From c3e7b665e642a353426d1b52062e6a0afbe131ff Mon Sep 17 00:00:00 2001 From: juliettech Date: Thu, 29 Jun 2023 14:17:25 -0400 Subject: [PATCH 1/4] Update README Header Updated the Header's README so that it contains the links to our organization's information. --- README.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/README.md b/README.md index 7f8d79149..d82338ab9 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,17 @@ ![Aragon](https://res.cloudinary.com/dacofvu8m/image/upload/v1677353961/Aragon%20CodeArena/osx_blue_logo_lqrvkr.png) +

+ Aragon website + • + Developer Portal + • + Join our Developer Community + • + Contribute +

+ +
+ # Aragon OSx Protocol The Aragon OSx protocol is the foundation layer of the new Aragon stack. It allows users to create, manage, and customize DAOs in a way that is lean, adaptable, and secure. From 34aacfb49b07417ce21a55697d0b646c6721892b Mon Sep 17 00:00:00 2001 From: Mathias Scherer Date: Fri, 30 Jun 2023 11:22:01 +0200 Subject: [PATCH 2/4] feat(DOPS-541): renames builders-portal to develoer-portal (#428) --- .github/workflows/documentation-update.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/documentation-update.yml b/.github/workflows/documentation-update.yml index 3409a9a9f..f7216de9a 100644 --- a/.github/workflows/documentation-update.yml +++ b/.github/workflows/documentation-update.yml @@ -30,17 +30,17 @@ jobs: working-directory: packages/contracts/ - name: Format with prettier run: yarn run prettier 'packages/contracts/docs/osx/03-reference-guide/**/*.md' --write - - name: Checkout builders-portal + - name: Checkout developer-portal uses: actions/checkout@v3 with: - repository: aragon/builders-portal + repository: aragon/developer-portal ref: staging - path: builders-portal + path: developer-portal token: ${{ secrets.ARABOT_PAT }} - - name: Remove the docs/osx folder in the builders-portal - run: rm -rf $GITHUB_WORKSPACE/builders-portal/docs/osx - - name: Copy the docs/osx folder to the builders-portal - run: cp -R packages/contracts/docs/osx $GITHUB_WORKSPACE/builders-portal/docs/osx + - name: Remove the docs/osx folder in the developer-portal + run: rm -rf $GITHUB_WORKSPACE/developer-portal/docs/osx + - name: Copy the docs/osx folder to the developer-portal + run: cp -R packages/contracts/docs/osx $GITHUB_WORKSPACE/developer-portal/docs/osx - name: Get short commit hash id: hash run: echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT @@ -48,7 +48,7 @@ jobs: uses: peter-evans/create-pull-request@v4 with: token: ${{ secrets.ARABOT_PAT }} - path: builders-portal + path: developer-portal commit-message: 'Update the Aragon OSx docs by commit ${{ steps.hash.outputs.sha_short }}' committer: 'Arabot ' branch: patch/aragon-osx-docs From 21e064d87c42523269d5f4c073e4a35dfb5acb60 Mon Sep 17 00:00:00 2001 From: Rekard0 <5880388+Rekard0@users.noreply.github.com> Date: Tue, 4 Jul 2023 16:26:12 +0300 Subject: [PATCH 3/4] OS-436 : use OSX npm for versioning (#418) * remove contracts-version * adapt osx & contracts-ethers import via alias * fix flows * remove redundant build * debug * debug 2 * fix package .json typechain * fix typo * rename alias * refactor the fixture functionalities * update docs * Feature/os 436 review (#421) * feat: improvements to the import paths * fix: remove comments * fix: redundant/outdated imports and typescript hints * fix: rollupjs warnings * Revert "fix: rollupjs warnings" This reverts commit 68dd5ab8402dc4482817a39833a1ec7698ca00cf. * clean up * fix typo * have single source of aliases * Feature/os 436 review (#424) * fix: rollupjs warnings * fix: rollupjs warning * clean up * update comments and readme * Apply suggestions from code review Co-authored-by: Mathias Scherer * run prettier --------- Co-authored-by: Michael Heuer <20623991+Michael-A-Heuer@users.noreply.github.com> Co-authored-by: Mathias Scherer --- .github/workflows/contract-tests.yml | 5 - .../workflows/contracts-versions-tests.yml | 34 - .github/workflows/documentation-update.yml | 3 - .github/workflows/subgraph-tests.yml | 2 - packages/contracts-versions/.gitignore | 3 - packages/contracts-versions/README.md | 71 - .../contracts-versions/commit_hashes.json | 8 - .../create-contract-versions.ts | 107 - packages/contracts-versions/jest.config.js | 4 - packages/contracts-versions/package.json | 46 - packages/contracts-versions/rollup.config.ts | 56 - .../contracts-versions/test/usage.test.ts | 24 - packages/contracts-versions/tsconfig.json | 16 - packages/contracts/README.md | 63 +- packages/contracts/deploy/helpers.ts | 8 +- .../deploy/update/to_v1.3.0/10_DAOFactory.ts | 3 +- .../to_v1.3.0/11_DAOFactory_conclude.ts | 3 +- .../update/to_v1.3.0/20_PluginRepoFactory.ts | 3 +- .../21_PluginRepoFactory_conclude.ts | 3 +- .../to_v1.3.0/30_Multisig_PluginRepo.ts | 3 +- .../update/to_v1.3.0/31_Multisig_Plugin.ts | 3 +- .../to_v1.3.0/32_Multisig_Plugin_conclude.ts | 3 +- .../to_v1.3.0/40_TokenVoting_PluginRepo.ts | 3 +- .../update/to_v1.3.0/41_TokenVoting_Plugin.ts | 3 +- .../42_TokenVoting_Plugin_conclude.ts | 3 +- .../50_AddresslistVoting_PluginRepo.ts | 3 +- .../to_v1.3.0/51_AddresslistVoting_Plugin.ts | 5 +- .../52_AddresslistVoting_Plugin_conclude.ts | 5 +- .../update/to_v1.3.0/60_Admin_PluginRepo.ts | 3 +- .../deploy/update/to_v1.3.0/90_ManagingDAO.ts | 3 +- packages/contracts/hardhat.config.ts | 1 + packages/contracts/npm/index.ts | 3 +- packages/contracts/package.json | 12 +- ....ts => generate-typechain-osx-versions.ts} | 11 +- .../scripts/generate-typechain-osx.ts | 66 + .../contracts/scripts/osx-versions-aliases.ts | 8 + .../src/test/{osx-versions => }/Migration.sol | 5 +- .../contracts/test/deploy/updateTo1_3_0.ts | 23 +- .../test/plugins/utils/addresslist.ts | 48 +- packages/contracts/test/test-utils/bitmap.ts | 5 +- packages/contracts/test/test-utils/ens.ts | 2 +- packages/contracts/test/test-utils/fixture.ts | 24 +- .../test/test-utils/plugin-setup-processor.ts | 2 +- packages/contracts/test/upgrade/dao.ts | 297 +-- packages/contracts/utils/ens.ts | 7 +- packages/contracts/utils/event.ts | 2 +- packages/contracts/utils/types.ts | 1 + packages/contracts/utils/updates.ts | 11 - packages/subgraph/package.json | 1 - yarn.lock | 1812 +---------------- 50 files changed, 261 insertions(+), 2579 deletions(-) delete mode 100644 .github/workflows/contracts-versions-tests.yml delete mode 100644 packages/contracts-versions/.gitignore delete mode 100644 packages/contracts-versions/README.md delete mode 100644 packages/contracts-versions/commit_hashes.json delete mode 100644 packages/contracts-versions/create-contract-versions.ts delete mode 100644 packages/contracts-versions/jest.config.js delete mode 100644 packages/contracts-versions/package.json delete mode 100644 packages/contracts-versions/rollup.config.ts delete mode 100644 packages/contracts-versions/test/usage.test.ts delete mode 100644 packages/contracts-versions/tsconfig.json rename packages/contracts/scripts/{generate-typechain.ts => generate-typechain-osx-versions.ts} (74%) create mode 100644 packages/contracts/scripts/generate-typechain-osx.ts create mode 100644 packages/contracts/scripts/osx-versions-aliases.ts rename packages/contracts/src/test/{osx-versions => }/Migration.sol (75%) delete mode 100644 packages/contracts/utils/updates.ts diff --git a/.github/workflows/contract-tests.yml b/.github/workflows/contract-tests.yml index 7eb4e38e4..164e034bb 100644 --- a/.github/workflows/contract-tests.yml +++ b/.github/workflows/contract-tests.yml @@ -28,11 +28,6 @@ jobs: node-version: 16 - name: Install dependencies run: cd ../../ && yarn install --pure-lockfile - - name: Build the osx-versions NPM package - run: yarn build - working-directory: packages/contracts-versions/ - - name: Clean the contracts directory - run: yarn clean - name: Check formatting run: yarn run formatting:check - name: Compile contracts diff --git a/.github/workflows/contracts-versions-tests.yml b/.github/workflows/contracts-versions-tests.yml deleted file mode 100644 index 80608d513..000000000 --- a/.github/workflows/contracts-versions-tests.yml +++ /dev/null @@ -1,34 +0,0 @@ -name: Contracts-versions Tests -on: - push: - paths: - - 'packages/contracts-versions/**' - - '.github/workflows/contract-*.yml' - -env: - working-directory: packages/contracts-versions - -jobs: - test-hardhat: - if: github.actor != 'arabot-1' - runs-on: ubuntu-latest - defaults: - run: - working-directory: ${{env.working-directory}} - steps: - - name: Checkout repository - uses: actions/checkout@v2 - with: - ref: ${{ github.ref }} - fetch-depth: 0 - - name: Install node - uses: actions/setup-node@v3 - with: - cache: 'yarn' - node-version: 16 - - name: Install dependencies - run: cd ../../ && yarn install --pure-lockfile - - name: Compile contracts-versions - run: yarn run build - - name: Run Tests - run: yarn run test diff --git a/.github/workflows/documentation-update.yml b/.github/workflows/documentation-update.yml index f7216de9a..87275ae57 100644 --- a/.github/workflows/documentation-update.yml +++ b/.github/workflows/documentation-update.yml @@ -19,9 +19,6 @@ jobs: node-version: 16 - name: Install dependencies run: yarn install --frozen-lockfile - - name: Build the osx-versions NPM package - run: yarn build - working-directory: packages/contracts-versions/ - name: Clean the contracts directory run: yarn clean working-directory: packages/contracts/ diff --git a/.github/workflows/subgraph-tests.yml b/.github/workflows/subgraph-tests.yml index 7593fcd8b..3dbc32e90 100644 --- a/.github/workflows/subgraph-tests.yml +++ b/.github/workflows/subgraph-tests.yml @@ -59,8 +59,6 @@ jobs: node-version: 16 - name: Install dependencies run: yarn - - name: Build contracts-versions - run: yarn run build:contracts-versions - name: Build contracts run: yarn run build:contracts - name: Build manifest diff --git a/packages/contracts-versions/.gitignore b/packages/contracts-versions/.gitignore deleted file mode 100644 index d29ca3ab9..000000000 --- a/packages/contracts-versions/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -versions -npm -npm/index.ts diff --git a/packages/contracts-versions/README.md b/packages/contracts-versions/README.md deleted file mode 100644 index cac705800..000000000 --- a/packages/contracts-versions/README.md +++ /dev/null @@ -1,71 +0,0 @@ -# Aragon OSx Contracts Versions - -A package to manage different contract versions and provide easy access to their ABI, types, and active contracts. - -## Installation - -```bash -npm install @aragon/osx-versions -``` - -or - -```bash -yarn add @aragon/osx-versions -``` - -## Usage - -Import Active contracts: - -```javascript -// import active contracts from a specific version -import {v1_2_0_active_contracts} from '@aragon/osx-versions'; - -const mumbaiActiveContracts = v1_2_0_active_contracts.mumbai; -``` - -Import a specific contract source code from a specific version: - -```solidity - -// SPDX-License-Identifier: AGPL-3.0-or-later - -pragma solidity 0.8.17; - -// import legacy contracts from a specific version -import {DAO} from '@aragon/osx-versions/versions/v1_0_1/contracts/core/dao/DAO.sol'; - -// ..... -``` - -### Generate typechain - -To generate TypeChain if needed: - -```console -find /artifacts/@aragon/osx-versions/versions/ -name '*.json' -type f | grep -v '.dbg.json' | xargs typechain --target=ethers-v5 --out-dir /typechain/osx-versions/versions/" -``` - -## Adding new contract versions - -1. Update `commit_hashes.json` with the new version name and the associated commit hash. -2. Run the `create-contract-versions.ts` script to build and generate the new version: - -```bash -yarn build:contracts -``` - -3. Run the Rollup build process: - -```bash -yarn build:npm -``` - -## Contributing - -Contributions are welcome! Feel free to open a pull request or create an issue to report bugs or request features. - -## License - -This project is licensed under the AGPL-3.0-or-later License. diff --git a/packages/contracts-versions/commit_hashes.json b/packages/contracts-versions/commit_hashes.json deleted file mode 100644 index c5314e18b..000000000 --- a/packages/contracts-versions/commit_hashes.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "versions": { - "v1_0_0": "c2b9d23a96654e81f22fbf91e6f334ef26a370af", - "v1_2_0": "9485d97301611cfc78faa4bd00eb54abb6dd2d5e", - "v1_2_1": "a432f25817675038e5891bdd7ec01a3096d8f0db", - "v1_2_2": "1bf17984d1a1b569c3c4b1d86026d87f74f81402" - } -} diff --git a/packages/contracts-versions/create-contract-versions.ts b/packages/contracts-versions/create-contract-versions.ts deleted file mode 100644 index 0ba28959b..000000000 --- a/packages/contracts-versions/create-contract-versions.ts +++ /dev/null @@ -1,107 +0,0 @@ -const fs = require('fs-extra'); -const path = require('path'); -const glob = require('glob'); -const util = require('util'); -const exec = util.promisify(require('child_process').exec); - -const monorepoRoot = path.join(__dirname, '../..'); -const contractsDir = path.join(monorepoRoot, 'packages/contracts'); -const contractVersionsDir = path.join(__dirname, 'versions'); -const commitHashes = require('./commit_hashes.json'); - -async function checkForUncommittedChanges() { - const {stdout} = await exec('git status --porcelain', {cwd: contractsDir}); - if (stdout.trim()) { - throw new Error( - 'There are uncommitted changes. Please commit or stash them before running this script.' - ); - } -} - -async function getCurrentTagOrBranch() { - const {stdout} = await exec( - 'git describe --exact-match --tags 2> /dev/null || git branch --show-current', - {cwd: contractsDir} - ); - return stdout.trim(); -} - -async function buildContracts(commit: string) { - try { - await exec(`git checkout ${commit}`, {cwd: contractsDir}); - await exec('yarn build', {cwd: contractsDir}); - } catch (error) { - console.error('Error building contracts:', error); - } -} - -async function copyContracts(versionName: string) { - try { - const srcContracts = path.join(contractsDir, 'src'); - const destContracts = path.join( - contractVersionsDir, - versionName, - 'contracts' - ); - - console.log(`Copying contracts from ${srcContracts} to ${destContracts}`); - - await fs.copy(srcContracts, destContracts); - - const srcActiveContracts = path.join(monorepoRoot, 'active_contracts.json'); - const destActiveContracts = path.join( - contractVersionsDir, - versionName, - 'active_contracts.json' - ); - - console.log(`Copying active_contracts.json to ${destActiveContracts}`); - - await fs.copy(srcActiveContracts, destActiveContracts); - } catch (error) { - console.error( - 'Error copying contracts source code and active contracts:', - error - ); - } -} - -async function createVersions() { - await checkForUncommittedChanges(); - - const currentTagOrBranch = await getCurrentTagOrBranch(); - - for (const version in commitHashes.versions) { - const versionCommit = commitHashes.versions[version] as string; - const versionName = version; - - console.log( - `Building contracts for version: ${versionName}, with commit: ${versionCommit}` - ); - await buildContracts(versionCommit); - await copyContracts(versionName); - } - - // Return to the original branch - await exec(`git checkout ${currentTagOrBranch}`, {cwd: contractsDir}); - - // Generate npm/index.ts file - const exports: string[] = []; - for (const version in commitHashes.versions) { - const versionName = version; - exports.push( - `import * as ${versionName}_active_contracts from '../versions/${versionName}/active_contracts.json';` - ); - } - exports.push( - `export { ${Object.keys(commitHashes.versions) - .map(versionName => `${versionName}_active_contracts`) - .join(', ')} };` - ); - - const npmDir = path.join(__dirname, 'npm'); - await fs.ensureDir(npmDir); - await fs.writeFile(path.join(npmDir, 'index.ts'), exports.join('\n')); -} - -createVersions(); diff --git a/packages/contracts-versions/jest.config.js b/packages/contracts-versions/jest.config.js deleted file mode 100644 index 4a5b465ec..000000000 --- a/packages/contracts-versions/jest.config.js +++ /dev/null @@ -1,4 +0,0 @@ -module.exports = { - preset: 'ts-jest', - testEnvironment: 'node', -}; diff --git a/packages/contracts-versions/package.json b/packages/contracts-versions/package.json deleted file mode 100644 index 67d231501..000000000 --- a/packages/contracts-versions/package.json +++ /dev/null @@ -1,46 +0,0 @@ -{ - "name": "@aragon/osx-versions", - "version": "1.0.0", - "description": "The Aragon OSx contract versions", - "main": "dist/index-cjs.js", - "module": "dist/index-esm.js", - "types": "dist/bundle.d.ts", - "publishConfig": { - "access": "public" - }, - "scripts": { - "build:contracts": "ts-node create-contract-versions.ts", - "build:npm": "rollup --config rollup.config.ts", - "build": "yarn build:contracts && yarn build:npm", - "test": "jest", - "clean": "rm -rf dist npm versions " - }, - "repository": { - "type": "git", - "url": "git+https://github.com/aragon/osx.git" - }, - "author": "", - "license": "AGPL-3.0-or-later", - "bugs": { - "url": "https://github.com/aragon/osx/issues" - }, - "homepage": "https://github.com/aragon/osx#readme", - "devDependencies": { - "@rollup/plugin-typescript": "^8.3.1", - "@typechain/ethers-v5": "^10.2.0", - "@types/fs-extra": "^11.0.1", - "@types/jest": "^29.5.1", - "@types/node": "^18.16.1", - "jest": "^29.5.0", - "rollup": "^2.70.1", - "rollup-plugin-copy": "^3.4.0", - "rollup-plugin-dts": "^4.2.0", - "ts-jest": "^29.1.0", - "ts-node": "^10.9.1", - "typechain": "^8.1.1", - "typescript": "^5.0.4" - }, - "dependencies": { - "ethers": "^5.6.2" - } -} diff --git a/packages/contracts-versions/rollup.config.ts b/packages/contracts-versions/rollup.config.ts deleted file mode 100644 index ce98890f6..000000000 --- a/packages/contracts-versions/rollup.config.ts +++ /dev/null @@ -1,56 +0,0 @@ -import typescript from '@rollup/plugin-typescript'; -import dts from 'rollup-plugin-dts'; -import json from '@rollup/plugin-json'; -import copy from 'rollup-plugin-copy'; - -export default [ - { - input: 'npm/index.ts', - plugins: [ - typescript({project: './tsconfig.json'}), - json(), - copy({ - targets: [ - { - src: 'versions/**/active_contracts.json', - dest: 'dist/versions', - rename: (name, extension, fullPath) => { - if (fullPath) { - const matchResult = fullPath.match(/versions\/(.+?)\//); - if (matchResult) { - const versionName = matchResult[1]; - return `${versionName}/active_contracts.json`; - } - } - return name; - }, - }, - ], - }), - ], - output: [ - { - dir: 'dist', - entryFileNames: 'index-esm.js', - format: 'esm', - exports: 'named', - sourcemap: true, - }, - { - dir: 'dist', - entryFileNames: 'index-cjs.js', - format: 'cjs', - exports: 'named', - sourcemap: true, - }, - ], - }, - { - input: 'npm/index.ts', - plugins: [dts(), json()], - output: { - file: 'dist/bundle.d.ts', - format: 'es', - }, - }, -]; diff --git a/packages/contracts-versions/test/usage.test.ts b/packages/contracts-versions/test/usage.test.ts deleted file mode 100644 index 9bd33eb7e..000000000 --- a/packages/contracts-versions/test/usage.test.ts +++ /dev/null @@ -1,24 +0,0 @@ -import { - v1_0_0_active_contracts, - v1_2_0_active_contracts, -} from '@aragon/osx-versions'; - -describe('contract-versions', () => { - it('should get active contracts for a specific version', async () => { - const activeContracts101 = v1_0_0_active_contracts; - expect(activeContracts101).toBeDefined(); - - const activeContracts120 = v1_2_0_active_contracts; - expect(activeContracts120).toBeDefined(); - }); - - it('should not have mumbai deployment', async () => { - const activeContracts101: Record = v1_0_0_active_contracts; - expect(activeContracts101['mumbai']).toBeUndefined(); - }); - - it('should have mumbai deployment', async () => { - const activeContracts120 = v1_2_0_active_contracts; - expect(activeContracts120.mumbai).toBeTruthy(); - }); -}); diff --git a/packages/contracts-versions/tsconfig.json b/packages/contracts-versions/tsconfig.json deleted file mode 100644 index b71a7a68f..000000000 --- a/packages/contracts-versions/tsconfig.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "compilerOptions": { - "target": "es2018", - "module": "esnext", - "strict": true, - "esModuleInterop": true, - "outDir": "dist", - "declaration": true, - "moduleResolution": "node", - "resolveJsonModule": true, - "rootDir": "./", - "baseUrl": "./" - }, - "include": ["./versions", "./npm"], - "files": ["./npm/index.ts"] -} diff --git a/packages/contracts/README.md b/packages/contracts/README.md index 41f282724..f1e921489 100644 --- a/packages/contracts/README.md +++ b/packages/contracts/README.md @@ -70,29 +70,55 @@ Then, copy the deployment address and paste it in to replace `DEPLOYED_CONTRACT_ npx hardhat verify --network goerli DEPLOYED_CONTRACT_ADDRESS "Hello, Hardhat!" ``` -## Testing +## Testing with Previous Contract Versions -The `@aragon/osx-versions` package allows you to work with previous versions of the contracts. The solidity source files of these versions are available in the `packages/contracts-versions/versions` directory after the package was built. For a details please refer to the [packages/contracts-versions/README.md](https://github.com/aragon/osx/blob/develop/packages/contracts-versions/README.md). +The `@aragon/osx` and `@aragon/osx-ethers` packages facilitate working with earlier versions of contracts by utilizing npm aliases. This is advantageous for testing contracts against varying versions without having to maintain multiple instances of the contracts within the repository. -If you want to import and test a contract from a previous version, you must first import the contract into `contracts/src/tests/osx-versions/Migration.sol`. This step is necessary for the contract to be compiled. +Here's a step-by-step guide to import and test a contract from a previous version: -```solidity -// contracts/src/tests/osx-versions/Migration.sol +### Step 1: Add the Previous Version as an Alias in package.json + +First, add an alias to your `package.json` under the `dependencies` section. This alias points to the specific version of the package you want to use. + +For example, to use version 1.0.1 of the `@aragon/osx` package, add the following: + +```json +"dependencies": { + "@aragon/osx-v1.0.1": "npm:@aragon/osx@1.0.1" +} +``` -import '../../contracts-versions/{version-name}/{path_to_contract}.sol'; +### Step 2: Install Dependencies -// Replace {version-name} with the version number of the contract, and {path_to_contract} with the actual path to the contract. +Now, run the yarn install command to install the dependencies: + +```sh +yarn install ``` -After successful contract compilation, TypeChain typings will be automatically generated and placed in the `typechain/osx-versions/{version-name}` directory. This will allow you to interact with the contract in a type-safe manner in your tests. +### Step 3: Update OSX_VERSION_ALIASES in the Script + +Next, you need to inform the typechain generator script about this new alias. Open the script `/scripts/osx-version-aliases.ts` and append the alias name to the `OSX_VERSION_ALIASES` array: ```ts -// Generic example of usage in a test +export const OSX_VERSION_ALIASES = ['@aragon/osx-v1.0.1/']; +``` -... +### Step 4: Import the Contract in Your Solidity File -import {MyContract} from '../../../typechain/osx-versions/{version-name}/{path to MyContract}'; -import {MyContract__factory} from '../../../typechain/osx-versions/{version-name}/{path to MyContract__factory}'; +Now, you can import the desired contract using the alias you've set. Replace `{path_to_contract}` with the actual path to the contract within the osx package version you are using (in this example, version 1.0.1). + +```solidity +import '@aragon/osx-v1.0.1/{path_to_contract}.sol'; +``` + +After successful contract compilation, TypeChain typings will be automatically generated. This will allow you to interact with the contract in a type-safe manner in your tests. + +Here is a generic example of usage in a test: + +```ts +import {MyContract} from '@aragon/osx-ethers-v1.2.0/{path_to_MyContract}'; +import {MyContract____factory} from '@aragon/osx-ethers-v1.2.0/{path_to_MyContract__factory}'; describe('MyContract Test', function () { let myContract: MyContract; @@ -108,23 +134,20 @@ describe('MyContract Test', function () { expect(result).to.equal(something); }); }); - -... - ``` -Please replace 'MyContract' with the actual name of your contract, and follow the same approach for the other placeholders (someFunction, something). This is an illustrative example, the actual test case will depend on the specific methods and functionality of your contract. +Please replace 'MyContract' with the actual name of your contract, and follow the same approach for the other placeholders (someFunction, something). This is an illustrative example; the actual test case will depend on the specific methods and functionality of your contract. + +Example of usage in a test: ```ts -// Example of usage in a test import {expect} from 'chai'; import {ethers} from 'hardhat'; import {SignerWithAddress} from '@nomiclabs/hardhat-ethers/signers'; -import {deployWithProxy} from '../../test-utils/proxy'; import { DAO as DAO_V1_3_0, - DAO__factory as DAO_V1_3_0__factory, -} from '../../typechain/osx-versions/v1_3_0/contracts/core/dao/DAO.sol'; + DAO__factory as DAO_V1_3_0_factory, +} from '@aragon/osx-ethers-v1.3.0/contracts/core/dao/DAO.sol'; describe('Legacy Test Example', function () { let signers: SignerWithAddress[]; diff --git a/packages/contracts/deploy/helpers.ts b/packages/contracts/deploy/helpers.ts index 3c5f9884a..26688af68 100644 --- a/packages/contracts/deploy/helpers.ts +++ b/packages/contracts/deploy/helpers.ts @@ -94,17 +94,13 @@ export async function getContractAddress( } catch (e) {} try { - if (!hre.testingFork.osxVersion) { + if (!hre.testingFork.osxVersion && !hre.testingFork.activeContracts) { console.log('=========================='); console.log('Warning: osxVersion is not set'); console.log('=========================='); } - // Try to import the specific active contracts for the given OSx version - const osxVersions = require(`@aragon/osx-versions`); - - const activeContractName = `${hre.testingFork.osxVersion}_active_contracts`; - const activeContracts = osxVersions[activeContractName]; + const activeContracts = hre.testingFork.activeContracts; if (activeContracts && activeContracts[networkName][contractName]) { return activeContracts[networkName][contractName]; diff --git a/packages/contracts/deploy/update/to_v1.3.0/10_DAOFactory.ts b/packages/contracts/deploy/update/to_v1.3.0/10_DAOFactory.ts index 221e17e66..9f02320d1 100644 --- a/packages/contracts/deploy/update/to_v1.3.0/10_DAOFactory.ts +++ b/packages/contracts/deploy/update/to_v1.3.0/10_DAOFactory.ts @@ -3,7 +3,6 @@ import {HardhatRuntimeEnvironment} from 'hardhat/types'; import {Operation} from '../../../utils/types'; import {getActiveContractAddress} from '../../helpers'; import {DAO__factory} from '../../../typechain'; -import {UPDATE_INFOS} from '../../../utils/updates'; import daoFactoryArtifact from '../../../artifacts/src/framework/dao/DAOFactory.sol/DAOFactory.json'; @@ -66,4 +65,4 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) { }); }; export default func; -func.tags = ['DAOFactory'].concat(UPDATE_INFOS['v1_3_0'].tags); +func.tags = ['DAOFactory', 'v1.3.0']; diff --git a/packages/contracts/deploy/update/to_v1.3.0/11_DAOFactory_conclude.ts b/packages/contracts/deploy/update/to_v1.3.0/11_DAOFactory_conclude.ts index cc2e87ea2..8b5a5fe15 100644 --- a/packages/contracts/deploy/update/to_v1.3.0/11_DAOFactory_conclude.ts +++ b/packages/contracts/deploy/update/to_v1.3.0/11_DAOFactory_conclude.ts @@ -2,7 +2,6 @@ import {DeployFunction} from 'hardhat-deploy/types'; import {HardhatRuntimeEnvironment} from 'hardhat/types'; import {DAOFactory__factory} from '../../../typechain'; import {getContractAddress} from '../../helpers'; -import {UPDATE_INFOS} from '../../../utils/updates'; const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) { console.log('\nConcluding DAOFactory update'); @@ -20,4 +19,4 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) { }); }; export default func; -func.tags = ['DAOFactory', 'Verify'].concat(UPDATE_INFOS['v1_3_0'].tags); +func.tags = ['DAOFactory', 'Verify', 'v1.3.0']; diff --git a/packages/contracts/deploy/update/to_v1.3.0/20_PluginRepoFactory.ts b/packages/contracts/deploy/update/to_v1.3.0/20_PluginRepoFactory.ts index 8e6335883..b80445d19 100644 --- a/packages/contracts/deploy/update/to_v1.3.0/20_PluginRepoFactory.ts +++ b/packages/contracts/deploy/update/to_v1.3.0/20_PluginRepoFactory.ts @@ -3,7 +3,6 @@ import {DeployFunction} from 'hardhat-deploy/types'; import {getActiveContractAddress} from '../../helpers'; import {PluginRepo__factory} from '../../../typechain'; import {Operation} from '../../../utils/types'; -import {UPDATE_INFOS} from '../../../utils/updates'; import pluginRepoFactoryArtifact from '../../../artifacts/src/framework/plugin/repo/PluginRepoFactory.sol/PluginRepoFactory.json'; @@ -66,4 +65,4 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) { }); }; export default func; -func.tags = ['PluginRepoFactory'].concat(UPDATE_INFOS['v1_3_0'].tags); +func.tags = ['PluginRepoFactory', 'v1.3.0']; diff --git a/packages/contracts/deploy/update/to_v1.3.0/21_PluginRepoFactory_conclude.ts b/packages/contracts/deploy/update/to_v1.3.0/21_PluginRepoFactory_conclude.ts index 747b99211..a0a2f6b9b 100644 --- a/packages/contracts/deploy/update/to_v1.3.0/21_PluginRepoFactory_conclude.ts +++ b/packages/contracts/deploy/update/to_v1.3.0/21_PluginRepoFactory_conclude.ts @@ -2,7 +2,6 @@ import {DeployFunction} from 'hardhat-deploy/types'; import {HardhatRuntimeEnvironment} from 'hardhat/types'; import {PluginRepoFactory__factory} from '../../../typechain'; import {getContractAddress} from '../../helpers'; -import {UPDATE_INFOS} from '../../../utils/updates'; const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) { console.log('\nConcluding PluginRepoFactory update'); @@ -26,4 +25,4 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) { }); }; export default func; -func.tags = ['PluginRepoFactory', 'Verify'].concat(UPDATE_INFOS['v1_3_0'].tags); +func.tags = ['PluginRepoFactory', 'Verify', 'v1.3.0']; diff --git a/packages/contracts/deploy/update/to_v1.3.0/30_Multisig_PluginRepo.ts b/packages/contracts/deploy/update/to_v1.3.0/30_Multisig_PluginRepo.ts index 556bbc3af..5b2e87dce 100644 --- a/packages/contracts/deploy/update/to_v1.3.0/30_Multisig_PluginRepo.ts +++ b/packages/contracts/deploy/update/to_v1.3.0/30_Multisig_PluginRepo.ts @@ -5,7 +5,6 @@ import { PluginRepoFactory__factory, } from '../../../typechain'; import {getContractAddress} from '../../helpers'; -import {UPDATE_INFOS} from '../../../utils/updates'; const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) { console.log( @@ -45,4 +44,4 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) { }); }; export default func; -func.tags = ['MultisigPluginRepo'].concat(UPDATE_INFOS['v1_3_0'].tags); +func.tags = ['MultisigPluginRepo', 'v1.3.0']; diff --git a/packages/contracts/deploy/update/to_v1.3.0/31_Multisig_Plugin.ts b/packages/contracts/deploy/update/to_v1.3.0/31_Multisig_Plugin.ts index f215910b9..7caf21e2f 100644 --- a/packages/contracts/deploy/update/to_v1.3.0/31_Multisig_Plugin.ts +++ b/packages/contracts/deploy/update/to_v1.3.0/31_Multisig_Plugin.ts @@ -7,7 +7,6 @@ import multisigSetupArtifact from '../../../artifacts/src/plugins/governance/mul import multisigReleaseMetadata from '../../../src/plugins/governance/multisig/release-metadata.json'; import multisigBuildMetadata from '../../../src/plugins/governance/multisig/build-metadata.json'; -import {UPDATE_INFOS} from '../../../utils/updates'; const TARGET_RELEASE = 1; @@ -86,4 +85,4 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) { }); }; export default func; -func.tags = ['MultisigPlugin'].concat(UPDATE_INFOS['v1_3_0'].tags); +func.tags = ['MultisigPlugin', 'v1.3.0']; diff --git a/packages/contracts/deploy/update/to_v1.3.0/32_Multisig_Plugin_conclude.ts b/packages/contracts/deploy/update/to_v1.3.0/32_Multisig_Plugin_conclude.ts index 61db0451a..8aa3ec741 100644 --- a/packages/contracts/deploy/update/to_v1.3.0/32_Multisig_Plugin_conclude.ts +++ b/packages/contracts/deploy/update/to_v1.3.0/32_Multisig_Plugin_conclude.ts @@ -1,6 +1,5 @@ import {DeployFunction} from 'hardhat-deploy/types'; import {HardhatRuntimeEnvironment} from 'hardhat/types'; -import {UPDATE_INFOS} from '../../../utils/updates'; const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) { console.log('\nConcluding Multisig Plugin Update'); @@ -8,4 +7,4 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) { hre.aragonToVerifyContracts.push(await hre.deployments.get('MultisigSetup')); }; export default func; -func.tags = ['MultisigPlugin', 'Verify'].concat(UPDATE_INFOS['v1_3_0'].tags); +func.tags = ['MultisigPlugin', 'Verify', 'v1.3.0']; diff --git a/packages/contracts/deploy/update/to_v1.3.0/40_TokenVoting_PluginRepo.ts b/packages/contracts/deploy/update/to_v1.3.0/40_TokenVoting_PluginRepo.ts index f6ff5a465..73cf0eba7 100644 --- a/packages/contracts/deploy/update/to_v1.3.0/40_TokenVoting_PluginRepo.ts +++ b/packages/contracts/deploy/update/to_v1.3.0/40_TokenVoting_PluginRepo.ts @@ -5,7 +5,6 @@ import { PluginRepoFactory__factory, } from '../../../typechain'; import {getContractAddress} from '../../helpers'; -import {UPDATE_INFOS} from '../../../utils/updates'; const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) { console.log( @@ -45,4 +44,4 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) { }); }; export default func; -func.tags = ['TokenVotingPluginRepo'].concat(UPDATE_INFOS['v1_3_0'].tags); +func.tags = ['TokenVotingPluginRepo', 'v1.3.0']; diff --git a/packages/contracts/deploy/update/to_v1.3.0/41_TokenVoting_Plugin.ts b/packages/contracts/deploy/update/to_v1.3.0/41_TokenVoting_Plugin.ts index a9de843c0..dcc13ca67 100644 --- a/packages/contracts/deploy/update/to_v1.3.0/41_TokenVoting_Plugin.ts +++ b/packages/contracts/deploy/update/to_v1.3.0/41_TokenVoting_Plugin.ts @@ -6,7 +6,6 @@ import {getContractAddress, uploadToIPFS} from '../../helpers'; import tokenVotingSetupArtifact from '../../../artifacts/src/plugins/governance/majority-voting/token/TokenVotingSetup.sol/TokenVotingSetup.json'; import tokenVotingReleaseMetadata from '../../../src/plugins/governance/majority-voting/token/release-metadata.json'; import tokenVotingBuildMetadata from '../../../src/plugins/governance/majority-voting/token/build-metadata.json'; -import {UPDATE_INFOS} from '../../../utils/updates'; const TARGET_RELEASE = 1; @@ -88,4 +87,4 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) { }); }; export default func; -func.tags = ['Update', 'TokenVotingPlugin'].concat(UPDATE_INFOS['v1_3_0'].tags); +func.tags = ['Update', 'TokenVotingPlugin', 'v1.3.0']; diff --git a/packages/contracts/deploy/update/to_v1.3.0/42_TokenVoting_Plugin_conclude.ts b/packages/contracts/deploy/update/to_v1.3.0/42_TokenVoting_Plugin_conclude.ts index d5be96947..cd2691b44 100644 --- a/packages/contracts/deploy/update/to_v1.3.0/42_TokenVoting_Plugin_conclude.ts +++ b/packages/contracts/deploy/update/to_v1.3.0/42_TokenVoting_Plugin_conclude.ts @@ -1,6 +1,5 @@ import {DeployFunction} from 'hardhat-deploy/types'; import {HardhatRuntimeEnvironment} from 'hardhat/types'; -import {UPDATE_INFOS} from '../../../utils/updates'; const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) { console.log('\nConcluding TokenVoting Plugin Update'); @@ -10,4 +9,4 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) { ); }; export default func; -func.tags = ['TokenVotingPlugin', 'Verify'].concat(UPDATE_INFOS['v1_3_0'].tags); +func.tags = ['TokenVotingPlugin', 'Verify', 'v1.3.0']; diff --git a/packages/contracts/deploy/update/to_v1.3.0/50_AddresslistVoting_PluginRepo.ts b/packages/contracts/deploy/update/to_v1.3.0/50_AddresslistVoting_PluginRepo.ts index 11422ece0..0318c1b5a 100644 --- a/packages/contracts/deploy/update/to_v1.3.0/50_AddresslistVoting_PluginRepo.ts +++ b/packages/contracts/deploy/update/to_v1.3.0/50_AddresslistVoting_PluginRepo.ts @@ -5,7 +5,6 @@ import { PluginRepoFactory__factory, } from '../../../typechain'; import {getContractAddress} from '../../helpers'; -import {UPDATE_INFOS} from '../../../utils/updates'; const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) { console.log( @@ -46,4 +45,4 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) { }); }; export default func; -func.tags = ['AddresslistVotingPluginRepo'].concat(UPDATE_INFOS['v1_3_0'].tags); +func.tags = ['AddresslistVotingPluginRepo', 'v1.3.0']; diff --git a/packages/contracts/deploy/update/to_v1.3.0/51_AddresslistVoting_Plugin.ts b/packages/contracts/deploy/update/to_v1.3.0/51_AddresslistVoting_Plugin.ts index 95e8faa29..7e2770db1 100644 --- a/packages/contracts/deploy/update/to_v1.3.0/51_AddresslistVoting_Plugin.ts +++ b/packages/contracts/deploy/update/to_v1.3.0/51_AddresslistVoting_Plugin.ts @@ -6,7 +6,6 @@ import {getContractAddress, uploadToIPFS} from '../../helpers'; import addresslistVotingSetupArtifact from '../../../artifacts/src/plugins/governance/majority-voting/addresslist/AddresslistVotingSetup.sol/AddresslistVotingSetup.json'; import addresslistVotingReleaseMetadata from '../../../src/plugins/governance/majority-voting/addresslist/release-metadata.json'; import addresslistVotingBuildMetadata from '../../../src/plugins/governance/majority-voting/addresslist/build-metadata.json'; -import {UPDATE_INFOS} from '../../../utils/updates'; const TARGET_RELEASE = 1; @@ -90,6 +89,4 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) { }); }; export default func; -func.tags = ['Update', 'AddresslistVotingPlugin'].concat( - UPDATE_INFOS['v1_3_0'].tags -); +func.tags = ['Update', 'AddresslistVotingPlugin', 'v1.3.0']; diff --git a/packages/contracts/deploy/update/to_v1.3.0/52_AddresslistVoting_Plugin_conclude.ts b/packages/contracts/deploy/update/to_v1.3.0/52_AddresslistVoting_Plugin_conclude.ts index 2824051ad..ed0fdaaf9 100644 --- a/packages/contracts/deploy/update/to_v1.3.0/52_AddresslistVoting_Plugin_conclude.ts +++ b/packages/contracts/deploy/update/to_v1.3.0/52_AddresslistVoting_Plugin_conclude.ts @@ -1,6 +1,5 @@ import {DeployFunction} from 'hardhat-deploy/types'; import {HardhatRuntimeEnvironment} from 'hardhat/types'; -import {UPDATE_INFOS} from '../../../utils/updates'; const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) { console.log('\nConcluding AddresslistVoting Plugin Update'); @@ -10,6 +9,4 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) { ); }; export default func; -func.tags = ['AddresslistVotingPlugin', 'Verify'].concat( - UPDATE_INFOS['v1_3_0'].tags -); +func.tags = ['AddresslistVotingPlugin', 'Verify', 'v1.3.0']; diff --git a/packages/contracts/deploy/update/to_v1.3.0/60_Admin_PluginRepo.ts b/packages/contracts/deploy/update/to_v1.3.0/60_Admin_PluginRepo.ts index 328e7ce83..b3ea92ee4 100644 --- a/packages/contracts/deploy/update/to_v1.3.0/60_Admin_PluginRepo.ts +++ b/packages/contracts/deploy/update/to_v1.3.0/60_Admin_PluginRepo.ts @@ -5,7 +5,6 @@ import { PluginRepoFactory__factory, } from '../../../typechain'; import {getContractAddress} from '../../helpers'; -import {UPDATE_INFOS} from '../../../utils/updates'; const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) { console.log( @@ -42,4 +41,4 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) { }); }; export default func; -func.tags = ['AdminPluginRepo'].concat(UPDATE_INFOS['v1_3_0'].tags); +func.tags = ['AdminPluginRepo', 'v1.3.0']; diff --git a/packages/contracts/deploy/update/to_v1.3.0/90_ManagingDAO.ts b/packages/contracts/deploy/update/to_v1.3.0/90_ManagingDAO.ts index 96188ae0b..9304e9b62 100644 --- a/packages/contracts/deploy/update/to_v1.3.0/90_ManagingDAO.ts +++ b/packages/contracts/deploy/update/to_v1.3.0/90_ManagingDAO.ts @@ -2,7 +2,6 @@ import {DeployFunction} from 'hardhat-deploy/types'; import {HardhatRuntimeEnvironment} from 'hardhat/types'; import {DAOFactory__factory, DAO__factory} from '../../../typechain'; import {getContractAddress} from '../../helpers'; -import {UPDATE_INFOS} from '../../../utils/updates'; const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) { console.log('\nUpgrade the managing DAO to new implemenation'); @@ -34,4 +33,4 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) { }); }; export default func; -func.tags = ['ManagingDAO'].concat(UPDATE_INFOS['v1_3_0'].tags); +func.tags = ['ManagingDAO', 'v1.3.0']; diff --git a/packages/contracts/hardhat.config.ts b/packages/contracts/hardhat.config.ts index 71b137f2e..717d9f9e2 100644 --- a/packages/contracts/hardhat.config.ts +++ b/packages/contracts/hardhat.config.ts @@ -39,6 +39,7 @@ extendEnvironment((hre: HardhatRuntimeEnvironment) => { const testingFork: TestingFork = { network: '', osxVersion: '', + activeContracts: {}, }; hre.aragonPluginRepos = aragonPluginRepos; hre.aragonToVerifyContracts = []; diff --git a/packages/contracts/npm/index.ts b/packages/contracts/npm/index.ts index 079ee67b9..8dfc2ae45 100644 --- a/packages/contracts/npm/index.ts +++ b/packages/contracts/npm/index.ts @@ -1,5 +1,4 @@ -import artifacts from './artifacts'; import activeContracts from '../../../active_contracts.json'; -export default artifacts; +export * from './artifacts'; export const activeContractsList = activeContracts; diff --git a/packages/contracts/package.json b/packages/contracts/package.json index 2e35a4ff0..7fc668964 100644 --- a/packages/contracts/package.json +++ b/packages/contracts/package.json @@ -12,12 +12,12 @@ "dist" ], "scripts": { - "typechain": "find ./artifacts -name '*.json' -type f -not -path './artifacts/@aragon/*' -not -path './artifacts/build-info/*' | grep -v '.dbg.json' | xargs typechain --target=ethers-v5 --out-dir ./typechain", - "typechain:osx-versions": "ts-node scripts/generate-typechain.ts", + "typechain:osx": "ts-node scripts/generate-typechain-osx.ts", + "typechain:osx-versions": "ts-node scripts/generate-typechain-osx-versions.ts", + "typechain": "yarn typechain:osx && yarn typechain:osx-versions", "test": "hardhat test", - "build": "hardhat compile && yarn typechain && yarn typechain:osx-versions", + "build": "hardhat compile && yarn typechain", "build:npm": "rollup --config rollup.config.ts", - "build:contracts-versions": "cd ../contracts-versions && yarn build", "coverage": "hardhat coverage --solcoverjs ./.solcover.js", "flatten": "hardhat flatten", "analyze": "mythx analyze", @@ -81,6 +81,8 @@ "@ensdomains/ens-contracts": "0.0.11", "@opengsn/contracts": "2.2.6", "@openzeppelin/contracts": "4.8.1", - "@openzeppelin/contracts-upgradeable": "4.8.1" + "@openzeppelin/contracts-upgradeable": "4.8.1", + "@aragon/osx-v1.0.1": "npm:@aragon/osx@1.0.1", + "@aragon/osx-ethers-v1.2.0": "npm:@aragon/osx-ethers@1.2.0" } } diff --git a/packages/contracts/scripts/generate-typechain.ts b/packages/contracts/scripts/generate-typechain-osx-versions.ts similarity index 74% rename from packages/contracts/scripts/generate-typechain.ts rename to packages/contracts/scripts/generate-typechain-osx-versions.ts index f28af738d..30fc0560b 100644 --- a/packages/contracts/scripts/generate-typechain.ts +++ b/packages/contracts/scripts/generate-typechain-osx-versions.ts @@ -2,6 +2,7 @@ import {exec} from 'child_process'; import path from 'path'; import fs from 'fs'; import util from 'util'; +import {OSX_VERSION_ALIASES} from './osx-versions-aliases'; const execPromise = util.promisify(exec); @@ -21,7 +22,9 @@ async function generateTypechain(src: string, dest: string): Promise { } } -generateTypechain( - './artifacts/@aragon/osx-versions/versions/', - './typechain/osx-versions' -); +for (let i = 0; i < OSX_VERSION_ALIASES.length; i++) { + generateTypechain( + `./artifacts/${OSX_VERSION_ALIASES[i]}`, + `./typechain/${OSX_VERSION_ALIASES[i]}` + ); +} diff --git a/packages/contracts/scripts/generate-typechain-osx.ts b/packages/contracts/scripts/generate-typechain-osx.ts new file mode 100644 index 000000000..85e27ff31 --- /dev/null +++ b/packages/contracts/scripts/generate-typechain-osx.ts @@ -0,0 +1,66 @@ +import {exec} from 'child_process'; +import path from 'path'; +import fs from 'fs'; +import util from 'util'; +import {OSX_VERSION_ALIASES} from './osx-versions-aliases'; + +const execPromise = util.promisify(exec); + +async function generateTypechain(): Promise { + const artifactsDir = './artifacts'; + const excludedDirs = new Set([path.join(artifactsDir, 'build-info')]); + + for (let i = 0; i < OSX_VERSION_ALIASES.length; i++) { + excludedDirs.add(path.join(artifactsDir, OSX_VERSION_ALIASES[i])); + } + + const jsonFiles: string[] = []; + + console.log('Searching for files...'); + + findFiles(artifactsDir, filePath => { + if (!filePath.endsWith('.json')) { + return; + } + + if (filePath.endsWith('.dbg.json')) { + return; + } + + const dirPath = path.dirname(filePath); + if (!excludedDirs.has(dirPath)) { + jsonFiles.push(filePath); + } + }); + + console.log(`Found ${jsonFiles.length} files. Running typechain...`); + + const filesArg = jsonFiles.join(' '); + + if (filesArg) { + await execPromise( + `typechain --target ethers-v5 --out-dir ./typechain ${filesArg}` + ); + } + + console.log('Finished processing all files.'); +} + +function findFiles(dir: string, callback: (filePath: string) => void): void { + const files = fs.readdirSync(dir); + + for (const file of files) { + const filePath = path.join(dir, file); + const stat = fs.statSync(filePath); + + if (stat.isDirectory()) { + findFiles(filePath, callback); + } else if (stat.isFile()) { + callback(filePath); + } + } +} + +generateTypechain().catch(error => { + console.error('An error occurred:', error); +}); diff --git a/packages/contracts/scripts/osx-versions-aliases.ts b/packages/contracts/scripts/osx-versions-aliases.ts new file mode 100644 index 000000000..9c3601aec --- /dev/null +++ b/packages/contracts/scripts/osx-versions-aliases.ts @@ -0,0 +1,8 @@ +/** + * An array of strings representing the aliases of different versions + * of the @aragon/osx package. These aliases can be used to import + * and work with contracts from previous versions of the package. + * + * To add a new version alias, append it to this array. + */ +export const OSX_VERSION_ALIASES = ['@aragon/osx-v1.0.1/']; diff --git a/packages/contracts/src/test/osx-versions/Migration.sol b/packages/contracts/src/test/Migration.sol similarity index 75% rename from packages/contracts/src/test/osx-versions/Migration.sol rename to packages/contracts/src/test/Migration.sol index bbe19a2ad..3304763a3 100644 --- a/packages/contracts/src/test/osx-versions/Migration.sol +++ b/packages/contracts/src/test/Migration.sol @@ -13,11 +13,10 @@ pragma solidity 0.8.17; * necessary in the context of this Migration.sol file to differentiate between contract versions. * * After a contract is imported here and the project is compiled, an associated artifact will be - * generated inside artifacts/@aragon/osx-versions/versions/{version-name}/*, + * generated inside artifacts/@aragon/{version-name}/*, * and TypeChain typings will be generated inside typechain/osx-version/{version-name}/* for type-safe interactions with the contract * in our tests. * */ -import {DAO as DAO_v1_0_0} from "@aragon/osx-versions/versions/v1_0_0/contracts/core/dao/DAO.sol"; -import {DAO as DAO_v1_2_0} from "@aragon/osx-versions/versions/v1_2_0/contracts/core/dao/DAO.sol"; +import {DAO as DAO_v1_0_0} from "@aragon/osx-v1.0.1/core/dao/DAO.sol"; diff --git a/packages/contracts/test/deploy/updateTo1_3_0.ts b/packages/contracts/test/deploy/updateTo1_3_0.ts index afe31a398..a2ebadcf0 100644 --- a/packages/contracts/test/deploy/updateTo1_3_0.ts +++ b/packages/contracts/test/deploy/updateTo1_3_0.ts @@ -1,8 +1,12 @@ import {expect} from 'chai'; import {deployments} from 'hardhat'; -import {initForkAndFixture} from '../test-utils/fixture'; -import {v1_0_0_active_contracts} from '@aragon/osx-versions'; +import { + ForkOsxVersion, + initForkForOsxVersion, + initializeDeploymentFixture, +} from '../test-utils/fixture'; +import {activeContractsList as v1_2_0_activeContracts} from '@aragon/osx-ethers-v1.2.0'; const enableTest = process.env.TEST_UPDATE_DEPLOY_SCRIPT !== undefined; const network = 'mainnet'; @@ -10,7 +14,16 @@ const network = 'mainnet'; if (enableTest) { describe('update/to_v1.3.0', function () { before(async () => { - await initForkAndFixture(network, 'v1_3_0', 'v1_0_0'); + const previousOsxVersion: ForkOsxVersion = { + version: 'v1.0.1', + activeContracts: v1_2_0_activeContracts, + forkBlockNumber: 16722881, + }; + + await initForkForOsxVersion(network, previousOsxVersion); + + const updateDeployTags = ['v1.3.0']; + await initializeDeploymentFixture(updateDeployTags); }); it('deploys new contracts with new addresses', async function () { @@ -25,9 +38,7 @@ if (enableTest) { const allDeployments = await deployments.all(); changedContracts.forEach((contractName: string) => { - const previous = (v1_0_0_active_contracts as any)[network][ - contractName - ]; + const previous = (v1_2_0_activeContracts as any)[network][contractName]; const current = allDeployments[contractName].address; expect(previous).to.not.be.empty; diff --git a/packages/contracts/test/plugins/utils/addresslist.ts b/packages/contracts/test/plugins/utils/addresslist.ts index 329cb6628..e834bcec0 100644 --- a/packages/contracts/test/plugins/utils/addresslist.ts +++ b/packages/contracts/test/plugins/utils/addresslist.ts @@ -49,54 +49,62 @@ describe('AddresslistMock', function () { context('addresslistLengthAtBlock', function () { it('returns the right length after addresses were added', async () => { - let tx1 = await addresslist.addAddresses([signers[0].address]); + const tx1 = await addresslist.addAddresses([signers[0].address]); await ethers.provider.send('evm_mine', []); - let tx2 = await addresslist.addAddresses([ + const tx2 = await addresslist.addAddresses([ signers[1].address, signers[2].address, ]); await ethers.provider.send('evm_mine', []); + const [rc1, rc2] = await Promise.all([tx1.wait(), tx2.wait()]); + expect( - await addresslist.addresslistLengthAtBlock(tx1.blockNumber - 1) + await addresslist.addresslistLengthAtBlock(rc1.blockNumber - 1) ).to.equal(0); expect( - await addresslist.addresslistLengthAtBlock(tx1.blockNumber) + await addresslist.addresslistLengthAtBlock(rc1.blockNumber) ).to.equal(1); expect( - await addresslist.addresslistLengthAtBlock(tx2.blockNumber) + await addresslist.addresslistLengthAtBlock(rc2.blockNumber) ).to.equal(3); }); it('returns the right length after addresses were removed', async () => { - let tx1 = await addresslist.addAddresses([ + const tx1 = await addresslist.addAddresses([ signers[0].address, signers[1].address, signers[2].address, ]); await ethers.provider.send('evm_mine', []); - let tx2 = await addresslist.removeAddresses([signers[0].address]); + const tx2 = await addresslist.removeAddresses([signers[0].address]); await ethers.provider.send('evm_mine', []); - let tx3 = await addresslist.removeAddresses([ + const tx3 = await addresslist.removeAddresses([ signers[1].address, signers[2].address, ]); await ethers.provider.send('evm_mine', []); - expect(tx1.blockNumber).to.be.lt(tx2.blockNumber); - expect(tx2.blockNumber).to.be.lt(tx3.blockNumber); + const [rc1, rc2, rc3] = await Promise.all([ + tx1.wait(), + tx2.wait(), + tx3.wait(), + ]); + + expect(rc1.blockNumber).to.be.lt(rc2.blockNumber); + expect(rc2.blockNumber).to.be.lt(rc3.blockNumber); expect( - await addresslist.addresslistLengthAtBlock(tx1.blockNumber) + await addresslist.addresslistLengthAtBlock(rc1.blockNumber) ).to.equal(3); expect( - await addresslist.addresslistLengthAtBlock(tx2.blockNumber) + await addresslist.addresslistLengthAtBlock(rc2.blockNumber) ).to.equal(2); expect( - await addresslist.addresslistLengthAtBlock(tx3.blockNumber) + await addresslist.addresslistLengthAtBlock(rc3.blockNumber) ).to.equal(0); }); }); @@ -122,13 +130,15 @@ describe('AddresslistMock', function () { let tx2 = await addresslist.removeAddresses([signers[0].address]); await ethers.provider.send('evm_mine', []); - expect(tx1.blockNumber).to.be.lt(tx2.blockNumber); + const [rc1, rc2] = await Promise.all([tx1.wait(), tx2.wait()]); + + expect(rc1.blockNumber).to.be.lt(rc2.blockNumber); expect( - await addresslist.isListedAtBlock(signers[0].address, tx1.blockNumber) + await addresslist.isListedAtBlock(signers[0].address, rc1.blockNumber) ).to.equal(true); expect( - await addresslist.isListedAtBlock(signers[0].address, tx2.blockNumber) + await addresslist.isListedAtBlock(signers[0].address, rc2.blockNumber) ).to.equal(false); }); @@ -136,14 +146,16 @@ describe('AddresslistMock', function () { let tx1 = await addresslist.addAddresses([signers[0].address]); await ethers.provider.send('evm_mine', []); + const rc1 = await tx1.wait(); + expect( await addresslist.isListedAtBlock( signers[0].address, - tx1.blockNumber - 1 + rc1.blockNumber - 1 ) ).to.equal(false); expect( - await addresslist.isListedAtBlock(signers[0].address, tx1.blockNumber) + await addresslist.isListedAtBlock(signers[0].address, rc1.blockNumber) ).to.equal(true); }); }); diff --git a/packages/contracts/test/test-utils/bitmap.ts b/packages/contracts/test/test-utils/bitmap.ts index 7b19dd018..04f00f277 100644 --- a/packages/contracts/test/test-utils/bitmap.ts +++ b/packages/contracts/test/test-utils/bitmap.ts @@ -1,13 +1,14 @@ import {ethers} from 'hardhat'; +import {BigNumber} from 'ethers'; // @ts-ignore -export function flipBit(index: number, num: ethers.BigNumber) { +export function flipBit(index: number, num: BigNumber) { const mask = ethers.BigNumber.from(1).shl(index & 0xff); return num.xor(mask); } // @ts-ignore -export function getBit(index: number, num: ethers.BigNumber) { +export function getBit(index: number, num: BigNumber) { const mask = ethers.BigNumber.from(1).shl(index & 0xff); return !num.and(mask).eq(0); } diff --git a/packages/contracts/test/test-utils/ens.ts b/packages/contracts/test/test-utils/ens.ts index c0d6951a2..f1093a2a5 100644 --- a/packages/contracts/test/test-utils/ens.ts +++ b/packages/contracts/test/test-utils/ens.ts @@ -8,7 +8,7 @@ import { ENSSubdomainRegistrar, ENSRegistry, PublicResolver, -} from '../../../typechain'; +} from '../../typechain'; import { ENSRegistry__factory, ENSSubdomainRegistrar__factory, diff --git a/packages/contracts/test/test-utils/fixture.ts b/packages/contracts/test/test-utils/fixture.ts index 81900d21c..153bf1442 100644 --- a/packages/contracts/test/test-utils/fixture.ts +++ b/packages/contracts/test/test-utils/fixture.ts @@ -1,7 +1,12 @@ import hre, {network, deployments} from 'hardhat'; import networks from '../../networks.json'; -import {UPDATE_INFOS} from '../../utils/updates'; + +export interface ForkOsxVersion { + version: string; + activeContracts: any; + forkBlockNumber: number; +} export async function initializeFork( forkNetwork: string, @@ -32,20 +37,17 @@ export async function initializeDeploymentFixture(tag: string | string[]) { await fixture(); } -export async function initForkAndFixture( +export async function initForkForOsxVersion( forkNetwork: string, - osxVersion: string, - previousOsxVersion: string + osxVersion: ForkOsxVersion ): Promise { - if (!UPDATE_INFOS[osxVersion]) { - throw new Error(`No update info found for osxVersion '${osxVersion}'.`); - } - + // Aggregate necessary information to HardhatEnvironment. hre.testingFork = { network: forkNetwork, - osxVersion: previousOsxVersion, + osxVersion: osxVersion.version, + activeContracts: osxVersion.activeContracts, }; - await initializeFork(forkNetwork, UPDATE_INFOS[osxVersion].forkBlockNumber); - await initializeDeploymentFixture(UPDATE_INFOS[osxVersion].tags); + // Initialize a fork. + await initializeFork(forkNetwork, osxVersion.forkBlockNumber); } diff --git a/packages/contracts/test/test-utils/plugin-setup-processor.ts b/packages/contracts/test/test-utils/plugin-setup-processor.ts index 1739f9d8f..d9c49f4e4 100644 --- a/packages/contracts/test/test-utils/plugin-setup-processor.ts +++ b/packages/contracts/test/test-utils/plugin-setup-processor.ts @@ -1,6 +1,6 @@ import {ethers} from 'hardhat'; -import {PluginRepoRegistry, PluginSetupProcessor} from '../../../typechain'; +import {PluginRepoRegistry, PluginSetupProcessor} from '../../typechain'; import {getMergedABI} from '../../utils/abi'; diff --git a/packages/contracts/test/upgrade/dao.ts b/packages/contracts/test/upgrade/dao.ts index 3104b09bb..ec3ba4ec7 100644 --- a/packages/contracts/test/upgrade/dao.ts +++ b/packages/contracts/test/upgrade/dao.ts @@ -5,11 +5,8 @@ import {SignerWithAddress} from '@nomiclabs/hardhat-ethers/signers'; import { DAO as DAO_V1_0_0, DAO__factory as DAO_V1_0_0__factory, -} from '../../typechain/osx-versions/v1_0_0/contracts/core/dao/DAO.sol'; -import { - DAO as DAO_V1_2_0, - DAO__factory as DAO_V1_2_0__factory, -} from '../../typechain/osx-versions/v1_2_0/contracts/core/dao/DAO.sol'; +} from '../../typechain/@aragon/osx-v1.0.1/core/dao/DAO.sol'; + import {DAO, DAO__factory, ProtocolVersion__factory} from '../../typechain'; import {daoExampleURI, ZERO_BYTES32} from '../test-utils/dao'; @@ -20,15 +17,11 @@ import {readImplementationValueFromSlot} from '../../utils/storage'; import {getInterfaceID} from '../test-utils/interfaces'; let signers: SignerWithAddress[]; -let DAO_V1_0_0: DAO_V1_0_0__factory; -let DAO_V1_2_0: DAO_V1_2_0__factory; +let DAO_old: DAO_V1_0_0__factory; let DAO_Current: DAO__factory; let daoV100Proxy: DAO_V1_0_0; -let daoV120Proxy: DAO_V1_2_0; - let daoV100Implementation: string; -let daoV120Implementation: string; let daoCurrentImplementaion: DAO; const EMPTY_DATA = '0x'; @@ -45,8 +38,7 @@ describe('DAO Upgrade', function () { signers = await ethers.getSigners(); // We don't use the typchain here but directly grab the artifacts. This will be changed in an upcoming PR again. - DAO_V1_0_0 = new DAO_V1_0_0__factory(signers[0]); - DAO_V1_2_0 = new DAO_V1_2_0__factory(signers[0]); + DAO_old = new DAO_V1_0_0__factory(signers[0]); DAO_Current = new DAO__factory(signers[0]); // Deploy the v1.3.0 implementation @@ -56,7 +48,7 @@ describe('DAO Upgrade', function () { context(`Re-entrancy`, function () { context(`v1.0.0 to v1.3.0`, function () { beforeEach(async function () { - daoV100Proxy = await deployWithProxy(DAO_V1_0_0); + daoV100Proxy = await deployWithProxy(DAO_old); await daoV100Proxy.initialize( DUMMY_METADATA, signers[0].address, @@ -97,7 +89,7 @@ describe('DAO Upgrade', function () { // Check the emitted implementation. const emittedImplementation = ( - await findEventTopicLog(upgradeTx, DAO_V1_0_0.interface, 'Upgraded') + await findEventTopicLog(upgradeTx, DAO_old.interface, 'Upgraded') ).args.implementation; expect(emittedImplementation).to.equal(daoCurrentImplementaion.address); @@ -259,218 +251,12 @@ describe('DAO Upgrade', function () { expect(await daoV100Proxy.getTrustedForwarder()).to.equal(FORWARDER_2); }); }); - - context(`v1.2.0 to v1.3.0`, function () { - beforeEach(async function () { - daoV120Proxy = await deployWithProxy(DAO_V1_2_0); - await daoV120Proxy.initialize( - DUMMY_METADATA, - signers[0].address, - ethers.constants.AddressZero, - daoExampleURI - ); - - // Store the v1.2.0 implementation - daoV120Implementation = await readImplementationValueFromSlot( - daoV120Proxy.address - ); - - // Grant the upgrade permission - await daoV120Proxy.grant( - daoV120Proxy.address, - signers[0].address, - UPGRADE_PERMISSIONS.UPGRADE_DAO_PERMISSION_ID - ); - }); - - it('does not corrupt the DAO storage', async () => { - // Upgrade and call `initializeFrom`. - const upgradeTx = await daoV120Proxy.upgradeToAndCall( - daoCurrentImplementaion.address, - DAO_Current.interface.encodeFunctionData('initializeFrom', [ - [1, 2, 0], - EMPTY_DATA, - ]) - ); - - // Check the stored implementation. - const implementationAfterUpgrade = - await readImplementationValueFromSlot(daoV120Proxy.address); - expect(implementationAfterUpgrade).to.equal( - daoCurrentImplementaion.address - ); - expect(implementationAfterUpgrade).to.not.equal(daoV120Implementation); - - // Check the emitted implementation. - const emittedImplementation = ( - await findEventTopicLog(upgradeTx, DAO_V1_2_0.interface, 'Upgraded') - ).args.implementation; - expect(emittedImplementation).to.equal(daoCurrentImplementaion.address); - - // Check that storage is not corrupted. - expect(await daoV120Proxy.callStatic.daoURI()).to.equal(daoExampleURI); - }); - - it('does not corrupt permissions', async () => { - await daoV120Proxy.grant( - daoV120Proxy.address, - signers[0].address, - ethers.utils.id('EXECUTE_PERMISSION') - ); - - // Check that permissions are granted before the upgrade - expect( - await daoV120Proxy.hasPermission( - daoV120Proxy.address, - signers[0].address, - ethers.utils.id('EXECUTE_PERMISSION'), - EMPTY_DATA - ) - ).to.be.true; - expect( - await daoV120Proxy.hasPermission( - daoV120Proxy.address, - signers[0].address, - ethers.utils.id('ROOT_PERMISSION'), - EMPTY_DATA - ) - ).to.be.true; - - // Check that a arbitrary permission is not granted. - expect( - await daoV120Proxy.hasPermission( - daoV120Proxy.address, - signers[0].address, - ethers.utils.id('NOT_GRANTED'), - EMPTY_DATA - ) - ).to.be.false; - - // Upgrade and call `initializeFrom`. - await daoV120Proxy.upgradeToAndCall( - daoCurrentImplementaion.address, - DAO_Current.interface.encodeFunctionData('initializeFrom', [ - [1, 2, 0], - EMPTY_DATA, - ]) - ); - - // Check the stored implementation. - const implementationAfterUpgrade = - await readImplementationValueFromSlot(daoV120Proxy.address); - expect(implementationAfterUpgrade).to.equal( - daoCurrentImplementaion.address - ); - expect(implementationAfterUpgrade).to.not.equal(daoV120Implementation); - - // Check that the permissions are still granted. - expect( - await daoV120Proxy.hasPermission( - daoV120Proxy.address, - signers[0].address, - ethers.utils.id('EXECUTE_PERMISSION'), - EMPTY_DATA - ) - ).to.be.true; - expect( - await daoV120Proxy.hasPermission( - daoV120Proxy.address, - signers[0].address, - ethers.utils.id('ROOT_PERMISSION'), - EMPTY_DATA - ) - ).to.be.true; - - // Check that a the arbitrary permission is still not granted. - expect( - await daoV120Proxy.hasPermission( - daoV120Proxy.address, - signers[0].address, - ethers.utils.id('NOT_GRANTED'), - EMPTY_DATA - ) - ).to.be.false; - }); - - it('executes actions after the upgrade', async () => { - await daoV120Proxy.grant( - daoV120Proxy.address, - signers[0].address, - ethers.utils.id('EXECUTE_PERMISSION') - ); - - // We use the `setTrustedForwarder` to test execution and must give permission to the DAO (executor) to call it. - await daoV120Proxy.grant( - daoV120Proxy.address, - daoV120Proxy.address, - ethers.utils.id('SET_TRUSTED_FORWARDER_PERMISSION') - ); - - // Create an action to set forwarder1 - const forwarderChangeAction1 = { - to: daoV120Proxy.address, - data: daoV120Proxy.interface.encodeFunctionData( - 'setTrustedForwarder', - [FORWARDER_1] - ), - value: 0, - }; - - // Execute and check in the event that the forwarder1 has been set. - await expect( - daoV120Proxy.execute(ZERO_BYTES32, [forwarderChangeAction1], 0) - ) - .to.emit(daoV120Proxy, 'TrustedForwarderSet') - .withArgs(FORWARDER_1); - - // Check that the storage variable now forwarder 1. - expect(await daoV120Proxy.getTrustedForwarder()).to.equal(FORWARDER_1); - - // Upgrade and call `initializeFrom`. - await daoV120Proxy.upgradeToAndCall( - daoCurrentImplementaion.address, - DAO_Current.interface.encodeFunctionData('initializeFrom', [ - [1, 2, 0], - EMPTY_DATA, - ]) - ); - - // Check that the stored implementatio has changed. - const implementationAfterUpgrade = - await readImplementationValueFromSlot(daoV120Proxy.address); - expect(implementationAfterUpgrade).to.equal( - daoCurrentImplementaion.address - ); - expect(implementationAfterUpgrade).to.not.equal(daoV100Implementation); - - // Check that the old forwarder is still unchanged. - expect(await daoV120Proxy.getTrustedForwarder()).to.equal(FORWARDER_1); - - // Create an action to change the forwarder to a new address. - const testAction = { - to: daoV120Proxy.address, - data: daoV120Proxy.interface.encodeFunctionData( - 'setTrustedForwarder', - [FORWARDER_2] - ), - value: 0, - }; - - // Execute and check in the event that the forwarder1 has been set. - await expect(daoV120Proxy.execute(ZERO_BYTES32, [testAction], 0)) - .to.emit(daoV120Proxy, 'TrustedForwarderSet') - .withArgs(FORWARDER_2); - - // Check that the storage variable is now forwarder 2. - expect(await daoV120Proxy.getTrustedForwarder()).to.equal(FORWARDER_2); - }); - }); }); context(`Protocol Version`, function () { beforeEach(async function () { // prepare v1.0.0 - daoV100Proxy = await deployWithProxy(DAO_V1_0_0); + daoV100Proxy = await deployWithProxy(DAO_old); await daoV100Proxy.initialize( DUMMY_METADATA, signers[0].address, @@ -484,22 +270,6 @@ describe('DAO Upgrade', function () { signers[0].address, UPGRADE_PERMISSIONS.UPGRADE_DAO_PERMISSION_ID ); - - // prepare v1.2.0 - daoV120Proxy = await deployWithProxy(DAO_V1_2_0); - await daoV120Proxy.initialize( - DUMMY_METADATA, - signers[0].address, - ethers.constants.AddressZero, - daoExampleURI - ); - - // Grant the upgrade permission - await daoV120Proxy.grant( - daoV120Proxy.address, - signers[0].address, - UPGRADE_PERMISSIONS.UPGRADE_DAO_PERMISSION_ID - ); }); it('fails to call protocolVersion on versions prior to v1.3.0 and succeeds from v1.3.0 onwards', async () => { @@ -526,15 +296,6 @@ describe('DAO Upgrade', function () { .to.be.revertedWithCustomError(daoV100Proxy, 'UnkownCallback') .withArgs(protocolVersionSelector, '0x00000000'); - const daoV120 = ProtocolVersion__factory.connect( - daoV120Proxy.address, - signers[0] - ); - - await expect(daoV120.protocolVersion()) - .to.be.revertedWithCustomError(daoV120Proxy, 'UnkownCallback') - .withArgs(protocolVersionSelector, '0x00000000'); - // for DAO v1.3.0 onward const daoV130 = ProtocolVersion__factory.connect( daoCurrentProxy.address, @@ -587,49 +348,5 @@ describe('DAO Upgrade', function () { expect(await daoV130.protocolVersion()).to.be.deep.eq([1, 3, 0]); }); }); - - context('v1.2.0 to v1.3.0', function () { - it('supports new protocol version interface after upgrade', async () => { - // check that the old version do not support protocol version interface - const protocolVersionInterface = - ProtocolVersion__factory.createInterface(); - - expect( - await daoV120Proxy.supportsInterface( - getInterfaceID(protocolVersionInterface) - ) - ).to.be.eq(false); - - // Upgrade and call `initializeFrom`. - await daoV120Proxy.upgradeToAndCall( - daoCurrentImplementaion.address, - DAO_Current.interface.encodeFunctionData('initializeFrom', [ - [1, 2, 0], - EMPTY_DATA, - ]) - ); - - // check the interface is registered. - expect( - await daoV120Proxy.supportsInterface( - getInterfaceID(protocolVersionInterface) - ) - ).to.be.eq(true); - }); - - it('returns the correct protocol version after upgrade', async () => { - // Upgrade and call `initializeFrom`. - await daoV120Proxy.upgradeToAndCall( - daoCurrentImplementaion.address, - DAO_Current.interface.encodeFunctionData('initializeFrom', [ - [1, 2, 0], - EMPTY_DATA, - ]) - ); - - const daoV130 = DAO_Current.attach(daoV120Proxy.address); - expect(await daoV130.protocolVersion()).to.be.deep.eq([1, 3, 0]); - }); - }); }); }); diff --git a/packages/contracts/utils/ens.ts b/packages/contracts/utils/ens.ts index 3f0d5d893..4a195b849 100644 --- a/packages/contracts/utils/ens.ts +++ b/packages/contracts/utils/ens.ts @@ -1,9 +1,9 @@ import {ethers} from 'hardhat'; import {ENSRegistry__factory} from '../typechain'; -import {EHRE} from './types'; import ensRegistryArtifact from '../artifacts/@ensdomains/ens-contracts/contracts/registry/ENSRegistry.sol/ENSRegistry.json'; import publicResolverArtifact from '../artifacts/@ensdomains/ens-contracts/contracts/resolvers/PublicResolver.sol/PublicResolver.json'; +import {HardhatRuntimeEnvironment} from 'hardhat/types'; export function ensLabelHash(label: string): string { return ethers.utils.id(label); @@ -13,7 +13,10 @@ export function ensDomainHash(name: string): string { return ethers.utils.namehash(name); } -export async function setupENS(domains: string[], hre: EHRE): Promise { +export async function setupENS( + domains: string[], + hre: HardhatRuntimeEnvironment +): Promise { const {deployments, ethers} = hre; const {deploy} = deployments; const [deployer] = await ethers.getSigners(); diff --git a/packages/contracts/utils/event.ts b/packages/contracts/utils/event.ts index b68b3785e..b6d54f743 100644 --- a/packages/contracts/utils/event.ts +++ b/packages/contracts/utils/event.ts @@ -9,7 +9,7 @@ export async function findEvent(tx: ContractTransaction, eventName: string) { throw new Error(`Event ${eventName} not found in TX.`); } - return event as T; + return event as unknown as T; } export async function findEventTopicLog( diff --git a/packages/contracts/utils/types.ts b/packages/contracts/utils/types.ts index 8201188e6..70da775f2 100644 --- a/packages/contracts/utils/types.ts +++ b/packages/contracts/utils/types.ts @@ -28,4 +28,5 @@ export enum Operation { export type TestingFork = { network: string; osxVersion: string; + activeContracts: any; }; diff --git a/packages/contracts/utils/updates.ts b/packages/contracts/utils/updates.ts deleted file mode 100644 index 0f6875625..000000000 --- a/packages/contracts/utils/updates.ts +++ /dev/null @@ -1,11 +0,0 @@ -export type UpdateInfo = { - tags: string | string[]; - forkBlockNumber: number; -}; - -export const UPDATE_INFOS: {[index: string]: UpdateInfo} = { - v1_3_0: { - tags: 'update/to_v1.3.0', - forkBlockNumber: 16722881, - }, -}; diff --git a/packages/subgraph/package.json b/packages/subgraph/package.json index 4422b814d..7cfbf7fd7 100644 --- a/packages/subgraph/package.json +++ b/packages/subgraph/package.json @@ -7,7 +7,6 @@ "scripts": { "lint": "eslint . --ext .ts", "build:contracts": "cd ../contracts && yarn build", - "build:contracts-versions": "cd ../contracts-versions && yarn build", "manifest": "scripts/build-manifest.sh", "extend:schema": "yarn ts-node tests/schema-extender.ts", "build": "scripts/build-subgraph.sh && yarn extend:schema", diff --git a/yarn.lock b/yarn.lock index ddf49defd..70e15a283 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,13 +2,17 @@ # yarn lockfile v1 -"@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== +"@aragon/osx-ethers-v1.2.0@npm:@aragon/osx-ethers@1.2.0": + version "1.2.0" + resolved "https://registry.yarnpkg.com/@aragon/osx-ethers/-/osx-ethers-1.2.0.tgz#b7e58714394183372ddf25d97cfe326f18ce6f1d" + integrity sha512-XI/tJo5NSjOwtcRRXvlfDFRh6YTTSVLYwlbd+4QlBxbTB2WDwS/4lq7rFwnO1bPufCQ4pSqGsTXFR5pwDLS4Ig== dependencies: - "@jridgewell/gen-mapping" "^0.3.0" - "@jridgewell/trace-mapping" "^0.3.9" + ethers "^5.6.2" + +"@aragon/osx-v1.0.1@npm:@aragon/osx@1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@aragon/osx/-/osx-1.0.1.tgz#b758ba87db93a46a8ddabfaefc99ac8e44c46c78" + integrity sha512-TiP5/1AGv/hth+V8PoDVFlwMzmLazYxzp//jiepAZ0WJkx9EnQNYafo+M7+pjAqRPG005liQjmFZNiK6ARLULg== "@babel/code-frame@7.12.11": version "7.12.11" @@ -24,13 +28,6 @@ dependencies: "@babel/highlight" "^7.16.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/code-frame@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.16.7.tgz#44416b6bd7624b998f5b1af5d470856c40138789" @@ -38,118 +35,6 @@ dependencies: "@babel/highlight" "^7.16.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.11.6", "@babel/core@^7.12.3": - 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.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.2" - semver "^6.3.0" - -"@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== - dependencies: - "@babel/types" "^7.21.4" - "@jridgewell/gen-mapping" "^0.3.2" - "@jridgewell/trace-mapping" "^0.3.17" - jsesc "^2.5.1" - -"@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== - dependencies: - "@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-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.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/template" "^7.20.7" - "@babel/types" "^7.21.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-module-imports@^7.18.6": - 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.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== - dependencies: - "@babel/helper-environment-visitor" "^7.18.9" - "@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.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@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== - -"@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.20.2" - -"@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.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.15.7": version "7.15.7" resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.15.7.tgz#220df993bfe904a4a6b02ab4f3385a5ebf6e2389" @@ -160,25 +45,6 @@ resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz#e8c602438c4a8195751243da9031d1607d247cad" integrity sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw== -"@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.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.21.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.20.7" - "@babel/traverse" "^7.21.0" - "@babel/types" "^7.21.0" - "@babel/highlight@^7.10.4", "@babel/highlight@^7.16.0": version "7.16.0" resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.16.0.tgz#6ceb32b2ca4b8f5f361fb7fd821e3fddf4a1725a" @@ -197,118 +63,6 @@ chalk "^2.0.0" js-tokens "^4.0.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.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== - -"@babel/plugin-syntax-async-generators@^7.8.4": - version "7.8.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz#a983fb1aeb2ec3f6ed042a210f640e90e786fe0d" - integrity sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw== - dependencies: - "@babel/helper-plugin-utils" "^7.8.0" - -"@babel/plugin-syntax-bigint@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz#4c9a6f669f5d0cdf1b90a1671e9a146be5300cea" - integrity sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg== - dependencies: - "@babel/helper-plugin-utils" "^7.8.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-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" - integrity sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g== - dependencies: - "@babel/helper-plugin-utils" "^7.10.4" - -"@babel/plugin-syntax-json-strings@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz#01ca21b668cd8218c9e640cb6dd88c5412b2c96a" - integrity sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA== - dependencies: - "@babel/helper-plugin-utils" "^7.8.0" - -"@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.20.2" - -"@babel/plugin-syntax-logical-assignment-operators@^7.8.3": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz#ca91ef46303530448b906652bac2e9fe9941f699" - integrity sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig== - dependencies: - "@babel/helper-plugin-utils" "^7.10.4" - -"@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== - dependencies: - "@babel/helper-plugin-utils" "^7.8.0" - -"@babel/plugin-syntax-numeric-separator@^7.8.3": - 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.4" - -"@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.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.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== - dependencies: - "@babel/helper-plugin-utils" "^7.8.0" - -"@babel/plugin-syntax-top-level-await@^7.8.3": - 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.14.5" - -"@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.20.2" - "@babel/runtime@^7.4.4": version "7.18.0" resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.18.0.tgz#6d77142a19cb6088f0af662af1ada37a604d34ae" @@ -323,52 +77,6 @@ dependencies: regenerator-runtime "^0.13.4" -"@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== - dependencies: - "@babel/code-frame" "^7.18.6" - "@babel/parser" "^7.20.7" - "@babel/types" "^7.20.7" - -"@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== - 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.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== - 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" - integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== - -"@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" - "@defi-wonderland/smock@^2.3.4": version "2.3.4" resolved "https://registry.yarnpkg.com/@defi-wonderland/smock/-/smock-2.3.4.tgz#2bfe7e19052140634b25db344d77de9b0ac7a96b" @@ -1635,264 +1343,6 @@ dependencies: multiformats "^9.5.4" -"@istanbuljs/load-nyc-config@^1.0.0": - version "1.1.0" - resolved "https://registry.yarnpkg.com/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz#fd3db1d59ecf7cf121e80650bb86712f9b55eced" - 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.3" - resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.3.tgz#e45e384e4b8ec16bce2fd903af78450f6bf7ec98" - integrity sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA== - -"@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@^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.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.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.5.0" - slash "^3.0.0" - strip-ansi "^6.0.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== - dependencies: - "@jest/fake-timers" "^29.5.0" - "@jest/types" "^29.5.0" - "@types/node" "*" - jest-mock "^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.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: - expect "^29.5.0" - jest-snapshot "^29.5.0" - -"@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.5.0" - "@sinonjs/fake-timers" "^10.0.2" - "@types/node" "*" - jest-message-util "^29.5.0" - jest-mock "^29.5.0" - jest-util "^29.5.0" - -"@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.5.0" - "@jest/expect" "^29.5.0" - "@jest/types" "^29.5.0" - jest-mock "^29.5.0" - -"@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: - "@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.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@^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: - "@jridgewell/trace-mapping" "^0.3.15" - callsites "^3.0.0" - graceful-fs "^4.2.9" - -"@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@^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.5.0" - graceful-fs "^4.2.9" - jest-haste-map "^29.5.0" - slash "^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" - integrity sha512-8vbeZWqLJOvHaDfeMuoHITGKSz5qWc9u04lnWrQE3VyuSw604PzQM824ZeX9XSjUCeDiE3GuxZe5UKa8J61NQw== - dependencies: - "@babel/core" "^7.11.6" - "@jest/types" "^29.5.0" - "@jridgewell/trace-mapping" "^0.3.15" - babel-plugin-istanbul "^6.1.1" - chalk "^4.0.0" - convert-source-map "^2.0.0" - fast-json-stable-stringify "^2.1.0" - graceful-fs "^4.2.9" - 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.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== - 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" - -"@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": - 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/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": - 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" - 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.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== - dependencies: - "@jridgewell/resolve-uri" "3.1.0" - "@jridgewell/sourcemap-codec" "1.4.14" - "@leichtgewicht/ip-codec@^2.0.1": version "2.0.4" resolved "https://registry.yarnpkg.com/@leichtgewicht/ip-codec/-/ip-codec-2.0.4.tgz#b2ac626d6cb9c8718ab459166d4bb405b8ffa78b" @@ -2420,30 +1870,11 @@ "@sentry/types" "5.30.0" tslib "^1.9.3" -"@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" resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.14.0.tgz#9fb3a3cf3132328151f353de4632e01e52102bea" integrity sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ== -"@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" - "@solidity-parser/parser@^0.12.0": version "0.12.2" resolved "https://registry.yarnpkg.com/@solidity-parser/parser/-/parser-0.12.2.tgz#1afad367cb29a2ed8cdd4a3a62701c2821fb578f" @@ -2566,26 +1997,6 @@ mkdirp "^1.0.4" path-browserify "^1.0.1" -"@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== - "@typechain/ethers-v5@^10.0.0": version "10.0.0" resolved "https://registry.yarnpkg.com/@typechain/ethers-v5/-/ethers-v5-10.0.0.tgz#1b6e292d2ed9afb0d2f7a4674cc199bb95bad714" @@ -2594,14 +2005,6 @@ lodash "^4.17.15" ts-essentials "^7.0.1" -"@typechain/ethers-v5@^10.2.0": - version "10.2.0" - resolved "https://registry.yarnpkg.com/@typechain/ethers-v5/-/ethers-v5-10.2.0.tgz#68f5963efb5214cb2d881477228e4b5b315473e1" - integrity sha512-ikaq0N/w9fABM+G01OFmU3U3dNnyRwEahkdvi9mqy1a3XwKiPZaF/lu54OcNaEWnpvEYyhhS0N7buCtLQqC92w== - dependencies: - lodash "^4.17.15" - ts-essentials "^7.0.1" - "@typechain/ethers-v5@^7.2.0": version "7.2.0" resolved "https://registry.yarnpkg.com/@typechain/ethers-v5/-/ethers-v5-7.2.0.tgz#d559cffe0efe6bdbc20e644b817f6fa8add5e8f8" @@ -2622,39 +2025,6 @@ resolved "https://registry.yarnpkg.com/@types/async-eventemitter/-/async-eventemitter-0.2.1.tgz#f8e6280e87e8c60b2b938624b0a3530fb3e24712" integrity sha512-M2P4Ng26QbAeITiH7w1d7OxtldgfAe0wobpyJzVK/XOb0cUGKU2R4pfAhqcJBXAe2ife5ZOhSv4wk7p+ffURtg== -"@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== - dependencies: - "@babel/parser" "^7.20.7" - "@babel/types" "^7.20.7" - "@types/babel__generator" "*" - "@types/babel__template" "*" - "@types/babel__traverse" "*" - -"@types/babel__generator@*": - 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.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.6": - version "7.18.5" - resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.18.5.tgz#c107216842905afafd3b6e774f6f935da6f5db80" - integrity sha512-enCvTL8m/EHS/zIvJno9nE+ndYPh1/oNFzRYRmtUqJICG2VnCSBzMLW5VN2KCQU91f23tsNKR8v7VJJQMatl7Q== - dependencies: - "@babel/types" "^7.3.0" - "@types/bn.js@^4.11.3", "@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" @@ -2721,21 +2091,6 @@ dependencies: "@types/node" "*" -"@types/fs-extra@^11.0.1": - version "11.0.1" - resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-11.0.1.tgz#f542ec47810532a8a252127e6e105f487e0a6ea5" - integrity sha512-MxObHvNl4A69ofaTRU8DFqvgzzv8s9yRtaPPm5gud9HDNvpB3GPQFvNuTWAI59B9huVGV5jXYJwbCsmBsOGYWA== - dependencies: - "@types/jsonfile" "*" - "@types/node" "*" - -"@types/fs-extra@^8.0.1": - 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@^7.1.1": version "7.2.0" resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.2.0.tgz#bc1b5bf3aa92f25bd5dd39f35c57361bdce5b2eb" @@ -2744,40 +2099,6 @@ "@types/minimatch" "*" "@types/node" "*" -"@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== - dependencies: - "@types/node" "*" - -"@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0", "@types/istanbul-lib-coverage@^2.0.1": - 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 "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@^3.0.0": - 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@^29.5.1": - 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" - "@types/json-schema@^7.0.7": version "7.0.9" resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.9.tgz#97edc9037ea0c38585320b28964dde3b39e4660d" @@ -2793,13 +2114,6 @@ resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee" integrity sha1-7ihweulOEdK4J7y+UnC86n8+ce4= -"@types/jsonfile@*": - version "6.1.1" - resolved "https://registry.yarnpkg.com/@types/jsonfile/-/jsonfile-6.1.1.tgz#ac84e9aefa74a2425a0fb3012bdea44f58970f1b" - integrity sha512-GSgiRCVeapDN+3pqA35IkQwasaCh/0YFH5dEF6S88iDvEn901DjOeH3/QPY+XYP1DFzDZPvIvfeEgk+7br5png== - dependencies: - "@types/node" "*" - "@types/lodash@^4.14.159": version "4.14.178" resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.178.tgz#341f6d2247db528d4a13ddbb374bcdc80406f4f8" @@ -2850,11 +2164,6 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-12.20.37.tgz#abb38afa9d6e8a2f627a8cb52290b3c80fbe61ed" integrity sha512-i1KGxqcvJaLQali+WuypQnXwcplhtNtjs66eNsZpp2P2FL/trJJxx/VWsM0YCL2iMoIJrbXje48lvIQAQ4p2ZA== -"@types/node@^18.16.1": - version "18.16.1" - resolved "https://registry.yarnpkg.com/@types/node/-/node-18.16.1.tgz#5db121e9c5352925bb1f1b892c4ae620e3526799" - integrity sha512-DZxSZWXxFfOlx7k7Rv4LAyiMroaxa3Ly/7OOzZO8cBNho0YzAi4qlbrx8W27JGqG57IgR/6J7r+nOJWw6kcvZA== - "@types/node@^8.0.0": version "8.10.66" resolved "https://registry.yarnpkg.com/@types/node/-/node-8.10.66.tgz#dd035d409df322acc83dff62a602f12a5783bbb3" @@ -2877,11 +2186,6 @@ resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.4.2.tgz#4c62fae93eb479660c3bd93f9d24d561597a8281" integrity sha512-ekoj4qOQYp7CvjX8ZDBgN86w3MqQhLE1hczEJbEIjgFEumDy+na/4AJAbLXfgEWFNB2pKadM5rPFtuSGMWK7xA== -"@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== - "@types/qs@*", "@types/qs@^6.2.31", "@types/qs@^6.9.7": version "6.9.7" resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.7.tgz#63bb7d067db107cc1e457c303bc25d511febf6cb" @@ -2899,11 +2203,6 @@ dependencies: "@types/node" "*" -"@types/stack-utils@^2.0.0": - 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/ws@^7.4.4": version "7.4.7" resolved "https://registry.yarnpkg.com/@types/ws/-/ws-7.4.7.tgz#f7c390a36f7a0679aa69de2d501319f4f8d9b702" @@ -2911,18 +2210,6 @@ dependencies: "@types/node" "*" -"@types/yargs-parser@*": - 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@^17.0.8": - 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" "*" - "@typescript-eslint/eslint-plugin@^4.33.0": version "4.33.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.33.0.tgz#c24dc7c8069c7706bc40d99f6fa87edcb2005276" @@ -3132,11 +2419,6 @@ acorn-jsx@^5.0.0, acorn-jsx@^5.3.1: resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937" integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ== -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== - acorn@^6.0.7: version "6.4.2" resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.2.tgz#35866fd710528e92de10cf06016498e47e39e1e6" @@ -3147,11 +2429,6 @@ acorn@^7.4.0: resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa" integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A== -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== - acorn@^8.7.0: version "8.7.0" resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.0.tgz#90951fde0f8f09df93549481e5fc141445b791cf" @@ -3232,7 +2509,7 @@ ansi-escapes@^3.2.0: resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz#8780b98ff9dbf5638152d1f1fe5c1d7b4442976b" integrity sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ== -ansi-escapes@^4.2.1, ansi-escapes@^4.3.0: +ansi-escapes@^4.3.0: 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== @@ -3273,11 +2550,6 @@ ansi-styles@^4.0.0, ansi-styles@^4.1.0: dependencies: 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== - antlr4@4.7.1: version "4.7.1" resolved "https://registry.yarnpkg.com/antlr4/-/antlr4-4.7.1.tgz#69984014f096e9e775f53dd9744bf994d8959773" @@ -3296,14 +2568,6 @@ any-signal@^2.1.0, any-signal@^2.1.2: abort-controller "^3.0.0" native-abort-controller "^1.0.3" -anymatch@^3.0.3: - 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" - anymatch@~3.1.1, anymatch@~3.1.2: version "3.1.2" resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716" @@ -3512,66 +2776,6 @@ axios@^0.21.1, axios@^0.21.2: dependencies: follow-redirects "^1.14.0" -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: - "@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.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 "^5.0.4" - test-exclude "^6.0.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== - dependencies: - "@babel/template" "^7.3.3" - "@babel/types" "^7.3.3" - "@types/babel__core" "^7.1.14" - "@types/babel__traverse" "^7.0.6" - -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" - integrity sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ== - dependencies: - "@babel/plugin-syntax-async-generators" "^7.8.4" - "@babel/plugin-syntax-bigint" "^7.8.3" - "@babel/plugin-syntax-class-properties" "^7.8.3" - "@babel/plugin-syntax-import-meta" "^7.8.3" - "@babel/plugin-syntax-json-strings" "^7.8.3" - "@babel/plugin-syntax-logical-assignment-operators" "^7.8.3" - "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3" - "@babel/plugin-syntax-numeric-separator" "^7.8.3" - "@babel/plugin-syntax-object-rest-spread" "^7.8.3" - "@babel/plugin-syntax-optional-catch-binding" "^7.8.3" - "@babel/plugin-syntax-optional-chaining" "^7.8.3" - "@babel/plugin-syntax-top-level-await" "^7.8.3" - -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" - balanced-match@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee" @@ -3871,23 +3075,6 @@ browserify-sign@^4.0.0: readable-stream "^3.6.0" safe-buffer "^5.2.0" -browserslist@^4.21.3: - 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.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" - 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.x" - bs58@^4.0.0, bs58@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/bs58/-/bs58-4.0.1.tgz#be161e76c354f6f788ae4071f63f34e8c4f0a42a" @@ -3904,13 +3091,6 @@ bs58check@^2.1.2: create-hash "^1.1.0" safe-buffer "^5.1.2" -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" - buffer-alloc-unsafe@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz#bd7dc26ae2972d0eda253be061dba992349c19f0" @@ -4052,21 +3232,16 @@ camelcase@^4.1.0: resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd" integrity sha512-FxAv7HpHrXbh3aPo4o2qxHay2lkLY3x5Mw3KeE4KQE8ysVfziWeRZDwcjauvwBSGEC/nXUPzZy8zeh4HokqOnw== -camelcase@^5.0.0, camelcase@^5.3.1: +camelcase@^5.0.0: 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, camelcase@^6.2.0: +camelcase@^6.0.0: version "6.3.0" resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a" integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA== -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== - caseless@^0.12.0, caseless@~0.12.0: version "0.12.0" resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc" @@ -4178,11 +3353,6 @@ change-case@3.0.2: 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" - integrity sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw== - chardet@^0.7.0: version "0.7.0" resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e" @@ -4299,11 +3469,6 @@ ci-info@^2.0.0: resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46" integrity sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ== -ci-info@^3.2.0: - 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, cids@~0.7.0, cids@~0.7.1: version "0.7.5" resolved "https://registry.yarnpkg.com/cids/-/cids-0.7.5.tgz#60a08138a99bfb69b6be4ceb63bfef7a396b28b2" @@ -4334,11 +3499,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@^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== - class-is@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/class-is/-/class-is-1.1.0.tgz#9d3c0fba0440d211d843cec3dedfa48055005825" @@ -4421,15 +3581,6 @@ cliui@^7.0.2: strip-ansi "^6.0.0" wrap-ansi "^7.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-response@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/clone-response/-/clone-response-1.0.2.tgz#d1dc973920314df67fbeb94223b4ee350239e96b" @@ -4442,11 +3593,6 @@ clone@^1.0.2: resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e" integrity sha1-2jCcwmPfFZlMaIypAheco8fNfH4= -co@^4.6.0: - version "4.6.0" - resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184" - integrity sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ== - code-block-writer@^11.0.3: version "11.0.3" resolved "https://registry.yarnpkg.com/code-block-writer/-/code-block-writer-11.0.3.tgz#9eec2993edfb79bfae845fbc093758c0a0b73b76" @@ -4457,11 +3603,6 @@ code-point-at@^1.0.0: resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c= -collect-v8-coverage@^1.0.0: - 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== - color-convert@^1.9.0: version "1.9.3" resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8" @@ -4486,11 +3627,6 @@ color-name@~1.1.4: resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== -colorette@^1.1.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.4.0.tgz#5190fbb87276259a86ad700bff2c6d6faa3fca40" - integrity sha512-Y2oEozpomLn7Q3HFP7dpww7AtMJplbM9lGZP6RDfHqmbeRjiwRg4n6VM6j4KLmRke85uWEI7JqF17f3pqdRA0g== - colors@1.3.3: version "1.3.3" resolved "https://registry.yarnpkg.com/colors/-/colors-1.3.3.tgz#39e005d546afe01e01f9c4ca8fa50f686a01205d" @@ -4613,16 +3749,6 @@ 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== -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" - 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" @@ -4721,11 +3847,6 @@ create-hmac@^1.1.0, 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-spawn@^6.0.5: version "6.0.5" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4" @@ -4737,7 +3858,7 @@ cross-spawn@^6.0.5: shebang-command "^1.2.0" which "^1.2.9" -cross-spawn@^7.0.0, cross-spawn@^7.0.2, cross-spawn@^7.0.3: +cross-spawn@^7.0.0, cross-spawn@^7.0.2: version "7.0.3" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w== @@ -4881,11 +4002,6 @@ decompress-response@^3.2.0, decompress-response@^3.3.0: dependencies: mimic-response "^1.0.0" -dedent@^0.7.0: - version "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" @@ -4910,11 +4026,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@^4.2.2: - 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" @@ -4972,11 +4083,6 @@ detect-indent@^5.0.0: resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-5.0.0.tgz#3871cc0a6a002e8c3e5b3cf7f336264675f06b9d" integrity sha1-OHHMCmoALow+Wzz38zYmRnXwa50= -detect-newline@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-3.1.0.tgz#576f5dfc63ae1a192ff192d8ad3af6308991b651" - integrity sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA== - detect-node@^2.0.4: version "2.1.0" resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.1.0.tgz#c9c70775a49c3d03bc2c06d9a73be550f978f8b1" @@ -4990,11 +4096,6 @@ detect-port@^1.3.0: address "^1.0.1" debug "^2.6.0" -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" resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12" @@ -5173,11 +4274,6 @@ electron-fetch@^1.7.2: dependencies: encoding "^0.1.13" -electron-to-chromium@^1.4.284: - version "1.4.376" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.376.tgz#a771d6c4db028634df126348a4f94075e07e7f65" - integrity sha512-TFeOKd98TpJzRHkr4Aorn16QkMnuCQuGAE6IZ0wYF+qkbSfMPqjplvRppR02tMUpVxZz8nyBNvVm9lIZsqrbPQ== - elliptic@6.5.4, elliptic@^6.4.0, elliptic@^6.5.2, elliptic@^6.5.3: version "6.5.4" resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.4.tgz#da37cebd31e79a1367e941b592ed1fbebd58abbb" @@ -5191,11 +4287,6 @@ elliptic@6.5.4, elliptic@^6.4.0, elliptic@^6.5.2, elliptic@^6.5.3: minimalistic-assert "^1.0.1" minimalistic-crypto-utils "^1.0.1" -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== - emoji-regex@^7.0.1: version "7.0.3" resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156" @@ -5369,11 +4460,6 @@ escape-string-regexp@4.0.0, escape-string-regexp@^4.0.0: resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34" integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA== -escape-string-regexp@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz#a30304e99daa32e23b2fd20f51babd07cffca344" - integrity sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w== - escodegen@1.8.x: version "1.8.1" resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.8.1.tgz#5a5b53af4693110bebb0867aa3430dd3b70a1018" @@ -6074,42 +5160,11 @@ execa@^3.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" - 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== -exit@^0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c" - integrity sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ== - -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== - dependencies: - "@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" - explain-error@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/explain-error/-/explain-error-1.0.4.tgz#a793d3ac0cad4c6ab571e9968fbbab6cb2532929" @@ -6247,7 +5302,7 @@ fast-glob@^3.2.9: merge2 "^1.3.0" micromatch "^4.0.4" -fast-json-stable-stringify@2.x, fast-json-stable-stringify@^2.0.0, fast-json-stable-stringify@^2.1.0: +fast-json-stable-stringify@^2.0.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== @@ -6264,13 +5319,6 @@ fastq@^1.6.0: dependencies: reusify "^1.0.4" -fb-watchman@^2.0.0: - 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" - figures@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/figures/-/figures-2.0.0.tgz#3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962" @@ -6362,14 +5410,6 @@ find-up@^2.1.0: dependencies: locate-path "^2.0.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== - dependencies: - locate-path "^5.0.0" - path-exists "^4.0.0" - flat-cache@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-2.0.1.tgz#5d296d6f04bda44a4630a301413bdbc2ec085ec0" @@ -6592,16 +5632,16 @@ fs.realpath@^1.0.0: resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8= -fsevents@^2.3.2, fsevents@~2.3.1, 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: version "2.1.3" resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.1.3.tgz#fb738703ae8d2f9fe900c33836ddebee8b97f23e" integrity sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ== +fsevents@~2.3.1, 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== + function-bind@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" @@ -6612,11 +5652,6 @@ 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 sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc= -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== - get-caller-file@^1.0.1: version "1.0.3" resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz#f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a" @@ -6646,11 +5681,6 @@ get-iterator@^1.0.2: resolved "https://registry.yarnpkg.com/get-iterator/-/get-iterator-1.0.2.tgz#cd747c02b4c084461fac14f48f6b45a80ed25c82" integrity sha512-v+dm9bNVfOYsY1OrhaCrmyOcYoSeVvbt+hHZ0Au+T+p1y+0Uyj9aMaGIeUTT6xdpRbWzDeYKvfOslPhggQMcsg== -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-port@^3.1.0: version "3.2.0" resolved "https://registry.yarnpkg.com/get-port/-/get-port-3.2.0.tgz#dd7ce7de187c06c8bf353796ac71e099f0980ebc" @@ -6675,11 +5705,6 @@ get-stream@^5.0.0, get-stream@^5.1.0: dependencies: pump "^3.0.0" -get-stream@^6.0.0: - 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" @@ -6776,18 +5801,6 @@ glob@^5.0.15: once "^1.3.0" path-is-absolute "^1.0.0" -glob@^7.1.4: - 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.1.1" - once "^1.3.0" - path-is-absolute "^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" @@ -6812,7 +5825,7 @@ global@~4.4.0: min-document "^2.19.0" process "^0.11.10" -globals@^11.1.0, globals@^11.7.0: +globals@^11.7.0: version "11.12.0" resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e" integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA== @@ -6824,20 +5837,6 @@ globals@^13.6.0, globals@^13.9.0: dependencies: type-fest "^0.20.2" -globby@10.0.1: - version "10.0.1" - resolved "https://registry.yarnpkg.com/globby/-/globby-10.0.1.tgz#4782c34cb75dd683351335c5829cc3420e606b22" - integrity sha512-sSs4inE1FB2YQiymcmTv6NWENryABjUNPeWhOvmn4SjtKybglsyPZxFB3U1/+L1bYi0rNZDqCLlHyLYDl1Pq5A== - dependencies: - "@types/glob" "^7.1.1" - array-union "^2.1.0" - dir-glob "^3.0.1" - fast-glob "^3.0.3" - glob "^7.1.3" - ignore "^5.1.1" - merge2 "^1.2.3" - slash "^3.0.0" - globby@^10.0.1: version "10.0.2" resolved "https://registry.yarnpkg.com/globby/-/globby-10.0.2.tgz#277593e745acaa4646c3ab411289ec47a0392543" @@ -6959,11 +5958,6 @@ graceful-fs@^4.2.4: resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c" integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA== -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== - graphql@15.5.0: version "15.5.0" resolved "https://registry.yarnpkg.com/graphql/-/graphql-15.5.0.tgz#39d19494dbe69d1ea719915b578bf920344a69d5" @@ -7219,11 +6213,6 @@ hosted-git-info@^2.1.4: resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9" integrity sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw== -html-escaper@^2.0.0: - version "2.0.2" - resolved "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.2.tgz#dfd60027da36a36dfcbe236262c00a5822681453" - integrity sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg== - htmlparser2@^8.0.1: version "8.0.1" resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-8.0.1.tgz#abaa985474fcefe269bc761a779b544d7196d010" @@ -7316,11 +6305,6 @@ human-signals@^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== - 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" @@ -7388,14 +6372,6 @@ import-fresh@^3.0.0, import-fresh@^3.1.0, import-fresh@^3.2.1: parent-module "^1.0.0" resolve-from "^4.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" - integrity sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg== - dependencies: - pkg-dir "^4.2.0" - resolve-cwd "^3.0.0" - imul@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/imul/-/imul-1.0.1.tgz#9d5867161e8b3de96c2c38d5dc7cb102f35e2ac9" @@ -7828,11 +6804,6 @@ is-function@^1.0.1: resolved "https://registry.yarnpkg.com/is-function/-/is-function-1.0.2.tgz#4f097f30abf6efadac9833b17ca5dc03f8144e08" integrity sha512-lw7DUp0aWXYg+CBCN+JKkcE0Q2RayZnSvnZBlwgxHBQhqt5pZNVy4Ri7H9GmmXkdu7LUthszM+Tor1u/2iBcpQ== -is-generator-fn@^2.0.0: - 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.10" resolved "https://registry.yarnpkg.com/is-generator-function/-/is-generator-function-1.0.10.tgz#f1558baf1ac17e0deea7c0415c438351ff2b3c72" @@ -7922,11 +6893,6 @@ 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@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-3.0.1.tgz#662d92d24c0aa4302407b0d45d21f2251c85f85b" - integrity sha512-Xnpx182SBMrr/aBik8y+GuR4U1L9FqMSojwDQwPMmxyC6bvEqly9UBCxhauBF5vNh2gwWJNX6oDV7O+OM4z34g== - is-promise@~1, is-promise@~1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-1.0.1.tgz#31573761c057e33c2e91aab9e96da08cefbe76e5" @@ -8076,48 +7042,6 @@ isstream@~0.1.2: resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a" integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo= -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@^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" - integrity sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg== - 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" - integrity sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw== - dependencies: - istanbul-lib-coverage "^3.0.0" - make-dir "^3.0.0" - supports-color "^7.1.0" - -istanbul-lib-source-maps@^4.0.0: - 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.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" - isurl@^1.0.0-alpha5: version "1.0.0" resolved "https://registry.yarnpkg.com/isurl/-/isurl-1.0.0.tgz#b27f4f49f3cdaa3ea44a0a5b7f3462e6edc39d67" @@ -8240,367 +7164,6 @@ jayson@3.6.6: uuid "^8.3.2" ws "^7.4.5" -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" - -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.5.0" - pure-rand "^6.0.0" - slash "^3.0.0" - stack-utils "^2.0.3" - -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.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.5.0" - jest-util "^29.5.0" - jest-validate "^29.5.0" - prompts "^2.0.1" - yargs "^17.3.1" - -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.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.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.5.0" - slash "^3.0.0" - strip-json-comments "^3.1.1" - -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.4.3" - jest-get-type "^29.4.3" - pretty-format "^29.5.0" - -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" - -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-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.5.0" - "@jest/fake-timers" "^29.5.0" - "@jest/types" "^29.5.0" - "@types/node" "*" - jest-mock "^29.5.0" - jest-util "^29.5.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: - 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.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.4.3" - jest-util "^29.5.0" - jest-worker "^29.5.0" - micromatch "^4.0.4" - walker "^1.0.8" - optionalDependencies: - fsevents "^2.3.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" - integrity sha512-u9YdeeVnghBUtpN5mVxjID7KbkKE1QU4f6uUwuxiY0vYRi9BUCLKlPEZfDGR67ofdFmDz9oPAy2G92Ujrntmow== - dependencies: - jest-get-type "^29.4.3" - pretty-format "^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== - dependencies: - chalk "^4.0.0" - jest-diff "^29.5.0" - jest-get-type "^29.4.3" - pretty-format "^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== - dependencies: - "@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@^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.5.0" - "@types/node" "*" - jest-util "^29.5.0" - -jest-pnp-resolver@^1.2.2: - 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@^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@^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.4.3" - jest-snapshot "^29.5.0" - -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.5.0" - jest-pnp-resolver "^1.2.2" - jest-util "^29.5.0" - jest-validate "^29.5.0" - resolve "^1.20.0" - resolve.exports "^2.0.0" - slash "^3.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" - integrity sha512-m7b6ypERhFghJsslMLhydaXBiLf7+jXy8FwGRHO3BGV1mcQpPbwiqiKUR2zU2NJuNeMenJmlFZCsIqzJCTeGLQ== - dependencies: - "@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.13.1" - graceful-fs "^4.2.9" - 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" - -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-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: - "@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@^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== - dependencies: - "@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@^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.5.0" - camelcase "^6.2.0" - chalk "^4.0.0" - jest-get-type "^29.4.3" - leven "^3.1.0" - pretty-format "^29.5.0" - -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: - "@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@^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@^29.5.0: - 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" - 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" @@ -8644,11 +7207,6 @@ jsbn@~0.1.0: resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513" integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM= -jsesc@^2.5.1: - version "2.5.2" - resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4" - integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA== - json-buffer@3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.0.tgz#5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898" @@ -8703,11 +7261,6 @@ json5@^1.0.1: dependencies: minimist "^1.2.0" -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== - jsonfile@^2.1.0: version "2.4.0" resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-2.4.0.tgz#3736a2b428b87bbda0cc83b53fa3d633a35c2ae8" @@ -8804,11 +7357,6 @@ klaw@^1.0.0: optionalDependencies: graceful-fs "^4.1.9" -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== - ky-universal@^0.2.2: version "0.2.2" resolved "https://registry.yarnpkg.com/ky-universal/-/ky-universal-0.2.2.tgz#7a36e1a75641a98f878157463513965f799f5bfe" @@ -8850,11 +7398,6 @@ level@^8.0.0: browser-level "^1.0.1" classic-level "^1.2.0" -leven@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/leven/-/leven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2" - integrity sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A== - levn@^0.3.0, levn@~0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee" @@ -8937,13 +7480,6 @@ locate-path@^3.0.0: p-locate "^3.0.0" path-exists "^3.0.0" -locate-path@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0" - integrity sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g== - dependencies: - p-locate "^4.1.0" - locate-path@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-6.0.0.tgz#55321eb309febbc59c4801d931a72452a681d286" @@ -8986,11 +7522,6 @@ lodash.lowerfirst@^4.3.1: resolved "https://registry.yarnpkg.com/lodash.lowerfirst/-/lodash.lowerfirst-4.3.1.tgz#de3c7b12e02c6524a0059c2f6cb7c5c52655a13d" integrity sha1-3jx7EuAsZSSgBZwvbLfFxSZVoT0= -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.2: version "4.6.2" resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a" @@ -9155,25 +7686,11 @@ magic-string@^0.26.1: dependencies: sourcemap-codec "^1.4.8" -make-dir@^3.0.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: +make-error@^1.1.1: version "1.3.6" resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2" integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw== -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.5" - markdown-table@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/markdown-table/-/markdown-table-1.1.3.tgz#9fcb69bcfdb8717bfd0398c6ec2d93036ef8de60" @@ -9330,13 +7847,6 @@ minimatch@5.0.1: dependencies: brace-expansion "^2.0.1" -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@^5.1.0: version "5.1.6" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.6.tgz#1cfcb8cf5522ea69952cd2af95ae09477f122a96" @@ -9822,16 +8332,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.3.0.tgz#9f256b03e5826150be39c764bf51e993946d71a3" integrity sha512-iWjXZvmboq0ja1pUGULQBexmxq8CV4xBhX7VDOTbL7ZR4FOowwY/VOtRxBN/yKxmdGoIp4j5ysNT4u3S2pDQ3Q== -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-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== - nodeify@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/nodeify/-/nodeify-1.0.1.tgz#64ab69a7bdbaf03ce107b4f0335c87c0b9e91b1d" @@ -9877,7 +8377,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== -npm-run-path@^4.0.0, npm-run-path@^4.0.1: +npm-run-path@^4.0.0: version "4.0.1" resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea" integrity sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw== @@ -10000,7 +8500,7 @@ onetime@^2.0.0: dependencies: mimic-fn "^1.0.0" -onetime@^5.1.0, onetime@^5.1.2: +onetime@^5.1.0: version "5.1.2" resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e" integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg== @@ -10109,14 +8609,14 @@ p-limit@^1.1.0: dependencies: p-try "^1.0.0" -p-limit@^2.0.0, p-limit@^2.2.0: +p-limit@^2.0.0: 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.2, p-limit@^3.1.0: +p-limit@^3.0.2: version "3.1.0" resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b" integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ== @@ -10137,13 +8637,6 @@ p-locate@^3.0.0: dependencies: p-limit "^2.0.0" -p-locate@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07" - integrity sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A== - dependencies: - p-limit "^2.2.0" - p-locate@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-5.0.0.tgz#83c8315c6785005e3bd021839411c9e110e6d834" @@ -10235,7 +8728,7 @@ parse-json@^4.0.0: error-ex "^1.3.1" json-parse-better-errors "^1.0.1" -parse-json@^5.0.0, parse-json@^5.2.0: +parse-json@^5.0.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== @@ -10394,11 +8887,6 @@ performance-now@^2.1.0: resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns= -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.2.1, picomatch@^2.2.3: version "2.3.0" resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.0.tgz#f1f061de8f6a4bf022892e2d128234fb98302972" @@ -10431,11 +8919,6 @@ pinkie@^2.0.0: resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870" integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA= -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@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-2.0.0.tgz#f6d5d1109e19d63edf428e0bd57e12777615334b" @@ -10443,13 +8926,6 @@ pkg-dir@^2.0.0: dependencies: find-up "^2.1.0" -pkg-dir@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3" - integrity sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ== - dependencies: - find-up "^4.0.0" - pkginfo@0.4.1: version "0.4.1" resolved "https://registry.yarnpkg.com/pkginfo/-/pkginfo-0.4.1.tgz#b5418ef0439de5425fc4995042dced14fb2a84ff" @@ -10516,15 +8992,6 @@ prettier@^2.4.1: resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.1.tgz#4e1fd11c34e2421bc1da9aea9bd8127cd0a35efc" integrity sha512-lqGoSJBQNJidqCHE80vqZJHWHRFoNYsSpP9AjFhlhi9ODCJA541svILes/+/1GM3VaL/abZi7cpFzOpdR9UPKg== -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== - dependencies: - "@jest/schemas" "^29.4.3" - ansi-styles "^5.0.0" - react-is "^18.0.0" - printj@~1.1.0: version "1.1.2" resolved "https://registry.yarnpkg.com/printj/-/printj-1.1.2.tgz#d90deb2975a8b9f600fb3a1c94e3f4c53c78a222" @@ -10569,14 +9036,6 @@ promisify-es6@^1.0.3: resolved "https://registry.yarnpkg.com/promisify-es6/-/promisify-es6-1.0.3.tgz#b012668c4df3c965ce13daac2b3a4d1726a96346" integrity sha512-N9iVG+CGJsI4b4ZGazjwLnxErD2d9Pe4DPvvXSxYA9tFNu8ymXME4Qs5HIQ0LMJpNM7zj+m0NlNnNeqFpKzqnA== -prompts@^2.0.1: - 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.3" - sisteransi "^1.0.5" - proper-lockfile@^4.1.1: version "4.1.2" resolved "https://registry.yarnpkg.com/proper-lockfile/-/proper-lockfile-4.1.2.tgz#c8b9de2af6b2f1601067f98e01ac66baa223141f" @@ -10693,11 +9152,6 @@ 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.2" - resolved "https://registry.yarnpkg.com/pure-rand/-/pure-rand-6.0.2.tgz#a9c2ddcae9b68d736a8163036f088a2781c8b306" - integrity sha512-6Yg0ekpKICSjPswYOuC5sku/TSWaRYlA0qsXqJgM/d/4pLPHPuTxK7Nbf7jFKzAeedUhR8C7K9Uv63FBsSo8xQ== - qs@6.7.0: version "6.7.0" resolved "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc" @@ -10793,11 +9247,6 @@ raw-body@^2.4.1: iconv-lite "0.4.24" unpipe "1.0.0" -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-fetch-api@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/react-native-fetch-api/-/react-native-fetch-api-2.0.0.tgz#c4af188b4fce3f3eaf1f1ff4e61dae1a00d4ffa0" @@ -10997,13 +9446,6 @@ require-main-filename@^2.0.0: resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b" integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg== -resolve-cwd@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-3.0.0.tgz#0f0075f1bb2544766cf73ba6a6e2adfebcb13f2d" - integrity sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg== - dependencies: - resolve-from "^5.0.0" - resolve-from@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz#b22c7af7d9d6881bc8b6e653335eebcb0a188748" @@ -11014,16 +9456,6 @@ resolve-from@^4.0.0: resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6" integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g== -resolve-from@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69" - integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw== - -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" @@ -11132,17 +9564,6 @@ rlp@^2.2.3, rlp@^2.2.4: dependencies: bn.js "^5.2.0" -rollup-plugin-copy@^3.4.0: - version "3.4.0" - resolved "https://registry.yarnpkg.com/rollup-plugin-copy/-/rollup-plugin-copy-3.4.0.tgz#f1228a3ffb66ffad8606e2f3fb7ff23141ed3286" - integrity sha512-rGUmYYsYsceRJRqLVlE9FivJMxJ7X6jDlP79fmFkL8sJs7VVMSVyA2yfyL+PGyO/vJs4A87hwhgVfz61njI+uQ== - dependencies: - "@types/fs-extra" "^8.0.1" - colorette "^1.1.0" - fs-extra "^8.1.0" - globby "10.0.1" - is-plain-object "^3.0.0" - rollup-plugin-dts@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/rollup-plugin-dts/-/rollup-plugin-dts-4.2.0.tgz#f7ae4646f5b3aec07560bc341c0dc4a85f8a0dff" @@ -11292,14 +9713,7 @@ semver@7.3.5, semver@^7.0.0, semver@^7.2.1, semver@^7.3.4, semver@^7.3.5: dependencies: lru-cache "^6.0.0" -semver@7.x: - 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.0, semver@^6.3.0: +semver@^6.1.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== @@ -11461,11 +9875,6 @@ signal-exit@^3.0.2: resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.6.tgz#24e630c4b0f03fea446a2bd299e62b4a6ca8d0af" integrity sha512-sDl4qMFpijcGw22U5w63KmD3cZJfBuFlVNbVMKje2keoKML7X2UzWbc4XrmEbDwg0NXJc3yv4/ox7b+JWb57kQ== -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== - signed-varint@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/signed-varint/-/signed-varint-2.0.1.tgz#50a9989da7c98c2c61dad119bc97470ef8528129" @@ -11487,11 +9896,6 @@ simple-get@^2.7.0: once "^1.3.1" simple-concat "^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@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634" @@ -11619,14 +10023,6 @@ solidity-docgen@^0.6.0-beta.35: handlebars "^4.7.7" solidity-ast "^0.4.38" -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.5.13, 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" @@ -11715,13 +10111,6 @@ stable@~0.1.8: resolved "https://registry.yarnpkg.com/stable/-/stable-0.1.8.tgz#836eb3c8382fe2936feaf544631017ce7d47a3cf" integrity sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w== -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: - escape-string-regexp "^2.0.0" - stacktrace-parser@^0.1.10: version "0.1.10" resolved "https://registry.yarnpkg.com/stacktrace-parser/-/stacktrace-parser-0.1.10.tgz#29fb0cae4e0d0b85155879402857a1639eb6051a" @@ -11769,14 +10158,6 @@ string-format@^2.0.0: resolved "https://registry.yarnpkg.com/string-format/-/string-format-2.0.0.tgz#f2df2e7097440d3b65de31b6d40d54c96eaffb9b" integrity sha512-bbEs3scLeYNXLecRRuk6uJxdXUSj6le/8rNPHChIJTn2V79aXVTR1EH2OH5zLKKoz0V02fOUKZZcw01pLUShZA== -string-length@^4.0.1: - 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" - string-width@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3" @@ -11887,11 +10268,6 @@ strip-bom@^3.0.0: resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3" integrity sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM= -strip-bom@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-4.0.0.tgz#9c3505c1db45bcedca3d9cf7a16f5c5aa3901878" - integrity sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w== - strip-final-newline@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad" @@ -11926,7 +10302,7 @@ supports-color@6.0.0: dependencies: has-flag "^3.0.0" -supports-color@8.1.1, supports-color@^8.0.0: +supports-color@8.1.1: version "8.1.1" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-8.1.1.tgz#cd6fc17e28500cff56c1b86c0a7fd4a54a73005c" integrity sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q== @@ -12101,15 +10477,6 @@ tar@^6.1.0: mkdirp "^1.0.3" yallist "^4.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" - integrity sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w== - dependencies: - "@istanbuljs/schema" "^0.1.2" - glob "^7.1.4" - minimatch "^3.0.4" - test-value@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/test-value/-/test-value-2.1.0.tgz#11da6ff670f3471a73b625ca4f3fdcf7bb748291" @@ -12207,21 +10574,11 @@ tmp@^0.2.0: dependencies: rimraf "^3.0.0" -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-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@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e" - integrity sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog== - to-readable-stream@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/to-readable-stream/-/to-readable-stream-1.0.0.tgz#ce0aa0c2f3df6adf852efb404a783e77c0475771" @@ -12267,20 +10624,6 @@ ts-essentials@^7.0.1: resolved "https://registry.yarnpkg.com/ts-essentials/-/ts-essentials-7.0.3.tgz#686fd155a02133eedcc5362dc8b5056cde3e5a38" integrity sha512-8+gr5+lqO3G84KdiTSMRLtuyJ+nTBVRKuCrK4lidMPdVeEp0uqC875uE5NMcaA7YYMN7XsNiFQuMvasF8HT/xQ== -ts-jest@^29.1.0: - 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.3" - lodash.memoize "4.x" - make-error "1.x" - semver "7.x" - yargs-parser "^21.0.1" - ts-morph@^17.0.1: version "17.0.1" resolved "https://registry.yarnpkg.com/ts-morph/-/ts-morph-17.0.1.tgz#d85df4fcf9a1fcda1b331d52c00655f381c932d1" @@ -12289,25 +10632,6 @@ ts-morph@^17.0.1: "@ts-morph/common" "~0.18.0" code-block-writer "^11.0.3" -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" - v8-compile-cache-lib "^3.0.1" - yn "3.1.1" - ts-node@^8.1.0: version "8.10.2" resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-8.10.2.tgz#eee03764633b1234ddd37f8db9ec10b75ec7fb8d" @@ -12392,7 +10716,7 @@ type-check@~0.3.2: dependencies: prelude-ls "~1.1.2" -type-detect@4.0.8, type-detect@^4.0.0, type-detect@^4.0.5: +type-detect@^4.0.0, type-detect@^4.0.5: version "4.0.8" resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c" integrity sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g== @@ -12462,22 +10786,6 @@ typechain@^8.0.0: ts-command-line-args "^2.2.0" ts-essentials "^7.0.1" -typechain@^8.1.1: - version "8.1.1" - resolved "https://registry.yarnpkg.com/typechain/-/typechain-8.1.1.tgz#9c2e8012c2c4c586536fc18402dcd7034c4ff0bd" - integrity sha512-uF/sUvnXTOVF2FHKhQYnxHk4su4JjZR8vr4mA2mBaRwHTbwh0jIlqARz9XJr1tA0l7afJGvEa1dTSi4zt039LQ== - dependencies: - "@types/prettier" "^2.1.1" - debug "^4.3.1" - fs-extra "^7.0.0" - glob "7.1.7" - js-sha3 "^0.8.0" - lodash "^4.17.15" - mkdirp "^1.0.4" - prettier "^2.3.1" - ts-command-line-args "^2.2.0" - ts-essentials "^7.0.1" - typedarray-to-buffer@^3.1.5: version "3.1.5" resolved "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz#a97ee7a9ff42691b9f783ff1bc5112fe3fca9080" @@ -12500,11 +10808,6 @@ typescript@^4.9.5: resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.5.tgz#095979f9bcc0d09da324d58d03ce8f8374cbe65a" integrity sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g== -typescript@^5.0.4: - version "5.0.4" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.0.4.tgz#b217fd20119bd61a94d4011274e0ab369058da3b" - integrity sha512-cW9T5W9xY37cc+jfEnaUvX91foxtHkza3Nw3wkoF4sSlKn0MONdkdEndig/qPBWXNkmplh3NzayQzCiHM4/hqw== - typical@^2.6.0, typical@^2.6.1: version "2.6.1" resolved "https://registry.yarnpkg.com/typical/-/typical-2.6.1.tgz#5c080e5d661cbbe38259d2e70a3c7253e873881d" @@ -12598,14 +10901,6 @@ unpipe@1.0.0, unpipe@~1.0.0: resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec" integrity sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw= -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" - 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" @@ -12711,25 +11006,11 @@ uuid@^8.3.2: resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2" integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg== -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.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@^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" - convert-source-map "^1.6.0" - validate-npm-package-license@^3.0.1: version "3.0.4" resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a" @@ -12767,13 +11048,6 @@ wabt@1.0.24: resolved "https://registry.yarnpkg.com/wabt/-/wabt-1.0.24.tgz#c02e0b5b4503b94feaf4a30a426ef01c1bea7c6c" integrity sha512-8l7sIOd3i5GWfTWciPL0+ff/FK/deVK2Q6FN+MPz4vfUcD78i2M/49XJTwF6aml91uIiuXJEsLKWMB2cw/mtKg== -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== - dependencies: - makeerror "1.0.12" - wcwidth@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/wcwidth/-/wcwidth-1.0.1.tgz#f0b0dcf915bc5ff1528afadb2c0e17b532da2fe8" @@ -13415,14 +11689,6 @@ wrappy@1: resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= -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== - dependencies: - imurmurhash "^0.1.4" - signal-exit "^3.0.7" - write@1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/write/-/write-1.0.3.tgz#0800e14523b923a387e415123c865616aae0f5c3" @@ -13572,11 +11838,6 @@ yargs-parser@^20.2.2: 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.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-unparser@1.6.0: version "1.6.0" resolved "https://registry.yarnpkg.com/yargs-unparser/-/yargs-unparser-1.6.0.tgz#ef25c2c769ff6bd09e4b0f9d7c605fb27846ea9f" @@ -13625,19 +11886,6 @@ yargs@16.2.0: y18n "^5.0.5" yargs-parser "^20.2.2" -yargs@^17.3.1: - version "17.7.2" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.2.tgz#991df39aca675a192b816e1e0363f9d75d2aa269" - integrity sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w== - 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@^4.7.1: version "4.8.1" resolved "https://registry.yarnpkg.com/yargs/-/yargs-4.8.1.tgz#c0c42924ca4aaa6b0e6da1739dfb216439f9ddc0" From b6a744fd74d030004729858685530c3991d3ce1c Mon Sep 17 00:00:00 2001 From: juliettech Date: Wed, 5 Jul 2023 13:38:44 +0200 Subject: [PATCH 4/4] Improve index naming (#423) * improved index naming * pushing a signed commit for merge * changed plugin repo title --- .../01-plugin-repo/01-plugin-repo-creation.md | 2 +- .../02-plugin-management/02-plugin-setup/index.md | 2 +- .../02-framework/02-plugin-management/index.md | 4 ++-- .../docs/osx/01-how-it-works/02-framework/index.md | 6 +++--- .../contracts/docs/osx/01-how-it-works/index.md | 13 ++++++------- .../02-how-to-guides/01-dao/03-protocol-upgrades.md | 2 +- .../01-dao/04-managing-plugins/index.md | 2 +- .../02-plugin-development/01-best-practices.md | 2 +- .../03-non-upgradeable-plugin/01-initialization.md | 2 +- .../03-non-upgradeable-plugin/02-implementation.md | 2 +- .../03-non-upgradeable-plugin/03-setup.md | 2 +- .../03-non-upgradeable-plugin/index.md | 4 +++- .../04-upgradeable-plugin/01-initialization.md | 2 +- .../04-upgradeable-plugin/02-implementation.md | 2 +- .../04-upgradeable-plugin/03-setup.md | 2 +- .../04-upgradeable-plugin/04-subsequent-builds.md | 2 +- .../04-upgradeable-plugin/05-updating-versions.md | 2 +- .../04-upgradeable-plugin/index.md | 2 +- .../05-governance-plugins/index.md | 2 +- .../07-publication/01-versioning.md | 2 +- .../02-plugin-development/07-publication/index.md | 2 +- .../02-how-to-guides/02-plugin-development/index.md | 4 ++-- .../contracts/docs/osx/03-reference-guide/index.md | 2 +- packages/contracts/docs/osx/index.md | 6 ++++++ 24 files changed, 40 insertions(+), 33 deletions(-) diff --git a/packages/contracts/docs/osx/01-how-it-works/02-framework/02-plugin-management/01-plugin-repo/01-plugin-repo-creation.md b/packages/contracts/docs/osx/01-how-it-works/02-framework/02-plugin-management/01-plugin-repo/01-plugin-repo-creation.md index de036aac7..3339b0e13 100644 --- a/packages/contracts/docs/osx/01-how-it-works/02-framework/02-plugin-management/01-plugin-repo/01-plugin-repo-creation.md +++ b/packages/contracts/docs/osx/01-how-it-works/02-framework/02-plugin-management/01-plugin-repo/01-plugin-repo-creation.md @@ -2,7 +2,7 @@ title: Publishing a Plugin --- -## The Plugin Repo Creation Process +## Start publishing your Plugin by creating a PluginRepo To be available for installation in the Aragon OSx framework, a `PluginRepo` must be created for each plugin. The `PluginRepo` creation process is handled by: diff --git a/packages/contracts/docs/osx/01-how-it-works/02-framework/02-plugin-management/02-plugin-setup/index.md b/packages/contracts/docs/osx/01-how-it-works/02-framework/02-plugin-management/02-plugin-setup/index.md index 8c70d4cdd..330b81fa3 100644 --- a/packages/contracts/docs/osx/01-how-it-works/02-framework/02-plugin-management/02-plugin-setup/index.md +++ b/packages/contracts/docs/osx/01-how-it-works/02-framework/02-plugin-management/02-plugin-setup/index.md @@ -1,5 +1,5 @@ --- -title: The Plugin Contracts +title: Installing Plugins --- ## The Smart Contracts Behind Plugins diff --git a/packages/contracts/docs/osx/01-how-it-works/02-framework/02-plugin-management/index.md b/packages/contracts/docs/osx/01-how-it-works/02-framework/02-plugin-management/index.md index 1e985979b..69d654af0 100644 --- a/packages/contracts/docs/osx/01-how-it-works/02-framework/02-plugin-management/index.md +++ b/packages/contracts/docs/osx/01-how-it-works/02-framework/02-plugin-management/index.md @@ -1,8 +1,8 @@ --- -title: Managing Plugins +title: Plugins --- -## Managing Plugins +## Plugins As mentioned earlier, plugins built by Aragon and third-party developers can be added and removed from your DAO to adapt it to your needs. diff --git a/packages/contracts/docs/osx/01-how-it-works/02-framework/index.md b/packages/contracts/docs/osx/01-how-it-works/02-framework/index.md index 242a17eb8..adc424a25 100644 --- a/packages/contracts/docs/osx/01-how-it-works/02-framework/index.md +++ b/packages/contracts/docs/osx/01-how-it-works/02-framework/index.md @@ -1,8 +1,8 @@ --- -title: Framework +title: Framework - How Everything Connects --- -## The Infrastructure Running the Araong OSx Protocol +## The Infrastructure Running the Aragon OSx Protocol The Aragon OSx protocol is composed of **framework-related contracts** creating and managing the **core contracts**. This includes the @@ -20,7 +20,7 @@ An overview of the involved contracts and their interactions is shown below: ![](aragon-os-infrastructure-core-overview.drawio.svg) -

+

Overview of the framework and core contracts of the Aragon OSx protocol.

diff --git a/packages/contracts/docs/osx/01-how-it-works/index.md b/packages/contracts/docs/osx/01-how-it-works/index.md index d2306ae5c..1f3bd82df 100644 --- a/packages/contracts/docs/osx/01-how-it-works/index.md +++ b/packages/contracts/docs/osx/01-how-it-works/index.md @@ -7,13 +7,12 @@ title: How It Works The Aragon OSx protocol is a DAO framework structured as follows:
- -![](./aragon-os-framework-overview.drawio.svg) - -

- Overview of the Aragon OSx protocol with its structural components and their responsibilities: the governance layer constituted by the framework DAO, the code layer including the framework and core contracts, which depends on external libraries and services. -

- + + ![](./aragon-os-framework-overview.drawio.svg) + +

+ Overview of the Aragon OSx protocol with its structural components and their responsibilities: the governance layer constituted by the framework DAO, the code layer including the framework and core contracts, which depends on external libraries and services. +

### Code Layer diff --git a/packages/contracts/docs/osx/02-how-to-guides/01-dao/03-protocol-upgrades.md b/packages/contracts/docs/osx/02-how-to-guides/01-dao/03-protocol-upgrades.md index 1adf6183c..f4167154d 100644 --- a/packages/contracts/docs/osx/02-how-to-guides/01-dao/03-protocol-upgrades.md +++ b/packages/contracts/docs/osx/02-how-to-guides/01-dao/03-protocol-upgrades.md @@ -1,5 +1,5 @@ --- -title: Upgrade your DAO to future Aragon OSx Protocol Versions +title: Upgrade your DAO to future Aragon OSx Versions --- ## Upgrading to Future Aragon OSx Protocol Versions diff --git a/packages/contracts/docs/osx/02-how-to-guides/01-dao/04-managing-plugins/index.md b/packages/contracts/docs/osx/02-how-to-guides/01-dao/04-managing-plugins/index.md index 9ec072890..75f8c6f68 100644 --- a/packages/contracts/docs/osx/02-how-to-guides/01-dao/04-managing-plugins/index.md +++ b/packages/contracts/docs/osx/02-how-to-guides/01-dao/04-managing-plugins/index.md @@ -1,5 +1,5 @@ --- -title: Manage the plugins installed in your DAO +title: Manage your DAO's Plugins --- ## How to manage the Plugins within your DAO diff --git a/packages/contracts/docs/osx/02-how-to-guides/02-plugin-development/01-best-practices.md b/packages/contracts/docs/osx/02-how-to-guides/02-plugin-development/01-best-practices.md index d49098f13..7230dc4e1 100644 --- a/packages/contracts/docs/osx/02-how-to-guides/02-plugin-development/01-best-practices.md +++ b/packages/contracts/docs/osx/02-how-to-guides/02-plugin-development/01-best-practices.md @@ -1,5 +1,5 @@ --- -title: Before starting +title: Before Starting --- ## Advice for Developing a Plugin diff --git a/packages/contracts/docs/osx/02-how-to-guides/02-plugin-development/03-non-upgradeable-plugin/01-initialization.md b/packages/contracts/docs/osx/02-how-to-guides/02-plugin-development/03-non-upgradeable-plugin/01-initialization.md index 3ce5a04aa..b087bd9ff 100644 --- a/packages/contracts/docs/osx/02-how-to-guides/02-plugin-development/03-non-upgradeable-plugin/01-initialization.md +++ b/packages/contracts/docs/osx/02-how-to-guides/02-plugin-development/03-non-upgradeable-plugin/01-initialization.md @@ -1,5 +1,5 @@ --- -title: Initializing Non-Upgradeable Plugins +title: Initialization --- ## How to Initialize Non-Upgradeable Plugins diff --git a/packages/contracts/docs/osx/02-how-to-guides/02-plugin-development/03-non-upgradeable-plugin/02-implementation.md b/packages/contracts/docs/osx/02-how-to-guides/02-plugin-development/03-non-upgradeable-plugin/02-implementation.md index 2afd84c05..a0595e994 100644 --- a/packages/contracts/docs/osx/02-how-to-guides/02-plugin-development/03-non-upgradeable-plugin/02-implementation.md +++ b/packages/contracts/docs/osx/02-how-to-guides/02-plugin-development/03-non-upgradeable-plugin/02-implementation.md @@ -1,5 +1,5 @@ --- -title: Building a Non-Upgradeable Plugin contract +title: Building the Plugin Implementation Contract --- ## How to Build a Non-Upgradeable Plugin diff --git a/packages/contracts/docs/osx/02-how-to-guides/02-plugin-development/03-non-upgradeable-plugin/03-setup.md b/packages/contracts/docs/osx/02-how-to-guides/02-plugin-development/03-non-upgradeable-plugin/03-setup.md index 6360e399c..e924122e7 100644 --- a/packages/contracts/docs/osx/02-how-to-guides/02-plugin-development/03-non-upgradeable-plugin/03-setup.md +++ b/packages/contracts/docs/osx/02-how-to-guides/02-plugin-development/03-non-upgradeable-plugin/03-setup.md @@ -1,5 +1,5 @@ --- -title: Building a Plugin Setup contract for a Non-Upgradeable Plugin +title: Building the Plugin Setup Contract --- ## What is the Plugin Setup contract? diff --git a/packages/contracts/docs/osx/02-how-to-guides/02-plugin-development/03-non-upgradeable-plugin/index.md b/packages/contracts/docs/osx/02-how-to-guides/02-plugin-development/03-non-upgradeable-plugin/index.md index d9fbd7078..cff630408 100644 --- a/packages/contracts/docs/osx/02-how-to-guides/02-plugin-development/03-non-upgradeable-plugin/index.md +++ b/packages/contracts/docs/osx/02-how-to-guides/02-plugin-development/03-non-upgradeable-plugin/index.md @@ -1,7 +1,9 @@ --- -title: Get Started with Non-Upgradeable Plugins +title: Non-Upgradeable Plugins --- +## Get Started with Non-Upgradeable Plugins + A Non-Upgradeable Plugin is a Plugin built on smart contracts that cannot be upgraded. This may or may not be what you want. Some observations: diff --git a/packages/contracts/docs/osx/02-how-to-guides/02-plugin-development/04-upgradeable-plugin/01-initialization.md b/packages/contracts/docs/osx/02-how-to-guides/02-plugin-development/04-upgradeable-plugin/01-initialization.md index 33aa60f29..618eed1c3 100644 --- a/packages/contracts/docs/osx/02-how-to-guides/02-plugin-development/04-upgradeable-plugin/01-initialization.md +++ b/packages/contracts/docs/osx/02-how-to-guides/02-plugin-development/04-upgradeable-plugin/01-initialization.md @@ -1,5 +1,5 @@ --- -title: Intializing an Upgradeable Plugin +title: Intialization --- ## How to Initialize Upgradeable Plugins diff --git a/packages/contracts/docs/osx/02-how-to-guides/02-plugin-development/04-upgradeable-plugin/02-implementation.md b/packages/contracts/docs/osx/02-how-to-guides/02-plugin-development/04-upgradeable-plugin/02-implementation.md index ead14755a..f8d1d02d2 100644 --- a/packages/contracts/docs/osx/02-how-to-guides/02-plugin-development/04-upgradeable-plugin/02-implementation.md +++ b/packages/contracts/docs/osx/02-how-to-guides/02-plugin-development/04-upgradeable-plugin/02-implementation.md @@ -1,5 +1,5 @@ --- -title: Building an Upgradeable Plugin +title: The Plugin Implementation Contract --- ## How to build an Upgradeable Plugin implementation contract diff --git a/packages/contracts/docs/osx/02-how-to-guides/02-plugin-development/04-upgradeable-plugin/03-setup.md b/packages/contracts/docs/osx/02-how-to-guides/02-plugin-development/04-upgradeable-plugin/03-setup.md index 2925367db..30261c873 100644 --- a/packages/contracts/docs/osx/02-how-to-guides/02-plugin-development/04-upgradeable-plugin/03-setup.md +++ b/packages/contracts/docs/osx/02-how-to-guides/02-plugin-development/04-upgradeable-plugin/03-setup.md @@ -1,5 +1,5 @@ --- -title: Building the Plugin Setup contract for Upgradeable Plugins +title: The Plugin Setup Contract --- ## How to build the Plugin Setup Contract for Upgradeable Plugins diff --git a/packages/contracts/docs/osx/02-how-to-guides/02-plugin-development/04-upgradeable-plugin/04-subsequent-builds.md b/packages/contracts/docs/osx/02-how-to-guides/02-plugin-development/04-upgradeable-plugin/04-subsequent-builds.md index eb2487f8a..bd2d9bcd8 100644 --- a/packages/contracts/docs/osx/02-how-to-guides/02-plugin-development/04-upgradeable-plugin/04-subsequent-builds.md +++ b/packages/contracts/docs/osx/02-how-to-guides/02-plugin-development/04-upgradeable-plugin/04-subsequent-builds.md @@ -1,5 +1,5 @@ --- -title: Subsequent Builds for Upgradeable Plugins +title: Subsequent Builds --- ## How to create a subsequent build to an Upgradeable Plugin diff --git a/packages/contracts/docs/osx/02-how-to-guides/02-plugin-development/04-upgradeable-plugin/05-updating-versions.md b/packages/contracts/docs/osx/02-how-to-guides/02-plugin-development/04-upgradeable-plugin/05-updating-versions.md index d2893dfcb..1f07c268e 100644 --- a/packages/contracts/docs/osx/02-how-to-guides/02-plugin-development/04-upgradeable-plugin/05-updating-versions.md +++ b/packages/contracts/docs/osx/02-how-to-guides/02-plugin-development/04-upgradeable-plugin/05-updating-versions.md @@ -1,5 +1,5 @@ --- -title: Upgrading an Upgradeable Plugin +title: Upgrade the Plugin --- ## How to upgrade an Upgradeable Plugin diff --git a/packages/contracts/docs/osx/02-how-to-guides/02-plugin-development/04-upgradeable-plugin/index.md b/packages/contracts/docs/osx/02-how-to-guides/02-plugin-development/04-upgradeable-plugin/index.md index 6189d5d50..37ca2ad33 100644 --- a/packages/contracts/docs/osx/02-how-to-guides/02-plugin-development/04-upgradeable-plugin/index.md +++ b/packages/contracts/docs/osx/02-how-to-guides/02-plugin-development/04-upgradeable-plugin/index.md @@ -1,5 +1,5 @@ --- -title: What are Upgradeable Plugins? +title: Upgradeable Plugins --- ## How to develop an Upgradeable Plugin diff --git a/packages/contracts/docs/osx/02-how-to-guides/02-plugin-development/05-governance-plugins/index.md b/packages/contracts/docs/osx/02-how-to-guides/02-plugin-development/05-governance-plugins/index.md index fa15fcd13..b43f7807d 100644 --- a/packages/contracts/docs/osx/02-how-to-guides/02-plugin-development/05-governance-plugins/index.md +++ b/packages/contracts/docs/osx/02-how-to-guides/02-plugin-development/05-governance-plugins/index.md @@ -1,5 +1,5 @@ --- -title: Building Governance Plugins +title: Governance Plugins --- ## How to Build a Governance Plugin diff --git a/packages/contracts/docs/osx/02-how-to-guides/02-plugin-development/07-publication/01-versioning.md b/packages/contracts/docs/osx/02-how-to-guides/02-plugin-development/07-publication/01-versioning.md index 9b0a62748..89348f29c 100644 --- a/packages/contracts/docs/osx/02-how-to-guides/02-plugin-development/07-publication/01-versioning.md +++ b/packages/contracts/docs/osx/02-how-to-guides/02-plugin-development/07-publication/01-versioning.md @@ -1,5 +1,5 @@ --- -title: Adding a new version of your plugin +title: New Plugin Version --- ## How to add a new version of your plugin diff --git a/packages/contracts/docs/osx/02-how-to-guides/02-plugin-development/07-publication/index.md b/packages/contracts/docs/osx/02-how-to-guides/02-plugin-development/07-publication/index.md index c7f41b438..f3dfd9c0e 100644 --- a/packages/contracts/docs/osx/02-how-to-guides/02-plugin-development/07-publication/index.md +++ b/packages/contracts/docs/osx/02-how-to-guides/02-plugin-development/07-publication/index.md @@ -1,5 +1,5 @@ --- -title: Publishing a plugin into Aragon's plugin registry +title: Publication of your Plugin into Aragon OSx --- ## How to publish a plugin into Aragon's plugin registry diff --git a/packages/contracts/docs/osx/02-how-to-guides/02-plugin-development/index.md b/packages/contracts/docs/osx/02-how-to-guides/02-plugin-development/index.md index 6c7deb48c..3b985f94a 100644 --- a/packages/contracts/docs/osx/02-how-to-guides/02-plugin-development/index.md +++ b/packages/contracts/docs/osx/02-how-to-guides/02-plugin-development/index.md @@ -1,8 +1,8 @@ --- -title: Get Started with Developing your Plugin +title: Get Started with your DAO Plugin --- -# Plugin Development Quickstart Guide +## Plugin Development Quickstart Guide Plugins are how we extend the functionality for DAOs. In Aragon OSx, everything a DAO can do is based on Plugin functionality enabled through permissions. diff --git a/packages/contracts/docs/osx/03-reference-guide/index.md b/packages/contracts/docs/osx/03-reference-guide/index.md index 09bc3bf83..499bb5499 100644 --- a/packages/contracts/docs/osx/03-reference-guide/index.md +++ b/packages/contracts/docs/osx/03-reference-guide/index.md @@ -1,5 +1,5 @@ --- -title: Reference +title: Reference Guide --- ## Reference Guide diff --git a/packages/contracts/docs/osx/index.md b/packages/contracts/docs/osx/index.md index 5a96fe0ef..0ed8ed9ff 100644 --- a/packages/contracts/docs/osx/index.md +++ b/packages/contracts/docs/osx/index.md @@ -46,6 +46,12 @@ contract MyCoolPlugin is Plugin { } ``` +## Customize your DAO + +DAO Plugins are the best way to customize your DAO. These are modular extendable pieces of software which you can install or uninstall from your DAO as it evolves and grows. + +To learn more about plugins, check out our guide [here](./02-how-to-guides/02-plugin-development/index.md). + ### Walkthrough This documentation is divided into conceptual and practical sections as well as the reference guide.