diff --git a/.github/scripts/download-6-9-2-3.sh b/.github/scripts/download-6-9-2-3.sh new file mode 100755 index 000000000..abe60f3c9 --- /dev/null +++ b/.github/scripts/download-6-9-2-3.sh @@ -0,0 +1,20 @@ +#!/bin/bash +set -e + +BASE_URL="https://maci-develop-fra.s3.eu-central-1.amazonaws.com/v1.2.0" +PKGS="maci_artifacts_6-9-2-3_prod.tar.gz" + +for p in $PKGS +do + url="$BASE_URL/$p" + echo "downloading $url" + curl $url -o $p + extension="${p##*.}" + if [ "$extension" == "gz" ] + then + tar -zxvf $p + fi +done + +mv zkeys params +rm maci_artifacts_6-9-2-3_prod.tar.gz diff --git a/.github/scripts/download-zkeys-micro.sh b/.github/scripts/download-zkeys-micro.sh new file mode 100755 index 000000000..88aabcb7c --- /dev/null +++ b/.github/scripts/download-zkeys-micro.sh @@ -0,0 +1,22 @@ +#!/bin/bash +set -e + +PKGS="zkeys_10-2-1-2_glibc-211.tar.gz ProcessMessages_10-2-1-2_test.0.zkey TallyVotes_10-1-2_test.0.zkey" + +mkdir -p params +cd params + + +BASE_URL=https://maci-develop-fra.s3.eu-central-1.amazonaws.com/v1.1.1-aa4ba27/10-2-1-2 +for p in $PKGS +do + url="$BASE_URL/$p" + echo "downloading $url" + curl $url -o $p + extension="${p##*.}" + if [ "$extension" == "gz" ] + then + tar -xvf $p + fi +done + diff --git a/.github/workflows/cancel-round.yml b/.github/workflows/cancel-round.yml index a44508f0e..5091547fe 100644 --- a/.github/workflows/cancel-round.yml +++ b/.github/workflows/cancel-round.yml @@ -1,10 +1,22 @@ name: Cancel current round -on: workflow_dispatch +on: + workflow_dispatch: + inputs: + clrfund: + description: 'Clrfund contract address' + required: true + default: '0x87790498127ff044f43b9230506833ca89113757' + network: + description: 'Network' + required: true + default: 'arbitrum-sepolia' + jsonrpc_url: + description: jsonrpc url to node + required: false env: - NODE_VERSION: 16.x - SUBGRPAH_URL: "https://api.thegraph.com/subgraphs/name/clrfund/clrfund-arbitrum-goerli" + NODE_VERSION: 20.x WALLET_PRIVATE_KEY: ${{ secrets.ARBITRUM_GOERLI_COORDINATOR_WALLET_PRIVATE_KEY }} jobs: @@ -19,10 +31,12 @@ jobs: uses: actions/checkout@v3 - name: Build CLR run: | + # use https to avoid error: unable to connect to github.com + git config --global url."https://".insteadOf git:// yarn && yarn build - name: Run the cancel round script run: | cd contracts - export FACTORY=$(curl -X POST -d '{"query":"{fundingRoundFactories {id}}"}' $SUBGRPAH_URL) - export FACTORY_ADDRESS=$(node -e 'console.log(JSON.parse(process.env.FACTORY).data.fundingRoundFactories[0].id)') - yarn hardhat cancel-round --factory ${FACTORY_ADDRESS} --network arbitrum-goerli + yarn hardhat cancel-round \ + --clrfund ${{ github.event.inputs.clrfund }} \ + --network ${{ github.event.inputs.network }} diff --git a/.github/workflows/create-version.yml b/.github/workflows/create-version.yml index 0037986c1..9cccd61a7 100644 --- a/.github/workflows/create-version.yml +++ b/.github/workflows/create-version.yml @@ -12,8 +12,8 @@ on: - major env: - NODE_VERSION: 16.x - VITE_CLRFUND_FACTORY_ADDRESS: "0x5FC8d32690cc91D4c39d9d3abcBD16989F875707" + NODE_VERSION: 20.x + VITE_CLRFUND_ADDRESS: "0x5FC8d32690cc91D4c39d9d3abcBD16989F875707" VITE_ETHEREUM_API_CHAINID: 1 VITE_ETHEREUM_API_URL: "dummy" VITE_IPFS_PINNING_JWT: "dummy" @@ -33,6 +33,8 @@ jobs: uses: actions/checkout@v3 - name: Install dependencies run: | + # use https to avoid error: unable to connect to github.com + git config --global url."https://".insteadOf git:// yarn && yarn build - name: setup git config run: | diff --git a/.github/workflows/finalize-round.yml b/.github/workflows/finalize-round.yml index d1e8e5219..0109651d5 100644 --- a/.github/workflows/finalize-round.yml +++ b/.github/workflows/finalize-round.yml @@ -3,23 +3,34 @@ name: Finalize a test round on: workflow_dispatch: inputs: - branch_name: - description: 'Clrfund branch name' + clrfund_address: + description: 'Clrfund contract address' required: true - default: 'develop' - subgraph_name: - description: 'Clrfund subgraph name' + default: '0x87790498127ff044f43b9230506833ca89113757' + maci_tx_hash: + description: 'MACI creation transaction hash' + required: false + blocks_per_batch: + description: 'Blocks of logs to fetch per batch' required: true - default: 'yuetloo/clrfund-dev' + default: '9000' + network: + description: 'Network' + required: true + default: 'arbitrum-sepolia' + jsonrpc_url: + description: jsonrpc url to node + required: false env: - NODE_VERSION: 16.x - NETWORK: "arbitrum-goerli" - COORDINATOR_ETH_PK: ${{ secrets.ARBITRUM_GOERLI_COORDINATOR_WALLET_PRIVATE_KEY }} - COORDINATOR_PK: ${{ secrets.ARBITRUM_GOERLI_COORDINATOR_MACI_PRIVATE_KEY }} - JSONRPC_HTTP_URL: ${{ secrets.JSONRPC_HTTP_URL }} - ETHERSCAN_API_KEY: ${{ secrets.ETHERSCAN_API_KEY_ARBITRUM }} - ETHERSCAN_URL: "https://api-goerli.arbiscan.io" + NODE_VERSION: 20.x + COORDINATOR_MACISK: ${{ secrets.COORDINATOR_MACI_PRIVATE_KEY }} + WALLET_PRIVATE_KEY: ${{ secrets.ARBITRUM_GOERLI_COORDINATOR_WALLET_PRIVATE_KEY }} + CIRCUIT_TYPE: micro + ZKEYS_DOWNLOAD_SCRIPT: "download-6-9-2-3.sh" + JSONRPC_HTTP_URL: ${{ github.event.inputs.jsonrpc_url }} + PINATA_API_KEY: ${{ secrets.PINATA_API_KEY }} + PINATA_SECRET_API_KEY: ${{ secrets.PINATA_SECRET_API_KEY }} jobs: finalize: @@ -33,41 +44,51 @@ jobs: run: | sudo apt update sudo apt-get install build-essential libgmp-dev libsodium-dev nlohmann-json3-dev nasm g++ curl - - name: Install rust toolchain - uses: actions-rs/toolchain@v1 + - name: Checkout rapidsnark source code + uses: actions/checkout@v3 with: - toolchain: stable - - name: Install zkutil + repository: clrfund/rapidsnark + path: rapidsnark + - name: Install rapidsnark run: | - cargo install zkutil --version 0.3.2 + cd $GITHUB_WORKSPACE/rapidsnark + npm install + git submodule init + git submodule update + ./build_gmp.sh host + mkdir build_prover && cd build_prover + cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=../package + make -j4 && make install - name: Checkout source code uses: actions/checkout@v3 with: - ref: ${{ github.event.inputs.branch_name }} + path: monorepo - name: Download batch 64 params run: | ls -la $GITHUB_WORKSPACE - $GITHUB_WORKSPACE/.github/scripts/download-batch64-params.sh + $GITHUB_WORKSPACE/monorepo/.github/scripts/${ZKEYS_DOWNLOAD_SCRIPT} - name: Build run: | + cd monorepo + # use https to avoid error: unable to connect to github.com + git config --global url."https://".insteadOf git:// yarn && yarn build - name: Run finalize scripts run: | - export SUBGRPAH_URL="https://api.thegraph.com/subgraphs/name/${{ github.event.inputs.subgraph_name }}" - echo $SUBGRAPH_URL - export NODE_CONFIG=$(node -e "const snarkParamsPath=process.env.GITHUB_WORKSPACE + '/params'; console.log(JSON.stringify({ snarkParamsPath }));") - export ROUND=$(curl -X POST -d '{"query":"{fundingRoundFactories {id currentRound {id maci}}}"}' $SUBGRPAH_URL) - export FACTORY_ADDRESS=$(node -e 'console.log(JSON.parse(process.env.ROUND).data.fundingRoundFactories[0].id)') - export ROUND_ADDRESS=$(node -e 'console.log(JSON.parse(process.env.ROUND).data.fundingRoundFactories[0].currentRound.id)') - export MACI_ADDRESS=$(node -e 'console.log(JSON.parse(process.env.ROUND).data.fundingRoundFactories[0].currentRound.maci)') - export TX_URL="${ETHERSCAN_URL}/api?module=account&action=txlistinternal&address=${MACI_ADDRESS}&startblock=0&page=10&offset=1&sort=asc&apikey=${ETHERSCAN_API_KEY}" - export TXLIST=$(curl $TX_URL) - export MACI_START_BLOCK=$(node -e 'console.log(JSON.parse(process.env.TXLIST).result[0].blockNumber)') - echo "MACI_START_BLOCK:" $MACI_START_BLOCK + export CLRFUND_ADDRESS=${{ github.event.inputs.clrfund_address }} + export MACI_TX_HASH=${{ github.event.inputs.maci_tx_hash }} + export NETWORK=${{ github.event.inputs.network }} + export BLOCKS_PER_BATCH=${{ github.event.inputs.blocks_per_batch }} + export RAPID_SNARK="$GITHUB_WORKSPACE/rapidsnark/package/bin/prover" + export CIRCUIT_DIRECTORY=$GITHUB_WORKSPACE/params # tally and finalize - cd contracts - yarn hardhat tally --round-address "${ROUND_ADDRESS}" --network "${NETWORK}" - curl --location --request POST 'https://api.pinata.cloud/pinning/pinFileToIPFS' \ - --header "Authorization: Bearer ${{ secrets.PINATA_JWT }}" \ - --form 'file=@"tally.json"' - JSONRPC_HTTP_URL=${{env.JSONRPC_HTTP_URL}} yarn hardhat run --network "${NETWORK}" scripts/finalize.ts + cd monorepo/contracts + mkdir -p proof_output + yarn hardhat tally --clrfund "${CLRFUND_ADDRESS}" --network "${NETWORK}" \ + --rapidsnark ${RAPID_SNARK} \ + --params-dir ${CIRCUIT_DIRECTORY} \ + --blocks-per-batch ${BLOCKS_PER_BATCH} \ + --maci-tx-hash "${MACI_TX_HASH}" \ + --proof-dir "./proof_output" + yarn hardhat --network "${NETWORK}" finalize --clrfund "${CLRFUND_ADDRESS}" \ + --proof-dir "./proof_output" diff --git a/.github/workflows/mantle_cancel_round.yml b/.github/workflows/mantle_cancel_round.yml deleted file mode 100644 index 80254827a..000000000 --- a/.github/workflows/mantle_cancel_round.yml +++ /dev/null @@ -1,40 +0,0 @@ -name: Mantle testnet - Cancel current round - -on: - workflow_dispatch: - inputs: - branch_name: - description: 'Clrfund branch name' - required: true - default: 'cohort/EthSingapore' - factory: - description: 'Clrfund factory address' - required: true - default: '0x006f39E6a6D15323334Be1db34C73088550BB20a' - network: - description: 'Network' - required: true - default: 'mantle-testnet' - - -env: - NODE_VERSION: 16.x - WALLET_PRIVATE_KEY: ${{ secrets.MANTLE_TESTNET_COORDINATOR_WALLET_PRIVATE_KEY }} - -jobs: - cancel-round: - runs-on: ubuntu-22.04 - steps: - - name: Use Node.js ${{ env.NODE_VERSION }} - uses: actions/setup-node@v3 - with: - node-version: ${{ env.NODE_VERSION }} - - name: Checkout source code - uses: actions/checkout@v3 - - name: Build CLR - run: | - yarn && yarn build - - name: Run the cancel round script - run: | - cd contracts - yarn hardhat cancel-round --factory "${{ github.event.inputs.factory }}" --network "${{ github.event.inputs.network }}" diff --git a/.github/workflows/mantle_create_new_round.yml b/.github/workflows/mantle_create_new_round.yml deleted file mode 100644 index 40de9dac0..000000000 --- a/.github/workflows/mantle_create_new_round.yml +++ /dev/null @@ -1,40 +0,0 @@ -name: Mantle testnet - Create new round - -on: - workflow_dispatch: - inputs: - branch_name: - description: 'Clrfund branch name' - required: true - default: 'cohort/EthSingapore' - factory: - description: 'Clrfund factory address' - required: true - default: '0x006f39E6a6D15323334Be1db34C73088550BB20a' - network: - description: 'Network' - required: true - default: 'mantle-testnet' - -env: - NODE_VERSION: 16.x - WALLET_PRIVATE_KEY: ${{ secrets.MANTLE_TESTNET_COORDINATOR_WALLET_PRIVATE_KEY }} - -jobs: - create-new-round: - runs-on: ubuntu-22.04 - steps: - - name: Use Node.js ${{ env.NODE_VERSION }} - uses: actions/setup-node@v3 - with: - node-version: ${{ env.NODE_VERSION }} - - name: Checkout source code - uses: actions/checkout@v3 - - name: Build CLR - run: | - yarn && yarn build - - name: Run create new round script - run: | - cd contracts - export FACTORY_ADDRESS="${{ github.event.inputs.factory }}" - yarn hardhat run scripts/newRound.ts --network "${{ github.event.inputs.network }}" diff --git a/.github/workflows/mantle_finalize_round.yml b/.github/workflows/mantle_finalize_round.yml deleted file mode 100644 index 1298cd77c..000000000 --- a/.github/workflows/mantle_finalize_round.yml +++ /dev/null @@ -1,76 +0,0 @@ -name: Mantle testnet - Finalize round - -on: - workflow_dispatch: - inputs: - branch_name: - description: 'Clrfund branch name' - required: true - default: 'cohort/EthSingapore' - maci_start_block: - description: 'MACI contract creation block' - required: true - default: '1' - subgraph_url: - description: 'Clrfund subgraph url' - required: true - default: 'https://graph.testnet.mantle.xyz/subgraphs/name/clrfund-ethsingapore-test' - network: - description: 'Network' - required: true - default: 'mantle-testnet' - -env: - NODE_VERSION: 16.x - NETWORK: "arbitrum-goerli" - COORDINATOR_ETH_PK: ${{ secrets.MANTLE_TESTNET_COORDINATOR_WALLET_PRIVATE_KEY }} - COORDINATOR_PK: ${{ secrets.MANTLE_TESTNET_COORDINATOR_MACI_PRIVATE_KEY }} - -jobs: - finalize: - runs-on: ubuntu-22.04 - steps: - - name: Use Node.js ${{ env.NODE_VERSION }} - uses: actions/setup-node@v3 - with: - node-version: ${{ env.NODE_VERSION }} - - name: Install g++ library dependencies - run: | - sudo apt update - sudo apt-get install build-essential libgmp-dev libsodium-dev nlohmann-json3-dev nasm g++ curl - - name: Install rust toolchain - uses: actions-rs/toolchain@v1 - with: - toolchain: stable - - name: Install zkutil - run: | - cargo install zkutil --version 0.3.2 - - name: Checkout source code - uses: actions/checkout@v3 - with: - ref: ${{ github.event.inputs.branch_name }} - - name: Download batch 64 params - run: | - ls -la $GITHUB_WORKSPACE - $GITHUB_WORKSPACE/.github/scripts/download-batch64-params.sh - - name: Build - run: | - yarn && yarn build - - name: Run finalize scripts - run: | - export SUBGRPAH_URL="${{ github.event.inputs.subgraph_url }}" - echo $SUBGRAPH_URL - export NODE_CONFIG=$(node -e "const snarkParamsPath=process.env.GITHUB_WORKSPACE + '/params'; console.log(JSON.stringify({ snarkParamsPath }));") - export ROUND=$(curl -X POST -d '{"query":"{fundingRoundFactories {id currentRound {id maci}}}"}' $SUBGRPAH_URL) - export FACTORY_ADDRESS=$(node -e 'console.log(JSON.parse(process.env.ROUND).data.fundingRoundFactories[0].id)') - export ROUND_ADDRESS=$(node -e 'console.log(JSON.parse(process.env.ROUND).data.fundingRoundFactories[0].currentRound.id)') - export MACI_ADDRESS=$(node -e 'console.log(JSON.parse(process.env.ROUND).data.fundingRoundFactories[0].currentRound.maci)') - export MACI_START_BLOCK="${{ github.event.inputs.maci_start_block }}" - echo "MACI_START_BLOCK:" $MACI_START_BLOCK - # tally and finalize - cd contracts - yarn hardhat tally --round-address "${ROUND_ADDRESS}" --network "${NETWORK}" - curl --location --request POST 'https://api.pinata.cloud/pinning/pinFileToIPFS' \ - --header "Authorization: Bearer ${{ secrets.PINATA_JWT }}" \ - --form 'file=@"tally.json"' - yarn hardhat run --network "${NETWORK}" scripts/finalize.ts diff --git a/.github/workflows/mantle_set_duration.yml b/.github/workflows/mantle_set_duration.yml deleted file mode 100644 index ccfa8cf5e..000000000 --- a/.github/workflows/mantle_set_duration.yml +++ /dev/null @@ -1,43 +0,0 @@ -name: Mantle testnet - Set voting duration - -on: - workflow_dispatch: - inputs: - voting_period: - description: 'Voting period in minutes' - required: true - default: '120' - reallocation_period: - description: 'Reallocation period in minutes' - required: true - default: '1' - factory: - description: 'Clrfund factory address' - required: true - default: '0x006f39E6a6D15323334Be1db34C73088550BB20a' - network: - description: 'Network' - required: true - default: 'mantle-testnet' - -env: - NODE_VERSION: 16.x - WALLET_PRIVATE_KEY: ${{ secrets.MANTLE_TESTNET_COORDINATOR_WALLET_PRIVATE_KEY }} - -jobs: - set-durations: - runs-on: ubuntu-22.04 - steps: - - name: Use Node.js ${{ env.NODE_VERSION }} - uses: actions/setup-node@v3 - with: - node-version: ${{ env.NODE_VERSION }} - - name: Checkout source code - uses: actions/checkout@v3 - - name: Build CLR - run: | - yarn && yarn build - - name: Run the set duration script - run: | - cd contracts - yarn hardhat set-durations --factory "${{ github.event.inputs.factory }}" --signup "${{ github.event.inputs.voting_period }}" --voting "${{ github.event.inputs.reallocation_period }}" --network "${{ github.event.inputs.network }}" diff --git a/.github/workflows/new-round.yml b/.github/workflows/new-round.yml index a25fa09ff..2c788842d 100644 --- a/.github/workflows/new-round.yml +++ b/.github/workflows/new-round.yml @@ -1,10 +1,26 @@ name: Create new round -on: workflow_dispatch +on: + workflow_dispatch: + inputs: + clrfund_address: + description: 'Clrfund contract address' + required: true + default: '0x87790498127ff044f43b9230506833ca89113757' + duration: + description: 'Round duration' + required: true + default: 3600 + network: + description: 'Network' + required: true + default: 'arbitrum-sepolia' + jsonrpc_url: + description: jsonrpc url to node + required: false env: - NODE_VERSION: 16.x - SUBGRPAH_URL: "https://api.thegraph.com/subgraphs/name/clrfund/clrfund-arbitrum-goerli" + NODE_VERSION: 20.x WALLET_PRIVATE_KEY: ${{ secrets.ARBITRUM_GOERLI_COORDINATOR_WALLET_PRIVATE_KEY }} jobs: @@ -19,10 +35,13 @@ jobs: uses: actions/checkout@v3 - name: Build CLR run: | + # use https to avoid error: unable to connect to github.com + git config --global url."https://".insteadOf git:// yarn && yarn build - name: Run create new round script run: | cd contracts - export FACTORY=$(curl -X POST -d '{"query":"{fundingRoundFactories {id}}"}' $SUBGRPAH_URL) - export FACTORY_ADDRESS=$(node -e 'console.log(JSON.parse(process.env.FACTORY).data.fundingRoundFactories[0].id)') - yarn hardhat run scripts/newRound.ts --network arbitrum-goerli + yarn hardhat new-round \ + --network ${{ github.event.inputs.network }} \ + --duration ${{ github.event.inputs.duration }} \ + --clrfund ${{ github.event.inputs.clrfund_address }} diff --git a/.github/workflows/test-buildsnark.yml b/.github/workflows/test-buildsnark.yml deleted file mode 100644 index 742d29e41..000000000 --- a/.github/workflows/test-buildsnark.yml +++ /dev/null @@ -1,72 +0,0 @@ -name: Small snark end to end test - -on: workflow_dispatch - -env: - NODE_VERSION: 16.x - CIRCUIT_TYPE: small - -jobs: - small-snark-test: - runs-on: ubuntu-22.04 - steps: - - name: Checkout MACI - uses: actions/checkout@v3 - with: - repository: privacy-scaling-explorations/maci - ref: v0.10.1 - path: maci - - name: Use Node.js ${{ env.NODE_VERSION }} - uses: actions/setup-node@v3 - with: - node-version: ${{ env.NODE_VERSION }} - - name: Install g++ library dependencies - run: | - sudo apt update - sudo apt-get install build-essential libgmp-dev libsodium-dev nlohmann-json3-dev nasm g++ curl - - name: Install rust toolchain - uses: actions-rs/toolchain@v1 - with: - toolchain: stable - - name: Install zkutil - run: | - cargo install zkutil --version 0.3.2 - - name: Build MACI - run: | - git config --global url."https://".insteadOf ssh:// - cd maci - npm i && npm run bootstrap && npm run build - - name: Build snarks - run: | - cd maci/circuits - ./scripts/buildSnarksSmall.sh - chmod u+x params/batchUstSmall params/qvtSmall - chmod u+r params/* - - name: Checkout Clrfund - uses: actions/checkout@v3 - with: - path: monorepo - - name: Install Clrfund - run: | - cd monorepo - yarn && yarn build - - name: Start hardhat network - run: | - cd monorepo - yarn start:node & - - name: Copy snark verifier contracts - run: | - pwd - echo $GITHUB_WORKSPACE - ls $GITHUB_WORKSPACE - ls $GITHUB_WORKSPACE/maci - cd monorepo - cp $GITHUB_WORKSPACE/maci/circuits/params/BatchUpdateStateTreeVerifierSmall.sol contracts/contracts/snarkVerifiers/ - cp $GITHUB_WORKSPACE/maci/circuits/params/QuadVoteTallyVerifierSmall.sol contracts/contracts/snarkVerifiers/ - - name: Run tests - run: | - export NODE_CONFIG=$(node -e "const snarkParamsPath=process.env.GITHUB_WORKSPACE + '/maci/circuits/params'; console.log(JSON.stringify({ snarkParamsPath }));") - echo $NODE_CONFIG - cd monorepo - yarn test:e2e - diff --git a/.github/workflows/test-contracts.yml b/.github/workflows/test-contracts.yml index 7bcb50b51..4f833f560 100644 --- a/.github/workflows/test-contracts.yml +++ b/.github/workflows/test-contracts.yml @@ -7,20 +7,22 @@ on: - 'contracts/**' env: - NODE_VERSION: 16.x + NODE_VERSION: 20.x jobs: test-contracts: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Use Node.js ${{ env.NODE_VERSION }} - uses: actions/setup-node@v2 + uses: actions/setup-node@v4 with: node-version: ${{ env.NODE_VERSION }} - name: Install - run: yarn + run: | + git config --global url."https://".insteadOf git:// + yarn && yarn build - name: Run tests run: yarn test:contracts diff --git a/.github/workflows/test-e2e.yml b/.github/workflows/test-e2e.yml index 9e1729e1a..c7c8babbc 100644 --- a/.github/workflows/test-e2e.yml +++ b/.github/workflows/test-e2e.yml @@ -7,19 +7,14 @@ on: - 'develop' env: - NODE_VERSION: 16.x - CIRCUIT_TYPE: prod + NODE_VERSION: 20.x + CIRCUIT_TYPE: micro + ZKEYS_DOWNLOAD_SCRIPT: "download-6-9-2-3.sh" jobs: e2e-test: runs-on: ubuntu-22.04 steps: - - name: Checkout MACI - uses: actions/checkout@v3 - with: - repository: privacy-scaling-explorations/maci - ref: v0.10.1 - path: maci - name: Use Node.js ${{ env.NODE_VERSION }} uses: actions/setup-node@v3 with: @@ -27,23 +22,34 @@ jobs: - name: Install g++ library dependencies run: | sudo apt update - sudo apt-get install build-essential libgmp-dev libsodium-dev nlohmann-json3-dev nasm g++ curl - - name: Install rust toolchain - uses: actions-rs/toolchain@v1 + sudo apt-get install cmake build-essential libgmp-dev libsodium-dev nlohmann-json3-dev nasm g++ curl + - name: Checkout rapidsnark source code + uses: actions/checkout@v3 with: - toolchain: stable - - name: Install zkutil + repository: clrfund/rapidsnark + path: rapidsnark + - name: Install rapidsnark run: | - cargo install zkutil --version 0.3.2 + cd $GITHUB_WORKSPACE/rapidsnark + npm install + git submodule init + git submodule update + ./build_gmp.sh host + mkdir build_prover && cd build_prover + cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=../package + make -j4 && make install - name: Checkout Clrfund uses: actions/checkout@v3 with: path: monorepo - - name: Download batch 64 zk circuit params + - name: Download micro zk circuit params run: | - $GITHUB_WORKSPACE/monorepo/.github/scripts/download-batch64-params.sh + cd monorepo/contracts + ../.github/scripts/${ZKEYS_DOWNLOAD_SCRIPT} - name: Build Clrfund run: | + # use https to avoid error: unable to connect to github.com + git config --global url."https://".insteadOf git:// cd monorepo yarn && yarn build - name: Start hardhat network @@ -52,8 +58,8 @@ jobs: yarn start:node & - name: Run tests run: | - export NODE_CONFIG=$(node -e "const snarkParamsPath=process.env.GITHUB_WORKSPACE + '/params'; console.log(JSON.stringify({ snarkParamsPath }));") - echo $NODE_CONFIG + export CIRCUIT_DIRECTORY="$GITHUB_WORKSPACE/monorepo/contracts/params" + export RAPID_SNARK="$GITHUB_WORKSPACE/rapidsnark/package/bin/prover" cd monorepo yarn test:e2e diff --git a/.github/workflows/test-scripts.yml b/.github/workflows/test-scripts.yml index b0390a18a..05082aa5e 100644 --- a/.github/workflows/test-scripts.yml +++ b/.github/workflows/test-scripts.yml @@ -8,7 +8,10 @@ on: - '.github/workflows/test-scripts.yml' env: - NODE_VERSION: 16.x + NODE_VERSION: 20.x + ZKEYS_DOWNLOAD_SCRIPT: "download-6-9-2-3.sh" + PINATA_API_KEY: ${{ secrets.PINATA_API_KEY }} + PINATA_SECRET_API_KEY: ${{ secrets.PINATA_SECRET_API_KEY }} jobs: script-tests: @@ -22,23 +25,34 @@ jobs: run: | sudo apt update sudo apt-get install build-essential libgmp-dev libsodium-dev nlohmann-json3-dev nasm g++ curl - - name: Install rust toolchain - uses: actions-rs/toolchain@v1 + - name: Checkout rapidsnark source code + uses: actions/checkout@v3 with: - toolchain: stable - - name: Install zkutil + repository: clrfund/rapidsnark + path: rapidsnark + - name: Install rapidsnark run: | - cargo install zkutil --version 0.3.2 + cd $GITHUB_WORKSPACE/rapidsnark + npm install + git submodule init + git submodule update + ./build_gmp.sh host + mkdir build_prover && cd build_prover + cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=../package + make -j4 && make install - name: Checkout source code uses: actions/checkout@v3 with: path: monorepo - - name: Download batch 64 params + - name: Download circuit params run: | - $GITHUB_WORKSPACE/monorepo/.github/scripts/download-batch64-params.sh + cd monorepo/contracts + ../.github/scripts/${ZKEYS_DOWNLOAD_SCRIPT} - name: Build CLR run: | cd monorepo + # use https to avoid error: unable to connect to github.com + git config --global url."https://".insteadOf git:// yarn && yarn build - name: Start hardhat network run: | @@ -46,14 +60,7 @@ jobs: yarn start:node & - name: Run script tests run: | + export RAPID_SNARK=$GITHUB_WORKSPACE/rapidsnark/package/bin/prover + export CIRCUIT_DIRECTORY=$GITHUB_WORKSPACE/params cd monorepo/contracts - export NODE_CONFIG=$(node -e "const snarkParamsPath=process.env.GITHUB_WORKSPACE + '/params'; console.log(JSON.stringify({ snarkParamsPath }));") - echo $NODE_CONFIG - yarn deploy:local - yarn deployTestRound:local - yarn contribute:local - yarn vote:local - yarn hardhat evm-increase-time 1200 --network localhost - yarn tally:local - yarn finalize:local - yarn claim:local + ./sh/runScriptTests.sh diff --git a/.gitignore b/.gitignore index abd370f7d..e35df81b3 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,5 @@ vetur.config.js # Local Netlify folder .netlify .DS_Store + +contracts/MyLogFile.log diff --git a/.husky/pre-push b/.husky/pre-push index a08e236b1..c0bc1da1c 100755 --- a/.husky/pre-push +++ b/.husky/pre-push @@ -2,7 +2,7 @@ . "$(dirname "$0")/_/husky.sh" # set these params so git push will work without .env -export VITE_CLRFUND_FACTORY_ADDRESS=0x5FC8d32690cc91D4c39d9d3abcBD16989F875707 +export VITE_CLRFUND_ADDRESS=0x5FC8d32690cc91D4c39d9d3abcBD16989F875707 export VITE_ETHEREUM_API_CHAINID=1 export VITE_ETHEREUM_API_URL=x export VITE_IPFS_PINNING_JWT=x diff --git a/.nvmrc b/.nvmrc index d9f880069..8b0beab16 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -16.14.2 +20.11.0 diff --git a/.prettierignore b/.prettierignore index 3321d9b8c..a03621459 100644 --- a/.prettierignore +++ b/.prettierignore @@ -11,6 +11,8 @@ yarn.lock vue-app/src/graphql/API.ts subgraph/generated vue-app/.eslintrc-auto-import.json +vue-app/src/auto-import.d.ts +vue-app/src/components.d.ts # local config vetur.config.js @@ -19,6 +21,10 @@ vetur.config.js contracts/state.json contracts/tally.json contracts/proofs.json +contracts/proof_output +contracts/typechain-types +contracts/local-state.json +contracts/params # local env files .env diff --git a/README.md b/README.md index 84622234f..470a4e1b7 100644 --- a/README.md +++ b/README.md @@ -62,33 +62,40 @@ In a future version, we plan to address this by routing ETH and token contributi ## Development -### Install Node v12 with nvm +### Install Node v20 with nvm ```sh -nvm install 12 -nvm use 12 +nvm install 20 +nvm use 20 ``` -If using the M1 chip in Apple products, you need to use Node v16. +### Install the dependencies and build ```sh -nvm install 16 -nvm use 16 +yarn && yarn build + +# Along with the dependencies, git hooks are also installed. At the end of the installation, you will see the following line after a successful setup. +husky - Git hooks installed ``` -### Install the dependencies +### Copy configuration for contract deployment ```sh -yarn +# adjust the configuration for localhost if necessary +cp contracts/deploy-config-example.json contracts/deploy-config.json +``` -# Along with the dependencies, git hooks are also installed. At the end of the installation, you will see the following line after a successful setup. -husky - Git hooks installed +### Generate coordinator MACI key +```sh +yarn hardhat new-maci-key ``` ### Copy env for contracts ```sh -cp contracts/.env.example contracts/.env # adjust if necessary +# update COORDINATOR_MACISK with the MACI key from previous step +# adjust other configuration if necessary +cp contracts/.env.example contracts/.env ``` ### Copy env for the webapp @@ -109,9 +116,8 @@ In a 2nd terminal you will need to run your graph node (more on this [here](docs/subgraph.md)) ```sh -# go to the thegraph repo directory and init the node -cd graph-node/docker -docker-compose up +cd subgraph/graph-node +docker compose up -d ``` And finally, in a 3rd terminal diff --git a/maci-utils/.eslintrc.js b/common/.eslintrc.js similarity index 100% rename from maci-utils/.eslintrc.js rename to common/.eslintrc.js diff --git a/common/.mocharc.json b/common/.mocharc.json new file mode 100644 index 000000000..3495e1e77 --- /dev/null +++ b/common/.mocharc.json @@ -0,0 +1,5 @@ +{ + "extension": ["ts"], + "spec": "src/**/*.spec.ts", + "require": "ts-node/register" +} diff --git a/common/package.json b/common/package.json index 56f45b22d..ee496d949 100644 --- a/common/package.json +++ b/common/package.json @@ -2,20 +2,29 @@ "name": "@clrfund/common", "version": "0.0.1", "description": "Common utility functions used by clrfund scripts and app", - "main": "src/index", + "main": "build/cjs/index.js", + "module": "build/esm/index.js", + "types": "build/esm/index.d.ts", "scripts": { - "build": "tsc", + "build": "yarn build:esm && yarn build:cjs && yarn test", + "build:esm": "tsc -p tsconfig.json --outDir build/esm --module ES6", + "build:cjs": "tsc -p tsconfig.json --outDir build/cjs", + "test": "mocha", "lint": "eslint 'src/**/*.ts'", "clean": "rm -rf build" }, "license": "GPL-3.0", "devDependencies": { "eslint": "^8.31.0", + "mocha": "^10.2.0", + "ts-node": "^10.9.2", "typescript": "^4.9.3" }, "dependencies": { "@openzeppelin/merkle-tree": "^1.0.5", - "ethers": "^5.7.2" + "ethers": "^6.11.1", + "maci-crypto": "^1.2.0", + "maci-domainobjs": "^1.2.0" }, "repository": { "type": "git", diff --git a/common/src/__tests__/math.spec.ts b/common/src/__tests__/math.spec.ts new file mode 100644 index 000000000..b7071a51e --- /dev/null +++ b/common/src/__tests__/math.spec.ts @@ -0,0 +1,47 @@ +import { expect } from 'chai' +import { bnSqrt } from '../index' +import { toBigInt } from 'ethers' + +const UNIT = BigInt(10) ** BigInt(18) +const cases = [ + [0n, 0n], + [1n, 1n], + [4n, 2n], + [100n, 10n], +] + +/** + * Get a random number in range + * @param min minimum number + * @param max maximum number + * @returns random number + */ +function getRandom(min: number, max: number) { + return Math.floor(Math.random() * (max - min) + min) +} + +describe('bnSqrt', function () { + it('should throw if value less than 0', function () { + expect(bnSqrt.bind(bnSqrt, -1n)).to.throw('Complex numbers not support') + }) + + for (const test of cases) { + const [val, expected] = test + it(`bnSqrt(${val}) === ${expected}`, function () { + expect(bnSqrt(val)).to.eq(expected) + }) + } + + it('Sqrt(8) throws as it took too long to calculate', function () { + expect(bnSqrt.bind(bnSqrt, 8n)).to.throw('Sqrt took too long to calculate') + }) + + it('testing random bigints', function () { + for (let i = 0; i < 100; i++) { + const rand = toBigInt(getRandom(5, 200)) * UNIT + const sqrtVal = bnSqrt(rand) + const val = sqrtVal * sqrtVal + expect(bnSqrt(val)).to.eq(sqrtVal) + } + }) +}) diff --git a/common/src/block.ts b/common/src/block.ts index fd00cf3f4..5ee2db782 100644 --- a/common/src/block.ts +++ b/common/src/block.ts @@ -1,4 +1,4 @@ -import { providers, utils } from 'ethers' +import { type JsonRpcProvider, toQuantity } from 'ethers' export interface Block { blockNumber: number @@ -6,14 +6,17 @@ export interface Block { stateRoot: string } -/* +/** * get the block stateRoot using eth_getBlockByHash + * @param blockNumber The block number + * @param provider the JSON rpc provider + * @returns the block information with block number, block hash and state root */ export async function getBlock( blockNumber: number, - provider: providers.JsonRpcProvider + provider: JsonRpcProvider ): Promise { - const blockNumberHex = utils.hexValue(blockNumber) + const blockNumberHex = toQuantity(blockNumber) const blockParams = [blockNumberHex, false] const rawBlock = await provider.send('eth_getBlockByNumber', blockParams) return { blockNumber, hash: rawBlock.hash, stateRoot: rawBlock.stateRoot } diff --git a/common/src/event.ts b/common/src/event.ts new file mode 100644 index 000000000..39a87ba46 --- /dev/null +++ b/common/src/event.ts @@ -0,0 +1,36 @@ +import { Contract, TransactionResponse } from 'ethers' + +/** + * Get event log argument value + * @param transactionReceipt transaction + * @param contract Contract handle + * @param eventName event name + * @param argumentName argument name + * @returns event argument value + */ +export async function getEventArg( + transaction: TransactionResponse, + contract: Contract, + eventName: string, + argumentName: string +): Promise { + const transactionReceipt = await transaction.wait() + const contractAddress = await contract.getAddress() + // eslint-disable-next-line + for (const log of transactionReceipt?.logs || []) { + if (log.address !== contractAddress) { + continue + } + const event = contract.interface.parseLog({ + data: log.data, + topics: [...log.topics], + }) + // eslint-disable-next-line + if (event && event.name === eventName) { + return event.args[argumentName] + } + } + throw new Error( + `Event ${eventName} from contract ${contractAddress} not found in transaction ${transaction.hash}` + ) +} diff --git a/common/src/index.ts b/common/src/index.ts index d1c59a047..d55811b4a 100644 --- a/common/src/index.ts +++ b/common/src/index.ts @@ -2,3 +2,8 @@ export * from './block' export * from './proof' export * from './merkle' export * from './ipfs' +export * from './keypair' +export * from './tally' +export * from './utils' +export * from './event' +export * from './math' diff --git a/common/src/ipfs.ts b/common/src/ipfs.ts index 4254607e8..84e864c92 100644 --- a/common/src/ipfs.ts +++ b/common/src/ipfs.ts @@ -1,4 +1,4 @@ -import { utils } from 'ethers' +import { FetchRequest } from 'ethers' const IPFS_BASE_URL = 'https://ipfs.io' @@ -13,6 +13,6 @@ export async function getIpfsContent( gatewayUrl = IPFS_BASE_URL ): Promise { const url = `${gatewayUrl}/ipfs/${hash}` - const result = utils.fetchJson(url) - return result + const req = new FetchRequest(url) + return req.send() } diff --git a/maci-utils/src/keypair.ts b/common/src/keypair.ts similarity index 71% rename from maci-utils/src/keypair.ts rename to common/src/keypair.ts index 78cdd0fe4..8e02ab52f 100644 --- a/maci-utils/src/keypair.ts +++ b/common/src/keypair.ts @@ -1,4 +1,4 @@ -import { utils, BigNumber } from 'ethers' +import { keccak256, isBytesLike, concat, toBeArray } from 'ethers' import { Keypair as MaciKeypair, PrivKey, PubKey } from 'maci-domainobjs' const SNARK_FIELD_SIZE = BigInt( @@ -8,7 +8,7 @@ const SNARK_FIELD_SIZE = BigInt( /** * Returns a BabyJub-compatible value. This function is modified from * the MACI's genRandomBabyJubValue(). Instead of returning random value - * for the private key, it derives the private key from the users', + * for the private key, it derives the private key from the users * signature hash * @param hash - user's signature hash */ @@ -16,28 +16,22 @@ function genPrivKey(hash: string): PrivKey { // Prevent modulo bias //const lim = BigInt('0x10000000000000000000000000000000000000000000000000000000000000000') //const min = (lim - SNARK_FIELD_SIZE) % SNARK_FIELD_SIZE - const min = BigNumber.from( + const min = BigInt( '6350874878119819312338956282401532410528162663560392320966563075034087161851' ) - if (!utils.isBytesLike(hash)) { + if (!isBytesLike(hash)) { throw new Error(`Hash must be a hex string: ${hash}`) } - let hashBN = BigNumber.from(hash) + let hashBN = BigInt(hash) // don't think we'll enter the for loop below, but, just in case - for (let counter = 1; min.gte(hashBN); counter++) { - const data = utils.concat([hashBN.toHexString(), utils.arrayify(counter)]) - hashBN = BigNumber.from(utils.keccak256(data)) - } - - const rawPrivKey = BigInt(hashBN.toString()) % SNARK_FIELD_SIZE - if (rawPrivKey >= SNARK_FIELD_SIZE) { - throw new Error( - `privKey ${rawPrivKey} must be less than SNARK_FIELD_SIZE ${SNARK_FIELD_SIZE}` - ) + for (let counter = 1; hashBN < min; counter++) { + const data = concat([toBeArray(hashBN), toBeArray(counter)]) + hashBN = BigInt(keccak256(data)) } + const rawPrivKey = hashBN % SNARK_FIELD_SIZE return new PrivKey(rawPrivKey) } diff --git a/common/src/math.ts b/common/src/math.ts new file mode 100644 index 000000000..61665d32d --- /dev/null +++ b/common/src/math.ts @@ -0,0 +1,30 @@ +/** + * Get the square root of a bigint + * @param val the value to apply square root on + */ +export function bnSqrt(val: bigint): bigint { + // Take square root from a bigint + // https://stackoverflow.com/a/52468569/1868395 + if (val < 0n) { + throw new Error('Complex numbers not support') + } + + if (val < 2n) { + return val + } + + let loop = 100 + let x: bigint + let x1 = val / 2n + do { + x = x1 + x1 = (x + val / x) / 2n + loop-- + } while (x !== x1 && loop) + + if (loop === 0 && x !== x1) { + throw new Error('Sqrt took too long to calculate') + } + + return x +} diff --git a/common/src/proof.ts b/common/src/proof.ts index 5cac6127f..415840377 100644 --- a/common/src/proof.ts +++ b/common/src/proof.ts @@ -1,4 +1,12 @@ -import { utils, providers } from 'ethers' +import { + keccak256, + concat, + encodeRlp, + decodeRlp, + zeroPadValue, + toBeHex, +} from 'ethers' +import type { JsonRpcProvider } from 'ethers' /** * RLP encode the proof returned from eth_getProof @@ -6,9 +14,9 @@ import { utils, providers } from 'ethers' * @returns */ export function rlpEncodeProof(proof: string[]) { - const decodedProof = proof.map((node: string) => utils.RLP.decode(node)) + const decodedProof = proof.map((node: string) => decodeRlp(node)) - return utils.RLP.encode(decodedProof) + return encodeRlp(decodedProof) } /** @@ -18,12 +26,7 @@ export function rlpEncodeProof(proof: string[]) { * @returns storage key used in the eth_getProof params */ export function getStorageKey(account: string, slotIndex: number) { - return utils.keccak256( - utils.concat([ - utils.hexZeroPad(account, 32), - utils.hexZeroPad(utils.hexValue(slotIndex), 32), - ]) - ) + return keccak256(concat([zeroPadValue(account, 32), toBeHex(slotIndex, 32)])) } /** @@ -33,7 +36,7 @@ export function getStorageKey(account: string, slotIndex: number) { */ async function getProof( params: Array, - provider: providers.JsonRpcProvider + provider: JsonRpcProvider ): Promise { try { const proof = await provider.send('eth_getProof', params) @@ -56,7 +59,7 @@ async function getProof( export async function getAccountProof( token: string, blockHash: string, - provider: providers.JsonRpcProvider + provider: JsonRpcProvider ): Promise { const params = [token, [], blockHash] return getProof(params, provider) @@ -76,7 +79,7 @@ export async function getStorageProof( blockHash: string, userAccount: string, storageSlotIndex: number, - provider: providers.JsonRpcProvider + provider: JsonRpcProvider ): Promise { const storageKey = getStorageKey(userAccount, storageSlotIndex) diff --git a/maci-utils/src/tally.ts b/common/src/tally.ts similarity index 74% rename from maci-utils/src/tally.ts rename to common/src/tally.ts index 8d6e4a5b8..874a9e689 100644 --- a/maci-utils/src/tally.ts +++ b/common/src/tally.ts @@ -4,17 +4,19 @@ export interface Tally { provider: string maci: string + pollId: string + newTallyCommitment: string results: { commitment: string tally: string[] salt: string } - totalVoiceCredits: { + totalSpentVoiceCredits: { spent: string commitment: string salt: string } - totalVoiceCreditsPerVoteOption: { + perVOSpentVoiceCredits: { commitment: string tally: string[] salt: string diff --git a/common/src/utils.ts b/common/src/utils.ts new file mode 100644 index 000000000..d0bd5cdcb --- /dev/null +++ b/common/src/utils.ts @@ -0,0 +1,107 @@ +import { + genTreeCommitment as genTallyResultCommitment, + genRandomSalt, + IncrementalQuinTree, + hashLeftRight, + hash5, + hash3, + hash2, +} from 'maci-crypto' +import { PubKey, PCommand, Message } from 'maci-domainobjs' +import { Keypair } from './keypair' +import { Tally } from './tally' +import { bnSqrt } from './math' + +const LEAVES_PER_NODE = 5 + +export function createMessage( + userStateIndex: number, + userKeypair: Keypair, + newUserKeypair: Keypair | null, + coordinatorPubKey: PubKey, + voteOptionIndex: number | null, + voiceCredits: bigint | null, + nonce: number, + pollId: bigint, + salt?: bigint +): [Message, PubKey] { + const encKeypair = newUserKeypair ? newUserKeypair : userKeypair + if (!salt) { + salt = genRandomSalt() as bigint + } + + const quadraticVoteWeight = voiceCredits ? bnSqrt(voiceCredits) : 0n + + const command = new PCommand( + BigInt(userStateIndex), + encKeypair.pubKey, + BigInt(voteOptionIndex || 0), + quadraticVoteWeight, + BigInt(nonce), + pollId, + salt + ) + const signature = command.sign(userKeypair.privKey) + const message = command.encrypt( + signature, + Keypair.genEcdhSharedKey(encKeypair.privKey, coordinatorPubKey) + ) + return [message, encKeypair.pubKey] +} + +export function getRecipientClaimData( + recipientIndex: number, + recipientTreeDepth: number, + tally: Tally +): any[] { + const maxRecipients = tally.perVOSpentVoiceCredits.tally.length + if (recipientIndex >= maxRecipients) { + throw new Error(`Invalid recipient index ${recipientIndex}.`) + } + + // Create proof for total amount of spent voice credits + const spent = tally.perVOSpentVoiceCredits.tally[recipientIndex] + const spentSalt = tally.perVOSpentVoiceCredits.salt + const spentTree = new IncrementalQuinTree( + recipientTreeDepth, + BigInt(0), + LEAVES_PER_NODE, + hash5 + ) + for (const leaf of tally.perVOSpentVoiceCredits.tally) { + spentTree.insert(BigInt(leaf)) + } + const spentProof = spentTree.genProof(recipientIndex) + + const resultsCommitment = genTallyResultCommitment( + tally.results.tally.map((x) => BigInt(x)), + BigInt(tally.results.salt), + recipientTreeDepth + ) + + const spentVoiceCreditsCommitment = hash2([ + BigInt(tally.totalSpentVoiceCredits.spent), + BigInt(tally.totalSpentVoiceCredits.salt), + ]) + + return [ + recipientIndex, + spent, + spentProof.pathElements.map((x) => x.map((y) => y.toString())), + spentSalt, + resultsCommitment, + spentVoiceCreditsCommitment, + ] +} + +export { + genTallyResultCommitment, + Message, + PCommand as Command, + IncrementalQuinTree, + hash5, + hash2, + hash3, + hashLeftRight, + LEAVES_PER_NODE, +} diff --git a/common/tsconfig.json b/common/tsconfig.json index 957cdc1a2..ea1601133 100644 --- a/common/tsconfig.json +++ b/common/tsconfig.json @@ -12,11 +12,12 @@ "sourceMap": true, "strict": true, "outDir": "./build", - "target": "es2018", + "target": "es2020", "esModuleInterop": true, "module": "commonjs", + "moduleResolution": "node", "declaration": true }, "exclude": ["node_modules/**"], - "include": ["./src"] + "include": ["src/**/*"] } diff --git a/contracts/.env.example b/contracts/.env.example index 9edad8c82..2db7006e4 100644 --- a/contracts/.env.example +++ b/contracts/.env.example @@ -1,51 +1,26 @@ -# Recipient registry type for local deployment: simple, optimistic -RECIPIENT_REGISTRY_TYPE=optimistic - -# Supported values: simple, brightid, snapshot, merkle -USER_REGISTRY_TYPE=simple -# clr.fund (prod) or CLRFundTest (testing) -BRIGHTID_CONTEXT=clr.fund -# BrightId node addr that signs verifications. Node One uses this one -#BRIGHTID_VERIFIER_ADDR=0xb1d71F62bEe34E9Fc349234C201090c33BCdF6DB -# brightid.clr.fund node uses this one, see the ethSigningAddress from https://brightid.clr.fund -BRIGHTID_VERIFIER_ADDR=0xdbf0b2ee9887fe11934789644096028ed3febe9c -# The contract that emits the sponsor events that the BrightId node is listening for -BRIGHTID_SPONSOR= # JSON-RPC endpoint to the selected network JSONRPC_HTTP_URL=https://eth-goerli.alchemyapi.io/v2/ADD_API_KEY -# One of the two options +# One of the two options to interact with contracts WALLET_MNEMONIC= WALLET_PRIVATE_KEY= -# Token address for funding round .setToken -NATIVE_TOKEN_ADDRESS= - -# Required to use in the tally and finalize scripts -FACTORY_ADDRESS= -ROUND_ADDRESS= -COORDINATOR_PK= -COORDINATOR_ETH_PK= - -# Used in the tally script to add tally results to funding round by batch, default is 20 -TALLY_BATCH_SIZE= -# The block that the MACI contract was created in. Used in fetchLogs -MACI_START_BLOCK= -# Number of blocks of the MACI event logs to fetch, default is 20,000 -NUM_BLOCKS_PER_REQUEST= +# The coordinator MACI private key, required by the gen-proofs script +COORDINATOR_MACISK= +# API key used to verify contracts on arbitrum chain (including testnet) +# Update the etherscan section in hardhat.config to add API key for other chains +ARBISCAN_API_KEY= -# Used to verify contracts -# Get the etherscan api keys for goerli, mainnet from https://etherscan.io -# Get the etherscan api keys for arbitrum and testnets from https://arbiscan.io/ -ETHERSCAN_API_KEY= - - -# ZK proof circuit type, based on MACI v0.10.1 circuit type as defined in utils/deployment.ts -# e.g. test, small, medium, x32, prod -CIRCUIT_TYPE=prod +# PINATE credentials to upload tally.json file to IPFS; used by the tally script +PINATA_API_KEY= +PINATA_SECRET_API_KEY= +# these are used in the e2e testing +CIRCUIT_TYPE= +CIRCUIT_DIRECTORY= +RAPID_SNARK= +PROOF_OUTPUT_DIR= +TALLY_BATCH_SIZE= -# The IPFS gateway url used by the prepare-results.ts script -IPFS_GATEWAY_URL= \ No newline at end of file diff --git a/contracts/.gitignore b/contracts/.gitignore index 67e19cff2..f78e8d418 100644 --- a/contracts/.gitignore +++ b/contracts/.gitignore @@ -7,4 +7,10 @@ proofs.json tally.json .env .DS_Store -tasks/addresses.txt +addresses.txt +proof_output +typechain-types +params +local-state.json +deploy-config.json +deployed-contracts.json diff --git a/contracts/README.md b/contracts/README.md index 075351271..20608ad58 100644 --- a/contracts/README.md +++ b/contracts/README.md @@ -2,22 +2,15 @@ ## Working with ZK proofs -Install [zkutil](https://github.com/poma/zkutil) (see instructions in [MACI readme](https://github.com/appliedzkp/maci#get-started)). +Read the [deployment guide](../docs/deployment.md) on how to install MACI dependencies, which include installing rapidsnark (for ubuntu only), c++ libraries and downloading circuit parameter files. -Download [zkSNARK parameters](https://gateway.pinata.cloud/ipfs/Qmbi3nqjBwANPMk5BRyKjCJ4QSHK6WNp7v9NLLo4uwrG1f) for 'test' circuits to `snark-params` directory. Example: - -``` -ipfs get --output snark-params Qmbi3nqjBwANPMk5BRyKjCJ4QSHK6WNp7v9NLLo4uwrG1f -``` - -Set the path to downloaded parameter files and also the path to `zkutil` binary (if needed): +## End-to-end tests +Start the hardhat node: ``` -export NODE_CONFIG='{"snarkParamsPath": "../../../contracts/snark-params/", "zkutil_bin": "/usr/bin/zkutil"}' +yarn run node ``` -## End-to-end tests - Run the tests: ``` @@ -25,59 +18,58 @@ yarn e2e ``` ## Scripts - -### Deploy factory contract - -Deploy to local network: +### Generate coordinator key ``` -yarn deploy:local +yarn hardhat new-maci-key ``` -### Deploy test round +### Copy env for contracts -This includes: +```sh +# update COORDINATOR_MACISK with the MACI key from previous step +# adjust other configuration if necessary +cp contracts/.env.example contracts/.env +``` -- Deploying ERC20 token contract. -- Adding tokens to the matching pool. -- Adding recipients. -- Deploying funding round. -- Deploying MACI instance. +### Copy configuration for contract deployment -``` -yarn deployTestRound:local +```sh +# adjust the configuration for localhost if necessary +cp contracts/deploy-config-example.json contracts/deploy-config.json ``` -### Run test round +### Deploy the ClrFund contract -Set coordinator's private key (optional, by default the Ganache account #1 will be used): +Deploy to local network: ``` -export COORDINATOR_ETH_PK='0x...' +yarn deploy:local ``` -Contribute funds, wait until sign-up period ends (10 minutes) and vote: - -``` -yarn contribute:local -sleep 300s && yarn vote:local -``` +### Run test round -Wait until voting period ends, process messages, tally votes and verify the results: +Download the circuit zkeys: ``` -sleep 300s && yarn tally:local && yarn finalize:local +# this script will download the zkeys in the params folder where the script is run +../.github/scripts/download-6-9-2-3.sh ``` -Claim funds: +If you have previously downloaded the zkeys, you can export the environment variable CIRCUIT_DIRECTORY to point to the directory. + +Run the script, the github action test-script.yml uses this script. ``` -yarn claim:local +sh/runScriptTests.sh ``` +The test includes setting coordinator keys, contribute funds, vote, tally, finalize and claim funds + ### Verify all clr.fund contracts The following command will verify all clr.fund contracts. It will log a warning if contract already verified or missing. ``` -yarn hardhat verify-all --network -``` \ No newline at end of file +yarn hardhat verify-all --network +``` + diff --git a/contracts/contracts/AnyOldERC20Token.sol b/contracts/contracts/AnyOldERC20Token.sol index cbc6e058c..3d88c9508 100644 --- a/contracts/contracts/AnyOldERC20Token.sol +++ b/contracts/contracts/AnyOldERC20Token.sol @@ -1,12 +1,11 @@ // SPDX-License-Identifier: GPL-3.0 -pragma solidity ^0.6.12; +pragma solidity ^0.8.10; import '@openzeppelin/contracts/token/ERC20/ERC20.sol'; contract AnyOldERC20Token is ERC20 { constructor(uint256 initialSupply) - public ERC20('Any old ERC20 token', 'AOE') { _mint(msg.sender, initialSupply); diff --git a/contracts/contracts/CloneFactory.sol b/contracts/contracts/CloneFactory.sol new file mode 100644 index 000000000..99247f723 --- /dev/null +++ b/contracts/contracts/CloneFactory.sol @@ -0,0 +1,37 @@ +// SPDX-License-Identifier: MIT + +/* +The MIT License (MIT) +Copyright (c) 2018 Murray Software, LLC. +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: +The above copyright notice and this permission notice shall be included +in all copies or substantial portions of the Software. +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +*/ + +pragma solidity 0.8.10; + +contract CloneFactory { // implementation of eip-1167 - see https://eips.ethereum.org/EIPS/eip-1167 + function createClone(address target) internal returns (address result) { + bytes20 targetBytes = bytes20(target); + assembly { + let clone := mload(0x40) + mstore(clone, 0x3d602d80600a3d3981f3363d3d373d3d3d363d73000000000000000000000000) + mstore(add(clone, 0x14), targetBytes) + mstore(add(clone, 0x28), 0x5af43d82803e903d91602b57fd5bf30000000000000000000000000000000000) + result := create(0, clone, 0x37) + } + } +} \ No newline at end of file diff --git a/contracts/contracts/ClrFund.sol b/contracts/contracts/ClrFund.sol index 07604f387..c9ad77389 100644 --- a/contracts/contracts/ClrFund.sol +++ b/contracts/contracts/ClrFund.sol @@ -1,26 +1,23 @@ // SPDX-License-Identifier: GPL-3.0 -pragma solidity ^0.6.12; -pragma experimental ABIEncoderV2; +pragma solidity 0.8.10; import '@openzeppelin/contracts/token/ERC20/ERC20.sol'; -import '@openzeppelin/contracts/token/ERC20/SafeERC20.sol'; -import '@openzeppelin/contracts/utils/EnumerableSet.sol'; +import '@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol'; +import '@openzeppelin/contracts/utils/structs/EnumerableSet.sol'; -// Import ownable from OpenZeppelin contracts - -import 'maci-contracts/sol/MACI.sol'; -import 'maci-contracts/sol/MACISharedObjs.sol'; -import 'maci-contracts/sol/gatekeepers/SignUpGatekeeper.sol'; -import 'maci-contracts/sol/initialVoiceCreditProxy/InitialVoiceCreditProxy.sol'; +import {Params} from 'maci-contracts/contracts/utilities/Params.sol'; +import {DomainObjs} from 'maci-contracts/contracts/utilities/DomainObjs.sol'; +import {IMACIFactory} from './interfaces/IMACIFactory.sol'; import './userRegistry/IUserRegistry.sol'; import './recipientRegistry/IRecipientRegistry.sol'; -import './MACIFactory.sol'; -import './FundingRound.sol'; -import './OwnableUpgradeable.sol'; +import {IFundingRound} from './interfaces/IFundingRound.sol'; +import {OwnableUpgradeable} from './OwnableUpgradeable.sol'; +import {IFundingRoundFactory} from './interfaces/IFundingRoundFactory.sol'; +import {TopupToken} from './TopupToken.sol'; -contract ClrFund is OwnableUpgradeable, MACISharedObjs { +contract ClrFund is OwnableUpgradeable, DomainObjs, Params { using EnumerableSet for EnumerableSet.AddressSet; using SafeERC20 for ERC20; @@ -28,13 +25,15 @@ contract ClrFund is OwnableUpgradeable, MACISharedObjs { address public coordinator; ERC20 public nativeToken; - MACIFactory public maciFactory; + IMACIFactory public maciFactory; IUserRegistry public userRegistry; IRecipientRegistry public recipientRegistry; PubKey public coordinatorPubKey; EnumerableSet.AddressSet private fundingSources; - FundingRound[] private rounds; + IFundingRound[] private rounds; + + IFundingRoundFactory public roundFactory; // Events event FundingSourceAdded(address _source); @@ -43,14 +42,104 @@ contract ClrFund is OwnableUpgradeable, MACISharedObjs { event RoundFinalized(address _round); event TokenChanged(address _token); event CoordinatorChanged(address _coordinator); + event Initialized(); + event UserRegistryChanged(address _userRegistry); + event RecipientRegistryChanged(address _recipientRegistry); + event FundingRoundTemplateChanged(address _template); + event FundingRoundFactoryChanged(address _roundFactory); + event MaciFactoryChanged(address _maciFactory); + + // errors + error FundingSourceAlreadyAdded(); + error FundingSourceNotFound(); + error AlreadyFinalized(); + error NotFinalized(); + error NotAuthorized(); + error NoCurrentRound(); + error NotOwnerOfMaciFactory(); + error InvalidFundingRoundFactory(); + error InvalidMaciFactory(); + error RecipientRegistryNotSet(); + error NotInitialized(); + error VoteOptionTreeDepthNotSet(); + + /** + * @dev Initialize clrfund instance with MACI factory and round factory + */ function init( - MACIFactory _maciFactory + address _maciFactory, + address _roundFactory ) external { __Ownable_init(); - maciFactory = _maciFactory; + _setMaciFactory(_maciFactory); + _setFundingRoundFactory(_roundFactory); + + emit Initialized(); + } + + /** + * @dev Set MACI factory. + * @param _maciFactory Address of a MACI factory. + */ + function _setMaciFactory(address _maciFactory) private + { + if (_maciFactory == address(0)) revert InvalidMaciFactory(); + + maciFactory = IMACIFactory(_maciFactory); + + emit MaciFactoryChanged(address(_maciFactory)); + } + + /** + * @dev Set MACI factory. + * @param _maciFactory Address of a MACI factory. + */ + function setMaciFactory(address _maciFactory) + external + onlyOwner + { + _setMaciFactory(_maciFactory); + } + + /** + * @dev Set Funding found factory. + * @param _roundFactory Factory Address of a funding round factory. + */ + function _setFundingRoundFactory(address _roundFactory) private + { + if (_roundFactory == address(0)) revert InvalidFundingRoundFactory(); + + roundFactory = IFundingRoundFactory(_roundFactory); + + emit FundingRoundFactoryChanged(address(roundFactory)); + } + + /** + * @dev Set Funding found factory. + * @param _roundFactory Factory Address of a funding round factory. + */ + function setFundingRoundFactory(address _roundFactory) + public + onlyOwner + { + _setFundingRoundFactory(_roundFactory); + } + + /** + * @dev Get the maximum recipients allowed in the recipient registry + */ + function getMaxRecipients() public view returns (uint256 _maxRecipients) { + TreeDepths memory treeDepths = maciFactory.treeDepths(); + if (treeDepths.voteOptionTreeDepth == 0) revert VoteOptionTreeDepthNotSet(); + + uint256 maxVoteOption = maciFactory.TREE_ARITY() ** treeDepths.voteOptionTreeDepth; + + // -1 because the first slot of the recipients array is not used + // and maxRecipients is used to generate 0 based index to the array + _maxRecipients = maxVoteOption - 1; } /** @@ -62,6 +151,8 @@ contract ClrFund is OwnableUpgradeable, MACISharedObjs { onlyOwner { userRegistry = _userRegistry; + + emit UserRegistryChanged(address(_userRegistry)); } /** @@ -73,8 +164,10 @@ contract ClrFund is OwnableUpgradeable, MACISharedObjs { onlyOwner { recipientRegistry = _recipientRegistry; - (,, uint256 maxVoteOptions) = maciFactory.maxValues(); - recipientRegistry.setMaxRecipients(maxVoteOptions); + uint256 maxRecipients = getMaxRecipients(); + recipientRegistry.setMaxRecipients(maxRecipients); + + emit RecipientRegistryChanged(address(_recipientRegistry)); } /** @@ -86,7 +179,9 @@ contract ClrFund is OwnableUpgradeable, MACISharedObjs { onlyOwner { bool result = fundingSources.add(_source); - require(result, 'Factory: Funding source already added'); + if (!result) { + revert FundingSourceAlreadyAdded(); + } emit FundingSourceAdded(_source); } @@ -99,83 +194,48 @@ contract ClrFund is OwnableUpgradeable, MACISharedObjs { onlyOwner { bool result = fundingSources.remove(_source); - require(result, 'Factory: Funding source not found'); + if (!result) { + revert FundingSourceNotFound(); + } emit FundingSourceRemoved(_source); } function getCurrentRound() public view - returns (FundingRound _currentRound) + returns (IFundingRound _currentRound) { if (rounds.length == 0) { - return FundingRound(address(0)); + return IFundingRound(address(0)); } return rounds[rounds.length - 1]; } - function setMaciParameters( - uint8 _stateTreeDepth, - uint8 _messageTreeDepth, - uint8 _voteOptionTreeDepth, - uint8 _tallyBatchSize, - uint8 _messageBatchSize, - SnarkVerifier _batchUstVerifier, - SnarkVerifier _qvtVerifier, - uint256 _signUpDuration, - uint256 _votingDuration - ) - external - onlyOwner - { - maciFactory.setMaciParameters( - _stateTreeDepth, - _messageTreeDepth, - _voteOptionTreeDepth, - _tallyBatchSize, - _messageBatchSize, - _batchUstVerifier, - _qvtVerifier, - _signUpDuration, - _votingDuration - ); - } - - /** + /** * @dev Deploy new funding round. + * @param duration The poll duration in seconds */ - function deployNewRound() + function deployNewRound( + uint256 duration + ) external onlyOwner { - require(maciFactory.owner() == address(this), 'Factory: MACI factory is not owned by FR factory'); - require(address(userRegistry) != address(0), 'Factory: User registry is not set'); - require(address(recipientRegistry) != address(0), 'Factory: Recipient registry is not set'); - require(address(nativeToken) != address(0), 'Factory: Native token is not set'); - require(coordinator != address(0), 'Factory: No coordinator'); - FundingRound currentRound = getCurrentRound(); - require( - address(currentRound) == address(0) || currentRound.isFinalized(), - 'Factory: Current round is not finalized' - ); + IFundingRound currentRound = getCurrentRound(); + if (address(currentRound) != address(0) && !currentRound.isFinalized()) { + revert NotFinalized(); + } + + if (address(recipientRegistry) == address(0)) revert RecipientRegistryNotSet(); + // Make sure that the max number of recipients is set correctly - (,, uint256 maxVoteOptions) = maciFactory.maxValues(); - recipientRegistry.setMaxRecipients(maxVoteOptions); + uint256 maxRecipients = getMaxRecipients(); + recipientRegistry.setMaxRecipients(maxRecipients); + // Deploy funding round and MACI contracts - FundingRound newRound = new FundingRound( - nativeToken, - userRegistry, - recipientRegistry, - coordinator - ); - rounds.push(newRound); - MACI maci = maciFactory.deployMaci( - SignUpGatekeeper(newRound), - InitialVoiceCreditProxy(newRound), - coordinator, - coordinatorPubKey - ); - newRound.setMaci(maci); + address newRound = roundFactory.deploy(duration, address(this)); + rounds.push(IFundingRound(newRound)); + emit RoundStarted(address(newRound)); } @@ -205,13 +265,16 @@ contract ClrFund is OwnableUpgradeable, MACISharedObjs { */ function transferMatchingFunds( uint256 _totalSpent, - uint256 _totalSpentSalt + uint256 _totalSpentSalt, + uint256 _newResultCommitment, + uint256 _perVOSpentVoiceCreditsHash ) external onlyOwner { - FundingRound currentRound = getCurrentRound(); - require(address(currentRound) != address(0), 'Factory: Funding round has not been deployed'); + IFundingRound currentRound = getCurrentRound(); + requireCurrentRound(currentRound); + ERC20 roundToken = currentRound.nativeToken(); // Factory contract is the default funding source uint256 matchingPoolSize = roundToken.balanceOf(address(this)); @@ -228,7 +291,7 @@ contract ClrFund is OwnableUpgradeable, MACISharedObjs { roundToken.safeTransferFrom(fundingSource, address(currentRound), contribution); } } - currentRound.finalize(_totalSpent, _totalSpentSalt); + currentRound.finalize(_totalSpent, _totalSpentSalt, _newResultCommitment, _perVOSpentVoiceCreditsHash); emit RoundFinalized(address(currentRound)); } @@ -239,9 +302,13 @@ contract ClrFund is OwnableUpgradeable, MACISharedObjs { external onlyOwner { - FundingRound currentRound = getCurrentRound(); - require(address(currentRound) != address(0), 'Factory: Funding round has not been deployed'); - require(!currentRound.isFinalized(), 'Factory: Current round is finalized'); + IFundingRound currentRound = getCurrentRound(); + requireCurrentRound(currentRound); + + if (currentRound.isFinalized()) { + revert AlreadyFinalized(); + } + currentRound.cancel(); emit RoundFinalized(address(currentRound)); } @@ -283,7 +350,7 @@ contract ClrFund is OwnableUpgradeable, MACISharedObjs { // the address being 0x0 coordinator = address(0); coordinatorPubKey = PubKey(0, 0); - FundingRound currentRound = getCurrentRound(); + IFundingRound currentRound = getCurrentRound(); if (address(currentRound) != address(0) && !currentRound.isFinalized()) { currentRound.cancel(); emit RoundFinalized(address(currentRound)); @@ -292,7 +359,15 @@ contract ClrFund is OwnableUpgradeable, MACISharedObjs { } modifier onlyCoordinator() { - require(msg.sender == coordinator, 'Factory: Sender is not the coordinator'); + if (msg.sender != coordinator) { + revert NotAuthorized(); + } _; } + + function requireCurrentRound(IFundingRound currentRound) private pure { + if (address(currentRound) == address(0)) { + revert NoCurrentRound(); + } + } } diff --git a/contracts/contracts/ClrFundDeployer.sol b/contracts/contracts/ClrFundDeployer.sol index 4c93617bc..2487723ff 100644 --- a/contracts/contracts/ClrFundDeployer.sol +++ b/contracts/contracts/ClrFundDeployer.sol @@ -1,84 +1,72 @@ -/* -The MIT License (MIT) -Copyright (c) 2018 Murray Software, LLC. -Permission is hereby granted, free of charge, to any person obtaining -a copy of this software and associated documentation files (the -"Software"), to deal in the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Software, and to -permit persons to whom the Software is furnished to do so, subject to -the following conditions: -The above copyright notice and this permission notice shall be included -in all copies or substantial portions of the Software. -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY -CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, -TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -*/ +// SPDX-License-Identifier: GPL-3.0 -pragma solidity ^0.6.12; -import './MACIFactory.sol'; -import './ClrFund.sol'; +pragma solidity 0.8.10; -contract CloneFactory { // implementation of eip-1167 - see https://eips.ethereum.org/EIPS/eip-1167 - function createClone(address target) internal returns (address result) { - bytes20 targetBytes = bytes20(target); - assembly { - let clone := mload(0x40) - mstore(clone, 0x3d602d80600a3d3981f3363d3d373d3d3d363d73000000000000000000000000) - mstore(add(clone, 0x14), targetBytes) - mstore(add(clone, 0x28), 0x5af43d82803e903d91602b57fd5bf30000000000000000000000000000000000) - result := create(0, clone, 0x37) - } - } -} +import {MACIFactory} from './MACIFactory.sol'; +import {ClrFund} from './ClrFund.sol'; +import {CloneFactory} from './CloneFactory.sol'; +import {SignUpGatekeeper} from "maci-contracts/contracts/gatekeepers/SignUpGatekeeper.sol"; +import {InitialVoiceCreditProxy} from "maci-contracts/contracts/initialVoiceCreditProxy/InitialVoiceCreditProxy.sol"; +import {Ownable} from '@openzeppelin/contracts/access/Ownable.sol'; + +contract ClrFundDeployer is CloneFactory, Ownable { + address public clrfundTemplate; + address public maciFactory; + address public roundFactory; + mapping (address => bool) public clrfunds; + + event NewInstance(address indexed clrfund); + event Register(address indexed clrfund, string metadata); + event NewFundingRoundTemplate(address newTemplate); + event NewClrfundTemplate(address newTemplate); + + // errors + error ClrFundAlreadyRegistered(); + error InvalidMaciFactory(); + error InvalidClrFundTemplate(); + error InvalidFundingRoundFactory(); + + constructor( + address _clrfundTemplate, + address _maciFactory, + address _roundFactory + ) + { + if (_clrfundTemplate == address(0)) revert InvalidClrFundTemplate(); + if (_maciFactory == address(0)) revert InvalidMaciFactory(); + if (_roundFactory == address(0)) revert InvalidFundingRoundFactory(); + + clrfundTemplate = _clrfundTemplate; + maciFactory = _maciFactory; + roundFactory = _roundFactory; + } -contract ClrFundDeployer is CloneFactory { - - address public template; - mapping (address => bool) public clrfunds; - uint clrId = 0; - ClrFund private clrfund; // funding factory contract - - constructor(address _template) public { - template = _template; - } - - event NewInstance(address indexed clrfund); - event Register(address indexed clrfund, string metadata); - - function deployFund( - MACIFactory _maciFactory - ) public returns (address) { - ClrFund clrfund = ClrFund(createClone(template)); - - clrfund.init( - _maciFactory - ); - - emit NewInstance(address(clrfund)); - - return address(clrfund); - } - - function registerInstance( - address _clrFundAddress, - string memory _metadata - ) public returns (bool) { - - clrfund = ClrFund(_clrFundAddress); - - require(clrfunds[_clrFundAddress] == false, 'ClrFund: metadata already registered'); + /** + * @dev Set a new clrfund template + * @param _clrfundTemplate New template + */ + function setClrFundTemplate(address _clrfundTemplate) + external + onlyOwner + { + if (_clrfundTemplate == address(0)) revert InvalidClrFundTemplate(); - clrfunds[_clrFundAddress] = true; - - clrId = clrId + 1; - emit Register(_clrFundAddress, _metadata); - return true; - - } - -} \ No newline at end of file + clrfundTemplate = _clrfundTemplate; + emit NewClrfundTemplate(_clrfundTemplate); + } + + /** + * @dev Deploy a new instance of ClrFund + */ + function deployClrFund() public returns (address) { + ClrFund clrfund = ClrFund(createClone(clrfundTemplate)); + clrfund.init(maciFactory, roundFactory); + + // clrfund.init() set the owner to us, now transfer to the caller + clrfund.transferOwnership(msg.sender); + + emit NewInstance(address(clrfund)); + + return address(clrfund); + } +} diff --git a/contracts/contracts/ExternalContacts.sol b/contracts/contracts/ExternalContacts.sol new file mode 100644 index 000000000..51706fb5f --- /dev/null +++ b/contracts/contracts/ExternalContacts.sol @@ -0,0 +1,13 @@ +// SPDX-License-Identifier: GPL-3.0 + +pragma solidity ^0.8.10; + +/* + * These imports are just for hardhat to find the contracts for deployment + * They are not used anywhere else + */ +import {Poll} from 'maci-contracts/contracts/Poll.sol'; +import {PollFactory} from 'maci-contracts/contracts/PollFactory.sol'; +import {TallyFactory} from 'maci-contracts/contracts/TallyFactory.sol'; +import {SubsidyFactory} from 'maci-contracts/contracts/SubsidyFactory.sol'; +import {MessageProcessorFactory} from 'maci-contracts/contracts/MessageProcessorFactory.sol'; diff --git a/contracts/contracts/FundingRound.sol b/contracts/contracts/FundingRound.sol index 1b3370533..38bb4f1ee 100644 --- a/contracts/contracts/FundingRound.sol +++ b/contracts/contracts/FundingRound.sol @@ -1,28 +1,85 @@ // SPDX-License-Identifier: GPL-3.0 -pragma solidity ^0.6.12; -pragma experimental ABIEncoderV2; +pragma solidity 0.8.10; import '@openzeppelin/contracts/access/Ownable.sol'; import '@openzeppelin/contracts/token/ERC20/ERC20.sol'; -import '@openzeppelin/contracts/token/ERC20/SafeERC20.sol'; - -import 'maci-contracts/sol/MACI.sol'; -import 'maci-contracts/sol/MACISharedObjs.sol'; -import 'maci-contracts/sol/gatekeepers/SignUpGatekeeper.sol'; -import 'maci-contracts/sol/initialVoiceCreditProxy/InitialVoiceCreditProxy.sol'; +import '@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol'; + +import {DomainObjs} from 'maci-contracts/contracts/utilities/DomainObjs.sol'; +import {MACI} from 'maci-contracts/contracts/MACI.sol'; +import {Poll} from 'maci-contracts/contracts/Poll.sol'; +import {Tally} from 'maci-contracts/contracts/Tally.sol'; +import {TopupToken} from './TopupToken.sol'; +import {SignUpGatekeeper} from 'maci-contracts/contracts/gatekeepers/SignUpGatekeeper.sol'; +import {InitialVoiceCreditProxy} from 'maci-contracts/contracts/initialVoiceCreditProxy/InitialVoiceCreditProxy.sol'; +import {CommonUtilities} from 'maci-contracts/contracts/utilities/CommonUtilities.sol'; +import {SnarkCommon} from 'maci-contracts/contracts/crypto/SnarkCommon.sol'; +import {ITallySubsidyFactory} from 'maci-contracts/contracts/interfaces/ITallySubsidyFactory.sol'; +import {IMessageProcessorFactory} from 'maci-contracts/contracts/interfaces/IMPFactory.sol'; +import {IClrFund} from './interfaces/IClrFund.sol'; +import {IMACIFactory} from './interfaces/IMACIFactory.sol'; +import {MACICommon} from './MACICommon.sol'; import './userRegistry/IUserRegistry.sol'; import './recipientRegistry/IRecipientRegistry.sol'; -contract FundingRound is Ownable, MACISharedObjs, SignUpGatekeeper, InitialVoiceCreditProxy { +contract FundingRound is + Ownable, + SignUpGatekeeper, + InitialVoiceCreditProxy, + DomainObjs, + SnarkCommon, + CommonUtilities, + MACICommon +{ using SafeERC20 for ERC20; + // Errors + error OnlyMaciCanRegisterVoters(); + error NotCoordinator(); + error InvalidPoll(); + error InvalidTally(); + error InvalidMessageProcessor(); + error MaciAlreadySet(); + error ContributionAmountIsZero(); + error ContributionAmountTooLarge(); + error AlreadyContributed(); + error UserNotVerified(); + error UserHasNotContributed(); + error UserAlreadyRegistered(); + error NoVoiceCredits(); + error NothingToWithdraw(); + error RoundNotCancelled(); + error RoundCancelled(); + error RoundAlreadyFinalized(); + error RoundNotFinalized(); + error VotesNotTallied(); + error EmptyTallyHash(); + error InvalidBudget(); + error NoProjectHasMoreThanOneVote(); + error VoteResultsAlreadyVerified(); + error IncorrectTallyResult(); + error IncorrectSpentVoiceCredits(); + error IncorrectPerVOSpentVoiceCredits(); + error FundsAlreadyClaimed(); + error TallyHashNotPublished(); + error IncompleteTallyResults(uint256 total, uint256 actual); + error NoVotes(); + error MaciNotSet(); + error PollNotSet(); + error InvalidMaci(); + error InvalidNativeToken(); + error InvalidUserRegistry(); + error InvalidRecipientRegistry(); + error InvalidCoordinator(); + error UnexpectedPollAddress(address expected, address actual); + + // Constants uint256 private constant MAX_VOICE_CREDITS = 10 ** 9; // MACI allows 2 ** 32 voice credits max uint256 private constant MAX_CONTRIBUTION_AMOUNT = 10 ** 4; // In tokens uint256 private constant ALPHA_PRECISION = 10 ** 18; // to account for loss of precision in division - uint8 private constant LEAVES_PER_NODE = 5; // leaves per node of the tally result tree // Structs struct ContributorStatus { @@ -48,9 +105,14 @@ contract FundingRound is Ownable, MACISharedObjs, SignUpGatekeeper, InitialVoice bool public isFinalized = false; bool public isCancelled = false; + uint256 public pollId; + Poll public poll; + Tally public tally; + address public coordinator; MACI public maci; ERC20 public nativeToken; + TopupToken public topupToken; IUserRegistry public userRegistry; IRecipientRegistry public recipientRegistry; string public tallyHash; @@ -71,18 +133,18 @@ contract FundingRound is Ownable, MACISharedObjs, SignUpGatekeeper, InitialVoice event TallyPublished(string _tallyHash); event Voted(address indexed _contributor); event TallyResultsAdded(uint256 indexed _voteOptionIndex, uint256 _tally); + event PollSet(address indexed _poll); + event TallySet(address indexed _tally); modifier onlyCoordinator() { - require(msg.sender == coordinator, 'FundingRound: Sender is not the coordinator'); + if(msg.sender != coordinator) { + revert NotCoordinator(); + } _; } /** * @dev Set round parameters. - * @param _nativeToken Address of a token which will be accepted for contributions. - * @param _userRegistry Address of the registry of verified users. - * @param _recipientRegistry Address of the recipient registry. - * @param _coordinator Address of the coordinator. */ constructor( ERC20 _nativeToken, @@ -90,31 +152,110 @@ contract FundingRound is Ownable, MACISharedObjs, SignUpGatekeeper, InitialVoice IRecipientRegistry _recipientRegistry, address _coordinator ) - public { + if (isAddressZero(address(_nativeToken))) revert InvalidNativeToken(); + if (isAddressZero(address(_userRegistry))) revert InvalidUserRegistry(); + if (isAddressZero(address(_recipientRegistry))) revert InvalidRecipientRegistry(); + if (isAddressZero(_coordinator)) revert InvalidCoordinator(); + nativeToken = _nativeToken; voiceCreditFactor = (MAX_CONTRIBUTION_AMOUNT * uint256(10) ** nativeToken.decimals()) / MAX_VOICE_CREDITS; voiceCreditFactor = voiceCreditFactor > 0 ? voiceCreditFactor : 1; + userRegistry = _userRegistry; recipientRegistry = _recipientRegistry; coordinator = _coordinator; + topupToken = new TopupToken(); + } + + /** + * @dev Is the given address a zero address + */ + function isAddressZero(address addressValue) public pure returns (bool) { + return (addressValue == address(0)); + } + + /** + * @dev Have the votes been tallied + */ + function isTallied() private view returns (bool) { + (uint256 numSignUps, ) = poll.numSignUpsAndMessages(); + (uint8 intStateTreeDepth, , , ) = poll.treeDepths(); + uint256 tallyBatchSize = TREE_ARITY ** uint256(intStateTreeDepth); + uint256 tallyBatchNum = tally.tallyBatchNum(); + uint256 totalTallied = tallyBatchNum * tallyBatchSize; + + return numSignUps > 0 && totalTallied >= numSignUps; + } + + /** + * @dev Set the tally contract + * @param _tally The tally contract address + */ + function _setTally(address _tally) private + { + if (isAddressZero(_tally)) { + revert InvalidTally(); + } + + tally = Tally(_tally); + emit TallySet(address(tally)); + } + + /** + * @dev Reset tally results. This should only be used if the tally script + * failed to proveOnChain due to unexpected error processing MACI logs + */ + function resetTally() + external + onlyCoordinator + { + if (isAddressZero(address(maci))) revert MaciNotSet(); + + _votingPeriodOver(poll); + if (isFinalized) { + revert RoundAlreadyFinalized(); + } + + address verifier = address(tally.verifier()); + address vkRegistry = address(tally.vkRegistry()); + + IMessageProcessorFactory messageProcessorFactory = maci.messageProcessorFactory(); + ITallySubsidyFactory tallyFactory = maci.tallyFactory(); + + address mp = messageProcessorFactory.deploy(verifier, vkRegistry, address(poll), coordinator); + address newTally = tallyFactory.deploy(verifier, vkRegistry, address(poll), mp, coordinator); + _setTally(newTally); } /** - * @dev Link MACI instance to this funding round. + * @dev Link MACI related contracts to this funding round. */ function setMaci( - MACI _maci + MACI _maci, + MACI.PollContracts memory _pollContracts ) external onlyOwner { - require(address(maci) == address(0), 'FundingRound: Already linked to MACI instance'); - require( - _maci.calcSignUpDeadline() > block.timestamp, - 'FundingRound: Signup deadline must be in the future' - ); + if (!isAddressZero(address(maci))) revert MaciAlreadySet(); + + if (isAddressZero(address(_maci))) revert InvalidMaci(); + if (isAddressZero(_pollContracts.poll)) revert InvalidPoll(); + if (isAddressZero(_pollContracts.messageProcessor)) revert InvalidMessageProcessor(); + + // we only create 1 poll per maci, make sure MACI use pollId = 0 + // as the first poll index + pollId = 0; + + address expectedPoll = _maci.getPoll(pollId); + if( _pollContracts.poll != expectedPoll ) { + revert UnexpectedPollAddress(expectedPoll, _pollContracts.poll); + } + maci = _maci; + poll = Poll(_pollContracts.poll); + _setTally(_pollContracts.tally); } /** @@ -128,19 +269,21 @@ contract FundingRound is Ownable, MACISharedObjs, SignUpGatekeeper, InitialVoice ) external { - require(address(maci) != address(0), 'FundingRound: MACI not deployed'); - require(contributorCount < maci.maxUsers(), 'FundingRound: Contributor limit reached'); - require(block.timestamp < maci.calcSignUpDeadline(), 'FundingRound: Contribution period ended'); - require(!isFinalized, 'FundingRound: Round finalized'); - require(amount > 0, 'FundingRound: Contribution amount must be greater than zero'); - require(amount <= MAX_VOICE_CREDITS * voiceCreditFactor, 'FundingRound: Contribution amount is too large'); - require(contributors[msg.sender].voiceCredits == 0, 'FundingRound: Already contributed'); + if (isAddressZero(address(maci))) revert MaciNotSet(); + if (isFinalized) revert RoundAlreadyFinalized(); + if (amount == 0) revert ContributionAmountIsZero(); + if (amount > MAX_VOICE_CREDITS * voiceCreditFactor) revert ContributionAmountTooLarge(); + if (contributors[msg.sender].voiceCredits != 0) { + revert AlreadyContributed(); + } + uint256 voiceCredits = amount / voiceCreditFactor; contributors[msg.sender] = ContributorStatus(voiceCredits, false); contributorCount += 1; bytes memory signUpGatekeeperData = abi.encode(msg.sender, voiceCredits); bytes memory initialVoiceCreditProxyData = abi.encode(msg.sender); nativeToken.safeTransferFrom(msg.sender, address(this), amount); + maci.signUp( pubKey, signUpGatekeeperData, @@ -149,7 +292,7 @@ contract FundingRound is Ownable, MACISharedObjs, SignUpGatekeeper, InitialVoice emit Contribution(msg.sender, amount); } - /** + /** * @dev Register user for voting. * This function is part of SignUpGatekeeper interface. * @param _data Encoded address of a contributor. @@ -161,12 +304,25 @@ contract FundingRound is Ownable, MACISharedObjs, SignUpGatekeeper, InitialVoice override public { - require(msg.sender == address(maci), 'FundingRound: Only MACI contract can register voters'); + if (msg.sender != address(maci)) { + revert OnlyMaciCanRegisterVoters(); + } + address user = abi.decode(_data, (address)); bool verified = userRegistry.isVerifiedUser(user); - require(verified, 'FundingRound: User has not been verified'); - require(contributors[user].voiceCredits > 0, 'FundingRound: User has not contributed'); - require(!contributors[user].isRegistered, 'FundingRound: User already registered'); + + if (!verified) { + revert UserNotVerified(); + } + + if (contributors[user].voiceCredits <= 0) { + revert UserHasNotContributed(); + } + + if (contributors[user].isRegistered) { + revert UserAlreadyRegistered(); + } + contributors[user].isRegistered = true; } @@ -186,24 +342,12 @@ contract FundingRound is Ownable, MACISharedObjs, SignUpGatekeeper, InitialVoice { address user = abi.decode(_data, (address)); uint256 initialVoiceCredits = contributors[user].voiceCredits; - require(initialVoiceCredits > 0, 'FundingRound: User does not have any voice credits'); - return initialVoiceCredits; - } - /** - * @dev Submit a batch of messages along with corresponding ephemeral public keys. - */ - function submitMessageBatch( - Message[] calldata _messages, - PubKey[] calldata _encPubKeys - ) - external - { - uint256 batchSize = _messages.length; - for (uint8 i = 0; i < batchSize; i++) { - maci.publishMessage(_messages[i], _encPubKeys[i]); + if (initialVoiceCredits <= 0) { + revert NoVoiceCredits(); } - emit Voted(msg.sender); + + return initialVoiceCredits; } /** @@ -213,7 +357,9 @@ contract FundingRound is Ownable, MACISharedObjs, SignUpGatekeeper, InitialVoice public returns (bool[] memory result) { - require(isCancelled, 'FundingRound: Round not cancelled'); + if (!isCancelled) { + revert RoundNotCancelled(); + } result = new bool[](_contributors.length); // Reconstruction of exact contribution amount from VCs may not be possible due to a loss of precision @@ -241,7 +387,9 @@ contract FundingRound is Ownable, MACISharedObjs, SignUpGatekeeper, InitialVoice msgSender[0] = msg.sender; bool[] memory results = withdrawContributions(msgSender); - require(results[0], 'FundingRound: Nothing to withdraw'); + if (!results[0]) { + revert NothingToWithdraw(); + } } /** @@ -252,8 +400,13 @@ contract FundingRound is Ownable, MACISharedObjs, SignUpGatekeeper, InitialVoice external onlyCoordinator { - require(!isFinalized, 'FundingRound: Round finalized'); - require(bytes(_tallyHash).length != 0, 'FundingRound: Tally hash is empty string'); + if (isFinalized) { + revert RoundAlreadyFinalized(); + } + if (bytes(_tallyHash).length == 0) { + revert EmptyTallyHash(); + } + tallyHash = _tallyHash; emit TallyPublished(_tallyHash); } @@ -276,13 +429,20 @@ contract FundingRound is Ownable, MACISharedObjs, SignUpGatekeeper, InitialVoice { // make sure budget = contributions + matching pool uint256 contributions = _totalSpent * voiceCreditFactor; - require(_budget >= contributions, 'FundingRound: Invalid budget'); - // guard against division by zero when fewer than 1 contributor for each project - require(_totalVotesSquares > _totalSpent, "FundingRound: Total quadratic votes must be greater than total spent voice credits"); + if (_budget < contributions) { + revert InvalidBudget(); + } + + // guard against division by zero. + // This happens when no project receives more than one vote + if (_totalVotesSquares <= _totalSpent) { + revert NoProjectHasMoreThanOneVote(); + } return (_budget - contributions) * ALPHA_PRECISION / (voiceCreditFactor * (_totalVotesSquares - _totalSpent)); + } /** @@ -295,27 +455,46 @@ contract FundingRound is Ownable, MACISharedObjs, SignUpGatekeeper, InitialVoice */ function finalize( uint256 _totalSpent, - uint256 _totalSpentSalt + uint256 _totalSpentSalt, + uint256 _newResultCommitment, + uint256 _perVOSpentVoiceCreditsHash ) external onlyOwner { - require(!isFinalized, 'FundingRound: Already finalized'); - require(address(maci) != address(0), 'FundingRound: MACI not deployed'); - require(maci.calcVotingDeadline() < block.timestamp, 'FundingRound: Voting has not been finished'); - require(!maci.hasUntalliedStateLeaves(), 'FundingRound: Votes has not been tallied'); - require(bytes(tallyHash).length != 0, 'FundingRound: Tally hash has not been published'); + if (isFinalized) { + revert RoundAlreadyFinalized(); + } + + if (isAddressZero(address(maci))) revert MaciNotSet(); + + _votingPeriodOver(poll); + + if (!isTallied()) { + revert VotesNotTallied(); + } + if (bytes(tallyHash).length == 0) { + revert TallyHashNotPublished(); + } // make sure we have received all the tally results - (,, uint8 voteOptionTreeDepth) = maci.treeDepths(); - uint256 totalResults = uint256(LEAVES_PER_NODE) ** uint256(voteOptionTreeDepth); - require(totalTallyResults == totalResults, 'FundingRound: Incomplete tally results'); + (,,, uint8 voteOptionTreeDepth) = poll.treeDepths(); + uint256 totalResults = uint256(TREE_ARITY) ** uint256(voteOptionTreeDepth); + if ( totalTallyResults != totalResults ) { + revert IncompleteTallyResults(totalResults, totalTallyResults); + } - totalVotes = maci.totalVotes(); // If nobody voted, the round should be cancelled to avoid locking of matching funds - require(totalVotes > 0, 'FundingRound: No votes'); - bool verified = maci.verifySpentVoiceCredits(_totalSpent, _totalSpentSalt); - require(verified, 'FundingRound: Incorrect total amount of spent voice credits'); + if ( _totalSpent == 0) { + revert NoVotes(); + } + + bool verified = tally.verifySpentVoiceCredits(_totalSpent, _totalSpentSalt, _newResultCommitment, _perVOSpentVoiceCreditsHash); + if (!verified) { + revert IncorrectSpentVoiceCredits(); + } + + totalSpent = _totalSpent; // Total amount of spent voice credits is the size of the pool of direct rewards. // Everything else, including unspent voice credits and downscaling error, @@ -335,7 +514,9 @@ contract FundingRound is Ownable, MACISharedObjs, SignUpGatekeeper, InitialVoice external onlyOwner { - require(!isFinalized, 'FundingRound: Already finalized'); + if (isFinalized) { + revert RoundAlreadyFinalized(); + } isFinalized = true; isCancelled = true; } @@ -355,8 +536,10 @@ contract FundingRound is Ownable, MACISharedObjs, SignUpGatekeeper, InitialVoice { // amount = ( alpha * (quadratic votes)^2 + (precision - alpha) * totalSpent ) / precision uint256 quadratic = alpha * voiceCreditFactor * _tallyResult * _tallyResult; - uint256 linear = (ALPHA_PRECISION - alpha) * voiceCreditFactor * _spent; - return (quadratic + linear) / ALPHA_PRECISION; + uint256 totalSpentCredits = voiceCreditFactor * _spent; + uint256 linearPrecision = ALPHA_PRECISION * totalSpentCredits; + uint256 linearAlpha = alpha * totalSpentCredits; + return ((quadratic + linearPrecision) - linearAlpha) / ALPHA_PRECISION; } /** @@ -364,44 +547,60 @@ contract FundingRound is Ownable, MACISharedObjs, SignUpGatekeeper, InitialVoice * @param _voteOptionIndex Vote option index. * @param _spent The amount of voice credits spent on the recipients. * @param _spentProof Proof of correctness for the amount of spent credits. - * @param _spentSalt Salt. */ function claimFunds( uint256 _voteOptionIndex, uint256 _spent, uint256[][] calldata _spentProof, - uint256 _spentSalt + uint256 _spentSalt, + uint256 _resultsCommitment, + uint256 _spentVoiceCreditsCommitment ) external { - require(isFinalized, 'FundingRound: Round not finalized'); - require(!isCancelled, 'FundingRound: Round has been cancelled'); - require(!recipients[_voteOptionIndex].fundsClaimed, 'FundingRound: Funds already claimed'); + if (!isFinalized) { + revert RoundNotFinalized(); + } + + if (isCancelled) { + revert RoundCancelled(); + } + + if (recipients[_voteOptionIndex].fundsClaimed) { + revert FundsAlreadyClaimed(); + } recipients[_voteOptionIndex].fundsClaimed = true; { // create scope to avoid 'stack too deep' error - (,, uint8 voteOptionTreeDepth) = maci.treeDepths(); - bool spentVerified = maci.verifyPerVOSpentVoiceCredits( - voteOptionTreeDepth, + + (, , , uint8 voteOptionTreeDepth) = poll.treeDepths(); + bool verified = tally.verifyPerVOSpentVoiceCredits( _voteOptionIndex, _spent, _spentProof, - _spentSalt + _spentSalt, + voteOptionTreeDepth, + _spentVoiceCreditsCommitment, + _resultsCommitment ); - require(spentVerified, 'FundingRound: Incorrect amount of spent voice credits'); + + if (!verified) { + revert IncorrectPerVOSpentVoiceCredits(); + } } - uint256 startTime = maci.signUpTimestamp(); + (uint256 startTime, uint256 duration) = poll.getDeployTimeAndDuration(); address recipient = recipientRegistry.getRecipientAddress( _voteOptionIndex, startTime, - startTime + maci.signUpDurationSeconds() + maci.votingDurationSeconds() + startTime + duration ); if (recipient == address(0)) { // Send funds back to the matching pool recipient = owner(); } + uint256 tallyResult = recipients[_voteOptionIndex].tallyResult; uint256 allocatedAmount = getAllocatedAmount(tallyResult, _spent); nativeToken.safeTransfer(recipient, allocatedAmount); @@ -410,32 +609,42 @@ contract FundingRound is Ownable, MACISharedObjs, SignUpGatekeeper, InitialVoice /** * @dev Add and verify tally votes and calculate sum of tally squares for alpha calculation. - * @param _voteOptionTreeDepth Vote option tree depth * @param _voteOptionIndex Vote option index. * @param _tallyResult The results of vote tally for the recipients. * @param _tallyResultProof Proofs of correctness of the vote tally results. - * @param _tallyResultSalt Salt. + * @param _tallyResultSalt the respective salt in the results object in the tally.json + * @param _spentVoiceCreditsHash hashLeftRight(number of spent voice credits, spent salt) + * @param _perVOSpentVoiceCreditsHash hashLeftRight(merkle root of the no spent voice credits per vote option, perVOSpentVoiceCredits salt) */ function _addTallyResult( - uint8 _voteOptionTreeDepth, uint256 _voteOptionIndex, uint256 _tallyResult, - uint256[][] calldata _tallyResultProof, - uint256 _tallyResultSalt + uint256[][] memory _tallyResultProof, + uint256 _tallyResultSalt, + uint256 _spentVoiceCreditsHash, + uint256 _perVOSpentVoiceCreditsHash ) private { RecipientStatus storage recipient = recipients[_voteOptionIndex]; - require(!recipient.tallyVerified, 'FundingRound: Vote results already verified'); + if (recipient.tallyVerified) { + revert VoteResultsAlreadyVerified(); + } - bool resultVerified = maci.verifyTallyResult( - _voteOptionTreeDepth, + (,,, uint8 voteOptionTreeDepth) = poll.treeDepths(); + bool resultVerified = tally.verifyTallyResult( _voteOptionIndex, _tallyResult, _tallyResultProof, - _tallyResultSalt + _tallyResultSalt, + voteOptionTreeDepth, + _spentVoiceCreditsHash, + _perVOSpentVoiceCreditsHash ); - require(resultVerified, 'FundingRound: Incorrect tally result'); + + if (!resultVerified) { + revert IncorrectTallyResult(); + } recipient.tallyVerified = true; recipient.tallyResult = _tallyResult; @@ -446,34 +655,42 @@ contract FundingRound is Ownable, MACISharedObjs, SignUpGatekeeper, InitialVoice /** * @dev Add and verify tally results by batch. - * @param _voteOptionTreeDepth Vote option tree depth. * @param _voteOptionIndices Vote option index. * @param _tallyResults The results of vote tally for the recipients. * @param _tallyResultProofs Proofs of correctness of the vote tally results. - * @param _tallyResultSalt Salt. - */ + * @param _tallyResultSalt the respective salt in the results object in the tally.json + * @param _spentVoiceCreditsHashes hashLeftRight(number of spent voice credits, spent salt) + * @param _perVOSpentVoiceCreditsHashes hashLeftRight(merkle root of the no spent voice credits per vote option, perVOSpentVoiceCredits salt) + */ function addTallyResultsBatch( - uint8 _voteOptionTreeDepth, uint256[] calldata _voteOptionIndices, uint256[] calldata _tallyResults, uint256[][][] calldata _tallyResultProofs, - uint256 _tallyResultSalt + uint256 _tallyResultSalt, + uint256 _spentVoiceCreditsHashes, + uint256 _perVOSpentVoiceCreditsHashes ) external onlyCoordinator { - require(!maci.hasUntalliedStateLeaves(), 'FundingRound: Votes have not been tallied'); - require(!isFinalized, 'FundingRound: Already finalized'); + if (isAddressZero(address(maci))) revert MaciNotSet(); + + if (!isTallied()) { + revert VotesNotTallied(); + } + if (isFinalized) { + revert RoundAlreadyFinalized(); + } for (uint256 i = 0; i < _voteOptionIndices.length; i++) { _addTallyResult( - _voteOptionTreeDepth, _voteOptionIndices[i], _tallyResults[i], _tallyResultProofs[i], - _tallyResultSalt + _tallyResultSalt, + _spentVoiceCreditsHashes, + _perVOSpentVoiceCreditsHashes ); } } - } diff --git a/contracts/contracts/FundingRoundFactory.sol b/contracts/contracts/FundingRoundFactory.sol index f2a9042d5..9a35c1077 100644 --- a/contracts/contracts/FundingRoundFactory.sol +++ b/contracts/contracts/FundingRoundFactory.sol @@ -1,295 +1,56 @@ // SPDX-License-Identifier: GPL-3.0 -pragma solidity ^0.6.12; -pragma experimental ABIEncoderV2; - -import '@openzeppelin/contracts/access/Ownable.sol'; -import '@openzeppelin/contracts/token/ERC20/ERC20.sol'; -import '@openzeppelin/contracts/token/ERC20/SafeERC20.sol'; -import '@openzeppelin/contracts/utils/EnumerableSet.sol'; - -import 'maci-contracts/sol/MACI.sol'; -import 'maci-contracts/sol/MACISharedObjs.sol'; -import 'maci-contracts/sol/gatekeepers/SignUpGatekeeper.sol'; -import 'maci-contracts/sol/initialVoiceCreditProxy/InitialVoiceCreditProxy.sol'; - -import './userRegistry/IUserRegistry.sol'; -import './recipientRegistry/IRecipientRegistry.sol'; -import './MACIFactory.sol'; -import './FundingRound.sol'; - -contract FundingRoundFactory is Ownable, MACISharedObjs { - using EnumerableSet for EnumerableSet.AddressSet; - using SafeERC20 for ERC20; - - // State - address public coordinator; - - ERC20 public nativeToken; - MACIFactory public maciFactory; - IUserRegistry public userRegistry; - IRecipientRegistry public recipientRegistry; - PubKey public coordinatorPubKey; - - EnumerableSet.AddressSet private fundingSources; - FundingRound[] public rounds; - - // Events - event FundingSourceAdded(address _source); - event FundingSourceRemoved(address _source); - event RoundStarted(address _round); - event RoundFinalized(address _round); - event TokenChanged(address _token); - event CoordinatorChanged(address _coordinator); - - constructor( - MACIFactory _maciFactory - ) - public - { - maciFactory = _maciFactory; - } - - /** - * @dev Set registry of verified users. - * @param _userRegistry Address of a user registry. - */ - function setUserRegistry(IUserRegistry _userRegistry) - external - onlyOwner - { - userRegistry = _userRegistry; - } - - /** - * @dev Set recipient registry. - * @param _recipientRegistry Address of a recipient registry. - */ - function setRecipientRegistry(IRecipientRegistry _recipientRegistry) - external - onlyOwner - { - recipientRegistry = _recipientRegistry; - (,, uint256 maxVoteOptions) = maciFactory.maxValues(); - recipientRegistry.setMaxRecipients(maxVoteOptions); - } - - /** - * @dev Add matching funds source. - * @param _source Address of a funding source. - */ - function addFundingSource(address _source) - external - onlyOwner - { - bool result = fundingSources.add(_source); - require(result, 'Factory: Funding source already added'); - emit FundingSourceAdded(_source); - } - - /** - * @dev Remove matching funds source. - * @param _source Address of the funding source. - */ - function removeFundingSource(address _source) - external - onlyOwner - { - bool result = fundingSources.remove(_source); - require(result, 'Factory: Funding source not found'); - emit FundingSourceRemoved(_source); - } - - function getCurrentRound() - public - view - returns (FundingRound _currentRound) - { - if (rounds.length == 0) { - return FundingRound(address(0)); - } - return rounds[rounds.length - 1]; - } - - function setMaciParameters( - uint8 _stateTreeDepth, - uint8 _messageTreeDepth, - uint8 _voteOptionTreeDepth, - uint8 _tallyBatchSize, - uint8 _messageBatchSize, - SnarkVerifier _batchUstVerifier, - SnarkVerifier _qvtVerifier, - uint256 _signUpDuration, - uint256 _votingDuration +pragma solidity ^0.8.10; + +import {FundingRound} from './FundingRound.sol'; +import {IClrFund} from './interfaces/IClrFund.sol'; +import {IMACIFactory} from './interfaces/IMACIFactory.sol'; +import {MACICommon} from './MACICommon.sol'; +import {MACI} from 'maci-contracts/contracts/MACI.sol'; +import {SignUpGatekeeper} from 'maci-contracts/contracts/gatekeepers/SignUpGatekeeper.sol'; +import {InitialVoiceCreditProxy} from 'maci-contracts/contracts/initialVoiceCreditProxy/InitialVoiceCreditProxy.sol'; + +/** +* @dev A factory to deploy the funding round contract +*/ +contract FundingRoundFactory is MACICommon { + /** + * @dev Deploy the funding round contract + * @param _duration the funding round duration + * @param _clrfund the clrfund contract containing information used to + * deploy a funding round, e.g. nativeToken, coordinator address + * coordinator public key, etc. + */ + function deploy( + uint256 _duration, + address _clrfund ) external - onlyOwner - { - maciFactory.setMaciParameters( - _stateTreeDepth, - _messageTreeDepth, - _voteOptionTreeDepth, - _tallyBatchSize, - _messageBatchSize, - _batchUstVerifier, - _qvtVerifier, - _signUpDuration, - _votingDuration - ); - } - - /** - * @dev Deploy new funding round. - */ - function deployNewRound() - external - onlyOwner + returns (address) { - require(maciFactory.owner() == address(this), 'Factory: MACI factory is not owned by FR factory'); - require(address(userRegistry) != address(0), 'Factory: User registry is not set'); - require(address(recipientRegistry) != address(0), 'Factory: Recipient registry is not set'); - require(address(nativeToken) != address(0), 'Factory: Native token is not set'); - require(coordinator != address(0), 'Factory: No coordinator'); - FundingRound currentRound = getCurrentRound(); - require( - address(currentRound) == address(0) || currentRound.isFinalized(), - 'Factory: Current round is not finalized' - ); - // Make sure that the max number of recipients is set correctly - (,, uint256 maxVoteOptions) = maciFactory.maxValues(); - recipientRegistry.setMaxRecipients(maxVoteOptions); - // Deploy funding round and MACI contracts + IClrFund clrfund = IClrFund(_clrfund); FundingRound newRound = new FundingRound( - nativeToken, - userRegistry, - recipientRegistry, - coordinator + clrfund.nativeToken(), + clrfund.userRegistry(), + clrfund.recipientRegistry(), + clrfund.coordinator() ); - rounds.push(newRound); - MACI maci = maciFactory.deployMaci( + + IMACIFactory maciFactory = clrfund.maciFactory(); + (MACI maci, MACI.PollContracts memory pollContracts) = maciFactory.deployMaci( SignUpGatekeeper(newRound), InitialVoiceCreditProxy(newRound), - coordinator, - coordinatorPubKey + address(newRound.topupToken()), + _duration, + newRound.coordinator(), + clrfund.coordinatorPubKey(), + address(this) ); - newRound.setMaci(maci); - emit RoundStarted(address(newRound)); - } - - /** - * @dev Get total amount of matching funds. - */ - function getMatchingFunds(ERC20 token) - external - view - returns (uint256) - { - uint256 matchingPoolSize = token.balanceOf(address(this)); - for (uint256 index = 0; index < fundingSources.length(); index++) { - address fundingSource = fundingSources.at(index); - uint256 allowance = token.allowance(fundingSource, address(this)); - uint256 balance = token.balanceOf(fundingSource); - uint256 contribution = allowance < balance ? allowance : balance; - matchingPoolSize += contribution; - } - return matchingPoolSize; - } - - /** - * @dev Transfer funds from matching pool to current funding round and finalize it. - * @param _totalSpent Total amount of spent voice credits. - * @param _totalSpentSalt The salt. - */ - function transferMatchingFunds( - uint256 _totalSpent, - uint256 _totalSpentSalt - ) - external - onlyOwner - { - FundingRound currentRound = getCurrentRound(); - require(address(currentRound) != address(0), 'Factory: Funding round has not been deployed'); - ERC20 roundToken = currentRound.nativeToken(); - // Factory contract is the default funding source - uint256 matchingPoolSize = roundToken.balanceOf(address(this)); - if (matchingPoolSize > 0) { - roundToken.safeTransfer(address(currentRound), matchingPoolSize); - } - // Pull funds from other funding sources - for (uint256 index = 0; index < fundingSources.length(); index++) { - address fundingSource = fundingSources.at(index); - uint256 allowance = roundToken.allowance(fundingSource, address(this)); - uint256 balance = roundToken.balanceOf(fundingSource); - uint256 contribution = allowance < balance ? allowance : balance; - if (contribution > 0) { - roundToken.safeTransferFrom(fundingSource, address(currentRound), contribution); - } - } - currentRound.finalize(_totalSpent, _totalSpentSalt); - emit RoundFinalized(address(currentRound)); - } - - /** - * @dev Cancel current round. - */ - function cancelCurrentRound() - external - onlyOwner - { - FundingRound currentRound = getCurrentRound(); - require(address(currentRound) != address(0), 'Factory: Funding round has not been deployed'); - require(!currentRound.isFinalized(), 'Factory: Current round is finalized'); - currentRound.cancel(); - emit RoundFinalized(address(currentRound)); - } - - /** - * @dev Set token in which contributions are accepted. - * @param _token Address of the token contract. - */ - function setToken(address _token) - external - onlyOwner - { - nativeToken = ERC20(_token); - emit TokenChanged(_token); - } - - /** - * @dev Set coordinator's address and public key. - * @param _coordinator Coordinator's address. - * @param _coordinatorPubKey Coordinator's public key. - */ - function setCoordinator( - address _coordinator, - PubKey memory _coordinatorPubKey - ) - external - onlyOwner - { - coordinator = _coordinator; - coordinatorPubKey = _coordinatorPubKey; - emit CoordinatorChanged(_coordinator); - } - - function coordinatorQuit() - external - onlyCoordinator - { - // The fact that they quit is obvious from - // the address being 0x0 - coordinator = address(0); - coordinatorPubKey = PubKey(0, 0); - FundingRound currentRound = getCurrentRound(); - if (address(currentRound) != address(0) && !currentRound.isFinalized()) { - currentRound.cancel(); - emit RoundFinalized(address(currentRound)); - } - emit CoordinatorChanged(address(0)); - } - modifier onlyCoordinator() { - require(msg.sender == coordinator, 'Factory: Sender is not the coordinator'); - _; + // link funding round with maci related contracts + newRound.setMaci(maci, pollContracts); + newRound.transferOwnership(_clrfund); + maci.transferOwnership(address(newRound)); + return address(newRound); } } diff --git a/contracts/contracts/MACICommon.sol b/contracts/contracts/MACICommon.sol new file mode 100644 index 000000000..3a73b4110 --- /dev/null +++ b/contracts/contracts/MACICommon.sol @@ -0,0 +1,24 @@ +// SPDX-License-Identifier: GPL-3.0 + +pragma solidity ^0.8.10; + +/** + * @dev a contract that holds common MACI structures + */ +contract MACICommon { + // MACI tree arity + uint256 public constant TREE_ARITY = 5; + + /** + * @dev These are contract factories used to deploy MACI poll processing contracts + * when creating a new ClrFund funding round. + */ + struct Factories { + address pollFactory; + address tallyFactory; + // subsidyFactory is not currently used, it's just a place holder here + address subsidyFactory; + address messageProcessorFactory; + } + +} \ No newline at end of file diff --git a/contracts/contracts/MACIFactory.sol b/contracts/contracts/MACIFactory.sol index 59451d1b4..1fb0b800b 100644 --- a/contracts/contracts/MACIFactory.sol +++ b/contracts/contracts/MACIFactory.sol @@ -1,118 +1,156 @@ // SPDX-License-Identifier: GPL-3.0 -pragma solidity ^0.6.12; -pragma experimental ABIEncoderV2; - -import '@openzeppelin/contracts/access/Ownable.sol'; -import 'maci-contracts/sol/MACI.sol'; -import 'maci-contracts/sol/MACIParameters.sol'; -import 'maci-contracts/sol/MACISharedObjs.sol'; -import 'maci-contracts/sol/gatekeepers/SignUpGatekeeper.sol'; -import 'maci-contracts/sol/initialVoiceCreditProxy/InitialVoiceCreditProxy.sol'; - -contract MACIFactory is Ownable, MACIParameters, MACISharedObjs { - // Constants - uint256 private constant STATE_TREE_BASE = 2; - uint256 private constant MESSAGE_TREE_BASE = 2; - uint256 private constant VOTE_OPTION_TREE_BASE = 5; - - // State +pragma solidity ^0.8.10; + +import {MACI} from 'maci-contracts/contracts/MACI.sol'; +import {IPollFactory} from 'maci-contracts/contracts/interfaces/IPollFactory.sol'; +import {ITallySubsidyFactory} from 'maci-contracts/contracts/interfaces/ITallySubsidyFactory.sol'; +import {IMessageProcessorFactory} from 'maci-contracts/contracts/interfaces/IMPFactory.sol'; +import {SignUpGatekeeper} from 'maci-contracts/contracts/gatekeepers/SignUpGatekeeper.sol'; +import {InitialVoiceCreditProxy} from 'maci-contracts/contracts/initialVoiceCreditProxy/InitialVoiceCreditProxy.sol'; +import {TopupCredit} from 'maci-contracts/contracts/TopupCredit.sol'; +import {VkRegistry} from 'maci-contracts/contracts/VkRegistry.sol'; +import {Verifier} from 'maci-contracts/contracts/crypto/Verifier.sol'; +import {SnarkCommon} from 'maci-contracts/contracts/crypto/SnarkCommon.sol'; +import {Ownable} from '@openzeppelin/contracts/access/Ownable.sol'; +import {Params} from 'maci-contracts/contracts/utilities/Params.sol'; +import {DomainObjs} from 'maci-contracts/contracts/utilities/DomainObjs.sol'; +import {MACICommon} from './MACICommon.sol'; + +contract MACIFactory is Ownable, Params, SnarkCommon, DomainObjs, MACICommon { + + // Verifying Key Registry containing circuit parameters + VkRegistry public vkRegistry; + // All the factory contracts used to deploy Poll, Tally, MessageProcessor, Subsidy + Factories public factories; + // verifier is used when creating Tally, MessageProcessor, Subsidy + Verifier public verifier; + + // circuit parameters + uint8 public stateTreeDepth; TreeDepths public treeDepths; - BatchSizes public batchSizes; - MaxValues public maxValues; - SnarkVerifier public batchUstVerifier; - SnarkVerifier public qvtVerifier; - uint256 public signUpDuration; - uint256 public votingDuration; // Events event MaciParametersChanged(); event MaciDeployed(address _maci); + // errors + error NotInitialized(); + error ProcessVkNotSet(); + error TallyVkNotSet(); + error InvalidVkRegistry(); + error InvalidPollFactory(); + error InvalidTallyFactory(); + error InvalidSubsidyFactory(); + error InvalidMessageProcessorFactory(); + error InvalidVerifier(); + constructor( - uint8 _stateTreeDepth, - uint8 _messageTreeDepth, - uint8 _voteOptionTreeDepth, - uint8 _tallyBatchSize, - uint8 _messageBatchSize, - SnarkVerifier _batchUstVerifier, - SnarkVerifier _qvtVerifier, - uint256 _signUpDuration, - uint256 _votingDuration - ) - public - { - _setMaciParameters( - _stateTreeDepth, - _messageTreeDepth, - _voteOptionTreeDepth, - _tallyBatchSize, - _messageBatchSize, - _batchUstVerifier, - _qvtVerifier, - _signUpDuration, - _votingDuration - ); + address _vkRegistry, + Factories memory _factories, + address _verifier + ) { + if (_vkRegistry == address(0)) revert InvalidVkRegistry(); + if (_factories.pollFactory == address(0)) revert InvalidPollFactory(); + if (_factories.tallyFactory == address(0)) revert InvalidTallyFactory(); + if (_factories.messageProcessorFactory == address(0)) revert InvalidMessageProcessorFactory(); + if (_verifier == address(0)) revert InvalidVerifier(); + + vkRegistry = VkRegistry(_vkRegistry); + factories = _factories; + verifier = Verifier(_verifier); } - function _setMaciParameters( - uint8 _stateTreeDepth, - uint8 _messageTreeDepth, - uint8 _voteOptionTreeDepth, - uint8 _tallyBatchSize, - uint8 _messageBatchSize, - SnarkVerifier _batchUstVerifier, - SnarkVerifier _qvtVerifier, - uint256 _signUpDuration, - uint256 _votingDuration - ) - internal - { - treeDepths = TreeDepths(_stateTreeDepth, _messageTreeDepth, _voteOptionTreeDepth); - batchSizes = BatchSizes(_tallyBatchSize, _messageBatchSize); - maxValues = MaxValues( - STATE_TREE_BASE ** treeDepths.stateTreeDepth - 1, - MESSAGE_TREE_BASE ** treeDepths.messageTreeDepth - 1, - VOTE_OPTION_TREE_BASE ** treeDepths.voteOptionTreeDepth - 1 - ); - batchUstVerifier = _batchUstVerifier; - qvtVerifier = _qvtVerifier; - signUpDuration = _signUpDuration; - votingDuration = _votingDuration; + /** + * @dev calculate the message batch size + */ + function getMessageBatchSize(uint8 messageTreeSubDepth) public pure + returns(uint256 _messageBatchSize) { + _messageBatchSize = TREE_ARITY ** messageTreeSubDepth; } /** - * @dev Set MACI parameters. - */ + * @dev set vk registry + */ + function setVkRegistry(address _vkRegistry) public onlyOwner { + if (_vkRegistry == address(0)) revert InvalidVkRegistry(); + + vkRegistry = VkRegistry(_vkRegistry); + } + + /** + * @dev set poll factory in MACI factory + * @param _pollFactory poll factory + */ + function setPollFactory(address _pollFactory) public onlyOwner { + if (_pollFactory == address(0)) revert InvalidPollFactory(); + + factories.pollFactory = _pollFactory; + } + + /** + * @dev set tally factory in MACI factory + * @param _tallyFactory tally factory + */ + function setTallyFactory(address _tallyFactory) public onlyOwner { + if (_tallyFactory == address(0)) revert InvalidTallyFactory(); + + factories.tallyFactory = _tallyFactory; + } + + /** + * @dev set message processor factory in MACI factory + * @param _messageProcessorFactory message processor factory + */ + function setMessageProcessorFactory(address _messageProcessorFactory) public onlyOwner { + if (_messageProcessorFactory == address(0)) revert InvalidMessageProcessorFactory(); + + factories.messageProcessorFactory = _messageProcessorFactory; + } + + /** + * @dev set verifier in MACI factory + * @param _verifier verifier contract + */ + function setVerifier(address _verifier) public onlyOwner { + if (_verifier == address(0)) revert InvalidVerifier(); + + verifier = Verifier(_verifier); + } + + /** + * @dev set MACI zkeys parameters + */ function setMaciParameters( uint8 _stateTreeDepth, - uint8 _messageTreeDepth, - uint8 _voteOptionTreeDepth, - uint8 _tallyBatchSize, - uint8 _messageBatchSize, - SnarkVerifier _batchUstVerifier, - SnarkVerifier _qvtVerifier, - uint256 _signUpDuration, - uint256 _votingDuration + TreeDepths calldata _treeDepths ) - external + public onlyOwner { - require( - _voteOptionTreeDepth >= treeDepths.voteOptionTreeDepth, - 'MACIFactory: Vote option tree depth can not be decreased' - ); - _setMaciParameters( + + uint256 messageBatchSize = getMessageBatchSize(_treeDepths.messageTreeSubDepth); + + if (!vkRegistry.hasProcessVk( _stateTreeDepth, - _messageTreeDepth, - _voteOptionTreeDepth, - _tallyBatchSize, - _messageBatchSize, - _batchUstVerifier, - _qvtVerifier, - _signUpDuration, - _votingDuration - ); + _treeDepths.messageTreeDepth, + _treeDepths.voteOptionTreeDepth, + messageBatchSize) + ) { + revert ProcessVkNotSet(); + } + + if (!vkRegistry.hasTallyVk( + _stateTreeDepth, + _treeDepths.intStateTreeDepth, + _treeDepths.voteOptionTreeDepth) + ) { + revert TallyVkNotSet(); + } + + stateTreeDepth = _stateTreeDepth; + treeDepths = _treeDepths; + emit MaciParametersChanged(); } @@ -120,28 +158,64 @@ contract MACIFactory is Ownable, MACIParameters, MACISharedObjs { * @dev Deploy new MACI instance. */ function deployMaci( - SignUpGatekeeper _signUpGatekeeper, - InitialVoiceCreditProxy _initialVoiceCreditProxy, - address _coordinator, - PubKey calldata _coordinatorPubKey + SignUpGatekeeper signUpGatekeeper, + InitialVoiceCreditProxy initialVoiceCreditProxy, + address topupCredit, + uint256 duration, + address coordinator, + PubKey calldata coordinatorPubKey, + address maciOwner ) external - onlyOwner - returns (MACI _maci) + returns (MACI _maci, MACI.PollContracts memory _pollContracts) { + uint256 messageBatchSize = getMessageBatchSize(treeDepths.messageTreeSubDepth); + + if (!vkRegistry.hasProcessVk( + stateTreeDepth, + treeDepths.messageTreeDepth, + treeDepths.voteOptionTreeDepth, + messageBatchSize) + ) { + revert ProcessVkNotSet(); + } + + if (!vkRegistry.hasTallyVk( + stateTreeDepth, + treeDepths.intStateTreeDepth, + treeDepths.voteOptionTreeDepth) + ) { + revert TallyVkNotSet(); + } + _maci = new MACI( + IPollFactory(factories.pollFactory), + IMessageProcessorFactory(factories.messageProcessorFactory), + ITallySubsidyFactory(factories.tallyFactory), + ITallySubsidyFactory(factories.subsidyFactory), + signUpGatekeeper, + initialVoiceCreditProxy, + TopupCredit(topupCredit), + stateTreeDepth + ); + + _pollContracts = _maci.deployPoll( + duration, treeDepths, - batchSizes, - maxValues, - _signUpGatekeeper, - batchUstVerifier, - qvtVerifier, - signUpDuration, - votingDuration, - _initialVoiceCreditProxy, - _coordinatorPubKey, - _coordinator + coordinatorPubKey, + address(verifier), + address(vkRegistry), + // pass false to not deploy the subsidy contract + false ); + + // transfer ownership to coordinator to run the tally scripts + Ownable(_pollContracts.poll).transferOwnership(coordinator); + Ownable(_pollContracts.messageProcessor).transferOwnership(coordinator); + Ownable(_pollContracts.tally).transferOwnership(coordinator); + + _maci.transferOwnership(maciOwner); + emit MaciDeployed(address(_maci)); } } diff --git a/contracts/contracts/OwnableUpgradeable.sol b/contracts/contracts/OwnableUpgradeable.sol index 5c120db56..3826e125a 100644 --- a/contracts/contracts/OwnableUpgradeable.sol +++ b/contracts/contracts/OwnableUpgradeable.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MIT -pragma solidity ^0.6.12; +pragma solidity ^0.8.10; // NOTE: had to copy contracts over since OZ uses a higher pragma than we do in the one's they maintain. @@ -65,7 +65,7 @@ abstract contract ContextUpgradeable is Initializable { function __Context_init_unchained() internal initializer { } function _msgSender() internal view virtual returns (address) { - return tx.origin; + return msg.sender; } function _msgData() internal view virtual returns (bytes calldata) { diff --git a/contracts/contracts/TopupToken.sol b/contracts/contracts/TopupToken.sol new file mode 100644 index 000000000..c70068ae7 --- /dev/null +++ b/contracts/contracts/TopupToken.sol @@ -0,0 +1,18 @@ +// SPDX-License-Identifier: GPL-3.0 + +pragma solidity ^0.8.10; + +import {ERC20} from '@openzeppelin/contracts/token/ERC20/ERC20.sol'; +import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol"; + +/** + * TopupToken is used by MACI Poll contract to validate the topup credits of a user + * In clrfund, this is only used as gateway to pass the topup amount to the Poll contract + */ +contract TopupToken is ERC20, Ownable { + constructor() ERC20("TopupCredit", "TopupCredit") {} + + function airdrop(uint256 amount) public onlyOwner { + _mint(msg.sender, amount); + } +} diff --git a/contracts/contracts/interfaces/IClrFund.sol b/contracts/contracts/interfaces/IClrFund.sol new file mode 100644 index 000000000..5da1b8b45 --- /dev/null +++ b/contracts/contracts/interfaces/IClrFund.sol @@ -0,0 +1,21 @@ +// SPDX-License-Identifier: GPL-3.0 + +pragma solidity 0.8.10; + +import {ERC20} from '@openzeppelin/contracts/token/ERC20/ERC20.sol'; +import {IUserRegistry} from '../userRegistry/IUserRegistry.sol'; +import {IRecipientRegistry} from '../recipientRegistry/IRecipientRegistry.sol'; +import {DomainObjs} from 'maci-contracts/contracts/utilities/DomainObjs.sol'; +import {IMACIFactory} from './IMACIFactory.sol'; + +/** + * @dev ClrFund interface + */ +interface IClrFund { + function nativeToken() external view returns (ERC20); + function maciFactory() external view returns (IMACIFactory); + function userRegistry() external view returns (IUserRegistry); + function recipientRegistry() external view returns (IRecipientRegistry); + function coordinatorPubKey() external view returns (DomainObjs.PubKey memory); + function coordinator() external view returns (address); +} \ No newline at end of file diff --git a/contracts/contracts/interfaces/IFundingRound.sol b/contracts/contracts/interfaces/IFundingRound.sol new file mode 100644 index 000000000..026f40c0a --- /dev/null +++ b/contracts/contracts/interfaces/IFundingRound.sol @@ -0,0 +1,21 @@ +// SPDX-License-Identifier: GPL-3.0 + +pragma solidity ^0.8.10; + +import {ERC20} from '@openzeppelin/contracts/token/ERC20/ERC20.sol'; + +/** + * @dev FundingRound interface used by the ClrFund contract + */ +interface IFundingRound { + function nativeToken() external view returns (ERC20); + function isFinalized() external view returns (bool); + function isCancelled() external view returns (bool); + function cancel() external; + function finalize( + uint256 _totalSpent, + uint256 _totalSpentSalt, + uint256 _newResultCommitment, + uint256 _perVOSpentVoiceCreditsHash + ) external; +} \ No newline at end of file diff --git a/contracts/contracts/interfaces/IFundingRoundFactory.sol b/contracts/contracts/interfaces/IFundingRoundFactory.sol new file mode 100644 index 000000000..9ca5806f1 --- /dev/null +++ b/contracts/contracts/interfaces/IFundingRoundFactory.sol @@ -0,0 +1,12 @@ +// SPDX-License-Identifier: GPL-3.0 + +pragma solidity ^0.8.10; + +import {ERC20} from '@openzeppelin/contracts/token/ERC20/ERC20.sol'; + +/** + * @dev FundingRoundFactory interface used by the ClrFund contract + */ +interface IFundingRoundFactory { + function deploy(uint256 _duration, address _clrfund) external returns (address); +} \ No newline at end of file diff --git a/contracts/contracts/interfaces/IMACIFactory.sol b/contracts/contracts/interfaces/IMACIFactory.sol new file mode 100644 index 000000000..d5d0bf3b2 --- /dev/null +++ b/contracts/contracts/interfaces/IMACIFactory.sol @@ -0,0 +1,45 @@ +// SPDX-License-Identifier: GPL-3.0 + +pragma solidity ^0.8.10; + +import {IVkRegistry} from 'maci-contracts/contracts/interfaces/IVkRegistry.sol'; +import {IVerifier} from 'maci-contracts/contracts/interfaces/IVerifier.sol'; +import {MACI} from 'maci-contracts/contracts/MACI.sol'; +import {Params} from 'maci-contracts/contracts/utilities/Params.sol'; +import {DomainObjs} from 'maci-contracts/contracts/utilities/DomainObjs.sol'; +import {SignUpGatekeeper} from 'maci-contracts/contracts/gatekeepers/SignUpGatekeeper.sol'; +import {InitialVoiceCreditProxy} from 'maci-contracts/contracts/initialVoiceCreditProxy/InitialVoiceCreditProxy.sol'; +import {MACICommon} from '../MACICommon.sol'; + +/** + * @dev MACIFactory interface + */ +interface IMACIFactory { + // Verifying Key Registry containing zk circuit parameters + function vkRegistry() external view returns (IVkRegistry); + + // All the factory contracts used to deploy Poll, Tally, MessageProcessor, Subsidy + function factories() external view returns (MACICommon.Factories memory); + + // verifier is used when creating Tally, MessageProcessor, Subsidy + function verifier() external view returns (IVerifier); + + // poll parameters + function stateTreeDepth() external view returns (uint8); + function treeDepths() external view returns (Params.TreeDepths memory); + + function getMessageBatchSize(uint8 _messageTreeSubDepth) external pure + returns(uint256 _messageBatchSize); + + function TREE_ARITY() external pure returns (uint256); + + function deployMaci( + SignUpGatekeeper signUpGatekeeper, + InitialVoiceCreditProxy initialVoiceCreditProxy, + address topupCredit, + uint256 duration, + address coordinator, + DomainObjs.PubKey calldata coordinatorPubKey, + address maciOwner + ) external returns (MACI _maci, MACI.PollContracts memory _pollContracts); +} diff --git a/contracts/contracts/recipientRegistry/BaseRecipientRegistry.sol b/contracts/contracts/recipientRegistry/BaseRecipientRegistry.sol index 6cd022472..8215fce92 100644 --- a/contracts/contracts/recipientRegistry/BaseRecipientRegistry.sol +++ b/contracts/contracts/recipientRegistry/BaseRecipientRegistry.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-3.0 -pragma solidity 0.6.12; +pragma solidity ^0.8.10; import './IRecipientRegistry.sol'; diff --git a/contracts/contracts/recipientRegistry/IKlerosGTCR.sol b/contracts/contracts/recipientRegistry/IKlerosGTCR.sol index 68ab08acc..6eda6f7cb 100644 --- a/contracts/contracts/recipientRegistry/IKlerosGTCR.sol +++ b/contracts/contracts/recipientRegistry/IKlerosGTCR.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-3.0 -pragma solidity ^0.6.12; +pragma solidity ^0.8.10; /** * @dev Interface for Kleros Generalized TCR. diff --git a/contracts/contracts/recipientRegistry/IRecipientRegistry.sol b/contracts/contracts/recipientRegistry/IRecipientRegistry.sol index 1ccea8561..3f139948e 100644 --- a/contracts/contracts/recipientRegistry/IRecipientRegistry.sol +++ b/contracts/contracts/recipientRegistry/IRecipientRegistry.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-3.0 -pragma solidity ^0.6.12; +pragma solidity ^0.8.10; /** * @dev Interface of the recipient registry. diff --git a/contracts/contracts/recipientRegistry/KlerosGTCRAdapter.sol b/contracts/contracts/recipientRegistry/KlerosGTCRAdapter.sol index 344b981ef..2bf70bd6d 100644 --- a/contracts/contracts/recipientRegistry/KlerosGTCRAdapter.sol +++ b/contracts/contracts/recipientRegistry/KlerosGTCRAdapter.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-3.0 -pragma solidity ^0.6.12; +pragma solidity ^0.8.10; import 'solidity-rlp/contracts/RLPReader.sol'; @@ -43,7 +43,6 @@ contract KlerosGTCRAdapter is BaseRecipientRegistry { IKlerosGTCR _tcr, address _controller ) - public { tcr = _tcr; controller = _controller; diff --git a/contracts/contracts/recipientRegistry/KlerosGTCRMock.sol b/contracts/contracts/recipientRegistry/KlerosGTCRMock.sol index 88505c3c6..abbc9bd16 100644 --- a/contracts/contracts/recipientRegistry/KlerosGTCRMock.sol +++ b/contracts/contracts/recipientRegistry/KlerosGTCRMock.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MIT -pragma solidity ^0.6.12; +pragma solidity ^0.8.10; import '@openzeppelin/contracts/access/Ownable.sol'; @@ -77,7 +77,7 @@ contract KlerosGTCRMock is Ownable { constructor( string memory _registrationMetaEvidence, string memory _clearingMetaEvidence - ) public { + ) { emit MetaEvidence(0, _registrationMetaEvidence); emit MetaEvidence(1, _clearingMetaEvidence); } diff --git a/contracts/contracts/recipientRegistry/OptimisticRecipientRegistry.sol b/contracts/contracts/recipientRegistry/OptimisticRecipientRegistry.sol index d10afe677..8bc331dbb 100644 --- a/contracts/contracts/recipientRegistry/OptimisticRecipientRegistry.sol +++ b/contracts/contracts/recipientRegistry/OptimisticRecipientRegistry.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-3.0 -pragma solidity 0.6.12; +pragma solidity ^0.8.10; import '@openzeppelin/contracts/access/Ownable.sol'; @@ -59,7 +59,6 @@ contract OptimisticRecipientRegistry is Ownable, BaseRecipientRegistry { uint256 _challengePeriodDuration, address _controller ) - public { baseDeposit = _baseDeposit; challengePeriodDuration = _challengePeriodDuration; @@ -103,7 +102,7 @@ contract OptimisticRecipientRegistry is Ownable, BaseRecipientRegistry { require(msg.value == baseDeposit, 'RecipientRegistry: Incorrect deposit amount'); requests[recipientId] = Request( RequestType.Registration, - msg.sender, + payable(msg.sender), block.timestamp, msg.value, _recipient, @@ -132,7 +131,7 @@ contract OptimisticRecipientRegistry is Ownable, BaseRecipientRegistry { require(msg.value == baseDeposit, 'RecipientRegistry: Incorrect deposit amount'); requests[_recipientId] = Request( RequestType.Removal, - msg.sender, + payable(msg.sender), block.timestamp, msg.value, address(0), diff --git a/contracts/contracts/recipientRegistry/PermissionedRecipientRegistry.sol b/contracts/contracts/recipientRegistry/PermissionedRecipientRegistry.sol index 744c31b6f..3833f3f77 100644 --- a/contracts/contracts/recipientRegistry/PermissionedRecipientRegistry.sol +++ b/contracts/contracts/recipientRegistry/PermissionedRecipientRegistry.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-3.0 -pragma solidity 0.6.12; +pragma solidity ^0.8.10; import '@openzeppelin/contracts/access/Ownable.sol'; @@ -59,7 +59,6 @@ contract PermissionedRecipientRegistry is Ownable, BaseRecipientRegistry { uint256 _challengePeriodDuration, address _controller ) - public { baseDeposit = _baseDeposit; challengePeriodDuration = _challengePeriodDuration; @@ -103,7 +102,7 @@ contract PermissionedRecipientRegistry is Ownable, BaseRecipientRegistry { require(msg.value == baseDeposit, 'RecipientRegistry: Incorrect deposit amount'); requests[recipientId] = Request( RequestType.Registration, - msg.sender, + payable(msg.sender), block.timestamp, msg.value, _recipient, @@ -132,7 +131,7 @@ contract PermissionedRecipientRegistry is Ownable, BaseRecipientRegistry { require(msg.value == baseDeposit, 'RecipientRegistry: Incorrect deposit amount'); requests[_recipientId] = Request( RequestType.Removal, - msg.sender, + payable(msg.sender), block.timestamp, msg.value, address(0), diff --git a/contracts/contracts/recipientRegistry/SimpleRecipientRegistry.sol b/contracts/contracts/recipientRegistry/SimpleRecipientRegistry.sol index efa40a093..bd273cea1 100644 --- a/contracts/contracts/recipientRegistry/SimpleRecipientRegistry.sol +++ b/contracts/contracts/recipientRegistry/SimpleRecipientRegistry.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-3.0 -pragma solidity ^0.6.12; +pragma solidity ^0.8.10; import '@openzeppelin/contracts/access/Ownable.sol'; @@ -31,7 +31,6 @@ contract SimpleRecipientRegistry is Ownable, BaseRecipientRegistry { constructor( address _controller ) - public { controller = _controller; } diff --git a/contracts/contracts/snarkVerifiers/BatchUpdateStateTreeVerifier.sol b/contracts/contracts/snarkVerifiers/BatchUpdateStateTreeVerifier.sol deleted file mode 100644 index f34141878..000000000 --- a/contracts/contracts/snarkVerifiers/BatchUpdateStateTreeVerifier.sol +++ /dev/null @@ -1,246 +0,0 @@ -// SPDX-License-Identifier: MIT - -// Copyright 2017 Christian Reitwiessner -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to -// deal in the Software without restriction, including without limitation the -// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -// sell copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS -// IN THE SOFTWARE. - -// 2019 OKIMS - -pragma solidity ^0.6.12; - -library Pairing { - - uint256 constant PRIME_Q = 21888242871839275222246405745257275088696311157297823662689037894645226208583; - - struct G1Point { - uint256 X; - uint256 Y; - } - - // Encoding of field elements is: X[0] * z + X[1] - struct G2Point { - uint256[2] X; - uint256[2] Y; - } - - /* - * @return The negation of p, i.e. p.plus(p.negate()) should be zero. - */ - function negate(G1Point memory p) internal pure returns (G1Point memory) { - - // The prime q in the base field F_q for G1 - if (p.X == 0 && p.Y == 0) { - return G1Point(0, 0); - } else { - return G1Point(p.X, PRIME_Q - (p.Y % PRIME_Q)); - } - } - - /* - * @return The sum of two points of G1 - */ - function plus( - G1Point memory p1, - G1Point memory p2 - ) internal view returns (G1Point memory r) { - - uint256[4] memory input; - input[0] = p1.X; - input[1] = p1.Y; - input[2] = p2.X; - input[3] = p2.Y; - bool success; - - // solium-disable-next-line security/no-inline-assembly - assembly { - success := staticcall(sub(gas(), 2000), 6, input, 0xc0, r, 0x60) - // Use "invalid" to make gas estimation work - switch success case 0 { invalid() } - } - - require(success,"pairing-add-failed"); - } - - /* - * @return The product of a point on G1 and a scalar, i.e. - * p == p.scalar_mul(1) and p.plus(p) == p.scalar_mul(2) for all - * points p. - */ - function scalar_mul(G1Point memory p, uint256 s) internal view returns (G1Point memory r) { - - uint256[3] memory input; - input[0] = p.X; - input[1] = p.Y; - input[2] = s; - bool success; - // solium-disable-next-line security/no-inline-assembly - assembly { - success := staticcall(sub(gas(), 2000), 7, input, 0x80, r, 0x60) - // Use "invalid" to make gas estimation work - switch success case 0 { invalid() } - } - require (success,"pairing-mul-failed"); - } - - /* @return The result of computing the pairing check - * e(p1[0], p2[0]) * .... * e(p1[n], p2[n]) == 1 - * For example, - * pairing([P1(), P1().negate()], [P2(), P2()]) should return true. - */ - function pairing( - G1Point memory a1, - G2Point memory a2, - G1Point memory b1, - G2Point memory b2, - G1Point memory c1, - G2Point memory c2, - G1Point memory d1, - G2Point memory d2 - ) internal view returns (bool) { - - G1Point[4] memory p1 = [a1, b1, c1, d1]; - G2Point[4] memory p2 = [a2, b2, c2, d2]; - - uint256 inputSize = 24; - uint256[] memory input = new uint256[](inputSize); - - for (uint256 i = 0; i < 4; i++) { - uint256 j = i * 6; - input[j + 0] = p1[i].X; - input[j + 1] = p1[i].Y; - input[j + 2] = p2[i].X[0]; - input[j + 3] = p2[i].X[1]; - input[j + 4] = p2[i].Y[0]; - input[j + 5] = p2[i].Y[1]; - } - - uint256[1] memory out; - bool success; - - // solium-disable-next-line security/no-inline-assembly - assembly { - success := staticcall(sub(gas(), 2000), 8, add(input, 0x20), mul(inputSize, 0x20), out, 0x20) - // Use "invalid" to make gas estimation work - switch success case 0 { invalid() } - } - - require(success,"pairing-opcode-failed"); - - return out[0] != 0; - } -} - -contract BatchUpdateStateTreeVerifier { - - using Pairing for *; - - uint256 constant SNARK_SCALAR_FIELD = 21888242871839275222246405745257275088548364400416034343698204186575808495617; - uint256 constant PRIME_Q = 21888242871839275222246405745257275088696311157297823662689037894645226208583; - - struct VerifyingKey { - Pairing.G1Point alpha1; - Pairing.G2Point beta2; - Pairing.G2Point gamma2; - Pairing.G2Point delta2; - Pairing.G1Point[17] IC; - } - - struct Proof { - Pairing.G1Point A; - Pairing.G2Point B; - Pairing.G1Point C; - } - - function verifyingKey() internal pure returns (VerifyingKey memory vk) { - vk.alpha1 = Pairing.G1Point(uint256(8023132588245056084381987891043043826461059931552067709318264903932815879902),uint256(20072067851748979121302437451512078645507459299862790013260601133436067250465)); - vk.beta2 = Pairing.G2Point([uint256(8776596780152580357834840947065367090564266719231738843486831492239088702100),uint256(2098827568933174633712729957680147811785957638905260881625028047649430733771)], [uint256(1130324400703569007398482292422739226029714121302716930443655414806452244008),uint256(1554496725893928866280515501351891090468601616517791807104132296822506230517)]); - vk.gamma2 = Pairing.G2Point([uint256(21794722627530163121147384785101259127251796988635526940447761027019620560972),uint256(11669013075857287569223852428104990419865728508084310588647896924443753946529)], [uint256(15828404727526159041305269942916979015767199749419876382138938787379138353861),uint256(16921028011300782447540886372408595679184740957930030652147189744368546964176)]); - vk.delta2 = Pairing.G2Point([uint256(16646191542604346123327435753992512532664508997347585759523033467482490319366),uint256(6819165626942119296453703452126524750228221553152178520014430208549277713815)], [uint256(20312793436173935311163054260433832834896569638350210076984340502892459883640),uint256(9080934942556385525524491630289963306626673521237345563698519561297434531834)]); - vk.IC[0] = Pairing.G1Point(uint256(6609326620954095817109632797503036595250289984857450481377675131055944802600),uint256(15859067641801156980777534991665682656006004134138068528483628963811028416754)); - vk.IC[1] = Pairing.G1Point(uint256(3903320927682210738161083802535431772598063750158785961648242885790966139469),uint256(4429510984459177683020064460887315850131860884766699907715305368364626401635)); - vk.IC[2] = Pairing.G1Point(uint256(3307149862238849309914312752245920173095022640711582456468131961831613690776),uint256(8145223865063717565333216223585297645345943654657586031504888952424901781284)); - vk.IC[3] = Pairing.G1Point(uint256(19296072903728731042202145346428898058857592158609590440144311325860237323153),uint256(12977234920410315015814854235224756124501494692244524183110551515312999703489)); - vk.IC[4] = Pairing.G1Point(uint256(2299549407402768923578080434233820923944747549401550307146244096230024835670),uint256(11454697293315626493838496992744496466082696246432496722179154517672750769080)); - vk.IC[5] = Pairing.G1Point(uint256(21192730793045330155651857270767390717318825191928566003294021743259676417861),uint256(7093439151393904093289832341188263198948385224748550753184465907421274356034)); - vk.IC[6] = Pairing.G1Point(uint256(7322112701877331586155695931503722791895934394402888693228431947224746813450),uint256(17608636909643581023593273284330934738444803210282260020662372751950293467017)); - vk.IC[7] = Pairing.G1Point(uint256(8565761666468354108215670411297787212097194512901300330707993080786520064887),uint256(19326513294735896092860626310371491818475871321565576202102049804578162595238)); - vk.IC[8] = Pairing.G1Point(uint256(7009716517681001749502905632106645200200352405976728673849244044650802951044),uint256(12689923035544327591908917071809007904541929903630474075278588980657428353897)); - vk.IC[9] = Pairing.G1Point(uint256(3635203484529678196898445813259680685496623497256426121016430200381357762607),uint256(13660571790696161319245879172053049256833052258646825926537270127620946385943)); - vk.IC[10] = Pairing.G1Point(uint256(4167025165720389586384528203304296796499392386159326353029913764015033483912),uint256(6888529101598262407705659066244378839074671181134986592699568442015065332304)); - vk.IC[11] = Pairing.G1Point(uint256(8428357466052237489230030108794940178402799970448759180676563906944650125168),uint256(8554341726262538325447106648220228120946216259516589560322516767079031334825)); - vk.IC[12] = Pairing.G1Point(uint256(13615988994639247876470242912645583420712560408764847159007423005893922551963),uint256(10354477135650598617547179938476622334380578461807517777945621840307824887747)); - vk.IC[13] = Pairing.G1Point(uint256(11244887424743242134790362492888034102721010830375948210137064822934977326952),uint256(17684187313026489492597429802881293612871932656553906991947013304148278603540)); - vk.IC[14] = Pairing.G1Point(uint256(13392824161217052157628920383952851932198250600058517703105246603679131515622),uint256(13943914136051075406125306264869359397235472689493773270207541760515998856232)); - vk.IC[15] = Pairing.G1Point(uint256(18178226072249078502407888038847995091511471370429326449078455540186037496452),uint256(160690850339346681295704186048821942090651855750485321276656089035394429567)); - vk.IC[16] = Pairing.G1Point(uint256(14884616765097466375757598441061965217839403493063361590848540040873391299658),uint256(5453307143362355367485616386262822946337860281980306853111269260524673153786)); - - } - - /* - * @returns Whether the proof is valid given the hardcoded verifying key - * above and the public inputs - */ - function verifyProof( - uint256[2] memory a, - uint256[2][2] memory b, - uint256[2] memory c, - uint256[] memory input - ) public view returns (bool) { - - Proof memory proof; - proof.A = Pairing.G1Point(a[0], a[1]); - proof.B = Pairing.G2Point([b[0][0], b[0][1]], [b[1][0], b[1][1]]); - proof.C = Pairing.G1Point(c[0], c[1]); - - VerifyingKey memory vk = verifyingKey(); - - // Compute the linear combination vk_x - Pairing.G1Point memory vk_x = Pairing.G1Point(0, 0); - - // Make sure that proof.A, B, and C are each less than the prime q - require(proof.A.X < PRIME_Q, "verifier-aX-gte-prime-q"); - require(proof.A.Y < PRIME_Q, "verifier-aY-gte-prime-q"); - - require(proof.B.X[0] < PRIME_Q, "verifier-bX0-gte-prime-q"); - require(proof.B.Y[0] < PRIME_Q, "verifier-bY0-gte-prime-q"); - - require(proof.B.X[1] < PRIME_Q, "verifier-bX1-gte-prime-q"); - require(proof.B.Y[1] < PRIME_Q, "verifier-bY1-gte-prime-q"); - - require(proof.C.X < PRIME_Q, "verifier-cX-gte-prime-q"); - require(proof.C.Y < PRIME_Q, "verifier-cY-gte-prime-q"); - - // Make sure that every input is less than the snark scalar field - //for (uint256 i = 0; i < input.length; i++) { - for (uint256 i = 0; i < 16; i++) { - require(input[i] < SNARK_SCALAR_FIELD,"verifier-gte-snark-scalar-field"); - vk_x = Pairing.plus(vk_x, Pairing.scalar_mul(vk.IC[i + 1], input[i])); - } - - vk_x = Pairing.plus(vk_x, vk.IC[0]); - - return Pairing.pairing( - Pairing.negate(proof.A), - proof.B, - vk.alpha1, - vk.beta2, - vk_x, - vk.gamma2, - proof.C, - vk.delta2 - ); - } -} diff --git a/contracts/contracts/snarkVerifiers/BatchUpdateStateTreeVerifier32.sol b/contracts/contracts/snarkVerifiers/BatchUpdateStateTreeVerifier32.sol deleted file mode 100644 index 5340f7cf4..000000000 --- a/contracts/contracts/snarkVerifiers/BatchUpdateStateTreeVerifier32.sol +++ /dev/null @@ -1,254 +0,0 @@ -// SPDX-License-Identifier: MIT - -// Copyright 2017 Christian Reitwiessner -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to -// deal in the Software without restriction, including without limitation the -// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -// sell copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS -// IN THE SOFTWARE. - -// 2019 OKIMS - -pragma solidity ^0.6.12; - -library Pairing { - - uint256 constant PRIME_Q = 21888242871839275222246405745257275088696311157297823662689037894645226208583; - - struct G1Point { - uint256 X; - uint256 Y; - } - - // Encoding of field elements is: X[0] * z + X[1] - struct G2Point { - uint256[2] X; - uint256[2] Y; - } - - /* - * @return The negation of p, i.e. p.plus(p.negate()) should be zero. - */ - function negate(G1Point memory p) internal pure returns (G1Point memory) { - - // The prime q in the base field F_q for G1 - if (p.X == 0 && p.Y == 0) { - return G1Point(0, 0); - } else { - return G1Point(p.X, PRIME_Q - (p.Y % PRIME_Q)); - } - } - - /* - * @return The sum of two points of G1 - */ - function plus( - G1Point memory p1, - G1Point memory p2 - ) internal view returns (G1Point memory r) { - - uint256[4] memory input; - input[0] = p1.X; - input[1] = p1.Y; - input[2] = p2.X; - input[3] = p2.Y; - bool success; - - // solium-disable-next-line security/no-inline-assembly - assembly { - success := staticcall(sub(gas(), 2000), 6, input, 0xc0, r, 0x60) - // Use "invalid" to make gas estimation work - switch success case 0 { invalid() } - } - - require(success,"pairing-add-failed"); - } - - /* - * @return The product of a point on G1 and a scalar, i.e. - * p == p.scalar_mul(1) and p.plus(p) == p.scalar_mul(2) for all - * points p. - */ - function scalar_mul(G1Point memory p, uint256 s) internal view returns (G1Point memory r) { - - uint256[3] memory input; - input[0] = p.X; - input[1] = p.Y; - input[2] = s; - bool success; - // solium-disable-next-line security/no-inline-assembly - assembly { - success := staticcall(sub(gas(), 2000), 7, input, 0x80, r, 0x60) - // Use "invalid" to make gas estimation work - switch success case 0 { invalid() } - } - require (success,"pairing-mul-failed"); - } - - /* @return The result of computing the pairing check - * e(p1[0], p2[0]) * .... * e(p1[n], p2[n]) == 1 - * For example, - * pairing([P1(), P1().negate()], [P2(), P2()]) should return true. - */ - function pairing( - G1Point memory a1, - G2Point memory a2, - G1Point memory b1, - G2Point memory b2, - G1Point memory c1, - G2Point memory c2, - G1Point memory d1, - G2Point memory d2 - ) internal view returns (bool) { - - G1Point[4] memory p1 = [a1, b1, c1, d1]; - G2Point[4] memory p2 = [a2, b2, c2, d2]; - - uint256 inputSize = 24; - uint256[] memory input = new uint256[](inputSize); - - for (uint256 i = 0; i < 4; i++) { - uint256 j = i * 6; - input[j + 0] = p1[i].X; - input[j + 1] = p1[i].Y; - input[j + 2] = p2[i].X[0]; - input[j + 3] = p2[i].X[1]; - input[j + 4] = p2[i].Y[0]; - input[j + 5] = p2[i].Y[1]; - } - - uint256[1] memory out; - bool success; - - // solium-disable-next-line security/no-inline-assembly - assembly { - success := staticcall(sub(gas(), 2000), 8, add(input, 0x20), mul(inputSize, 0x20), out, 0x20) - // Use "invalid" to make gas estimation work - switch success case 0 { invalid() } - } - - require(success,"pairing-opcode-failed"); - - return out[0] != 0; - } -} - -contract BatchUpdateStateTreeVerifier32 { - - using Pairing for *; - - uint256 constant SNARK_SCALAR_FIELD = 21888242871839275222246405745257275088548364400416034343698204186575808495617; - uint256 constant PRIME_Q = 21888242871839275222246405745257275088696311157297823662689037894645226208583; - - struct VerifyingKey { - Pairing.G1Point alpha1; - Pairing.G2Point beta2; - Pairing.G2Point gamma2; - Pairing.G2Point delta2; - Pairing.G1Point[25] IC; - } - - struct Proof { - Pairing.G1Point A; - Pairing.G2Point B; - Pairing.G1Point C; - } - - function verifyingKey() internal pure returns (VerifyingKey memory vk) { - vk.alpha1 = Pairing.G1Point(uint256(2235937757258328332581655207316854914340553041478756749021922386043254497665),uint256(11720695076632845600035435519386961195137050119051159881119328470568375901061)); - vk.beta2 = Pairing.G2Point([uint256(18103312586997372723464065125468726628197103937398148351874079500906002078514),uint256(3521241463040229090496972414283999306378042701894409495991649947043913050390)], [uint256(19929222577579677319710308208655935830382430571925744018028233535451768572526),uint256(2713488580683808567223254461296987686393416756219077378633699157752784449871)]); - vk.gamma2 = Pairing.G2Point([uint256(18540033106735871504246221953284252727449583113344978088798752551559197497443),uint256(11804507394712288367663827325809152799963322749311995594214433375808748914215)], [uint256(7823444017721090114052934461767123920657200397414318893992672133734334584881),uint256(381539947305595214533183072009982233806337443107151710535066901935181836650)]); - vk.delta2 = Pairing.G2Point([uint256(13777830633300304139191093890421583212822007120835768179730867378433207369904),uint256(5829308442558755354882021024059658392511579302722950339672751965830178369479)], [uint256(3247971301408566159364701679393539201504071675477219748559808130461833317206),uint256(20333401927295807868473825746451131502855146064139046665350946639946989255290)]); - vk.IC[0] = Pairing.G1Point(uint256(12695296843741290243689381493557344935288860265047293012366283732179354585998),uint256(8756234222257929396036211927997035681483199097361823776457523938231702657637)); - vk.IC[1] = Pairing.G1Point(uint256(19427060885837198291358374320196723084935525206551352881413292228008641375494),uint256(17830025099056800507919694199083128206588010134164569106894828438761905032458)); - vk.IC[2] = Pairing.G1Point(uint256(410478146407936532689270128315003070671881564424239715170777648878967168005),uint256(19810008246942770361558893286482792592821114623562524395734095279442205700805)); - vk.IC[3] = Pairing.G1Point(uint256(16927932954172000562734191935150272341340300065159146447389567055435697197896),uint256(7080985430376548388712273850247201104283444559574087251008037877021942324388)); - vk.IC[4] = Pairing.G1Point(uint256(16230357772827331182078389034367129255766008017458394951654453835970997773946),uint256(14390597016939564779231872532412964300980781945004466358993998728674970309401)); - vk.IC[5] = Pairing.G1Point(uint256(13714106385150866732996352043897273245837658980446605229373226331378168393032),uint256(486150390705720151962722842770974288776559483789878327517085343215375560197)); - vk.IC[6] = Pairing.G1Point(uint256(17768923331894319515675582767948565732688231025317939555708699614152398211686),uint256(8499610897814284712396152304339583329559266108913886418999627219565622002315)); - vk.IC[7] = Pairing.G1Point(uint256(14415647971716124875365599377021987010020281756838687529386783498764570820512),uint256(14613451060692886380252911494947779806626467670508276424823896732115700932878)); - vk.IC[8] = Pairing.G1Point(uint256(16764983637282451325253712526116676245825038387105887732952918407603662725617),uint256(1352524463256846201723591130214587605935782520895303289524343032854923110908)); - vk.IC[9] = Pairing.G1Point(uint256(10056087566202527332631589268663832673613483884145297923102443097932637361605),uint256(16730779773798332173061611611644870364986949778018646363117835815193258915616)); - vk.IC[10] = Pairing.G1Point(uint256(13290900503321714658935311585568872029990198888697506684512806338887123938831),uint256(8114386552118049168577883416679077864672808493670718294274215610717572843963)); - vk.IC[11] = Pairing.G1Point(uint256(7782896038733621968832942200150060348729169883217332185424996914395075738032),uint256(20682377337106534901146812854074383535826740744181459358117072396602346484606)); - vk.IC[12] = Pairing.G1Point(uint256(617901749705332346513537208464626960953097676177271170612675508795831094045),uint256(16186736174707113904460258035003488129644568973675010912669231698078479023222)); - vk.IC[13] = Pairing.G1Point(uint256(14477430187013369520618676362674934644081527218666492121095639975702523047093),uint256(13914336563460888476578316933419114155531706131840740221252768233483396324368)); - vk.IC[14] = Pairing.G1Point(uint256(5924187723811910208644055167942297972031087776772786313548743929893285133800),uint256(16361662290370920310451572623845118040008422660307051722847580146457871736989)); - vk.IC[15] = Pairing.G1Point(uint256(17090166758717550052215882897464335068092945362735421722892605678597646540057),uint256(16398300913997240579023943771253062149083261407674822502769328439978123578689)); - vk.IC[16] = Pairing.G1Point(uint256(7574674900722229272749996430153170469828315370484171764654649633984135615279),uint256(5069496413177806803124281195026969110815809700378025228167702995573586665836)); - vk.IC[17] = Pairing.G1Point(uint256(10441721171682792688941253005732564080622492912137608063443699246450315451923),uint256(15398991661933253947425996624904544110556542286879829919064231912826539570526)); - vk.IC[18] = Pairing.G1Point(uint256(17674413698382420009917026819492643888193304168981044450949863673048991538414),uint256(9527495908817414334530454481572961657315487660716656106473790248118706961070)); - vk.IC[19] = Pairing.G1Point(uint256(1305107076420532159069082995140140252760452422131801890994478405555848637105),uint256(20641138567711443797973886773618825716028720528130685248162815978012474008318)); - vk.IC[20] = Pairing.G1Point(uint256(20823282309713566159682969445806802229330524100205102112933548669175660181229),uint256(1585818072534898485010386083641472744958777764688589865815398129584392257276)); - vk.IC[21] = Pairing.G1Point(uint256(8602838104248160338689652217659749853668007141927006509298162439781733248626),uint256(3031659185416842164642200249451988498992828231012099148797461669175568452385)); - vk.IC[22] = Pairing.G1Point(uint256(15062697778545981716015498304594399446175287977109202577788056450289044074530),uint256(14595426536584631660528478734922855298873285152019524939752258039412967085035)); - vk.IC[23] = Pairing.G1Point(uint256(9203110864527021095159434212260506563713459019946440113668834753150698387275),uint256(6633831390080912793725673980685906970380191858784131579135247042888943087524)); - vk.IC[24] = Pairing.G1Point(uint256(9703769305917897594120374760147891009572024854624222123846683638776025013089),uint256(16754141899540658922386431411326524911697563540800148668488844811424060636134)); - - } - - /* - * @returns Whether the proof is valid given the hardcoded verifying key - * above and the public inputs - */ - function verifyProof( - uint256[2] memory a, - uint256[2][2] memory b, - uint256[2] memory c, - uint256[] memory input - ) public view returns (bool) { - - Proof memory proof; - proof.A = Pairing.G1Point(a[0], a[1]); - proof.B = Pairing.G2Point([b[0][0], b[0][1]], [b[1][0], b[1][1]]); - proof.C = Pairing.G1Point(c[0], c[1]); - - VerifyingKey memory vk = verifyingKey(); - - // Compute the linear combination vk_x - Pairing.G1Point memory vk_x = Pairing.G1Point(0, 0); - - // Make sure that proof.A, B, and C are each less than the prime q - require(proof.A.X < PRIME_Q, "verifier-aX-gte-prime-q"); - require(proof.A.Y < PRIME_Q, "verifier-aY-gte-prime-q"); - - require(proof.B.X[0] < PRIME_Q, "verifier-bX0-gte-prime-q"); - require(proof.B.Y[0] < PRIME_Q, "verifier-bY0-gte-prime-q"); - - require(proof.B.X[1] < PRIME_Q, "verifier-bX1-gte-prime-q"); - require(proof.B.Y[1] < PRIME_Q, "verifier-bY1-gte-prime-q"); - - require(proof.C.X < PRIME_Q, "verifier-cX-gte-prime-q"); - require(proof.C.Y < PRIME_Q, "verifier-cY-gte-prime-q"); - - // Make sure that every input is less than the snark scalar field - //for (uint256 i = 0; i < input.length; i++) { - for (uint256 i = 0; i < 24; i++) { - require(input[i] < SNARK_SCALAR_FIELD,"verifier-gte-snark-scalar-field"); - vk_x = Pairing.plus(vk_x, Pairing.scalar_mul(vk.IC[i + 1], input[i])); - } - - vk_x = Pairing.plus(vk_x, vk.IC[0]); - - return Pairing.pairing( - Pairing.negate(proof.A), - proof.B, - vk.alpha1, - vk.beta2, - vk_x, - vk.gamma2, - proof.C, - vk.delta2 - ); - } -} \ No newline at end of file diff --git a/contracts/contracts/snarkVerifiers/BatchUpdateStateTreeVerifier32Batch16.sol b/contracts/contracts/snarkVerifiers/BatchUpdateStateTreeVerifier32Batch16.sol deleted file mode 100644 index 7450710a4..000000000 --- a/contracts/contracts/snarkVerifiers/BatchUpdateStateTreeVerifier32Batch16.sol +++ /dev/null @@ -1,270 +0,0 @@ -// SPDX-License-Identifier: MIT - -// Copyright 2017 Christian Reitwiessner -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to -// deal in the Software without restriction, including without limitation the -// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -// sell copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS -// IN THE SOFTWARE. - -// 2019 OKIMS - -pragma solidity ^0.6.12; - -library Pairing { - - uint256 constant PRIME_Q = 21888242871839275222246405745257275088696311157297823662689037894645226208583; - - struct G1Point { - uint256 X; - uint256 Y; - } - - // Encoding of field elements is: X[0] * z + X[1] - struct G2Point { - uint256[2] X; - uint256[2] Y; - } - - /* - * @return The negation of p, i.e. p.plus(p.negate()) should be zero. - */ - function negate(G1Point memory p) internal pure returns (G1Point memory) { - - // The prime q in the base field F_q for G1 - if (p.X == 0 && p.Y == 0) { - return G1Point(0, 0); - } else { - return G1Point(p.X, PRIME_Q - (p.Y % PRIME_Q)); - } - } - - /* - * @return The sum of two points of G1 - */ - function plus( - G1Point memory p1, - G1Point memory p2 - ) internal view returns (G1Point memory r) { - - uint256[4] memory input; - input[0] = p1.X; - input[1] = p1.Y; - input[2] = p2.X; - input[3] = p2.Y; - bool success; - - // solium-disable-next-line security/no-inline-assembly - assembly { - success := staticcall(sub(gas(), 2000), 6, input, 0xc0, r, 0x60) - // Use "invalid" to make gas estimation work - switch success case 0 { invalid() } - } - - require(success,"pairing-add-failed"); - } - - /* - * @return The product of a point on G1 and a scalar, i.e. - * p == p.scalar_mul(1) and p.plus(p) == p.scalar_mul(2) for all - * points p. - */ - function scalar_mul(G1Point memory p, uint256 s) internal view returns (G1Point memory r) { - - uint256[3] memory input; - input[0] = p.X; - input[1] = p.Y; - input[2] = s; - bool success; - // solium-disable-next-line security/no-inline-assembly - assembly { - success := staticcall(sub(gas(), 2000), 7, input, 0x80, r, 0x60) - // Use "invalid" to make gas estimation work - switch success case 0 { invalid() } - } - require (success,"pairing-mul-failed"); - } - - /* @return The result of computing the pairing check - * e(p1[0], p2[0]) * .... * e(p1[n], p2[n]) == 1 - * For example, - * pairing([P1(), P1().negate()], [P2(), P2()]) should return true. - */ - function pairing( - G1Point memory a1, - G2Point memory a2, - G1Point memory b1, - G2Point memory b2, - G1Point memory c1, - G2Point memory c2, - G1Point memory d1, - G2Point memory d2 - ) internal view returns (bool) { - - G1Point[4] memory p1 = [a1, b1, c1, d1]; - G2Point[4] memory p2 = [a2, b2, c2, d2]; - - uint256 inputSize = 24; - uint256[] memory input = new uint256[](inputSize); - - for (uint256 i = 0; i < 4; i++) { - uint256 j = i * 6; - input[j + 0] = p1[i].X; - input[j + 1] = p1[i].Y; - input[j + 2] = p2[i].X[0]; - input[j + 3] = p2[i].X[1]; - input[j + 4] = p2[i].Y[0]; - input[j + 5] = p2[i].Y[1]; - } - - uint256[1] memory out; - bool success; - - // solium-disable-next-line security/no-inline-assembly - assembly { - success := staticcall(sub(gas(), 2000), 8, add(input, 0x20), mul(inputSize, 0x20), out, 0x20) - // Use "invalid" to make gas estimation work - switch success case 0 { invalid() } - } - - require(success,"pairing-opcode-failed"); - - return out[0] != 0; - } -} - -contract BatchUpdateStateTreeVerifier32Batch16 { - - using Pairing for *; - - uint256 constant SNARK_SCALAR_FIELD = 21888242871839275222246405745257275088548364400416034343698204186575808495617; - uint256 constant PRIME_Q = 21888242871839275222246405745257275088696311157297823662689037894645226208583; - - struct VerifyingKey { - Pairing.G1Point alpha1; - Pairing.G2Point beta2; - Pairing.G2Point gamma2; - Pairing.G2Point delta2; - Pairing.G1Point[41] IC; - } - - struct Proof { - Pairing.G1Point A; - Pairing.G2Point B; - Pairing.G1Point C; - } - - function verifyingKey() internal pure returns (VerifyingKey memory vk) { - vk.alpha1 = Pairing.G1Point(uint256(17564466972987208178905070198019717960990774560424996549632340406571921270135),uint256(6212564911154525198736769572109918484573926992228075175561121911305420747892)); - vk.beta2 = Pairing.G2Point([uint256(19862806046850266517918019458699375042492414007810580051130360096409146797114),uint256(18968182867766566527308258731979440721408347503223170931357675093063900018998)], [uint256(15869963506744343382954688098759615756353669448820636651988694593208220260541),uint256(17415631041899920918759548249552784090262638044632769170520738845364398275366)]); - vk.gamma2 = Pairing.G2Point([uint256(11257253160245273080869306676658832074325489738113181602057846648381137371076),uint256(397473356291690562654977459050659929392435262209846402221339197403868900174)], [uint256(15964627439216663086041856051177544908720747472786343019771626700991693030486),uint256(6022076246583820501204467975945998225634462297953032723555607903078152261782)]); - vk.delta2 = Pairing.G2Point([uint256(8960304480954470322423292821010723559000712087743155784344677845709031842356),uint256(4733214216315583653992596764777849980658452927149554703439675897776902590030)], [uint256(5883145061333084001583838147325844327393273269643138829803996465957380959561),uint256(6556416943678009124760019244975816690522642072024061675141905579498114037881)]); - vk.IC[0] = Pairing.G1Point(uint256(20573688474783321846811030145444435978946625455817040976400110171429717762313),uint256(14219795410675122323711179893760742300342532333476317858787056167262160908937)); - vk.IC[1] = Pairing.G1Point(uint256(16042051692957428703650515029444172293895511179110788253133560310150814316357),uint256(17413331071024005080031335036071091790041478145914042688818908877361537279793)); - vk.IC[2] = Pairing.G1Point(uint256(4469309738798192251990686173604159186219995479238540395764540658446930749145),uint256(11574488575927551819587207552625323277821402181373682396813667332531657122576)); - vk.IC[3] = Pairing.G1Point(uint256(13663215469207902744973802514353956563905823199937005483772920223690579405487),uint256(14871215385058895610722549990927147904343728800816746147041918066710584226713)); - vk.IC[4] = Pairing.G1Point(uint256(3489292745098913386172335587317749246980343597777688754173176571645664598569),uint256(16900666770697929965250780969454193347188841711403509395696012994572983674828)); - vk.IC[5] = Pairing.G1Point(uint256(2945290910588501179672392707111211440991551718469541150674976815500282424963),uint256(14598879565524130705374188049646292346600280808118113951050422637050501514200)); - vk.IC[6] = Pairing.G1Point(uint256(1743907228984471502641556290643648078257956018892523942117108222472161514139),uint256(13546457107687734244831126558572113644917121420356142865411127965095244393366)); - vk.IC[7] = Pairing.G1Point(uint256(16239926623460462478853653011219290924924349984217262572113572728526722183948),uint256(6389572798636712055906110008459033979858910590912048163453532204275624832591)); - vk.IC[8] = Pairing.G1Point(uint256(4530655587139374397780646343900207609123290875354646335164468398273552121272),uint256(14128028354444670871720348761393076419788117867224991521747385291768930733900)); - vk.IC[9] = Pairing.G1Point(uint256(2084130186412291868004808742213302933245412886080440295285131766970403857381),uint256(13804644315777078738867680048258647864123013819623348345307968440653417669189)); - vk.IC[10] = Pairing.G1Point(uint256(18709486436861021941485824601602744556543964540298118932107637038300041246452),uint256(6227388549172304522473912467840752177496736905518667301640567961284075418436)); - vk.IC[11] = Pairing.G1Point(uint256(19122006749333320301608897562376816558619150023714623953742504350126075003788),uint256(1363782165044296870545293244929009318232323707960615856401281654383175898692)); - vk.IC[12] = Pairing.G1Point(uint256(5364413641687847338151532060627376981772485264434472923538886778626702553325),uint256(15629906454889243991306438607174696870420819153196924767318221349043732920137)); - vk.IC[13] = Pairing.G1Point(uint256(359121925809342098662374393566383044710271325511783297443508988005252057893),uint256(10811152193314929697376755563378270957694626213124806939092423550685049711334)); - vk.IC[14] = Pairing.G1Point(uint256(17981051144466785906880479913215952997275376146299543204378412051670626574122),uint256(9186797238560565226322431760068041435141486516483393586811312602762508934600)); - vk.IC[15] = Pairing.G1Point(uint256(6365374263154884818000869700803640946567044106549610402459455159852388744718),uint256(11797546156554134645751011447880999714231910885220716843380510034965755651040)); - vk.IC[16] = Pairing.G1Point(uint256(10032451025857463031715146956483534885580387223837889532345041361533387806339),uint256(3387493870558732227389076524589538808644245211636504330892809177455235677785)); - vk.IC[17] = Pairing.G1Point(uint256(2410612158467426620067995137390208949985066150538147153449069937898731808572),uint256(18521287304374984854388998234185412497698792859563570797864631992955274102818)); - vk.IC[18] = Pairing.G1Point(uint256(1813841176463493988104135613769097659002362073379920872551589566744485729425),uint256(6358940015006101246169889831008910886341927609866160536081376191976735620689)); - vk.IC[19] = Pairing.G1Point(uint256(19847081327301917802071509303149389020431564544248328496360668988278832485136),uint256(5211553418968503163058788485400452950515983724722138311061753467468280712633)); - vk.IC[20] = Pairing.G1Point(uint256(3426067802106052552538239688068111098552336356878690064196584551340276343362),uint256(16164134703700162701548772292563817322744059513730556911486018167068452826168)); - vk.IC[21] = Pairing.G1Point(uint256(8668312818069908501493412489204108759565349640063306306478085197244829974013),uint256(13810982784687518301385299461854703917878448472895644674481777667257255651320)); - vk.IC[22] = Pairing.G1Point(uint256(981077468077602291838374553840063429865380290334026656328300299263444718358),uint256(9119368190311983873098621061906337470424090352798797307268722991397740756160)); - vk.IC[23] = Pairing.G1Point(uint256(12527168323265871598354886691498363541846438222537709625367385945449773211746),uint256(2917118573022600221023372381853434922615408196327449576428539574935065403243)); - vk.IC[24] = Pairing.G1Point(uint256(10930278986094694298133371790221234279985134460531943692403668317610232742941),uint256(5862695788973409172672967320590899199162083486531717036727412479032235988065)); - vk.IC[25] = Pairing.G1Point(uint256(19143840440293111384177720404724681785293925298123626495518125552351038037165),uint256(7856520125014358900158196027676468930009418746941329024543565879388665656381)); - vk.IC[26] = Pairing.G1Point(uint256(6775239578044551661567862976069748513078619995670391427056172891956633265071),uint256(9284560981899345091778250628921565052467457991819815198504467006412459015751)); - vk.IC[27] = Pairing.G1Point(uint256(5437988353950279901669028370215493448328043979559724253975191086761262229143),uint256(8176067762582906031719418628593932629618591280530549530843556225763407224284)); - vk.IC[28] = Pairing.G1Point(uint256(14419631426965159557658781212186643724248390035688706768554749807493869120240),uint256(20829049296989859000251091454357109695901711580992440150395839575453171214015)); - vk.IC[29] = Pairing.G1Point(uint256(19608141634472932940433918240261639952962553934341785939122543569039402409141),uint256(13202356373118919099990439264234752617330284072473003408798579312466654945225)); - vk.IC[30] = Pairing.G1Point(uint256(6721446556587383910935961059312054388432394977522853801119708229959202737436),uint256(18874416278004109801516351556023467746164986339155152231450545308976800785800)); - vk.IC[31] = Pairing.G1Point(uint256(1121297910398623972014321595193328729838277331998467353747864490201136608978),uint256(5479532420089283113354607976800616803141032716983446523858749471234109786252)); - vk.IC[32] = Pairing.G1Point(uint256(467086760777282035652878041333579903278580939332416688170241256808993547575),uint256(13756152367683309448429375410787943224591772034678008033485038211776826923105)); - vk.IC[33] = Pairing.G1Point(uint256(544588907891071733780736623354853251736286846455666159919529736335009172121),uint256(19814174389629121597516552220557392671724772880943104553900974211505364673700)); - vk.IC[34] = Pairing.G1Point(uint256(9718043170262637281912309305033913756397788551277481886761502969350964449209),uint256(9928286376606476192337438359582609228172024954515187888460390683064495863566)); - vk.IC[35] = Pairing.G1Point(uint256(8833241059924366760602716054754193491983227264165402284693696886993482375792),uint256(20217437076969561492960066126914621838511190476542843609181381577334240082262)); - vk.IC[36] = Pairing.G1Point(uint256(21691301249544308137330827386088690246733997944828733953042133363071032775561),uint256(8416731669909969552797133391600423980357220150298256151928192993549593014572)); - vk.IC[37] = Pairing.G1Point(uint256(18591239855619987960480421772799014085639022706413599497355173036346631326229),uint256(19557170727169515145077122571593152129100237734331890620470088472162864118761)); - vk.IC[38] = Pairing.G1Point(uint256(3862906872967117807500943404548237031139970973065025611287515004824373974308),uint256(14763824391416574387650349848092354763656539119581187921054485482268328744531)); - vk.IC[39] = Pairing.G1Point(uint256(4581382328791187996308811405974001991040756459205750759173122039179987836596),uint256(14577738635095065315453864617647694757772478953718921634232796382928686688380)); - vk.IC[40] = Pairing.G1Point(uint256(17187231740479352852864198251137151477227537702159385928600612471898233918627),uint256(835160958364646681144544132626099284400020971025799680904837349622297335830)); - - } - - /* - * @returns Whether the proof is valid given the hardcoded verifying key - * above and the public inputs - */ - function verifyProof( - uint256[2] memory a, - uint256[2][2] memory b, - uint256[2] memory c, - uint256[] memory input - ) public view returns (bool) { - - Proof memory proof; - proof.A = Pairing.G1Point(a[0], a[1]); - proof.B = Pairing.G2Point([b[0][0], b[0][1]], [b[1][0], b[1][1]]); - proof.C = Pairing.G1Point(c[0], c[1]); - - VerifyingKey memory vk = verifyingKey(); - - // Compute the linear combination vk_x - Pairing.G1Point memory vk_x = Pairing.G1Point(0, 0); - - // Make sure that proof.A, B, and C are each less than the prime q - require(proof.A.X < PRIME_Q, "verifier-aX-gte-prime-q"); - require(proof.A.Y < PRIME_Q, "verifier-aY-gte-prime-q"); - - require(proof.B.X[0] < PRIME_Q, "verifier-bX0-gte-prime-q"); - require(proof.B.Y[0] < PRIME_Q, "verifier-bY0-gte-prime-q"); - - require(proof.B.X[1] < PRIME_Q, "verifier-bX1-gte-prime-q"); - require(proof.B.Y[1] < PRIME_Q, "verifier-bY1-gte-prime-q"); - - require(proof.C.X < PRIME_Q, "verifier-cX-gte-prime-q"); - require(proof.C.Y < PRIME_Q, "verifier-cY-gte-prime-q"); - - // Make sure that every input is less than the snark scalar field - //for (uint256 i = 0; i < input.length; i++) { - for (uint256 i = 0; i < 40; i++) { - require(input[i] < SNARK_SCALAR_FIELD,"verifier-gte-snark-scalar-field"); - vk_x = Pairing.plus(vk_x, Pairing.scalar_mul(vk.IC[i + 1], input[i])); - } - - vk_x = Pairing.plus(vk_x, vk.IC[0]); - - return Pairing.pairing( - Pairing.negate(proof.A), - proof.B, - vk.alpha1, - vk.beta2, - vk_x, - vk.gamma2, - proof.C, - vk.delta2 - ); - } -} diff --git a/contracts/contracts/snarkVerifiers/BatchUpdateStateTreeVerifierBatch64.sol b/contracts/contracts/snarkVerifiers/BatchUpdateStateTreeVerifierBatch64.sol deleted file mode 100644 index a6d6f798a..000000000 --- a/contracts/contracts/snarkVerifiers/BatchUpdateStateTreeVerifierBatch64.sol +++ /dev/null @@ -1,366 +0,0 @@ -// SPDX-License-Identifier: MIT - -// Copyright 2017 Christian Reitwiessner -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to -// deal in the Software without restriction, including without limitation the -// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -// sell copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS -// IN THE SOFTWARE. - -// 2019 OKIMS - -pragma solidity ^0.6.12; - -library Pairing { - - uint256 constant PRIME_Q = 21888242871839275222246405745257275088696311157297823662689037894645226208583; - - struct G1Point { - uint256 X; - uint256 Y; - } - - // Encoding of field elements is: X[0] * z + X[1] - struct G2Point { - uint256[2] X; - uint256[2] Y; - } - - /* - * @return The negation of p, i.e. p.plus(p.negate()) should be zero. - */ - function negate(G1Point memory p) internal pure returns (G1Point memory) { - - // The prime q in the base field F_q for G1 - if (p.X == 0 && p.Y == 0) { - return G1Point(0, 0); - } else { - return G1Point(p.X, PRIME_Q - (p.Y % PRIME_Q)); - } - } - - /* - * @return The sum of two points of G1 - */ - function plus( - G1Point memory p1, - G1Point memory p2 - ) internal view returns (G1Point memory r) { - - uint256[4] memory input; - input[0] = p1.X; - input[1] = p1.Y; - input[2] = p2.X; - input[3] = p2.Y; - bool success; - - // solium-disable-next-line security/no-inline-assembly - assembly { - success := staticcall(sub(gas(), 2000), 6, input, 0xc0, r, 0x60) - // Use "invalid" to make gas estimation work - switch success case 0 { invalid() } - } - - require(success,"pairing-add-failed"); - } - - /* - * @return The product of a point on G1 and a scalar, i.e. - * p == p.scalar_mul(1) and p.plus(p) == p.scalar_mul(2) for all - * points p. - */ - function scalar_mul(G1Point memory p, uint256 s) internal view returns (G1Point memory r) { - - uint256[3] memory input; - input[0] = p.X; - input[1] = p.Y; - input[2] = s; - bool success; - // solium-disable-next-line security/no-inline-assembly - assembly { - success := staticcall(sub(gas(), 2000), 7, input, 0x80, r, 0x60) - // Use "invalid" to make gas estimation work - switch success case 0 { invalid() } - } - require (success,"pairing-mul-failed"); - } - - /* @return The result of computing the pairing check - * e(p1[0], p2[0]) * .... * e(p1[n], p2[n]) == 1 - * For example, - * pairing([P1(), P1().negate()], [P2(), P2()]) should return true. - */ - function pairing( - G1Point memory a1, - G2Point memory a2, - G1Point memory b1, - G2Point memory b2, - G1Point memory c1, - G2Point memory c2, - G1Point memory d1, - G2Point memory d2 - ) internal view returns (bool) { - - G1Point[4] memory p1 = [a1, b1, c1, d1]; - G2Point[4] memory p2 = [a2, b2, c2, d2]; - - uint256 inputSize = 24; - uint256[] memory input = new uint256[](inputSize); - - for (uint256 i = 0; i < 4; i++) { - uint256 j = i * 6; - input[j + 0] = p1[i].X; - input[j + 1] = p1[i].Y; - input[j + 2] = p2[i].X[0]; - input[j + 3] = p2[i].X[1]; - input[j + 4] = p2[i].Y[0]; - input[j + 5] = p2[i].Y[1]; - } - - uint256[1] memory out; - bool success; - - // solium-disable-next-line security/no-inline-assembly - assembly { - success := staticcall(sub(gas(), 2000), 8, add(input, 0x20), mul(inputSize, 0x20), out, 0x20) - // Use "invalid" to make gas estimation work - switch success case 0 { invalid() } - } - - require(success,"pairing-opcode-failed"); - - return out[0] != 0; - } -} - -contract BatchUpdateStateTreeVerifierBatch64 { - - using Pairing for *; - - uint256 constant SNARK_SCALAR_FIELD = 21888242871839275222246405745257275088548364400416034343698204186575808495617; - uint256 constant PRIME_Q = 21888242871839275222246405745257275088696311157297823662689037894645226208583; - - struct VerifyingKey { - Pairing.G1Point alpha1; - Pairing.G2Point beta2; - Pairing.G2Point gamma2; - Pairing.G2Point delta2; - Pairing.G1Point[137] IC; - } - - struct Proof { - Pairing.G1Point A; - Pairing.G2Point B; - Pairing.G1Point C; - } - - function verifyingKey() internal pure returns (VerifyingKey memory vk) { - vk.alpha1 = Pairing.G1Point(uint256(20111080972059956339770330822842174014028834762406291931369219466654304651947),uint256(12617701555281079140502645308327272670695003907823882015559302949283468652265)); - vk.beta2 = Pairing.G2Point([uint256(13542344348353495181403994427087825307359707135045861990032896341194354804027),uint256(21495413117026630692390948489284050783642854854611941789985830749278288076019)], [uint256(14506113082745454888160012508724679162141302039154827891210912565820929074277),uint256(3350288264585300535086052300399402169962936857002440578169769772249674537321)]); - vk.gamma2 = Pairing.G2Point([uint256(1405893342850909592901993047116357102257777845904120854072918797353322262004),uint256(19039671411780007398709575658966632348032959209903650830372041924458096901884)], [uint256(10246278299067469558430169227798852211761712958408139619453971385803508820401),uint256(15610397642216218497160132307603098145221061848302396069439857040941724165478)]); - vk.delta2 = Pairing.G2Point([uint256(218449558449230811211684913120166693986265997555702745202050296498830988537),uint256(5407412409774150903042787049136199519480710038481547450708858944052764255898)], [uint256(11041661707049238194800418097140585648833245776885036685698406508603026023618),uint256(133760400102501241432017477738575766306011192481736590344059611691663304908)]); - vk.IC[0] = Pairing.G1Point(uint256(21154028465075083712658841897667003802526258215567114307761064418376815086215),uint256(1508603373580985357750185712435454283342822243681375102146040323901851882861)); - vk.IC[1] = Pairing.G1Point(uint256(17138670918452087442204333646184278115264761559617238017915185098227172982811),uint256(5611082957038412360589088211229082874946611618574538759210306439661299176945)); - vk.IC[2] = Pairing.G1Point(uint256(15390062030817469858239962767688560984963862923150691651695470714836749513537),uint256(2326278356592104332893498078974085120183205776960952327317801670322144268312)); - vk.IC[3] = Pairing.G1Point(uint256(670502483544788577495533106037306685680302193138027386568284657638217305162),uint256(13899932709234250089113138746199887493989716128773617251114173979406178685854)); - vk.IC[4] = Pairing.G1Point(uint256(1668858581160068229751170422086552283069112892923284875458714097455940271060),uint256(10963928549779385078551207286148560603493064860855479456777796037752746438821)); - vk.IC[5] = Pairing.G1Point(uint256(14443949715331357106440648501127551284419877012742935773796450280993895557950),uint256(7327092816369746696069608426307677295251675492358792703722654814347910670799)); - vk.IC[6] = Pairing.G1Point(uint256(5195131423503819493553434036524142715087086191307960034902232416510656885185),uint256(12954097701521836361385154063939800867915572539231767504727206187028067060316)); - vk.IC[7] = Pairing.G1Point(uint256(5014496811794396976665624820671057271105624005885691507118903143762222055653),uint256(2439861537398184499213246384674917439703377312852628599682703382994166713105)); - vk.IC[8] = Pairing.G1Point(uint256(4283779997045552072886989647120873562506891397517893101552024394063778228179),uint256(6797444259192627688173655690751340206418239290444353902720624326561114110758)); - vk.IC[9] = Pairing.G1Point(uint256(1764526698812192069022588686170356509360022164888258513593936487059961066941),uint256(17009662947771196235743594446075866146647869480629555603040823675969643779051)); - vk.IC[10] = Pairing.G1Point(uint256(4634044914106045971667518785339036534014121178220843446289537005542492308535),uint256(15546587576688521479105738976327958863746365837253142983784091540880955579980)); - vk.IC[11] = Pairing.G1Point(uint256(2715687604695872089734177102456674874291540185351660893793943298723076162023),uint256(8175293297644947591266018188895500373877148851930870966940114884237467841513)); - vk.IC[12] = Pairing.G1Point(uint256(20121655344011849412536946281011930004933787724346969597015929984774157832582),uint256(21105616102575587428032100019159228354467439290237984300855255375809452861700)); - vk.IC[13] = Pairing.G1Point(uint256(12196403456413067372907894607228547021168026355185769152640581456011640908115),uint256(21407951242918884928699901097047515520528209072349143202832003101963003432617)); - vk.IC[14] = Pairing.G1Point(uint256(5310579898763467707257750843874466287781776312027753089568037427631501300785),uint256(13656390395313566507812604343352575249308212454341840895399980715808616168680)); - vk.IC[15] = Pairing.G1Point(uint256(5228663941897766588851959590652190955458180715181587426615826411725401946424),uint256(17071465706070749339990865138715666296514424588111537608363813692692990940366)); - vk.IC[16] = Pairing.G1Point(uint256(21392686683745202445405791550348258910214506132555422218147448100798518012624),uint256(19973818140995305279304988251723192392522267302457604906450941473549909206005)); - vk.IC[17] = Pairing.G1Point(uint256(15195347567926738961665396600441664048946386695266635762683008484732412196206),uint256(5443504796488635873491333526101509884793241238220915769454608984351813705352)); - vk.IC[18] = Pairing.G1Point(uint256(507648814511001940181794192328810194158207104111469073500188579284369879392),uint256(19878164414562305196590521861798978690302638328953743153865298948302940844681)); - vk.IC[19] = Pairing.G1Point(uint256(7804204219955298169106734572698710394497148749473703625951731300392649704154),uint256(20749617701130874929367317738562309195716127925605185086004583710327959048427)); - vk.IC[20] = Pairing.G1Point(uint256(4136423452244920542789285713474930233560780284858790342002681682013099183779),uint256(9973148020780206454495393084156055095162709960047565170525379600003193810062)); - vk.IC[21] = Pairing.G1Point(uint256(7431606657645725193952573841697636390810591901046924605499097775346387992290),uint256(5564038490812252127842883537078377994942518033402640280384493207800949173851)); - vk.IC[22] = Pairing.G1Point(uint256(15626975527875622140792987711825573705920791436147184958617981173929107303657),uint256(14502833020345145695691362402464485762891674236180321493138116694907998011)); - vk.IC[23] = Pairing.G1Point(uint256(12878936960170927766371526382844902588843389976321318914661478214677770790248),uint256(5876460520718282533702520524897969113039507901531034929557462309166868606822)); - vk.IC[24] = Pairing.G1Point(uint256(16206306303565793121727450649844616805570868789440368125097120703656428468197),uint256(21466131705360086522427463180380688685767570787253803257228497277582175527492)); - vk.IC[25] = Pairing.G1Point(uint256(21415591897257783503862369405185488044149515290857177493989651919054569685198),uint256(19111807106136759041568303560519102945559357726442697071460970763574722828826)); - vk.IC[26] = Pairing.G1Point(uint256(18597076716458443423413289916997990176080742981245463826800606445425301059259),uint256(7848662551744864770963244474671513926512950753742401298459761273493739794876)); - vk.IC[27] = Pairing.G1Point(uint256(13478058920612073343883464152893321390311200483920696440656727524055057501695),uint256(1141484237022293981977393567736173116561183466681305710973251196757434813744)); - vk.IC[28] = Pairing.G1Point(uint256(15769077441619055970381886505780732308249815547683508143977406021029452872552),uint256(11041176207552285494760896858611142356090292881145533908058442986708927140068)); - vk.IC[29] = Pairing.G1Point(uint256(6317204961991307505110367333461546493002130407088713977697365919648289809555),uint256(16485259080552904056112526579040492506588962838309100629831761305228011180668)); - vk.IC[30] = Pairing.G1Point(uint256(4257110455950153652298535845399920474497037031925464616890886837426603419588),uint256(11872545793699592767799719701047416357370472440569693263077615092286272478514)); - vk.IC[31] = Pairing.G1Point(uint256(6961807017167071724371454268303022052413314092826667739692730740465087447637),uint256(3548416379898170774979179836877281134673281973630993406136692598268193428615)); - vk.IC[32] = Pairing.G1Point(uint256(21126159292924936794341610841149549910479950100575700253425887185534804026911),uint256(9665356991799845435109808741455357929036550119689810467582994476043039656375)); - vk.IC[33] = Pairing.G1Point(uint256(4126555849352009875773383333602810568818670985786945593706220065006276506699),uint256(13389907085387505200515368697127009874021544752954888239558364644026308267105)); - vk.IC[34] = Pairing.G1Point(uint256(9237247460110549033997472057018612356175421663903706416565822025921474348482),uint256(12479126715944469540020905209065301961586449718316255995034034427944451434840)); - vk.IC[35] = Pairing.G1Point(uint256(141999452778411753111875715249603444123023422502137319587911822280155648959),uint256(1953125230366380735124086773077985745995946475601777124731379373291524377234)); - vk.IC[36] = Pairing.G1Point(uint256(11781645780818495939618015750292991736294631437879209396450605477900247000129),uint256(10427776284156614685231665682387604681177186710015159262013630828614428971274)); - vk.IC[37] = Pairing.G1Point(uint256(7320842327404510671561729460506495430535413853828849843449519029765075554813),uint256(21672549045605752785173249488145571339262757812277123222081715504950345316114)); - vk.IC[38] = Pairing.G1Point(uint256(15843737739485817496811128063605940139111457287880259830761212263801078571298),uint256(18242013210254730973873870903453729710621046943883887111042684248588571061847)); - vk.IC[39] = Pairing.G1Point(uint256(20016595100062158316451938534243252321996797777010650604387061069048405385417),uint256(20993637865430287538984233040285431558951614830256982679897124168312952630939)); - vk.IC[40] = Pairing.G1Point(uint256(15334716930997133577306970429209161911742529260933017908277231237452607330821),uint256(685388011722901396424928778072393449123264587481808881182825804771090518383)); - vk.IC[41] = Pairing.G1Point(uint256(1303572165860930120284335343212677918045902191683549658721438126058571397640),uint256(13905311908068188694433787916547614635591226084525428070472134336893399093746)); - vk.IC[42] = Pairing.G1Point(uint256(14221300826968969082380487511562669771162038931016459790783016554828539071028),uint256(3793753201377522263643616048114341014139606587430774642745359231545618520074)); - vk.IC[43] = Pairing.G1Point(uint256(11832772449848274783470280628809411265387468482258558389852767954678108547210),uint256(14834860013882731405618722640186796344077421236283342428469907998531860454177)); - vk.IC[44] = Pairing.G1Point(uint256(17639041462588987659575385363021668478220589429834850328037158110389078883040),uint256(8704969675351836770098849680526710356004509474160008874237661643718531775648)); - vk.IC[45] = Pairing.G1Point(uint256(5300669047095411489879499682325147800890453538028385356237349525690882478918),uint256(15807078216435200960341268208073744792548344803921008654764854111918279022000)); - vk.IC[46] = Pairing.G1Point(uint256(16759701479370137632714483158195271493447455620368412483284976632032643763769),uint256(12119578575407359446677894550708029309579098640507319654992119663517978340030)); - vk.IC[47] = Pairing.G1Point(uint256(3546618055876451624271770844642081662395644632532568159350978635181892288450),uint256(7899711169092095967606908624829171809878683672403689963659422259393482150720)); - vk.IC[48] = Pairing.G1Point(uint256(12510986215555297660829149639903728729881090196649895701627872388148718275015),uint256(17938310289008954981347264094252860622099244536932534849229515962756808374025)); - vk.IC[49] = Pairing.G1Point(uint256(10409103229107940165748369566396677252139728324786456864640963494010260668235),uint256(12208504036723332249430584763478241147278778517031072962335060653268740832434)); - vk.IC[50] = Pairing.G1Point(uint256(19078937359506343330527168061276270611841567433397448629987841881566543425430),uint256(11481500418047012282975132773342910097993984928448563097150924565336610666536)); - vk.IC[51] = Pairing.G1Point(uint256(5668164983048179781866248655288808464925703406969538833351186308137830654277),uint256(2036685125881168735638155303624535536249217225379298881837967911494254746186)); - vk.IC[52] = Pairing.G1Point(uint256(10582885345920107024694752542268339630454841905176111334219464927407148285571),uint256(5302511072101913226528212309612354576738191518686848766232770054248911296133)); - vk.IC[53] = Pairing.G1Point(uint256(10763456976681834643711799449282626018019885337204621884611514607700042818803),uint256(2301609750924291463999855717400419535128299260641718628700547785424597102453)); - vk.IC[54] = Pairing.G1Point(uint256(14090175978138869104232840539484119022774252145335173930783246809099832962316),uint256(6221349702045432514870976695635674962728125885258176729129488888732828800410)); - vk.IC[55] = Pairing.G1Point(uint256(12979553571150817138420948789020393806894793915531144444421859462533374052099),uint256(19200617597505760330609395924204780472385656815449526965159307707620566764859)); - vk.IC[56] = Pairing.G1Point(uint256(17463292323109723850032883884721435618399847208181626612913544509828940781241),uint256(4640330488095610287297321719298782385410932546586616186092407400139615590090)); - vk.IC[57] = Pairing.G1Point(uint256(5026751021136652956884280623386725977584562160860216981445937597176863849153),uint256(3726806205455462506192306538007629772202324302040678177248736103409118613785)); - vk.IC[58] = Pairing.G1Point(uint256(10401634702025754926410545975890506063988215551615820658203094591849811159631),uint256(18749829455441645964781375179927225016584277575687706948231860700748733027052)); - vk.IC[59] = Pairing.G1Point(uint256(8900544578516002654755404382821090990852948336443604263092346279560463093021),uint256(18006601535750985461327662670949981534033907644968069359180602924268163004324)); - vk.IC[60] = Pairing.G1Point(uint256(4923009907077112126720542234146116224672392899835836662687070218433373705722),uint256(18423757328042105778787925090173086548101110659746089450844654256764118325601)); - vk.IC[61] = Pairing.G1Point(uint256(8496765642282856203983699155346261739858072134636611403990649857712160055778),uint256(4388334225743601326859195830073286369325699325286991437221049420432654092953)); - vk.IC[62] = Pairing.G1Point(uint256(6814778709224790817106591651987195100179673979164667477931063958497939427212),uint256(202848748206250811388580708835503713707654793206461021686825244651622264039)); - vk.IC[63] = Pairing.G1Point(uint256(9712073020664581454703761893278579101940468173428050353979543473165772895683),uint256(16040831046435892825035903107855958297938152758905062284792692747629553256707)); - vk.IC[64] = Pairing.G1Point(uint256(464285856079964863337668128884110751354784252445460337726538919141766442307),uint256(18298744009556568810538541912213974993321803850681854903651969678496784694111)); - vk.IC[65] = Pairing.G1Point(uint256(1095197435643971555064350556393021336605395355065960270057589173461184696337),uint256(2371995713846161841708775649454592609278907116185770018881555739791203555532)); - vk.IC[66] = Pairing.G1Point(uint256(21496449855100960838766768514830510452996823088263015662455987171227339154387),uint256(579596441272302995884967634501598678761512973483058268484496798383540310589)); - vk.IC[67] = Pairing.G1Point(uint256(18887705942025081976221623747494259379053007766953067407121210914692251976307),uint256(19263616461960262551559783019847173689300250342438900318562000334791634717184)); - vk.IC[68] = Pairing.G1Point(uint256(14716293115883307245092089544318348512298862035942865682986124416102553587746),uint256(13407174783655301681566217843988935740396704279597545147247198530403440438542)); - vk.IC[69] = Pairing.G1Point(uint256(8900997157012117172770905271175132729552960821748024149989068731273061894060),uint256(18274585601658156662940484885212221657515118604751892338041379436414857450227)); - vk.IC[70] = Pairing.G1Point(uint256(12167440767111275300984212539995067770335699142323631256234615040761402805822),uint256(9075299166921376582555856072820251116892867974126953073350366964708808984910)); - vk.IC[71] = Pairing.G1Point(uint256(2059815164798909576203732646672210899587142768137518599550435283468704025507),uint256(2608153945501014126591908624616527620011162747374867493421981432572216497882)); - vk.IC[72] = Pairing.G1Point(uint256(10599096542036501024265560487895513859113363423568037524937840260694705766171),uint256(9279326687807953384658592766685984239789127905534993112158348724015076837698)); - vk.IC[73] = Pairing.G1Point(uint256(18572463152745003849804098342368124919247700243449857746217649935067065850150),uint256(4271302815739774362417719364521319242832592843797563758771516686536354433825)); - vk.IC[74] = Pairing.G1Point(uint256(20588410275488673850673340736265898273778034663881535267761168002085081885071),uint256(14214623554987678047849743210352845290635958141580656013834998776699751159828)); - vk.IC[75] = Pairing.G1Point(uint256(2163722300592233786295471708199826265491705308195110455734978794412240252082),uint256(8267508554119920340725744568125044648312324782432899548133021564673192786292)); - vk.IC[76] = Pairing.G1Point(uint256(7197484269598779655985151220872592322066489414844363451684046156382303125419),uint256(21616596691508874538973614495991415514486861395908301007359214048159264706847)); - vk.IC[77] = Pairing.G1Point(uint256(9317296188908243633506496117686166305859402226985134506599967925055807406239),uint256(9246662625993721575939009540092858167693567801636177886999030975109306100431)); - vk.IC[78] = Pairing.G1Point(uint256(13130291969164442309654135261527037484695214343744471907179891767339554237812),uint256(19439420900777819255222132111763290888110851303845997171070229099783225604353)); - vk.IC[79] = Pairing.G1Point(uint256(8341274125831103087891955418526024155350981135186426107382130311966075308341),uint256(4004611672363485155286210618830799765020486401448881276116498234644093532588)); - vk.IC[80] = Pairing.G1Point(uint256(18169731422481037799505983555963375952636041638492364150413818994301923394922),uint256(6920580573279503695945721875233103879114044960770671707600918652213055872299)); - vk.IC[81] = Pairing.G1Point(uint256(14650110447931945378950543791319356392503885786645882445700101669286085199593),uint256(2672236893363303197228993949960317801525904563326503330829870235354157424455)); - vk.IC[82] = Pairing.G1Point(uint256(2528986115564995166900493334973939997264055530799688307116832245865032633252),uint256(16154503512380645952650117479127814018462759770354166106071852796538589151508)); - vk.IC[83] = Pairing.G1Point(uint256(19481294150685092990791924103805501678815906468656811961335770799971334206204),uint256(3363598330662226286855183671247665794560445868227630426048283517520728381115)); - vk.IC[84] = Pairing.G1Point(uint256(18978808201339133091409700185663114595291545168713536752334377601075245117564),uint256(1213612765235708464178869186669487814311448260124908714497814085098588994320)); - vk.IC[85] = Pairing.G1Point(uint256(14418075925290525696668747676082112105539395074953365477412301469559858950260),uint256(4594154586437226394452076127560734363696966763267974496550853723612732151304)); - vk.IC[86] = Pairing.G1Point(uint256(15244532626961782816328729554676239130116573352299399696442635297143065136722),uint256(16264067400808255284629914138151864703503231517377905402475157542088372521552)); - vk.IC[87] = Pairing.G1Point(uint256(13412404072841706439721760404171528212883832785394223681641514970735279943894),uint256(18772972421520087602416100777493366840700406847871247779866356020537964956696)); - vk.IC[88] = Pairing.G1Point(uint256(7278518834098053866811197734898595965893448864016564932459779237303281761639),uint256(9543037822177179166761432005315104657257283894479997218038173048112648103966)); - vk.IC[89] = Pairing.G1Point(uint256(1709222636826423108574086973126513957814331116981895535842631406293849262297),uint256(4171313661071748327281373689968909626610309456777530265707325990329480802799)); - vk.IC[90] = Pairing.G1Point(uint256(15179786172976985895438656664754965437591541176657924883571685176235651293728),uint256(11638096950777001048523602013267712327098521271732859050058176904585051580899)); - vk.IC[91] = Pairing.G1Point(uint256(2407781716437481630793286485722773331260575264950391514382377514019101702961),uint256(14458695686781772302449747288128751866667294558156464499992469536004627829083)); - vk.IC[92] = Pairing.G1Point(uint256(16468694895252699887555280460041688687239148427728528952752209086050643766774),uint256(20788646394947004095604345011150936219737186787061030407112092179878706057219)); - vk.IC[93] = Pairing.G1Point(uint256(3991089774358787341484887719129638059357053872667707502370199075852626851388),uint256(3902510497519799402123711531126476360243139127161818082359557470600621147465)); - vk.IC[94] = Pairing.G1Point(uint256(1466886815147365122710697057812173142241409916115347202712031841666728491371),uint256(11081437349185659268515559439118507187272381051158242403039829784368439096334)); - vk.IC[95] = Pairing.G1Point(uint256(15675367948639125929148213270961949441292490055618970357828231434598551590204),uint256(2778909164426958617541800819922952546319291205058583128114764331756307890038)); - vk.IC[96] = Pairing.G1Point(uint256(9493824125881071996157942648835347397579068134315426656519530306969327486571),uint256(13569015783770899535131482373694228204303101581888049300595964306574568460864)); - vk.IC[97] = Pairing.G1Point(uint256(9242602532194001182855914032689535056578184961713113993929815181120862231207),uint256(6484901250930427127830138798552069220619407988056810332966942878581890583162)); - vk.IC[98] = Pairing.G1Point(uint256(1523872847727869237456921431552857964814153573520494518692099453140090587506),uint256(17418695360532982046447994094582201363152685411867522147722234353839392352963)); - vk.IC[99] = Pairing.G1Point(uint256(11399742549177078929798714912076333760007468805044120388679382257106867494165),uint256(10670133949401240696006942337972465426990736934932061421488627959980739421528)); - vk.IC[100] = Pairing.G1Point(uint256(14433470718644592947375658909140593220622114396056063069015450435001476096193),uint256(3402331349906821334617732939054219019484982686825450914946814521361485434979)); - vk.IC[101] = Pairing.G1Point(uint256(21833676945846828172148864519474394581737351469412892197765854727950456147819),uint256(7462335039361807122731055524290203689391395125357934825602744430038141690911)); - vk.IC[102] = Pairing.G1Point(uint256(210066286602533018799742236569265965239665480635234801768634128214921900378),uint256(16977879956906814285553478771463215856313874372007024525393213937911956567308)); - vk.IC[103] = Pairing.G1Point(uint256(19485406473781142572266866513249570342833693458809793171812114197067555622413),uint256(14983003204010254445281945758732583005538659082097191657565536755860705984136)); - vk.IC[104] = Pairing.G1Point(uint256(1643409554143106462161536815350340794659353923663214739221709734566068746896),uint256(11288237047349511313733592916022399013051134309999893750401178613798551720496)); - vk.IC[105] = Pairing.G1Point(uint256(5660270548866243505458641580735922840522326056308552445940776615197111838792),uint256(16533532851632707812388601246498492787400003143775487523391826146411027105771)); - vk.IC[106] = Pairing.G1Point(uint256(18747657054895962286964950383285730210515655024520661768552618132579955125115),uint256(19027238642993917589693815893442453793582302233540587165226862529468750526603)); - vk.IC[107] = Pairing.G1Point(uint256(2650826258757381691643075897762790582637910639050159702541438068052629614054),uint256(3774731589623370538734392851462470712657730891426324115255281048189285372436)); - vk.IC[108] = Pairing.G1Point(uint256(4662400107144032873395173618484459148565405388335329460947219312803233640865),uint256(8073252455973744240359587336736369228115457758316383143255777663748671850386)); - vk.IC[109] = Pairing.G1Point(uint256(13244815569763137509027845541821848396881898000645766685064481010466764272952),uint256(15522973493542306202906347506987443126632067507488219275739902568044982305697)); - vk.IC[110] = Pairing.G1Point(uint256(19749116273014997405254210700055584858311566706740802020066495391263747011588),uint256(11738555759350126374410652439691111485806802038437627641262728151255748920647)); - vk.IC[111] = Pairing.G1Point(uint256(11455436321789801029959926621468100831387257112637033043144729421294765064839),uint256(10277663761094508810186911322351958424104244917715020422247125949835571149267)); - vk.IC[112] = Pairing.G1Point(uint256(12732537264035416277851608224506324531375270159226936067760069141822919044048),uint256(16416240630658544393597970037593706089294118301617257468224946372126948974082)); - vk.IC[113] = Pairing.G1Point(uint256(10516115624793536684758243788374015086509817039690631741147324866729714618420),uint256(7281097342761181523840666064202614730291420363390735832776326394623945061814)); - vk.IC[114] = Pairing.G1Point(uint256(1902373706865446835156364162955903136789061174445568661057522144610650427069),uint256(5452659003657947834438667736032309272469975574808215759517389777040039530319)); - vk.IC[115] = Pairing.G1Point(uint256(11891140194810316547361992199254053502185941207721636377627299695075892638278),uint256(16130283882098494590042359320753560234548959693114287821736368875186436623966)); - vk.IC[116] = Pairing.G1Point(uint256(14522514398752668329215638117210177464868398724634637927944188255719495719791),uint256(3403517244273478901791556803769637205898834452903997586511432370635451167411)); - vk.IC[117] = Pairing.G1Point(uint256(5734575700530357400562096763439606095780205077210360017987438644395685957016),uint256(14336954586773900618591010892691057715838366325074462859243020677418854888386)); - vk.IC[118] = Pairing.G1Point(uint256(12945113475405829440179988254017674878359904858305320385471664828323468960215),uint256(9331695673206621682725776908309057304745443130609501436382308569434664050737)); - vk.IC[119] = Pairing.G1Point(uint256(12805183903263949727947933481510994462075090289151015632646584549911707672114),uint256(15054758166003413547242371494822609546352775865411590496523538807337930162163)); - vk.IC[120] = Pairing.G1Point(uint256(1461650666181324607934715397719669697167766930891294777923440461927270052477),uint256(19979989352259333167426847501212112161778188563489085835157314671288124368343)); - vk.IC[121] = Pairing.G1Point(uint256(11200654822846841133725824364839307380833213205471277971844423265332774024060),uint256(10238782818030344762170615817154386114792703189345414964959003512861602156265)); - vk.IC[122] = Pairing.G1Point(uint256(18744324171982470808688651814809297411690580944649636605549308210994185657270),uint256(1328654417237017417010783392800592190819703116836024667917667110819463217203)); - vk.IC[123] = Pairing.G1Point(uint256(612266599210749035013745392268833690974426686975573120141391354476146241027),uint256(7903077119396400694450206637930278212614063414142131659931620450565889229384)); - vk.IC[124] = Pairing.G1Point(uint256(12798298805836523370442542016556603769932526767799169681647656847075273744276),uint256(2999423457284549668595714800652056858584184770644989181648205538604660031710)); - vk.IC[125] = Pairing.G1Point(uint256(15562951103048198246058544397019105032195165943285808912291386560600736792878),uint256(17254303321388628569857907786894515305009188117276406287966816967851392077824)); - vk.IC[126] = Pairing.G1Point(uint256(7857905771896587186044136087414656474604671307343998508011003584850698242314),uint256(965966572394044230411443545922398510058722123750783128100264132456694748186)); - vk.IC[127] = Pairing.G1Point(uint256(6826563322944870206262950323378042094930942787115856237220092687812916923338),uint256(16997356694684541445466543668304270868828514937784717244056774581901581744501)); - vk.IC[128] = Pairing.G1Point(uint256(6916461496370818557272906066818414648287924724221672605801357595072816551227),uint256(18709969507672604061817338077692474555037780314646588254854697996453602915421)); - vk.IC[129] = Pairing.G1Point(uint256(13953856422146529357914602862431925106403810477983604430514681346184534247396),uint256(5852214220014262914689217151035149197684391482947611614040822660076949017339)); - vk.IC[130] = Pairing.G1Point(uint256(883027530876177460300657468207253106021065999640005620485264456323124773674),uint256(9645521061995659521432534479570562814747093346092082788327789703319317765640)); - vk.IC[131] = Pairing.G1Point(uint256(7682396289453340034942765191901335113671659387001278538463716593824450777179),uint256(11159553141771355181354519876188974719165136270626670989121305930207064649429)); - vk.IC[132] = Pairing.G1Point(uint256(7834352299743738961211888560865104800760657368650393621357707010227902129305),uint256(5256303466095737975531528989934871846609654422399758301358728690752178996964)); - vk.IC[133] = Pairing.G1Point(uint256(5115977327746256824998071788278199443411955778535105982357034789442747671146),uint256(5868891348240646803024539375568175374772325608896242181635723021982168546519)); - vk.IC[134] = Pairing.G1Point(uint256(18828553669800119068476997516015930097243571498795866530032170278543012797891),uint256(1286300698474334950849038692739675849219302930241092756607360829287530426744)); - vk.IC[135] = Pairing.G1Point(uint256(18655018460061098164066901184027734560881886408801867234084210199953746031888),uint256(16134600889715752130216186812644915735718850558240252492338479115835565582540)); - vk.IC[136] = Pairing.G1Point(uint256(4485659543400195319589657606363653034690372730120772385411739404388056406598),uint256(12596043386375142555047260357771861294052774830451299708187886980188757722437)); - - } - - /* - * @returns Whether the proof is valid given the hardcoded verifying key - * above and the public inputs - */ - function verifyProof( - uint256[2] memory a, - uint256[2][2] memory b, - uint256[2] memory c, - uint256[] memory input - ) public view returns (bool) { - - Proof memory proof; - proof.A = Pairing.G1Point(a[0], a[1]); - proof.B = Pairing.G2Point([b[0][0], b[0][1]], [b[1][0], b[1][1]]); - proof.C = Pairing.G1Point(c[0], c[1]); - - VerifyingKey memory vk = verifyingKey(); - - // Compute the linear combination vk_x - Pairing.G1Point memory vk_x = Pairing.G1Point(0, 0); - - // Make sure that proof.A, B, and C are each less than the prime q - require(proof.A.X < PRIME_Q, "verifier-aX-gte-prime-q"); - require(proof.A.Y < PRIME_Q, "verifier-aY-gte-prime-q"); - - require(proof.B.X[0] < PRIME_Q, "verifier-bX0-gte-prime-q"); - require(proof.B.Y[0] < PRIME_Q, "verifier-bY0-gte-prime-q"); - - require(proof.B.X[1] < PRIME_Q, "verifier-bX1-gte-prime-q"); - require(proof.B.Y[1] < PRIME_Q, "verifier-bY1-gte-prime-q"); - - require(proof.C.X < PRIME_Q, "verifier-cX-gte-prime-q"); - require(proof.C.Y < PRIME_Q, "verifier-cY-gte-prime-q"); - - // Make sure that every input is less than the snark scalar field - //for (uint256 i = 0; i < input.length; i++) { - for (uint256 i = 0; i < 136; i++) { - require(input[i] < SNARK_SCALAR_FIELD,"verifier-gte-snark-scalar-field"); - vk_x = Pairing.plus(vk_x, Pairing.scalar_mul(vk.IC[i + 1], input[i])); - } - - vk_x = Pairing.plus(vk_x, vk.IC[0]); - - return Pairing.pairing( - Pairing.negate(proof.A), - proof.B, - vk.alpha1, - vk.beta2, - vk_x, - vk.gamma2, - proof.C, - vk.delta2 - ); - } -} diff --git a/contracts/contracts/snarkVerifiers/BatchUpdateStateTreeVerifierCustom.sol b/contracts/contracts/snarkVerifiers/BatchUpdateStateTreeVerifierCustom.sol deleted file mode 100644 index 48ce34bcd..000000000 --- a/contracts/contracts/snarkVerifiers/BatchUpdateStateTreeVerifierCustom.sol +++ /dev/null @@ -1,366 +0,0 @@ -// SPDX-License-Identifier: MIT - -// Copyright 2017 Christian Reitwiessner -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to -// deal in the Software without restriction, including without limitation the -// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -// sell copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS -// IN THE SOFTWARE. - -// 2019 OKIMS - -pragma solidity ^0.6.12; - -library Pairing { - - uint256 constant PRIME_Q = 21888242871839275222246405745257275088696311157297823662689037894645226208583; - - struct G1Point { - uint256 X; - uint256 Y; - } - - // Encoding of field elements is: X[0] * z + X[1] - struct G2Point { - uint256[2] X; - uint256[2] Y; - } - - /* - * @return The negation of p, i.e. p.plus(p.negate()) should be zero. - */ - function negate(G1Point memory p) internal pure returns (G1Point memory) { - - // The prime q in the base field F_q for G1 - if (p.X == 0 && p.Y == 0) { - return G1Point(0, 0); - } else { - return G1Point(p.X, PRIME_Q - (p.Y % PRIME_Q)); - } - } - - /* - * @return The sum of two points of G1 - */ - function plus( - G1Point memory p1, - G1Point memory p2 - ) internal view returns (G1Point memory r) { - - uint256[4] memory input; - input[0] = p1.X; - input[1] = p1.Y; - input[2] = p2.X; - input[3] = p2.Y; - bool success; - - // solium-disable-next-line security/no-inline-assembly - assembly { - success := staticcall(sub(gas(), 2000), 6, input, 0xc0, r, 0x60) - // Use "invalid" to make gas estimation work - switch success case 0 { invalid() } - } - - require(success,"pairing-add-failed"); - } - - /* - * @return The product of a point on G1 and a scalar, i.e. - * p == p.scalar_mul(1) and p.plus(p) == p.scalar_mul(2) for all - * points p. - */ - function scalar_mul(G1Point memory p, uint256 s) internal view returns (G1Point memory r) { - - uint256[3] memory input; - input[0] = p.X; - input[1] = p.Y; - input[2] = s; - bool success; - // solium-disable-next-line security/no-inline-assembly - assembly { - success := staticcall(sub(gas(), 2000), 7, input, 0x80, r, 0x60) - // Use "invalid" to make gas estimation work - switch success case 0 { invalid() } - } - require (success,"pairing-mul-failed"); - } - - /* @return The result of computing the pairing check - * e(p1[0], p2[0]) * .... * e(p1[n], p2[n]) == 1 - * For example, - * pairing([P1(), P1().negate()], [P2(), P2()]) should return true. - */ - function pairing( - G1Point memory a1, - G2Point memory a2, - G1Point memory b1, - G2Point memory b2, - G1Point memory c1, - G2Point memory c2, - G1Point memory d1, - G2Point memory d2 - ) internal view returns (bool) { - - G1Point[4] memory p1 = [a1, b1, c1, d1]; - G2Point[4] memory p2 = [a2, b2, c2, d2]; - - uint256 inputSize = 24; - uint256[] memory input = new uint256[](inputSize); - - for (uint256 i = 0; i < 4; i++) { - uint256 j = i * 6; - input[j + 0] = p1[i].X; - input[j + 1] = p1[i].Y; - input[j + 2] = p2[i].X[0]; - input[j + 3] = p2[i].X[1]; - input[j + 4] = p2[i].Y[0]; - input[j + 5] = p2[i].Y[1]; - } - - uint256[1] memory out; - bool success; - - // solium-disable-next-line security/no-inline-assembly - assembly { - success := staticcall(sub(gas(), 2000), 8, add(input, 0x20), mul(inputSize, 0x20), out, 0x20) - // Use "invalid" to make gas estimation work - switch success case 0 { invalid() } - } - - require(success,"pairing-opcode-failed"); - - return out[0] != 0; - } -} - -contract BatchUpdateStateTreeVerifierCustom { - - using Pairing for *; - - uint256 constant SNARK_SCALAR_FIELD = 21888242871839275222246405745257275088548364400416034343698204186575808495617; - uint256 constant PRIME_Q = 21888242871839275222246405745257275088696311157297823662689037894645226208583; - - struct VerifyingKey { - Pairing.G1Point alpha1; - Pairing.G2Point beta2; - Pairing.G2Point gamma2; - Pairing.G2Point delta2; - Pairing.G1Point[137] IC; - } - - struct Proof { - Pairing.G1Point A; - Pairing.G2Point B; - Pairing.G1Point C; - } - - function verifyingKey() internal pure returns (VerifyingKey memory vk) { - vk.alpha1 = Pairing.G1Point(uint256(20087353828077202850794044320950857268374503478528972609823484324215331801636),uint256(11476883565453070321867378546975856970885584116909418759035533502511538352926)); - vk.beta2 = Pairing.G2Point([uint256(21661869609286011667004284886876061748883471906320898511156819152590982503460),uint256(1411267331255101216687187759308799712318293061108820897500456502826062760161)], [uint256(242338193632610253406780460721162660970322868717712034766855444702801043068),uint256(11205102304711535815941921385002492265801636744630227197506747841473030702040)]); - vk.gamma2 = Pairing.G2Point([uint256(10703132643546140356186378204895065022814221219458116741589121895614548783664),uint256(8728787808915888886518516188706571827044921488715782720858292899421614548992)], [uint256(21855932176432612007184523640521010134533271824713890942038051024979667517411),uint256(14463000202053145707614344130583620641279820564069360237424059003065520412766)]); - vk.delta2 = Pairing.G2Point([uint256(15511409780586937596469386375448730565918438087848214063975685304482412679403),uint256(2871962587045834446520485474136952467328346328772359835190464961287391630197)], [uint256(15098923887127735110115098383257212634964365431441844211165982132092604642119),uint256(19716506293446006761611333969798166840619850480902019859898831749671195591534)]); - vk.IC[0] = Pairing.G1Point(uint256(13449409323553982807626717659206995893486616914721488975771211075709370315026),uint256(19819167563363500342420294247298414043779583800301883591559879913778994928970)); - vk.IC[1] = Pairing.G1Point(uint256(18288751040873995405829352561880517511670216090222253370470629005274973230224),uint256(3340939551764112714060652679366038538227707806197811714382712640842923887338)); - vk.IC[2] = Pairing.G1Point(uint256(9034324435110195600984520035015153412337260951213866638651602731777208517827),uint256(14546595006162979541631014330847388063705106451104883570324018472333580218369)); - vk.IC[3] = Pairing.G1Point(uint256(18959526910556928462007511646743694022357186454775805231806268761848703787052),uint256(21548913956199741505617644115252315331247918262133746388493422156797029529793)); - vk.IC[4] = Pairing.G1Point(uint256(14667130442384977541051000098091277853515714184455121995211368752877562919286),uint256(1571213305279482731892557325220575745236783105648521604666877211311213326751)); - vk.IC[5] = Pairing.G1Point(uint256(19913405290485444662222555136914754224161963225418121384899196830085445637499),uint256(9353516643529373068293908681832909830620075327436046394651358446880200530845)); - vk.IC[6] = Pairing.G1Point(uint256(4392121493858814884850445257811530682565304094158379534072964024456308711140),uint256(14425403533600244626342298100875789752762767255327078376159416785560008923705)); - vk.IC[7] = Pairing.G1Point(uint256(15817729744441652723145528920073644919288747927823346517846772502038661326087),uint256(6339493756631971029867733380652623802663224827384426871973039193434998926674)); - vk.IC[8] = Pairing.G1Point(uint256(480637294199047307667161992553993337214654072373808050110284394523079810339),uint256(8832148377128939012209474718545762695603645681727887570297879424473451535544)); - vk.IC[9] = Pairing.G1Point(uint256(18744271653088608732764725475608044605973633651736355180626060057128665597247),uint256(10029431604036329130096548676181936710270515833881358240468741367688995476231)); - vk.IC[10] = Pairing.G1Point(uint256(2887974560189403494889743306897414514537070863016749530233722584820661287284),uint256(19531090389757911465455371999342290893522171780307155242713966624430836080666)); - vk.IC[11] = Pairing.G1Point(uint256(14831622056182946369342012331708153541419644376854897007623505162522515905155),uint256(17207180946963880497939168446060614092109855520510825916157704836216098405189)); - vk.IC[12] = Pairing.G1Point(uint256(15506398342704908970868595954855105998758099219541375937953499095105173507550),uint256(1509358924009691430397237655658579260967617755952022251213522582773276442679)); - vk.IC[13] = Pairing.G1Point(uint256(13081356290354186063074749971306070814496882977524291959736906760563684568695),uint256(9884406427032162441347033456153235609148950546399906330857509941718552620268)); - vk.IC[14] = Pairing.G1Point(uint256(719373316591795302151839273680068838979384878504494828773494046765201947280),uint256(4285574473052728017508050004433562406388738477725957133910140811836712357969)); - vk.IC[15] = Pairing.G1Point(uint256(1161961279887123633351369246418294359429428925248242696699854294267840126266),uint256(2753838659155669461065600495917012924384518686391121187033697795542200403972)); - vk.IC[16] = Pairing.G1Point(uint256(13682879487790288634920243025369860399504234851888478701512257545221680936810),uint256(2153246008085528874532592135250171671811203616520867548078143863278493007749)); - vk.IC[17] = Pairing.G1Point(uint256(3516369807590261163059894146447014910302140628998802112065686961872586702551),uint256(5370787160830393410214210351964623688718912410066120987032733452259286528086)); - vk.IC[18] = Pairing.G1Point(uint256(1988524361751778706932724684329605660441921048206095037586339797069472862182),uint256(21114285963513640070787641747881253082556602533623795027313886115253996080647)); - vk.IC[19] = Pairing.G1Point(uint256(2485955165890974183236816009331112192305108639988665043518792297482584311923),uint256(11880640146304852444592379682415385509408598783155502899174478577569880083056)); - vk.IC[20] = Pairing.G1Point(uint256(10219331172860533280779041276433310836289975824303193871202179089572278703569),uint256(7370861950873412157131303975669615391088774540400276783484707074149416805294)); - vk.IC[21] = Pairing.G1Point(uint256(14167728148516477840256196286607935101668320057446161671806500834090072725785),uint256(14874328203966708937121090833723158080118646495824532613915964279405802897922)); - vk.IC[22] = Pairing.G1Point(uint256(6889309751089080036157423235545680142690650792398279314062387575899228869494),uint256(17678911668088463543175270505444996571219698085940587035964935219043301776169)); - vk.IC[23] = Pairing.G1Point(uint256(9673323848791621411824117667951494409448803912571572035911987567276800873692),uint256(8010318233717184439361450385728075741524318837946509278121601177634948395076)); - vk.IC[24] = Pairing.G1Point(uint256(19001216591939800685596329025823328559725214996604900719736845720656499624867),uint256(16800790914194952657872094131443784987321340590188967934648441664397455856225)); - vk.IC[25] = Pairing.G1Point(uint256(14229772670511491842377063841403695319183750623861101302835638264008211544676),uint256(16700086453597824634366081416911323903395382119942186242938984470600767077018)); - vk.IC[26] = Pairing.G1Point(uint256(6190110473128199039318674139275953731627477080237305570664048170694216558607),uint256(9156069687286703875886126396409243836856376303654173871625378309678962742301)); - vk.IC[27] = Pairing.G1Point(uint256(19041950742766772503703484046141610117011636465603587128037213418839536735126),uint256(1741521843922631538075137437516945946494447419662725791349055244115174732397)); - vk.IC[28] = Pairing.G1Point(uint256(20572595967381616358855167208674217372017018727251574275804447670907816537950),uint256(15530155742998922859635289650887433052284249839254842342598193039162339193385)); - vk.IC[29] = Pairing.G1Point(uint256(18894959902692739855443380454453511822218459028123989847552010175424931175589),uint256(21720555445949680264216624728183544115705279456243597689157013642155036265415)); - vk.IC[30] = Pairing.G1Point(uint256(11420223426220804446523491080946075698396582996335464285431689162267487484067),uint256(3181697461117579761185097953588782487765626082815159306282849737563745424506)); - vk.IC[31] = Pairing.G1Point(uint256(2921370814594030903899051421374417440461203550081209203567416200073023145049),uint256(5347812108419343983369408836373704300702310310540619421686782928991729409164)); - vk.IC[32] = Pairing.G1Point(uint256(16741476685225855934358725975984964877988445638736565287964542186206107152293),uint256(4729669602346204655607884191853032759553867998868447356742304646390812496415)); - vk.IC[33] = Pairing.G1Point(uint256(9756675234809793791892705465682087248632694984652554680972716007491924825951),uint256(5988354804897075683722895724359335032053854461455265017672782021744588344814)); - vk.IC[34] = Pairing.G1Point(uint256(19814683865678732851894888194537462976081202780523678223106719506629549258897),uint256(6080471180403505923559123931327801567873683689169241241662583679341260897736)); - vk.IC[35] = Pairing.G1Point(uint256(1438239620527399948189462788892238398578982906275271867592155948061939566626),uint256(2199055174486710563451423451952849431624087101967400585017518019108165853190)); - vk.IC[36] = Pairing.G1Point(uint256(967676148418361677737873476276863318059309477609707671643977589336859176127),uint256(15797276132011461989185803015523111093330042939894033038100054846133562563324)); - vk.IC[37] = Pairing.G1Point(uint256(20201801978563503818789599624676158315679823610998322710056742798817954976063),uint256(11598358783925779109653102359075130468763033066887386333859407419035615301007)); - vk.IC[38] = Pairing.G1Point(uint256(7747526982755731888665585361416626948929515076673700820729567631840982182127),uint256(8266477541281971795125742686488473665271470129792619047143237743745554013710)); - vk.IC[39] = Pairing.G1Point(uint256(19630347857068381357762752321517383973545380130254869958667818061574406509936),uint256(15186347777687718013099982394931225548070830348604080143466772297210051562836)); - vk.IC[40] = Pairing.G1Point(uint256(7557975808969352606285335263414157381982093159126770512582919553699648350483),uint256(6331359472500035804643208799188536087855091113155475777082984912192250759374)); - vk.IC[41] = Pairing.G1Point(uint256(14845008071231916162530646819506161170789752619959011105785671398905933762955),uint256(17510852870482242342381039816675219266744505657530214435696082802116282488658)); - vk.IC[42] = Pairing.G1Point(uint256(13028483425255096939536859978320334835707092501368542039049983266498742408332),uint256(9680955997542002092545710879095660094124123676658363044411252537219803810269)); - vk.IC[43] = Pairing.G1Point(uint256(18570485684385256456511558721236129814674664211827057233856298536476007823563),uint256(6786587425550032533190651930990699335249545132866171624112725170443784236607)); - vk.IC[44] = Pairing.G1Point(uint256(6229010105044576579707704062880618330142301356182755458537022491776084974500),uint256(2958446025628338713087051414787827196521720086407187883901740977668009458474)); - vk.IC[45] = Pairing.G1Point(uint256(19711064707259131885284329850510953278564434575422258680339661582446519996893),uint256(6447334502627514228819588471839200327796435951160054171955070846382297766993)); - vk.IC[46] = Pairing.G1Point(uint256(13654512333629104147605163426403071872951885435411994083936410963051621892949),uint256(17650265592485694925363566185316073499680014776202819473217500634597804211217)); - vk.IC[47] = Pairing.G1Point(uint256(5632109105332974207832397468511779966406880188637740594191372151186045229561),uint256(13651675148237626614923296165038029228539866352571194577844266938252974170084)); - vk.IC[48] = Pairing.G1Point(uint256(8527345386665720309165783434253008921795266063983738469923301602966779024366),uint256(16149187991861855926722833165905235574832072162827813978624809869628415187689)); - vk.IC[49] = Pairing.G1Point(uint256(6646163805935695669626521901182643404621755887577997925506901386112844229851),uint256(11361301962986100960081361654544753510182204509642964951112554856701961156187)); - vk.IC[50] = Pairing.G1Point(uint256(10921559406917075466554221464922756249180248754762588574619694367252428227945),uint256(15987818311916597433092891016570609774371036003985987971567882858356951694123)); - vk.IC[51] = Pairing.G1Point(uint256(19319321803549704705343605501384818081154665651565507251713174153621472515462),uint256(2737644346677906343234185972413750255380030320584877572350390603749165517091)); - vk.IC[52] = Pairing.G1Point(uint256(14097924791420990626067662965994354649057100100900878471771528723878979063670),uint256(3446659685548421144804125954538853863956916787759744530684127569073823331713)); - vk.IC[53] = Pairing.G1Point(uint256(9983862632251067005815597520616536972155239828533016448370610241448628423219),uint256(9425718421842054710526654962601883705369930663657776686776262667638786657422)); - vk.IC[54] = Pairing.G1Point(uint256(2688984403049401342903683721913746062136910340901612180883159738614628664638),uint256(6537385568788079956897582609732708399792014147299594434121004163987996923797)); - vk.IC[55] = Pairing.G1Point(uint256(18265540920707633157018592793425156625083767097873832410185928416315911651112),uint256(614830982358373399190790570742951602645537091079871616861069500149456469620)); - vk.IC[56] = Pairing.G1Point(uint256(12125321699285743073611607029813382470546481051048160495748291470225531864512),uint256(3716293670309368968675908852623314593073639774424731454150351335135845445749)); - vk.IC[57] = Pairing.G1Point(uint256(7853056802721517963036421484032072942693765378562098368306104805678418585162),uint256(6424789894907881712069802715529228349918886636331654615971484908566086243872)); - vk.IC[58] = Pairing.G1Point(uint256(19115005503431091096721184080895329804587690694447705536547788962171345376377),uint256(21684667845604031973485165382669985845242661934129735060595710490022281580308)); - vk.IC[59] = Pairing.G1Point(uint256(5934951296346946320689083498211342144043216739159202457194772865605223848817),uint256(16531730612519172995954542776277328233589925446255179981248179286637232098743)); - vk.IC[60] = Pairing.G1Point(uint256(548179290994039790062273715118266322711869818074110355798782872494554119127),uint256(21277541640969431282210948877991685569792198011788537435034440443744017806814)); - vk.IC[61] = Pairing.G1Point(uint256(5698932685323749446566832552112536072262214364822836541442194088625134869756),uint256(18173025416893411048966167980710924405089325259853820754338009550096212580109)); - vk.IC[62] = Pairing.G1Point(uint256(5407139961162687782789268353002587250953566955217132246179178517076765432715),uint256(15088228606773832436431560223153028924260952727854826128522128552157315934324)); - vk.IC[63] = Pairing.G1Point(uint256(3297833865321076345999149557999739794735986140950154026339694076355675796967),uint256(3411471118249712872884387591128740913549716748840876207700900440280171428377)); - vk.IC[64] = Pairing.G1Point(uint256(7842388686335992312801332510612951894847538866301083390230994724615251547549),uint256(9506065469948872795705994936031211750874514789756601843559917376763183093918)); - vk.IC[65] = Pairing.G1Point(uint256(4095852829188395404575969005812446864304840367703021566476256455754460675693),uint256(8491316200241330102237645830695567828271170242496389953775586915469855840662)); - vk.IC[66] = Pairing.G1Point(uint256(13025537576077929051149126228765064213045713215302857727492279859380396356016),uint256(2692834756506679874200086947427348829159380570066044209560542269051062640881)); - vk.IC[67] = Pairing.G1Point(uint256(8213689088249141668841132843593219869582692686267381807826045996178718589976),uint256(5934750740375389011242980889807579582140412795439731691760487737537146384870)); - vk.IC[68] = Pairing.G1Point(uint256(5064286005858996906539521173567342723294768227186533518332524072316626813796),uint256(18194357467986683563844190921029033308662124754563987268423540451940150494386)); - vk.IC[69] = Pairing.G1Point(uint256(513524361877395586890580626735501312175734658618400473937221160065153077430),uint256(21066430682077818283600250344847770187662959287016517114730950504105800523459)); - vk.IC[70] = Pairing.G1Point(uint256(16131973789317585551032586924024478720306017209112230164516773197156811660827),uint256(2629437023298887657704157265354419011007844685935531259234622748649925287960)); - vk.IC[71] = Pairing.G1Point(uint256(14333443795131676087362902053591471457648753635869483711366294938960766965855),uint256(12375065056354337574541874851953853772434526791527859885521192098306924954605)); - vk.IC[72] = Pairing.G1Point(uint256(8650965935327444683681899304659642514103760946243255832533343127837713901260),uint256(17350766954455027422821468769776856954427397105499750970125107357315321891443)); - vk.IC[73] = Pairing.G1Point(uint256(19127940891316463106484748416155199078020628471209896451231437541817085077431),uint256(9663583369451454043509657828849429547454302647650088620902697913423546564526)); - vk.IC[74] = Pairing.G1Point(uint256(4024045629953114025834675015518977207041945104823465323803797652513143739853),uint256(7099031579319409562306045437060668113626384467426238808017971940237526720957)); - vk.IC[75] = Pairing.G1Point(uint256(19777520349508781241579877240909708384019577017734082523373047015766886330187),uint256(20543687412232979508991763895812193752676648814819172150316512715838932781811)); - vk.IC[76] = Pairing.G1Point(uint256(13381716905414454291256465188057975528662534279036129120834023444787120778828),uint256(83068903289307625321440883120020242942419200390426643332494275740989439527)); - vk.IC[77] = Pairing.G1Point(uint256(7761960949208896426802556459429974793308266350208241353184947107970422491129),uint256(2089026195731535072085584097366292321990391592844991889095562893901021029045)); - vk.IC[78] = Pairing.G1Point(uint256(5197970819517869977641836587074894393807023630746693731371708152450489969498),uint256(15030173127846951102748719502126507555120149267996232824889459685032460633760)); - vk.IC[79] = Pairing.G1Point(uint256(10738029463630555541033436864764967361429379579447728903906800161601920881914),uint256(8890051727148365024606043733688100310356137564792142189316987818514656702210)); - vk.IC[80] = Pairing.G1Point(uint256(12792936448350863485798336539770498877619679941787502943063936842797879294217),uint256(14379669594142278338427457116016736020516627571642516277280265863257375782458)); - vk.IC[81] = Pairing.G1Point(uint256(13559434756703389257582627200705563231522482733893623255451993723994545049976),uint256(14892650996406162560002958956428094083109122401519142177808416014717662579626)); - vk.IC[82] = Pairing.G1Point(uint256(14252276184535708042709518130518888874496340661124769270302165933313034236450),uint256(15273924344508848264258477250341486434993268879902111993744999413719610729096)); - vk.IC[83] = Pairing.G1Point(uint256(9809205799202468521806578646546780450146808562401906118296006228293627684369),uint256(11307415536498866034675798915908732740209657309834816970198638577514763250721)); - vk.IC[84] = Pairing.G1Point(uint256(21705327260612726721607027572593333828131899563073285225389452443571564581741),uint256(21018596752445529907566552196456728940837044358621700846827205193330981345608)); - vk.IC[85] = Pairing.G1Point(uint256(8726253405089330847191862720082852744524984989277533298149093584335630612059),uint256(18486186530998050985018181700908491808421033831981323727450435858762932718129)); - vk.IC[86] = Pairing.G1Point(uint256(6503536483724878233870656193473281418950363845795000055683485451008630495010),uint256(20373536533546802032215725505482963077326337719927421078346183177571358001238)); - vk.IC[87] = Pairing.G1Point(uint256(21362345493034032487313388146136193327479786529066051395403594100453963769111),uint256(5659302265151057957108067254997946560345397781011169944959956043052574665674)); - vk.IC[88] = Pairing.G1Point(uint256(7449550964742803340675630812325796218565644913828914465913881384357756681548),uint256(17292064125777099006635793940096466365126227952794001913174478930939581123256)); - vk.IC[89] = Pairing.G1Point(uint256(6125497125689284067831318181472617987031052184276342829492439288589510595502),uint256(12585026108513932953515017993201613768584424358528209508664951085853306523754)); - vk.IC[90] = Pairing.G1Point(uint256(12762245270309389117737641685449675404740403315746754385981092875802564011552),uint256(4776105253784521029665216303967098003880083781647370925393247521792397407888)); - vk.IC[91] = Pairing.G1Point(uint256(13807938458651671227739057402325558662935793724423758150238166950827759630565),uint256(8407443299360885769442648551918604539455371547608849811398829544820103779159)); - vk.IC[92] = Pairing.G1Point(uint256(19354271469665911556037183311554687370650863636736009934227267454117678598867),uint256(2889581474166896849215445080012200130279831332202980472677608450870018824419)); - vk.IC[93] = Pairing.G1Point(uint256(6226227238242660704404188961830279826158507659691896952725574118929530402933),uint256(16450115825870066758814214991430148198082508764837404422948743285414888884178)); - vk.IC[94] = Pairing.G1Point(uint256(4780964847774203341666353527075414079062026230513049950866837627817139518944),uint256(16859068361144747142625578004213384508540191114869687793312011678232224372225)); - vk.IC[95] = Pairing.G1Point(uint256(8062525302997605008090891400414607999817592945480209521332494130391040549486),uint256(10042482661997039621263546535097387401245876819894143240347776832509613454998)); - vk.IC[96] = Pairing.G1Point(uint256(4156112324011039404668548707912082198272430690748058804543223692230235584010),uint256(6467835632275616211076158221632969554420082266873705242098900605173284788072)); - vk.IC[97] = Pairing.G1Point(uint256(16978493603420177201284890469513822737364101412764684161147950679395900370490),uint256(4804013104215913645504042647931299604664370881965529654982744609336873815572)); - vk.IC[98] = Pairing.G1Point(uint256(20063224436134296487145192369456053667043930173386619477170690006672425660230),uint256(8018762550302361989416661307519944480135763273042015031096306898128032672769)); - vk.IC[99] = Pairing.G1Point(uint256(9381136972738249930310747728613628512869836321932371408132641447585727108675),uint256(13792274675162440241090306118979937533255670775110959353619238438903042099483)); - vk.IC[100] = Pairing.G1Point(uint256(17249799750153971053356997293380265081163205379000759347308627353711859528438),uint256(11860582928346589952937516820758334143823517059789983241580798089780599031873)); - vk.IC[101] = Pairing.G1Point(uint256(2209125375494676829996593878418698944200062459109379104033878964709019186550),uint256(9044941556620400719209087348338656682667735114334848800591128202753917262364)); - vk.IC[102] = Pairing.G1Point(uint256(7905831048152572475855614559007206580981737455003199081628859335938538130184),uint256(3219362210026178835574532431902129534204421524894508591333411433674437426662)); - vk.IC[103] = Pairing.G1Point(uint256(10034645824488683370676189228201474691737684065016222057492787707541855843562),uint256(10962875262870711754286714288576688333775621455833092480063924261333137338082)); - vk.IC[104] = Pairing.G1Point(uint256(16681217492767809220626946625462893148742282263278770454356009745085326859036),uint256(8609765386746653380889813599059419164123726125803365736957612935297948115084)); - vk.IC[105] = Pairing.G1Point(uint256(10409861984682249634638249483107543711654774759190644297788218352203797832971),uint256(10963947759662935212884888830847146879486435953717902604694788526569408050896)); - vk.IC[106] = Pairing.G1Point(uint256(19610116640561738573121735873270623412842636275783845690930764829525483185517),uint256(19999697268734757669286329323254853862322933620601846163862344221876819142639)); - vk.IC[107] = Pairing.G1Point(uint256(20796538276246959844610503898053705465834091935725306697900595861453314277534),uint256(8463040972818515190474433150965544533570162872588257416128796378472361625254)); - vk.IC[108] = Pairing.G1Point(uint256(16242734927529699680977092850391685525876857116431871118405705879284460279923),uint256(233800030226637912442083358100093812963916941762884764432747765761205593722)); - vk.IC[109] = Pairing.G1Point(uint256(575299231355200429649645736454601450683561619418476466277518167882449241582),uint256(16441392148980496339439815763952122005106502317757024622981193995288053243753)); - vk.IC[110] = Pairing.G1Point(uint256(1603299324276303191667584100848645563589905602358091967172803717926108919833),uint256(2923207606433658024984614511442599369631740064463368057365647551116862475865)); - vk.IC[111] = Pairing.G1Point(uint256(15612397606496480900845188862617925195166889100242281072974188587056786460685),uint256(6067268371068187386960150210701543773298636595460683602669641801140055222693)); - vk.IC[112] = Pairing.G1Point(uint256(11716278844761725707707926991887023640732693999845301976833122906763630000470),uint256(4785089586353316211662706302146360930361614633336109347707536468281339428146)); - vk.IC[113] = Pairing.G1Point(uint256(13583970090332558444106411973400436007441644550158519399118705791407995280322),uint256(19644166569147988073283886636967542007943692023233562457318835255034799889940)); - vk.IC[114] = Pairing.G1Point(uint256(1686045902562150190863786039249272152595323263993869676824656256416347524970),uint256(17748495582430458497854085558648682169890368554794356546738567734485590533503)); - vk.IC[115] = Pairing.G1Point(uint256(14018407513023200909083059584310902264885930292989350049846251819450636644515),uint256(15282365300853626656506664284946919761222329988945904085162429142333058688432)); - vk.IC[116] = Pairing.G1Point(uint256(16724562362615523120167011908918353532981098883153390523539421723425152477307),uint256(843622462409191805919999628441033590397683131077427864110140693629784330140)); - vk.IC[117] = Pairing.G1Point(uint256(9317229908502429358451115076979763649356526034355777152382574378803867793407),uint256(2617787134893809524818335754594505537496659392456978184732584754140270601161)); - vk.IC[118] = Pairing.G1Point(uint256(12643564839060300175073382088429811648928756114554035624702422497673075822811),uint256(15646981702412923801232315502751915516527154519138252804608886597168220251051)); - vk.IC[119] = Pairing.G1Point(uint256(16136179725000153445080279536165216574525067823359334408100828869622561025204),uint256(710304109108463984900640046876452138580862272055110902990476351162646910693)); - vk.IC[120] = Pairing.G1Point(uint256(692942860249784705898329710403028922082659734627553976311078555856071631087),uint256(11843201175511394674224882314719744090005823775711198123908970674468441340626)); - vk.IC[121] = Pairing.G1Point(uint256(11779866285886477058233262617181102875810432515236086165301634888647796468285),uint256(20304904017079364293528985902914652711056094838577523831107251186430000376103)); - vk.IC[122] = Pairing.G1Point(uint256(16741048327094051449850380442322997638089566456733427175028993526920079216552),uint256(469168782820627354614016869964037684089616570710843167108196420227532543358)); - vk.IC[123] = Pairing.G1Point(uint256(8192970453232272547440654687523742209402660277066973787541850715511374651622),uint256(15378234133052651769174717524827877745034818735188283718621316832075692924406)); - vk.IC[124] = Pairing.G1Point(uint256(10874114257144317851900054481205527956050976138359009857985393174723062892676),uint256(12717308684825512964345073222442623220963599686472628674634895201106020201890)); - vk.IC[125] = Pairing.G1Point(uint256(5267065588819698865144857558764204428263327949346016006240918993613635535317),uint256(9504308288810723489809880319665125296646318783448726885811570230750183852840)); - vk.IC[126] = Pairing.G1Point(uint256(19589750306950764739097899155765349671907282871881276201801496319992047650746),uint256(19355465427953889761240746637309186677085883165092990254569077723585487580684)); - vk.IC[127] = Pairing.G1Point(uint256(17157506086704891040661746569169794341719382632415432679454534292409879487085),uint256(19897635624356405012232528284119658467695828553967677022062327424627204803193)); - vk.IC[128] = Pairing.G1Point(uint256(20238858483410373364817397805629956894825450075652394120977179046203337104373),uint256(6874509773395989359964200584287462074246787158135629964693169157409514901534)); - vk.IC[129] = Pairing.G1Point(uint256(12042579617996728748165735987255778752470955736200812791100866788721737191632),uint256(11956625767696871244461941300661106065113240619864391737851713805635374157021)); - vk.IC[130] = Pairing.G1Point(uint256(16548366919176947814040435329595118023993324878565761882418197223671907573357),uint256(10620821967136310262692802689974809502198526374547943939269158284384653114350)); - vk.IC[131] = Pairing.G1Point(uint256(8175466437668934308709975762665321770552084750706095349920295311638284090340),uint256(17425364680901154207661740679315488758276320872402168607111940050845887976471)); - vk.IC[132] = Pairing.G1Point(uint256(9198147470468043329255739956904344209746369324919711050881466969196801966276),uint256(20298732777222909816627151550361882672333769232236128952325518941075042836010)); - vk.IC[133] = Pairing.G1Point(uint256(15904946907253788347044186320302300871858274132480685493537494288950980594193),uint256(15409483562413553293784442699758192278775213388937158234684578475424442082364)); - vk.IC[134] = Pairing.G1Point(uint256(14220065024533152210243662627649996829439850016253669280094507063796589016407),uint256(2782695826772336437168593281979032224437557674189704274938530289022757554551)); - vk.IC[135] = Pairing.G1Point(uint256(3439664554786124907619188183455389534759238310861135614302099160907607051269),uint256(20990451399839802618416331354962424116625631351552047454336086879944775872991)); - vk.IC[136] = Pairing.G1Point(uint256(17322663660000121892857220907135345561983364271033777284327298998169328112152),uint256(8518935329747198938862986634975284512581273824227035851902576752634386127933)); - - } - - /* - * @returns Whether the proof is valid given the hardcoded verifying key - * above and the public inputs - */ - function verifyProof( - uint256[2] memory a, - uint256[2][2] memory b, - uint256[2] memory c, - uint256[] memory input - ) public view returns (bool) { - - Proof memory proof; - proof.A = Pairing.G1Point(a[0], a[1]); - proof.B = Pairing.G2Point([b[0][0], b[0][1]], [b[1][0], b[1][1]]); - proof.C = Pairing.G1Point(c[0], c[1]); - - VerifyingKey memory vk = verifyingKey(); - - // Compute the linear combination vk_x - Pairing.G1Point memory vk_x = Pairing.G1Point(0, 0); - - // Make sure that proof.A, B, and C are each less than the prime q - require(proof.A.X < PRIME_Q, "verifier-aX-gte-prime-q"); - require(proof.A.Y < PRIME_Q, "verifier-aY-gte-prime-q"); - - require(proof.B.X[0] < PRIME_Q, "verifier-bX0-gte-prime-q"); - require(proof.B.Y[0] < PRIME_Q, "verifier-bY0-gte-prime-q"); - - require(proof.B.X[1] < PRIME_Q, "verifier-bX1-gte-prime-q"); - require(proof.B.Y[1] < PRIME_Q, "verifier-bY1-gte-prime-q"); - - require(proof.C.X < PRIME_Q, "verifier-cX-gte-prime-q"); - require(proof.C.Y < PRIME_Q, "verifier-cY-gte-prime-q"); - - // Make sure that every input is less than the snark scalar field - //for (uint256 i = 0; i < input.length; i++) { - for (uint256 i = 0; i < 136; i++) { - require(input[i] < SNARK_SCALAR_FIELD,"verifier-gte-snark-scalar-field"); - vk_x = Pairing.plus(vk_x, Pairing.scalar_mul(vk.IC[i + 1], input[i])); - } - - vk_x = Pairing.plus(vk_x, vk.IC[0]); - - return Pairing.pairing( - Pairing.negate(proof.A), - proof.B, - vk.alpha1, - vk.beta2, - vk_x, - vk.gamma2, - proof.C, - vk.delta2 - ); - } -} diff --git a/contracts/contracts/snarkVerifiers/BatchUpdateStateTreeVerifierMedium.sol b/contracts/contracts/snarkVerifiers/BatchUpdateStateTreeVerifierMedium.sol deleted file mode 100644 index 772e8c9fd..000000000 --- a/contracts/contracts/snarkVerifiers/BatchUpdateStateTreeVerifierMedium.sol +++ /dev/null @@ -1,246 +0,0 @@ -// SPDX-License-Identifier: MIT - -// Copyright 2017 Christian Reitwiessner -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to -// deal in the Software without restriction, including without limitation the -// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -// sell copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS -// IN THE SOFTWARE. - -// 2019 OKIMS - -pragma solidity ^0.6.12; - -library Pairing { - - uint256 constant PRIME_Q = 21888242871839275222246405745257275088696311157297823662689037894645226208583; - - struct G1Point { - uint256 X; - uint256 Y; - } - - // Encoding of field elements is: X[0] * z + X[1] - struct G2Point { - uint256[2] X; - uint256[2] Y; - } - - /* - * @return The negation of p, i.e. p.plus(p.negate()) should be zero. - */ - function negate(G1Point memory p) internal pure returns (G1Point memory) { - - // The prime q in the base field F_q for G1 - if (p.X == 0 && p.Y == 0) { - return G1Point(0, 0); - } else { - return G1Point(p.X, PRIME_Q - (p.Y % PRIME_Q)); - } - } - - /* - * @return The sum of two points of G1 - */ - function plus( - G1Point memory p1, - G1Point memory p2 - ) internal view returns (G1Point memory r) { - - uint256[4] memory input; - input[0] = p1.X; - input[1] = p1.Y; - input[2] = p2.X; - input[3] = p2.Y; - bool success; - - // solium-disable-next-line security/no-inline-assembly - assembly { - success := staticcall(sub(gas(), 2000), 6, input, 0xc0, r, 0x60) - // Use "invalid" to make gas estimation work - switch success case 0 { invalid() } - } - - require(success,"pairing-add-failed"); - } - - /* - * @return The product of a point on G1 and a scalar, i.e. - * p == p.scalar_mul(1) and p.plus(p) == p.scalar_mul(2) for all - * points p. - */ - function scalar_mul(G1Point memory p, uint256 s) internal view returns (G1Point memory r) { - - uint256[3] memory input; - input[0] = p.X; - input[1] = p.Y; - input[2] = s; - bool success; - // solium-disable-next-line security/no-inline-assembly - assembly { - success := staticcall(sub(gas(), 2000), 7, input, 0x80, r, 0x60) - // Use "invalid" to make gas estimation work - switch success case 0 { invalid() } - } - require (success,"pairing-mul-failed"); - } - - /* @return The result of computing the pairing check - * e(p1[0], p2[0]) * .... * e(p1[n], p2[n]) == 1 - * For example, - * pairing([P1(), P1().negate()], [P2(), P2()]) should return true. - */ - function pairing( - G1Point memory a1, - G2Point memory a2, - G1Point memory b1, - G2Point memory b2, - G1Point memory c1, - G2Point memory c2, - G1Point memory d1, - G2Point memory d2 - ) internal view returns (bool) { - - G1Point[4] memory p1 = [a1, b1, c1, d1]; - G2Point[4] memory p2 = [a2, b2, c2, d2]; - - uint256 inputSize = 24; - uint256[] memory input = new uint256[](inputSize); - - for (uint256 i = 0; i < 4; i++) { - uint256 j = i * 6; - input[j + 0] = p1[i].X; - input[j + 1] = p1[i].Y; - input[j + 2] = p2[i].X[0]; - input[j + 3] = p2[i].X[1]; - input[j + 4] = p2[i].Y[0]; - input[j + 5] = p2[i].Y[1]; - } - - uint256[1] memory out; - bool success; - - // solium-disable-next-line security/no-inline-assembly - assembly { - success := staticcall(sub(gas(), 2000), 8, add(input, 0x20), mul(inputSize, 0x20), out, 0x20) - // Use "invalid" to make gas estimation work - switch success case 0 { invalid() } - } - - require(success,"pairing-opcode-failed"); - - return out[0] != 0; - } -} - -contract BatchUpdateStateTreeVerifierMedium { - - using Pairing for *; - - uint256 constant SNARK_SCALAR_FIELD = 21888242871839275222246405745257275088548364400416034343698204186575808495617; - uint256 constant PRIME_Q = 21888242871839275222246405745257275088696311157297823662689037894645226208583; - - struct VerifyingKey { - Pairing.G1Point alpha1; - Pairing.G2Point beta2; - Pairing.G2Point gamma2; - Pairing.G2Point delta2; - Pairing.G1Point[17] IC; - } - - struct Proof { - Pairing.G1Point A; - Pairing.G2Point B; - Pairing.G1Point C; - } - - function verifyingKey() internal pure returns (VerifyingKey memory vk) { - vk.alpha1 = Pairing.G1Point(uint256(8127368723535166419632247524465558331085902869555340986059718511989533877903),uint256(20751332113681994095650238414495480904944949506381825493965392781178871266400)); - vk.beta2 = Pairing.G2Point([uint256(9685355385772429669466876586032950444529073715446288295667192086154215757045),uint256(7956626864936620944123193484482287319258088339178359422012222341945141262220)], [uint256(19277014037627504374082945717900190531762317571436581847505825764213853980686),uint256(1908967219375266398782153786533621521966321545716402064661821836653497251741)]); - vk.gamma2 = Pairing.G2Point([uint256(5702317503459074564121810512849723904030883133659602462895207227676159457073),uint256(9752411496072907857511096469537907301675968143151763666915902954766029820649)], [uint256(15311638672119697109635568189096163980728853237572158000887687187767443065721),uint256(1467949219797428504423330776372868631685191022967660814672971291349981326453)]); - vk.delta2 = Pairing.G2Point([uint256(10042644312445726099186680195135610911154557846368466839914514090420315363196),uint256(5953242661240745376894723690499081179580713522533109505888896972170548423447)], [uint256(10432007173047800436393448146423908598229591402975125688897148668885988436869),uint256(12761943683328572443702167247603024646278392963300375768416341208640194440024)]); - vk.IC[0] = Pairing.G1Point(uint256(11684292448093409938749262856593257593265415990315799375441434818225669117513),uint256(17354060169699583056385031768553520066269419437930441355141323183474193288344)); - vk.IC[1] = Pairing.G1Point(uint256(18978804233362855254748336240885798166167145695925971316209016129430982996836),uint256(257858084308660882579741098452103505697546993991481243530058803272769410057)); - vk.IC[2] = Pairing.G1Point(uint256(17649396753598836169644322173305297636595195297224350400248366524982692230220),uint256(2165143809338451531595352410274439369578304210861736455028198355991881901890)); - vk.IC[3] = Pairing.G1Point(uint256(12743475133933567838181095413456793317278787317007224370983379018748448880439),uint256(17387113142283371215066240407634247412819690889126818223090569191529216359300)); - vk.IC[4] = Pairing.G1Point(uint256(1973511551104436924982643118293031400664941922560734295520380902778965063251),uint256(21423512037659270408296674189055636682814308571306415638667681949212670378307)); - vk.IC[5] = Pairing.G1Point(uint256(12777475795556421867594783452639673004232530111226584159211744735927472586255),uint256(7326014169312842413471118740148351952862820599657458623242388398534338006363)); - vk.IC[6] = Pairing.G1Point(uint256(5216469969299120528732608160349918061249907501767043565375615161147976215332),uint256(989946861370125382242158047375361790746368218462907689336263579770837836807)); - vk.IC[7] = Pairing.G1Point(uint256(1682411899235644827727477309775512902504716511759651526016668337120108984926),uint256(21769687491878374021041256695129294708083537029426461275027954222572060532876)); - vk.IC[8] = Pairing.G1Point(uint256(5947652013068851029927893718347327362975416962746360721614242282675280018208),uint256(19799444121016126892140192037794264125999664316205188958742024257185442352276)); - vk.IC[9] = Pairing.G1Point(uint256(21375424700580426268242254401461692906048911765321104036248562923057326547366),uint256(9129515758103210983440731412054967409022512154388896010243757658363345066677)); - vk.IC[10] = Pairing.G1Point(uint256(5181083872326425277095701295102437078618842182808106432882453866402826205563),uint256(3909589691497505586347501966012568332505459927841506312555163682171624999043)); - vk.IC[11] = Pairing.G1Point(uint256(10937238241723729230999281548237275936689326872031049956988113144871249285169),uint256(908961722856783819279957126760115378461171320446208214965651116245467045331)); - vk.IC[12] = Pairing.G1Point(uint256(3340262943862885831954653074465395723752665498076653211793977667293737939299),uint256(10595003636105707362809228404198822880051256440874866938066599528736642232113)); - vk.IC[13] = Pairing.G1Point(uint256(17733118154261984975207903210356648996459746363268039856505287526450143633061),uint256(10229172354780818691484249140658139755710494926977826788534554464077750899291)); - vk.IC[14] = Pairing.G1Point(uint256(15606780348017354284133115125836593111691468822472478900734443507129354597871),uint256(7527502697349561903585389719636612489476423980435833597073323824095560676366)); - vk.IC[15] = Pairing.G1Point(uint256(20637507020360298247108263518839712916953032459692536666602324578797100233564),uint256(3551825909610153987714265190158118462865969018102364275668450938716744737389)); - vk.IC[16] = Pairing.G1Point(uint256(15117627238918034193896927328047801718793634367825184271113223515449162451314),uint256(5616304170205753474662337142730909509040421377018706342325018229476514760803)); - - } - - /* - * @returns Whether the proof is valid given the hardcoded verifying key - * above and the public inputs - */ - function verifyProof( - uint256[2] memory a, - uint256[2][2] memory b, - uint256[2] memory c, - uint256[] memory input - ) public view returns (bool) { - - Proof memory proof; - proof.A = Pairing.G1Point(a[0], a[1]); - proof.B = Pairing.G2Point([b[0][0], b[0][1]], [b[1][0], b[1][1]]); - proof.C = Pairing.G1Point(c[0], c[1]); - - VerifyingKey memory vk = verifyingKey(); - - // Compute the linear combination vk_x - Pairing.G1Point memory vk_x = Pairing.G1Point(0, 0); - - // Make sure that proof.A, B, and C are each less than the prime q - require(proof.A.X < PRIME_Q, "verifier-aX-gte-prime-q"); - require(proof.A.Y < PRIME_Q, "verifier-aY-gte-prime-q"); - - require(proof.B.X[0] < PRIME_Q, "verifier-bX0-gte-prime-q"); - require(proof.B.Y[0] < PRIME_Q, "verifier-bY0-gte-prime-q"); - - require(proof.B.X[1] < PRIME_Q, "verifier-bX1-gte-prime-q"); - require(proof.B.Y[1] < PRIME_Q, "verifier-bY1-gte-prime-q"); - - require(proof.C.X < PRIME_Q, "verifier-cX-gte-prime-q"); - require(proof.C.Y < PRIME_Q, "verifier-cY-gte-prime-q"); - - // Make sure that every input is less than the snark scalar field - //for (uint256 i = 0; i < input.length; i++) { - for (uint256 i = 0; i < 16; i++) { - require(input[i] < SNARK_SCALAR_FIELD,"verifier-gte-snark-scalar-field"); - vk_x = Pairing.plus(vk_x, Pairing.scalar_mul(vk.IC[i + 1], input[i])); - } - - vk_x = Pairing.plus(vk_x, vk.IC[0]); - - return Pairing.pairing( - Pairing.negate(proof.A), - proof.B, - vk.alpha1, - vk.beta2, - vk_x, - vk.gamma2, - proof.C, - vk.delta2 - ); - } -} diff --git a/contracts/contracts/snarkVerifiers/QuadVoteTallyVerifier.sol b/contracts/contracts/snarkVerifiers/QuadVoteTallyVerifier.sol deleted file mode 100644 index d55ee98b7..000000000 --- a/contracts/contracts/snarkVerifiers/QuadVoteTallyVerifier.sol +++ /dev/null @@ -1,240 +0,0 @@ -// SPDX-License-Identifier: MIT - -// Copyright 2017 Christian Reitwiessner -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to -// deal in the Software without restriction, including without limitation the -// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -// sell copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS -// IN THE SOFTWARE. - -// 2019 OKIMS - -pragma solidity ^0.6.12; - -library Pairing { - - uint256 constant PRIME_Q = 21888242871839275222246405745257275088696311157297823662689037894645226208583; - - struct G1Point { - uint256 X; - uint256 Y; - } - - // Encoding of field elements is: X[0] * z + X[1] - struct G2Point { - uint256[2] X; - uint256[2] Y; - } - - /* - * @return The negation of p, i.e. p.plus(p.negate()) should be zero. - */ - function negate(G1Point memory p) internal pure returns (G1Point memory) { - - // The prime q in the base field F_q for G1 - if (p.X == 0 && p.Y == 0) { - return G1Point(0, 0); - } else { - return G1Point(p.X, PRIME_Q - (p.Y % PRIME_Q)); - } - } - - /* - * @return The sum of two points of G1 - */ - function plus( - G1Point memory p1, - G1Point memory p2 - ) internal view returns (G1Point memory r) { - - uint256[4] memory input; - input[0] = p1.X; - input[1] = p1.Y; - input[2] = p2.X; - input[3] = p2.Y; - bool success; - - // solium-disable-next-line security/no-inline-assembly - assembly { - success := staticcall(sub(gas(), 2000), 6, input, 0xc0, r, 0x60) - // Use "invalid" to make gas estimation work - switch success case 0 { invalid() } - } - - require(success,"pairing-add-failed"); - } - - /* - * @return The product of a point on G1 and a scalar, i.e. - * p == p.scalar_mul(1) and p.plus(p) == p.scalar_mul(2) for all - * points p. - */ - function scalar_mul(G1Point memory p, uint256 s) internal view returns (G1Point memory r) { - - uint256[3] memory input; - input[0] = p.X; - input[1] = p.Y; - input[2] = s; - bool success; - // solium-disable-next-line security/no-inline-assembly - assembly { - success := staticcall(sub(gas(), 2000), 7, input, 0x80, r, 0x60) - // Use "invalid" to make gas estimation work - switch success case 0 { invalid() } - } - require (success,"pairing-mul-failed"); - } - - /* @return The result of computing the pairing check - * e(p1[0], p2[0]) * .... * e(p1[n], p2[n]) == 1 - * For example, - * pairing([P1(), P1().negate()], [P2(), P2()]) should return true. - */ - function pairing( - G1Point memory a1, - G2Point memory a2, - G1Point memory b1, - G2Point memory b2, - G1Point memory c1, - G2Point memory c2, - G1Point memory d1, - G2Point memory d2 - ) internal view returns (bool) { - - G1Point[4] memory p1 = [a1, b1, c1, d1]; - G2Point[4] memory p2 = [a2, b2, c2, d2]; - - uint256 inputSize = 24; - uint256[] memory input = new uint256[](inputSize); - - for (uint256 i = 0; i < 4; i++) { - uint256 j = i * 6; - input[j + 0] = p1[i].X; - input[j + 1] = p1[i].Y; - input[j + 2] = p2[i].X[0]; - input[j + 3] = p2[i].X[1]; - input[j + 4] = p2[i].Y[0]; - input[j + 5] = p2[i].Y[1]; - } - - uint256[1] memory out; - bool success; - - // solium-disable-next-line security/no-inline-assembly - assembly { - success := staticcall(sub(gas(), 2000), 8, add(input, 0x20), mul(inputSize, 0x20), out, 0x20) - // Use "invalid" to make gas estimation work - switch success case 0 { invalid() } - } - - require(success,"pairing-opcode-failed"); - - return out[0] != 0; - } -} - -contract QuadVoteTallyVerifier { - - using Pairing for *; - - uint256 constant SNARK_SCALAR_FIELD = 21888242871839275222246405745257275088548364400416034343698204186575808495617; - uint256 constant PRIME_Q = 21888242871839275222246405745257275088696311157297823662689037894645226208583; - - struct VerifyingKey { - Pairing.G1Point alpha1; - Pairing.G2Point beta2; - Pairing.G2Point gamma2; - Pairing.G2Point delta2; - Pairing.G1Point[11] IC; - } - - struct Proof { - Pairing.G1Point A; - Pairing.G2Point B; - Pairing.G1Point C; - } - - function verifyingKey() internal pure returns (VerifyingKey memory vk) { - vk.alpha1 = Pairing.G1Point(uint256(478592870202004608407700946626510860825148547055186999737325427570268071144),uint256(9157751337584079183052823489385089906467596264238255675172315388015682209774)); - vk.beta2 = Pairing.G2Point([uint256(6301620314605447452471250663439393534638947012799820621609105749783745560238),uint256(12341502659983370456526803525767300996895322973579878805909946779444016389895)], [uint256(17916035858196687513208189237457342837320151929236378973691981190169390281199),uint256(16444228891791804865508709572623644561615935374209966906478869289655940086819)]); - vk.gamma2 = Pairing.G2Point([uint256(5681708471910945625508468623962396133764094578948387511590294581780247636017),uint256(12118744368887744070277905720785727027721900792460533412560115235173516007908)], [uint256(19143226185719422706551432871778581754615352286078150770379633722946728087125),uint256(8771291206027627376480902628253800619076104193002741604312297889777140358543)]); - vk.delta2 = Pairing.G2Point([uint256(9183444025997791469483933628505481094940229831191936388841069110540752769781),uint256(8121628155109074152882719504614154410527219019551879405875845762324393116130)], [uint256(8325138441882418069414030057991625671383402127217529829084370835890202514000),uint256(9700306852366593120852495830825669684287132235431702544754680617352512454780)]); - vk.IC[0] = Pairing.G1Point(uint256(4473856644216221607948987814014926389720185629882460701333813122776100635359),uint256(6956131460421571269545707696409648145308526664212416140417363000095589815957)); - vk.IC[1] = Pairing.G1Point(uint256(19726295696846084173995518778637603505432011392669350104762042298570929316346),uint256(13684462422305003621518551338570850725671233410625819322646002682428910339429)); - vk.IC[2] = Pairing.G1Point(uint256(1793827834727029479223351236835013187707179140888477179764044490904850639387),uint256(9312618810000293440910138801600864403438208853566431650456704114136859489280)); - vk.IC[3] = Pairing.G1Point(uint256(11299035697656742275163765506077278401047329066124730515593035905313819503632),uint256(8322913632991975622972935760048898137909505419420978665497880611712700540401)); - vk.IC[4] = Pairing.G1Point(uint256(13280602119776390452472714232270236887712223629882412086729691920155671150647),uint256(9540967200702169920405239453575495565944466677486003725855919012643557907267)); - vk.IC[5] = Pairing.G1Point(uint256(12200560943472216911056438915706858784124211911450075427378114042676593812259),uint256(17363473751896243640122786159552908959774140510742843930466234747339374414344)); - vk.IC[6] = Pairing.G1Point(uint256(12464095219545033179030609307332889165874320294995310908043756072470336241120),uint256(18572326813401808505761456164543655416444739586565502040584417514349858243117)); - vk.IC[7] = Pairing.G1Point(uint256(15305793898268890519676908327637239309682558965763582917391906664096155448814),uint256(9329976234288148300706215406568623952682983727826487364179817651003418007797)); - vk.IC[8] = Pairing.G1Point(uint256(4350651078029810241597622803746393469046970908830068946962238954577441679407),uint256(20824581855206441124855000731935153775549323660729469647725245043549733300013)); - vk.IC[9] = Pairing.G1Point(uint256(16275960615024373983571481323744994250709112408244262892442567264765482858200),uint256(5739458670378731325014841645966986236597983834936517804475078311820134531416)); - vk.IC[10] = Pairing.G1Point(uint256(4795536229571555988834795837284084799723912608501169725196781157502877593631),uint256(9268532769594658382717845783893860710430840681661979231328300443942186410276)); - - } - - /* - * @returns Whether the proof is valid given the hardcoded verifying key - * above and the public inputs - */ - function verifyProof( - uint256[2] memory a, - uint256[2][2] memory b, - uint256[2] memory c, - uint256[] memory input - ) public view returns (bool) { - - Proof memory proof; - proof.A = Pairing.G1Point(a[0], a[1]); - proof.B = Pairing.G2Point([b[0][0], b[0][1]], [b[1][0], b[1][1]]); - proof.C = Pairing.G1Point(c[0], c[1]); - - VerifyingKey memory vk = verifyingKey(); - - // Compute the linear combination vk_x - Pairing.G1Point memory vk_x = Pairing.G1Point(0, 0); - - // Make sure that proof.A, B, and C are each less than the prime q - require(proof.A.X < PRIME_Q, "verifier-aX-gte-prime-q"); - require(proof.A.Y < PRIME_Q, "verifier-aY-gte-prime-q"); - - require(proof.B.X[0] < PRIME_Q, "verifier-bX0-gte-prime-q"); - require(proof.B.Y[0] < PRIME_Q, "verifier-bY0-gte-prime-q"); - - require(proof.B.X[1] < PRIME_Q, "verifier-bX1-gte-prime-q"); - require(proof.B.Y[1] < PRIME_Q, "verifier-bY1-gte-prime-q"); - - require(proof.C.X < PRIME_Q, "verifier-cX-gte-prime-q"); - require(proof.C.Y < PRIME_Q, "verifier-cY-gte-prime-q"); - - // Make sure that every input is less than the snark scalar field - //for (uint256 i = 0; i < input.length; i++) { - for (uint256 i = 0; i < 10; i++) { - require(input[i] < SNARK_SCALAR_FIELD,"verifier-gte-snark-scalar-field"); - vk_x = Pairing.plus(vk_x, Pairing.scalar_mul(vk.IC[i + 1], input[i])); - } - - vk_x = Pairing.plus(vk_x, vk.IC[0]); - - return Pairing.pairing( - Pairing.negate(proof.A), - proof.B, - vk.alpha1, - vk.beta2, - vk_x, - vk.gamma2, - proof.C, - vk.delta2 - ); - } -} diff --git a/contracts/contracts/snarkVerifiers/QuadVoteTallyVerifier32.sol b/contracts/contracts/snarkVerifiers/QuadVoteTallyVerifier32.sol deleted file mode 100644 index c225996b6..000000000 --- a/contracts/contracts/snarkVerifiers/QuadVoteTallyVerifier32.sol +++ /dev/null @@ -1,240 +0,0 @@ -// SPDX-License-Identifier: MIT - -// Copyright 2017 Christian Reitwiessner -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to -// deal in the Software without restriction, including without limitation the -// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -// sell copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS -// IN THE SOFTWARE. - -// 2019 OKIMS - -pragma solidity ^0.6.12; - -library Pairing { - - uint256 constant PRIME_Q = 21888242871839275222246405745257275088696311157297823662689037894645226208583; - - struct G1Point { - uint256 X; - uint256 Y; - } - - // Encoding of field elements is: X[0] * z + X[1] - struct G2Point { - uint256[2] X; - uint256[2] Y; - } - - /* - * @return The negation of p, i.e. p.plus(p.negate()) should be zero. - */ - function negate(G1Point memory p) internal pure returns (G1Point memory) { - - // The prime q in the base field F_q for G1 - if (p.X == 0 && p.Y == 0) { - return G1Point(0, 0); - } else { - return G1Point(p.X, PRIME_Q - (p.Y % PRIME_Q)); - } - } - - /* - * @return The sum of two points of G1 - */ - function plus( - G1Point memory p1, - G1Point memory p2 - ) internal view returns (G1Point memory r) { - - uint256[4] memory input; - input[0] = p1.X; - input[1] = p1.Y; - input[2] = p2.X; - input[3] = p2.Y; - bool success; - - // solium-disable-next-line security/no-inline-assembly - assembly { - success := staticcall(sub(gas(), 2000), 6, input, 0xc0, r, 0x60) - // Use "invalid" to make gas estimation work - switch success case 0 { invalid() } - } - - require(success,"pairing-add-failed"); - } - - /* - * @return The product of a point on G1 and a scalar, i.e. - * p == p.scalar_mul(1) and p.plus(p) == p.scalar_mul(2) for all - * points p. - */ - function scalar_mul(G1Point memory p, uint256 s) internal view returns (G1Point memory r) { - - uint256[3] memory input; - input[0] = p.X; - input[1] = p.Y; - input[2] = s; - bool success; - // solium-disable-next-line security/no-inline-assembly - assembly { - success := staticcall(sub(gas(), 2000), 7, input, 0x80, r, 0x60) - // Use "invalid" to make gas estimation work - switch success case 0 { invalid() } - } - require (success,"pairing-mul-failed"); - } - - /* @return The result of computing the pairing check - * e(p1[0], p2[0]) * .... * e(p1[n], p2[n]) == 1 - * For example, - * pairing([P1(), P1().negate()], [P2(), P2()]) should return true. - */ - function pairing( - G1Point memory a1, - G2Point memory a2, - G1Point memory b1, - G2Point memory b2, - G1Point memory c1, - G2Point memory c2, - G1Point memory d1, - G2Point memory d2 - ) internal view returns (bool) { - - G1Point[4] memory p1 = [a1, b1, c1, d1]; - G2Point[4] memory p2 = [a2, b2, c2, d2]; - - uint256 inputSize = 24; - uint256[] memory input = new uint256[](inputSize); - - for (uint256 i = 0; i < 4; i++) { - uint256 j = i * 6; - input[j + 0] = p1[i].X; - input[j + 1] = p1[i].Y; - input[j + 2] = p2[i].X[0]; - input[j + 3] = p2[i].X[1]; - input[j + 4] = p2[i].Y[0]; - input[j + 5] = p2[i].Y[1]; - } - - uint256[1] memory out; - bool success; - - // solium-disable-next-line security/no-inline-assembly - assembly { - success := staticcall(sub(gas(), 2000), 8, add(input, 0x20), mul(inputSize, 0x20), out, 0x20) - // Use "invalid" to make gas estimation work - switch success case 0 { invalid() } - } - - require(success,"pairing-opcode-failed"); - - return out[0] != 0; - } -} - -contract QuadVoteTallyVerifier32 { - - using Pairing for *; - - uint256 constant SNARK_SCALAR_FIELD = 21888242871839275222246405745257275088548364400416034343698204186575808495617; - uint256 constant PRIME_Q = 21888242871839275222246405745257275088696311157297823662689037894645226208583; - - struct VerifyingKey { - Pairing.G1Point alpha1; - Pairing.G2Point beta2; - Pairing.G2Point gamma2; - Pairing.G2Point delta2; - Pairing.G1Point[11] IC; - } - - struct Proof { - Pairing.G1Point A; - Pairing.G2Point B; - Pairing.G1Point C; - } - - function verifyingKey() internal pure returns (VerifyingKey memory vk) { - vk.alpha1 = Pairing.G1Point(uint256(9788127595119201866856617003695348381494833524466400639949073585957021339037),uint256(17932521094406734810716540317777009267479808128307339657586752246845966324546)); - vk.beta2 = Pairing.G2Point([uint256(21696649512957474520766095764799013940939016236949108680242351137594278285669),uint256(9016446391367028110234589585753924330264825516230321143634114592563371307117)], [uint256(7087399056167398372761076892757707007018670953459473525927429087917826945053),uint256(9659617587389110165682052807238376129317889332523805252341223621597875480794)]); - vk.gamma2 = Pairing.G2Point([uint256(13962369966765040668829655136924014476219060175797181969275750747389840617448),uint256(19823961448325229305204277789628974240377979114016419863625529107132599746377)], [uint256(21003505158985748144125490558991246355533878946496416497168816402925446815665),uint256(14051298214898763705311654324232715279911394037278143384416856363195856079315)]); - vk.delta2 = Pairing.G2Point([uint256(11530440852220161646149031563657779726613020784068593716469602804710970865016),uint256(14257554911323500151026989745783771294105663833290894907603970279224038797748)], [uint256(5383887732348773780113795775564370073998899934497202895231896126994803955425),uint256(11233493274723621382210142971760402149935803222743635486876071121294805940438)]); - vk.IC[0] = Pairing.G1Point(uint256(10331630364560579918439924807409069040574467453347970997831619467700630786260),uint256(7352703907083746684727908159265924004558758803834300636605141089397401744276)); - vk.IC[1] = Pairing.G1Point(uint256(2383454224874693764660765415618474893054453576782110395746877001592325997813),uint256(1542959527417798518589026170675817148209513312208940161838188351540305261351)); - vk.IC[2] = Pairing.G1Point(uint256(18884898847905030735430424271903368807631300921120481538677323215944429955882),uint256(7994371495659448868909256534360335828331664970438054963950762473745447828579)); - vk.IC[3] = Pairing.G1Point(uint256(12191131903986550861667269414449440505467282925229091327826064446444042925410),uint256(10287091939791432810651612894102236781556081667714076895904551125587377961104)); - vk.IC[4] = Pairing.G1Point(uint256(20501120058293061653434025117099905624068740273769213189741054505135138713238),uint256(17165567928850585462269967533098885781515290109705663694639983179304840313303)); - vk.IC[5] = Pairing.G1Point(uint256(20751307669795641184935675550765974725507672821656889501312345885830120955045),uint256(11018164791073843718441881117561339638946066654006646219940842025563325157728)); - vk.IC[6] = Pairing.G1Point(uint256(18159318129566988733741597410767431681008828827772613186940913319367318549079),uint256(12396436918085027159836905968189917573204122166878503885239851905631641956072)); - vk.IC[7] = Pairing.G1Point(uint256(13060171889041434447360216444511148806054464772702115083624471143224891275324),uint256(10094424363784529626834006689496204497794067280043536139893786658250635934309)); - vk.IC[8] = Pairing.G1Point(uint256(6854173124674957005941305536675433520123924432035620687587028033143445025531),uint256(19506224151286244452202284185755930627153417086070884411467083228467399266356)); - vk.IC[9] = Pairing.G1Point(uint256(18168338073015895229874309533757429566747399006686550780596425981177180963553),uint256(21672263069691916535914406330276563680996218330501255716766232162984703727459)); - vk.IC[10] = Pairing.G1Point(uint256(12867344578516149856332575271023915354048241534592007123391907132955424635582),uint256(1166388922196880405559962045533802218202004023209252233378224410860556005741)); - - } - - /* - * @returns Whether the proof is valid given the hardcoded verifying key - * above and the public inputs - */ - function verifyProof( - uint256[2] memory a, - uint256[2][2] memory b, - uint256[2] memory c, - uint256[] memory input - ) public view returns (bool) { - - Proof memory proof; - proof.A = Pairing.G1Point(a[0], a[1]); - proof.B = Pairing.G2Point([b[0][0], b[0][1]], [b[1][0], b[1][1]]); - proof.C = Pairing.G1Point(c[0], c[1]); - - VerifyingKey memory vk = verifyingKey(); - - // Compute the linear combination vk_x - Pairing.G1Point memory vk_x = Pairing.G1Point(0, 0); - - // Make sure that proof.A, B, and C are each less than the prime q - require(proof.A.X < PRIME_Q, "verifier-aX-gte-prime-q"); - require(proof.A.Y < PRIME_Q, "verifier-aY-gte-prime-q"); - - require(proof.B.X[0] < PRIME_Q, "verifier-bX0-gte-prime-q"); - require(proof.B.Y[0] < PRIME_Q, "verifier-bY0-gte-prime-q"); - - require(proof.B.X[1] < PRIME_Q, "verifier-bX1-gte-prime-q"); - require(proof.B.Y[1] < PRIME_Q, "verifier-bY1-gte-prime-q"); - - require(proof.C.X < PRIME_Q, "verifier-cX-gte-prime-q"); - require(proof.C.Y < PRIME_Q, "verifier-cY-gte-prime-q"); - - // Make sure that every input is less than the snark scalar field - //for (uint256 i = 0; i < input.length; i++) { - for (uint256 i = 0; i < 10; i++) { - require(input[i] < SNARK_SCALAR_FIELD,"verifier-gte-snark-scalar-field"); - vk_x = Pairing.plus(vk_x, Pairing.scalar_mul(vk.IC[i + 1], input[i])); - } - - vk_x = Pairing.plus(vk_x, vk.IC[0]); - - return Pairing.pairing( - Pairing.negate(proof.A), - proof.B, - vk.alpha1, - vk.beta2, - vk_x, - vk.gamma2, - proof.C, - vk.delta2 - ); - } -} \ No newline at end of file diff --git a/contracts/contracts/snarkVerifiers/QuadVoteTallyVerifier32Batch16.sol b/contracts/contracts/snarkVerifiers/QuadVoteTallyVerifier32Batch16.sol deleted file mode 100644 index 4c0cb2f1f..000000000 --- a/contracts/contracts/snarkVerifiers/QuadVoteTallyVerifier32Batch16.sol +++ /dev/null @@ -1,240 +0,0 @@ -// SPDX-License-Identifier: MIT - -// Copyright 2017 Christian Reitwiessner -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to -// deal in the Software without restriction, including without limitation the -// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -// sell copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS -// IN THE SOFTWARE. - -// 2019 OKIMS - -pragma solidity ^0.6.12; - -library Pairing { - - uint256 constant PRIME_Q = 21888242871839275222246405745257275088696311157297823662689037894645226208583; - - struct G1Point { - uint256 X; - uint256 Y; - } - - // Encoding of field elements is: X[0] * z + X[1] - struct G2Point { - uint256[2] X; - uint256[2] Y; - } - - /* - * @return The negation of p, i.e. p.plus(p.negate()) should be zero. - */ - function negate(G1Point memory p) internal pure returns (G1Point memory) { - - // The prime q in the base field F_q for G1 - if (p.X == 0 && p.Y == 0) { - return G1Point(0, 0); - } else { - return G1Point(p.X, PRIME_Q - (p.Y % PRIME_Q)); - } - } - - /* - * @return The sum of two points of G1 - */ - function plus( - G1Point memory p1, - G1Point memory p2 - ) internal view returns (G1Point memory r) { - - uint256[4] memory input; - input[0] = p1.X; - input[1] = p1.Y; - input[2] = p2.X; - input[3] = p2.Y; - bool success; - - // solium-disable-next-line security/no-inline-assembly - assembly { - success := staticcall(sub(gas(), 2000), 6, input, 0xc0, r, 0x60) - // Use "invalid" to make gas estimation work - switch success case 0 { invalid() } - } - - require(success,"pairing-add-failed"); - } - - /* - * @return The product of a point on G1 and a scalar, i.e. - * p == p.scalar_mul(1) and p.plus(p) == p.scalar_mul(2) for all - * points p. - */ - function scalar_mul(G1Point memory p, uint256 s) internal view returns (G1Point memory r) { - - uint256[3] memory input; - input[0] = p.X; - input[1] = p.Y; - input[2] = s; - bool success; - // solium-disable-next-line security/no-inline-assembly - assembly { - success := staticcall(sub(gas(), 2000), 7, input, 0x80, r, 0x60) - // Use "invalid" to make gas estimation work - switch success case 0 { invalid() } - } - require (success,"pairing-mul-failed"); - } - - /* @return The result of computing the pairing check - * e(p1[0], p2[0]) * .... * e(p1[n], p2[n]) == 1 - * For example, - * pairing([P1(), P1().negate()], [P2(), P2()]) should return true. - */ - function pairing( - G1Point memory a1, - G2Point memory a2, - G1Point memory b1, - G2Point memory b2, - G1Point memory c1, - G2Point memory c2, - G1Point memory d1, - G2Point memory d2 - ) internal view returns (bool) { - - G1Point[4] memory p1 = [a1, b1, c1, d1]; - G2Point[4] memory p2 = [a2, b2, c2, d2]; - - uint256 inputSize = 24; - uint256[] memory input = new uint256[](inputSize); - - for (uint256 i = 0; i < 4; i++) { - uint256 j = i * 6; - input[j + 0] = p1[i].X; - input[j + 1] = p1[i].Y; - input[j + 2] = p2[i].X[0]; - input[j + 3] = p2[i].X[1]; - input[j + 4] = p2[i].Y[0]; - input[j + 5] = p2[i].Y[1]; - } - - uint256[1] memory out; - bool success; - - // solium-disable-next-line security/no-inline-assembly - assembly { - success := staticcall(sub(gas(), 2000), 8, add(input, 0x20), mul(inputSize, 0x20), out, 0x20) - // Use "invalid" to make gas estimation work - switch success case 0 { invalid() } - } - - require(success,"pairing-opcode-failed"); - - return out[0] != 0; - } -} - -contract QuadVoteTallyVerifier32Batch16 { - - using Pairing for *; - - uint256 constant SNARK_SCALAR_FIELD = 21888242871839275222246405745257275088548364400416034343698204186575808495617; - uint256 constant PRIME_Q = 21888242871839275222246405745257275088696311157297823662689037894645226208583; - - struct VerifyingKey { - Pairing.G1Point alpha1; - Pairing.G2Point beta2; - Pairing.G2Point gamma2; - Pairing.G2Point delta2; - Pairing.G1Point[11] IC; - } - - struct Proof { - Pairing.G1Point A; - Pairing.G2Point B; - Pairing.G1Point C; - } - - function verifyingKey() internal pure returns (VerifyingKey memory vk) { - vk.alpha1 = Pairing.G1Point(uint256(3931802286032916768722587566330261370902955393767942929056531203487688137529),uint256(10293105233586296031473050653492052327805448683376110761534611791713915549265)); - vk.beta2 = Pairing.G2Point([uint256(21113959492300078886023582393043413128535975125428858805958839308822991748856),uint256(12222282698476210310273536080661281164688722800089362655366747391082242682958)], [uint256(20739573447354048976161197946493569928714465565589532971602923073536082697608),uint256(12941541312444627642958656716514029404685754754869818026526533196090365546374)]); - vk.gamma2 = Pairing.G2Point([uint256(14670836137271604202540255380769830849745744579684969689183516705496317922507),uint256(12178657156513808651243577987886528335149661869282225179912079606061386989744)], [uint256(1125902728883689137508324551765647737011904363437526425591650949891310723812),uint256(15919834918458423371681379777897287057084498811382451098590568497815773165692)]); - vk.delta2 = Pairing.G2Point([uint256(2231852960373618563799433391860999041123211180191070579878255252716013298732),uint256(14291274065364399133654336098495355501982202302398283580502954673818060696633)], [uint256(3168628806727684542778047539988455291220201924183716864807010176642260685841),uint256(12606002808572759608577415926932586006638023328815450374325080704700677189688)]); - vk.IC[0] = Pairing.G1Point(uint256(12848020380718535565089853534681145843006092696634142199856299025847321502371),uint256(6468756580219346512614969481554956146762400832923090074339557565951026058536)); - vk.IC[1] = Pairing.G1Point(uint256(789092430114940371944840041796419370450123967868354406244601329700742570445),uint256(11703230415288173665088837798624967250284180660322246777462631600764972864812)); - vk.IC[2] = Pairing.G1Point(uint256(16252197430844492890521435281772316410665185290137018091020232186750112907512),uint256(20861485175504002710376158881527553699531789728793309486150649246737774028347)); - vk.IC[3] = Pairing.G1Point(uint256(16969171625806775801891191965047460974818115969312194891897374689668597542196),uint256(14389419046525510722177847778450425484834864589330386321604392542455541983572)); - vk.IC[4] = Pairing.G1Point(uint256(13928883789499754049998767198742842124977905594692254232979837689918838899511),uint256(6757216204221511030872544186493375503384465407204524181513380457112801460878)); - vk.IC[5] = Pairing.G1Point(uint256(12615105472464956174046705416720445236758313003314061110048664932376957788951),uint256(1115476865907623432334995719744390855110066393577587591466560011685797098103)); - vk.IC[6] = Pairing.G1Point(uint256(12126180897004602060892141406139130628195608764592739755066384985876875328223),uint256(837414672224275155302376389224725114262382901229023048656048324984574980028)); - vk.IC[7] = Pairing.G1Point(uint256(721442001352764820041409242091349606527760014067614573870735409795650532250),uint256(5871690341119940542207233131936464616602051666920986699510353544932455895913)); - vk.IC[8] = Pairing.G1Point(uint256(11936590707137322489603100954274435093115715779097755089203405884503252799861),uint256(5832382048375298946996376174464817616061448358844675910441699738844607159400)); - vk.IC[9] = Pairing.G1Point(uint256(1150487096467611973629613424410317323826245588905051816727229632029031650443),uint256(19621934380117246037511579161242972091034040331100068879508644849318614270487)); - vk.IC[10] = Pairing.G1Point(uint256(14447725242028063610944438927433683612461991907837633029384208510392253681728),uint256(15642702797143402072429225245488363130997179355079100914641555016655302069615)); - - } - - /* - * @returns Whether the proof is valid given the hardcoded verifying key - * above and the public inputs - */ - function verifyProof( - uint256[2] memory a, - uint256[2][2] memory b, - uint256[2] memory c, - uint256[] memory input - ) public view returns (bool) { - - Proof memory proof; - proof.A = Pairing.G1Point(a[0], a[1]); - proof.B = Pairing.G2Point([b[0][0], b[0][1]], [b[1][0], b[1][1]]); - proof.C = Pairing.G1Point(c[0], c[1]); - - VerifyingKey memory vk = verifyingKey(); - - // Compute the linear combination vk_x - Pairing.G1Point memory vk_x = Pairing.G1Point(0, 0); - - // Make sure that proof.A, B, and C are each less than the prime q - require(proof.A.X < PRIME_Q, "verifier-aX-gte-prime-q"); - require(proof.A.Y < PRIME_Q, "verifier-aY-gte-prime-q"); - - require(proof.B.X[0] < PRIME_Q, "verifier-bX0-gte-prime-q"); - require(proof.B.Y[0] < PRIME_Q, "verifier-bY0-gte-prime-q"); - - require(proof.B.X[1] < PRIME_Q, "verifier-bX1-gte-prime-q"); - require(proof.B.Y[1] < PRIME_Q, "verifier-bY1-gte-prime-q"); - - require(proof.C.X < PRIME_Q, "verifier-cX-gte-prime-q"); - require(proof.C.Y < PRIME_Q, "verifier-cY-gte-prime-q"); - - // Make sure that every input is less than the snark scalar field - //for (uint256 i = 0; i < input.length; i++) { - for (uint256 i = 0; i < 10; i++) { - require(input[i] < SNARK_SCALAR_FIELD,"verifier-gte-snark-scalar-field"); - vk_x = Pairing.plus(vk_x, Pairing.scalar_mul(vk.IC[i + 1], input[i])); - } - - vk_x = Pairing.plus(vk_x, vk.IC[0]); - - return Pairing.pairing( - Pairing.negate(proof.A), - proof.B, - vk.alpha1, - vk.beta2, - vk_x, - vk.gamma2, - proof.C, - vk.delta2 - ); - } -} diff --git a/contracts/contracts/snarkVerifiers/QuadVoteTallyVerifierBatch64.sol b/contracts/contracts/snarkVerifiers/QuadVoteTallyVerifierBatch64.sol deleted file mode 100644 index 7f5d8befd..000000000 --- a/contracts/contracts/snarkVerifiers/QuadVoteTallyVerifierBatch64.sol +++ /dev/null @@ -1,240 +0,0 @@ -// SPDX-License-Identifier: MIT - -// Copyright 2017 Christian Reitwiessner -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to -// deal in the Software without restriction, including without limitation the -// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -// sell copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS -// IN THE SOFTWARE. - -// 2019 OKIMS - -pragma solidity ^0.6.12; - -library Pairing { - - uint256 constant PRIME_Q = 21888242871839275222246405745257275088696311157297823662689037894645226208583; - - struct G1Point { - uint256 X; - uint256 Y; - } - - // Encoding of field elements is: X[0] * z + X[1] - struct G2Point { - uint256[2] X; - uint256[2] Y; - } - - /* - * @return The negation of p, i.e. p.plus(p.negate()) should be zero. - */ - function negate(G1Point memory p) internal pure returns (G1Point memory) { - - // The prime q in the base field F_q for G1 - if (p.X == 0 && p.Y == 0) { - return G1Point(0, 0); - } else { - return G1Point(p.X, PRIME_Q - (p.Y % PRIME_Q)); - } - } - - /* - * @return The sum of two points of G1 - */ - function plus( - G1Point memory p1, - G1Point memory p2 - ) internal view returns (G1Point memory r) { - - uint256[4] memory input; - input[0] = p1.X; - input[1] = p1.Y; - input[2] = p2.X; - input[3] = p2.Y; - bool success; - - // solium-disable-next-line security/no-inline-assembly - assembly { - success := staticcall(sub(gas(), 2000), 6, input, 0xc0, r, 0x60) - // Use "invalid" to make gas estimation work - switch success case 0 { invalid() } - } - - require(success,"pairing-add-failed"); - } - - /* - * @return The product of a point on G1 and a scalar, i.e. - * p == p.scalar_mul(1) and p.plus(p) == p.scalar_mul(2) for all - * points p. - */ - function scalar_mul(G1Point memory p, uint256 s) internal view returns (G1Point memory r) { - - uint256[3] memory input; - input[0] = p.X; - input[1] = p.Y; - input[2] = s; - bool success; - // solium-disable-next-line security/no-inline-assembly - assembly { - success := staticcall(sub(gas(), 2000), 7, input, 0x80, r, 0x60) - // Use "invalid" to make gas estimation work - switch success case 0 { invalid() } - } - require (success,"pairing-mul-failed"); - } - - /* @return The result of computing the pairing check - * e(p1[0], p2[0]) * .... * e(p1[n], p2[n]) == 1 - * For example, - * pairing([P1(), P1().negate()], [P2(), P2()]) should return true. - */ - function pairing( - G1Point memory a1, - G2Point memory a2, - G1Point memory b1, - G2Point memory b2, - G1Point memory c1, - G2Point memory c2, - G1Point memory d1, - G2Point memory d2 - ) internal view returns (bool) { - - G1Point[4] memory p1 = [a1, b1, c1, d1]; - G2Point[4] memory p2 = [a2, b2, c2, d2]; - - uint256 inputSize = 24; - uint256[] memory input = new uint256[](inputSize); - - for (uint256 i = 0; i < 4; i++) { - uint256 j = i * 6; - input[j + 0] = p1[i].X; - input[j + 1] = p1[i].Y; - input[j + 2] = p2[i].X[0]; - input[j + 3] = p2[i].X[1]; - input[j + 4] = p2[i].Y[0]; - input[j + 5] = p2[i].Y[1]; - } - - uint256[1] memory out; - bool success; - - // solium-disable-next-line security/no-inline-assembly - assembly { - success := staticcall(sub(gas(), 2000), 8, add(input, 0x20), mul(inputSize, 0x20), out, 0x20) - // Use "invalid" to make gas estimation work - switch success case 0 { invalid() } - } - - require(success,"pairing-opcode-failed"); - - return out[0] != 0; - } -} - -contract QuadVoteTallyVerifierBatch64 { - - using Pairing for *; - - uint256 constant SNARK_SCALAR_FIELD = 21888242871839275222246405745257275088548364400416034343698204186575808495617; - uint256 constant PRIME_Q = 21888242871839275222246405745257275088696311157297823662689037894645226208583; - - struct VerifyingKey { - Pairing.G1Point alpha1; - Pairing.G2Point beta2; - Pairing.G2Point gamma2; - Pairing.G2Point delta2; - Pairing.G1Point[11] IC; - } - - struct Proof { - Pairing.G1Point A; - Pairing.G2Point B; - Pairing.G1Point C; - } - - function verifyingKey() internal pure returns (VerifyingKey memory vk) { - vk.alpha1 = Pairing.G1Point(uint256(8998677785356475976681729551581748241325038364445707399605311153715193285192),uint256(16532093260476468234284235622994996263894019866786993774689525941531486715280)); - vk.beta2 = Pairing.G2Point([uint256(14479696864247948470811129902981074107577880260267988466643697895429700862357),uint256(7673508468962275876822578116767566306007923040617408204893910425294482718359)], [uint256(3025794662125932744461510313664354244361345886188220954268088904152332320651),uint256(18992001603150737150609170655111529043323918325565233843250080825070227900741)]); - vk.gamma2 = Pairing.G2Point([uint256(4774442582759577548845273460482286945247270845418250880380173808037730007146),uint256(19632998816417277057191816929078931508219443286363999553420436712667847802509)], [uint256(8918484860111856084885536772945733139126131932286560515976472672010960012834),uint256(12728669449444166995903623839504592322409504301832398134300330772308607917073)]); - vk.delta2 = Pairing.G2Point([uint256(15785059851343798028684598751378759057245187772163751398827510094565061725238),uint256(21118128021055465323522140883656695832878555508305373434189121269701766235730)], [uint256(13568894355304319876421253464785911878212017214379681164608971423414503706203),uint256(13159583370455092481079763163823460297963250255523361267085961821806615709492)]); - vk.IC[0] = Pairing.G1Point(uint256(17565231262536262059880953057168652920760564268967484995833449932868505425453),uint256(12188686363387894404482877921579809555738089118150529762262500832547425324413)); - vk.IC[1] = Pairing.G1Point(uint256(11189327955398716455357578100208632792320136054341850974581633926389276968439),uint256(13346042944044822030526526592409317594222810159017045773876902868540767926789)); - vk.IC[2] = Pairing.G1Point(uint256(4841917664084834927763896883310585967014384374505892074230796208068284173617),uint256(18170939148620637269090232661132873974208089448822352559672713479981933524597)); - vk.IC[3] = Pairing.G1Point(uint256(18819966500293660402531086354419973912066562695742018658017872617474355110586),uint256(21777120900100859259925548526006244513934409052108418268054046593333988632979)); - vk.IC[4] = Pairing.G1Point(uint256(16090571137665417344860949919114298372447642825525030792688149453160603275973),uint256(11028345007100474884743109999990340096930987561377988366283061948118635256399)); - vk.IC[5] = Pairing.G1Point(uint256(8565376255290633678674898949265672764671797704000889552605773658404947597356),uint256(8134113217715388235372429381559636053722293848617705894690514518674228042182)); - vk.IC[6] = Pairing.G1Point(uint256(14563576887421649746847610551642066185997940451407657996153162281658269151338),uint256(3006545207325771542831873992663481302506804502922484994752738879448954888593)); - vk.IC[7] = Pairing.G1Point(uint256(2945281449524289396587806467221452974974132513125923527213072377993572783955),uint256(16114859942947305831498266256190478085152888824338102881853989411303260441326)); - vk.IC[8] = Pairing.G1Point(uint256(17535290294201239551318275539559369129483399986530054025564198618381997235450),uint256(4670423088334897050397605971773705631924741154427292154782933204365329751809)); - vk.IC[9] = Pairing.G1Point(uint256(17614334556994749443749549798035358239179553133825558482478045411777802484523),uint256(7094754689901925867819232494399619412173023860803836457804265404702369434376)); - vk.IC[10] = Pairing.G1Point(uint256(7390265632726797438431040125237407305009017950382543022039201491896546184823),uint256(17970645195573822913849013220214770354709981129727702271146338010115720135385)); - - } - - /* - * @returns Whether the proof is valid given the hardcoded verifying key - * above and the public inputs - */ - function verifyProof( - uint256[2] memory a, - uint256[2][2] memory b, - uint256[2] memory c, - uint256[] memory input - ) public view returns (bool) { - - Proof memory proof; - proof.A = Pairing.G1Point(a[0], a[1]); - proof.B = Pairing.G2Point([b[0][0], b[0][1]], [b[1][0], b[1][1]]); - proof.C = Pairing.G1Point(c[0], c[1]); - - VerifyingKey memory vk = verifyingKey(); - - // Compute the linear combination vk_x - Pairing.G1Point memory vk_x = Pairing.G1Point(0, 0); - - // Make sure that proof.A, B, and C are each less than the prime q - require(proof.A.X < PRIME_Q, "verifier-aX-gte-prime-q"); - require(proof.A.Y < PRIME_Q, "verifier-aY-gte-prime-q"); - - require(proof.B.X[0] < PRIME_Q, "verifier-bX0-gte-prime-q"); - require(proof.B.Y[0] < PRIME_Q, "verifier-bY0-gte-prime-q"); - - require(proof.B.X[1] < PRIME_Q, "verifier-bX1-gte-prime-q"); - require(proof.B.Y[1] < PRIME_Q, "verifier-bY1-gte-prime-q"); - - require(proof.C.X < PRIME_Q, "verifier-cX-gte-prime-q"); - require(proof.C.Y < PRIME_Q, "verifier-cY-gte-prime-q"); - - // Make sure that every input is less than the snark scalar field - //for (uint256 i = 0; i < input.length; i++) { - for (uint256 i = 0; i < 10; i++) { - require(input[i] < SNARK_SCALAR_FIELD,"verifier-gte-snark-scalar-field"); - vk_x = Pairing.plus(vk_x, Pairing.scalar_mul(vk.IC[i + 1], input[i])); - } - - vk_x = Pairing.plus(vk_x, vk.IC[0]); - - return Pairing.pairing( - Pairing.negate(proof.A), - proof.B, - vk.alpha1, - vk.beta2, - vk_x, - vk.gamma2, - proof.C, - vk.delta2 - ); - } -} diff --git a/contracts/contracts/snarkVerifiers/QuadVoteTallyVerifierCustom.sol b/contracts/contracts/snarkVerifiers/QuadVoteTallyVerifierCustom.sol deleted file mode 100644 index a6a396654..000000000 --- a/contracts/contracts/snarkVerifiers/QuadVoteTallyVerifierCustom.sol +++ /dev/null @@ -1,240 +0,0 @@ -// SPDX-License-Identifier: MIT - -// Copyright 2017 Christian Reitwiessner -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to -// deal in the Software without restriction, including without limitation the -// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -// sell copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS -// IN THE SOFTWARE. - -// 2019 OKIMS - -pragma solidity ^0.6.12; - -library Pairing { - - uint256 constant PRIME_Q = 21888242871839275222246405745257275088696311157297823662689037894645226208583; - - struct G1Point { - uint256 X; - uint256 Y; - } - - // Encoding of field elements is: X[0] * z + X[1] - struct G2Point { - uint256[2] X; - uint256[2] Y; - } - - /* - * @return The negation of p, i.e. p.plus(p.negate()) should be zero. - */ - function negate(G1Point memory p) internal pure returns (G1Point memory) { - - // The prime q in the base field F_q for G1 - if (p.X == 0 && p.Y == 0) { - return G1Point(0, 0); - } else { - return G1Point(p.X, PRIME_Q - (p.Y % PRIME_Q)); - } - } - - /* - * @return The sum of two points of G1 - */ - function plus( - G1Point memory p1, - G1Point memory p2 - ) internal view returns (G1Point memory r) { - - uint256[4] memory input; - input[0] = p1.X; - input[1] = p1.Y; - input[2] = p2.X; - input[3] = p2.Y; - bool success; - - // solium-disable-next-line security/no-inline-assembly - assembly { - success := staticcall(sub(gas(), 2000), 6, input, 0xc0, r, 0x60) - // Use "invalid" to make gas estimation work - switch success case 0 { invalid() } - } - - require(success,"pairing-add-failed"); - } - - /* - * @return The product of a point on G1 and a scalar, i.e. - * p == p.scalar_mul(1) and p.plus(p) == p.scalar_mul(2) for all - * points p. - */ - function scalar_mul(G1Point memory p, uint256 s) internal view returns (G1Point memory r) { - - uint256[3] memory input; - input[0] = p.X; - input[1] = p.Y; - input[2] = s; - bool success; - // solium-disable-next-line security/no-inline-assembly - assembly { - success := staticcall(sub(gas(), 2000), 7, input, 0x80, r, 0x60) - // Use "invalid" to make gas estimation work - switch success case 0 { invalid() } - } - require (success,"pairing-mul-failed"); - } - - /* @return The result of computing the pairing check - * e(p1[0], p2[0]) * .... * e(p1[n], p2[n]) == 1 - * For example, - * pairing([P1(), P1().negate()], [P2(), P2()]) should return true. - */ - function pairing( - G1Point memory a1, - G2Point memory a2, - G1Point memory b1, - G2Point memory b2, - G1Point memory c1, - G2Point memory c2, - G1Point memory d1, - G2Point memory d2 - ) internal view returns (bool) { - - G1Point[4] memory p1 = [a1, b1, c1, d1]; - G2Point[4] memory p2 = [a2, b2, c2, d2]; - - uint256 inputSize = 24; - uint256[] memory input = new uint256[](inputSize); - - for (uint256 i = 0; i < 4; i++) { - uint256 j = i * 6; - input[j + 0] = p1[i].X; - input[j + 1] = p1[i].Y; - input[j + 2] = p2[i].X[0]; - input[j + 3] = p2[i].X[1]; - input[j + 4] = p2[i].Y[0]; - input[j + 5] = p2[i].Y[1]; - } - - uint256[1] memory out; - bool success; - - // solium-disable-next-line security/no-inline-assembly - assembly { - success := staticcall(sub(gas(), 2000), 8, add(input, 0x20), mul(inputSize, 0x20), out, 0x20) - // Use "invalid" to make gas estimation work - switch success case 0 { invalid() } - } - - require(success,"pairing-opcode-failed"); - - return out[0] != 0; - } -} - -contract QuadVoteTallyVerifierCustom { - - using Pairing for *; - - uint256 constant SNARK_SCALAR_FIELD = 21888242871839275222246405745257275088548364400416034343698204186575808495617; - uint256 constant PRIME_Q = 21888242871839275222246405745257275088696311157297823662689037894645226208583; - - struct VerifyingKey { - Pairing.G1Point alpha1; - Pairing.G2Point beta2; - Pairing.G2Point gamma2; - Pairing.G2Point delta2; - Pairing.G1Point[11] IC; - } - - struct Proof { - Pairing.G1Point A; - Pairing.G2Point B; - Pairing.G1Point C; - } - - function verifyingKey() internal pure returns (VerifyingKey memory vk) { - vk.alpha1 = Pairing.G1Point(uint256(16943336223702478034729513866374796851228809856161008919800913520856468181573),uint256(2995090004627639065569871279932395584911899798711981190091501417285102191177)); - vk.beta2 = Pairing.G2Point([uint256(16224714118819881643530609308327988952043965596591357129331660443749437880225),uint256(18713080770238836914085757668180363883442449561648958290173009680301883643312)], [uint256(22349732573235212308155999603848231077445494488349558443704557051018923559),uint256(10320633006958853808156951459730803259989331403375988741484169048853496829865)]); - vk.gamma2 = Pairing.G2Point([uint256(13754685977183525838201298718645487522999887715054765691404125733830578085397),uint256(6942074706854035824685190568710272703891322307475144729076362801105779834805)], [uint256(5140158617774088963306972183201877929593031398407933973109566549607124831751),uint256(13035987335313190818598467074385857301795834547346013393313010045759712554988)]); - vk.delta2 = Pairing.G2Point([uint256(8060558336832861646731122586124893496721636529597338211955002623228447877246),uint256(11266091873376325088415037049219024114103234301565804309675027383590258801637)], [uint256(14778268722321702691286210615443377029665021234872720602744008230960335632554),uint256(159950337696748857596651038995043496935979997396302102605500326482927324500)]); - vk.IC[0] = Pairing.G1Point(uint256(16066585270605647433163972725844364442561475974556889399601021622371369271144),uint256(12676191990324881131751023451007364920714885702228311161299501530006872841519)); - vk.IC[1] = Pairing.G1Point(uint256(8741724346703266580019385312120367474943720529314996811441101272835876516470),uint256(17031176066038457326863997348851727124563803542303563511325983859631762911934)); - vk.IC[2] = Pairing.G1Point(uint256(18066750137770170845946733820200480964706781331673770545419839050076884756612),uint256(9347679342275024796450198445411694201271359973979853238013376665002795681996)); - vk.IC[3] = Pairing.G1Point(uint256(12615311434592602984490157419406590901170885801626249228431749604898753676825),uint256(14923844847934190225877627597124089862553879390935260800034269416514426560258)); - vk.IC[4] = Pairing.G1Point(uint256(20169822918031976507682131782892646776809554001149512021190639599804349326690),uint256(16500262714506045360275229153359308289644927300370679736657829361303433615345)); - vk.IC[5] = Pairing.G1Point(uint256(17087302943942300743176792228086268327696285793900716344408973607382655072319),uint256(18235408216267296600740961289869198243767504308584360263468406970385003239783)); - vk.IC[6] = Pairing.G1Point(uint256(19545026119096666217656647361860838923223293971001406747125714826757828149809),uint256(6559080491999014353344865620771583944769725829299641810721028046777843584264)); - vk.IC[7] = Pairing.G1Point(uint256(19060100374012958103958897290158267767597513329256041185857758273030309802587),uint256(9555898096763236508022594162106408962958705890577795983031819651275877959038)); - vk.IC[8] = Pairing.G1Point(uint256(11259424594567992022915148822616114808210551795687973599385042152935186891352),uint256(8847372443318686693647511285032355230775674903720747383283857986227997292264)); - vk.IC[9] = Pairing.G1Point(uint256(20034938052071061170101345512267783478448487278351248710639589348238685776221),uint256(20456838147183647185441901749475039833247081714013147449136222686509036222717)); - vk.IC[10] = Pairing.G1Point(uint256(14726963331140212908790922462256415603139476517884646197732123280907881194129),uint256(19499071686152952417621806302814788689759796377680900572072370183655072718752)); - - } - - /* - * @returns Whether the proof is valid given the hardcoded verifying key - * above and the public inputs - */ - function verifyProof( - uint256[2] memory a, - uint256[2][2] memory b, - uint256[2] memory c, - uint256[] memory input - ) public view returns (bool) { - - Proof memory proof; - proof.A = Pairing.G1Point(a[0], a[1]); - proof.B = Pairing.G2Point([b[0][0], b[0][1]], [b[1][0], b[1][1]]); - proof.C = Pairing.G1Point(c[0], c[1]); - - VerifyingKey memory vk = verifyingKey(); - - // Compute the linear combination vk_x - Pairing.G1Point memory vk_x = Pairing.G1Point(0, 0); - - // Make sure that proof.A, B, and C are each less than the prime q - require(proof.A.X < PRIME_Q, "verifier-aX-gte-prime-q"); - require(proof.A.Y < PRIME_Q, "verifier-aY-gte-prime-q"); - - require(proof.B.X[0] < PRIME_Q, "verifier-bX0-gte-prime-q"); - require(proof.B.Y[0] < PRIME_Q, "verifier-bY0-gte-prime-q"); - - require(proof.B.X[1] < PRIME_Q, "verifier-bX1-gte-prime-q"); - require(proof.B.Y[1] < PRIME_Q, "verifier-bY1-gte-prime-q"); - - require(proof.C.X < PRIME_Q, "verifier-cX-gte-prime-q"); - require(proof.C.Y < PRIME_Q, "verifier-cY-gte-prime-q"); - - // Make sure that every input is less than the snark scalar field - //for (uint256 i = 0; i < input.length; i++) { - for (uint256 i = 0; i < 10; i++) { - require(input[i] < SNARK_SCALAR_FIELD,"verifier-gte-snark-scalar-field"); - vk_x = Pairing.plus(vk_x, Pairing.scalar_mul(vk.IC[i + 1], input[i])); - } - - vk_x = Pairing.plus(vk_x, vk.IC[0]); - - return Pairing.pairing( - Pairing.negate(proof.A), - proof.B, - vk.alpha1, - vk.beta2, - vk_x, - vk.gamma2, - proof.C, - vk.delta2 - ); - } -} diff --git a/contracts/contracts/snarkVerifiers/QuadVoteTallyVerifierMedium.sol b/contracts/contracts/snarkVerifiers/QuadVoteTallyVerifierMedium.sol deleted file mode 100644 index 6a0b9771c..000000000 --- a/contracts/contracts/snarkVerifiers/QuadVoteTallyVerifierMedium.sol +++ /dev/null @@ -1,240 +0,0 @@ -// SPDX-License-Identifier: MIT - -// Copyright 2017 Christian Reitwiessner -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to -// deal in the Software without restriction, including without limitation the -// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -// sell copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS -// IN THE SOFTWARE. - -// 2019 OKIMS - -pragma solidity ^0.6.12; - -library Pairing { - - uint256 constant PRIME_Q = 21888242871839275222246405745257275088696311157297823662689037894645226208583; - - struct G1Point { - uint256 X; - uint256 Y; - } - - // Encoding of field elements is: X[0] * z + X[1] - struct G2Point { - uint256[2] X; - uint256[2] Y; - } - - /* - * @return The negation of p, i.e. p.plus(p.negate()) should be zero. - */ - function negate(G1Point memory p) internal pure returns (G1Point memory) { - - // The prime q in the base field F_q for G1 - if (p.X == 0 && p.Y == 0) { - return G1Point(0, 0); - } else { - return G1Point(p.X, PRIME_Q - (p.Y % PRIME_Q)); - } - } - - /* - * @return The sum of two points of G1 - */ - function plus( - G1Point memory p1, - G1Point memory p2 - ) internal view returns (G1Point memory r) { - - uint256[4] memory input; - input[0] = p1.X; - input[1] = p1.Y; - input[2] = p2.X; - input[3] = p2.Y; - bool success; - - // solium-disable-next-line security/no-inline-assembly - assembly { - success := staticcall(sub(gas(), 2000), 6, input, 0xc0, r, 0x60) - // Use "invalid" to make gas estimation work - switch success case 0 { invalid() } - } - - require(success,"pairing-add-failed"); - } - - /* - * @return The product of a point on G1 and a scalar, i.e. - * p == p.scalar_mul(1) and p.plus(p) == p.scalar_mul(2) for all - * points p. - */ - function scalar_mul(G1Point memory p, uint256 s) internal view returns (G1Point memory r) { - - uint256[3] memory input; - input[0] = p.X; - input[1] = p.Y; - input[2] = s; - bool success; - // solium-disable-next-line security/no-inline-assembly - assembly { - success := staticcall(sub(gas(), 2000), 7, input, 0x80, r, 0x60) - // Use "invalid" to make gas estimation work - switch success case 0 { invalid() } - } - require (success,"pairing-mul-failed"); - } - - /* @return The result of computing the pairing check - * e(p1[0], p2[0]) * .... * e(p1[n], p2[n]) == 1 - * For example, - * pairing([P1(), P1().negate()], [P2(), P2()]) should return true. - */ - function pairing( - G1Point memory a1, - G2Point memory a2, - G1Point memory b1, - G2Point memory b2, - G1Point memory c1, - G2Point memory c2, - G1Point memory d1, - G2Point memory d2 - ) internal view returns (bool) { - - G1Point[4] memory p1 = [a1, b1, c1, d1]; - G2Point[4] memory p2 = [a2, b2, c2, d2]; - - uint256 inputSize = 24; - uint256[] memory input = new uint256[](inputSize); - - for (uint256 i = 0; i < 4; i++) { - uint256 j = i * 6; - input[j + 0] = p1[i].X; - input[j + 1] = p1[i].Y; - input[j + 2] = p2[i].X[0]; - input[j + 3] = p2[i].X[1]; - input[j + 4] = p2[i].Y[0]; - input[j + 5] = p2[i].Y[1]; - } - - uint256[1] memory out; - bool success; - - // solium-disable-next-line security/no-inline-assembly - assembly { - success := staticcall(sub(gas(), 2000), 8, add(input, 0x20), mul(inputSize, 0x20), out, 0x20) - // Use "invalid" to make gas estimation work - switch success case 0 { invalid() } - } - - require(success,"pairing-opcode-failed"); - - return out[0] != 0; - } -} - -contract QuadVoteTallyVerifierMedium { - - using Pairing for *; - - uint256 constant SNARK_SCALAR_FIELD = 21888242871839275222246405745257275088548364400416034343698204186575808495617; - uint256 constant PRIME_Q = 21888242871839275222246405745257275088696311157297823662689037894645226208583; - - struct VerifyingKey { - Pairing.G1Point alpha1; - Pairing.G2Point beta2; - Pairing.G2Point gamma2; - Pairing.G2Point delta2; - Pairing.G1Point[11] IC; - } - - struct Proof { - Pairing.G1Point A; - Pairing.G2Point B; - Pairing.G1Point C; - } - - function verifyingKey() internal pure returns (VerifyingKey memory vk) { - vk.alpha1 = Pairing.G1Point(uint256(13319089463234179848573002558390225549925881544844229526026924163697823868217),uint256(16969301351798186988714599867637580075355998123297360899531464320382608917823)); - vk.beta2 = Pairing.G2Point([uint256(884135738813217152621098145714294997398020017370840732264237360992258561447),uint256(19265421094608053372816753968184963865893506095669353940268571978837240754173)], [uint256(6012149136709364348511994415938926021699699739179211173438016183904359873348),uint256(18991863387357993343955782395887020515221469647499376150856526155670788249449)]); - vk.gamma2 = Pairing.G2Point([uint256(21706235430892367859879218182417991464200104199464192769968420709969064082182),uint256(9915925245823821340262119200814211466249968283712127067494733663581717141808)], [uint256(8014379982653295859045609354888939159136652087530005163017336188856076697895),uint256(2588603844529736152444998937030017992055831391004763507477228242434048551536)]); - vk.delta2 = Pairing.G2Point([uint256(21672490495356192161771534456050409753676928730042015138105659729884181401296),uint256(11689585908171101387988657019546096291792404055572652014148290715892557767130)], [uint256(17715373485732263146801654162487114729339353301382818364817626786331552897670),uint256(7696588916204722756361279480504273602458100892781940413610616014966001317247)]); - vk.IC[0] = Pairing.G1Point(uint256(17087295223641082531404079553051944993373273715611908012655503993166473305754),uint256(6182736911358003151475000767360161120209489648201280392864464064000417014535)); - vk.IC[1] = Pairing.G1Point(uint256(21858953054392112643557291820558011932152397351662137062152873307837243226369),uint256(274645877754130014813042509232530378175318856440973274077059796717639658430)); - vk.IC[2] = Pairing.G1Point(uint256(14548545129502259069026547328012710742416048860809889195881907206952252416017),uint256(3228019127016928543942878181040938702662111374432682887727142995462783476447)); - vk.IC[3] = Pairing.G1Point(uint256(14373384695365988284659515115291314982184320080618552455788003283931361168551),uint256(8036736519216864070653705682127086068109886836500549090511686027151133616841)); - vk.IC[4] = Pairing.G1Point(uint256(16675333368700753066857800168703829812516465703476953717896334935892560689090),uint256(21608453333300419224392882163943662578792079956113795409183520246170299650376)); - vk.IC[5] = Pairing.G1Point(uint256(15736222309742563960248671973021862579667636851297012518581665096370726236454),uint256(21335199829751875203976028398898650985868040373956185059024547759260250305410)); - vk.IC[6] = Pairing.G1Point(uint256(16015435326083107624534169308129329045670274526456331351092633532436693939936),uint256(7453357474723762629421327112394063535945396093961872225177306831806502964062)); - vk.IC[7] = Pairing.G1Point(uint256(20800366726240207296493046386720608820175660231494817648971335534167674634983),uint256(2240276722181725673183741162820624252693987652993756341839102628211641338510)); - vk.IC[8] = Pairing.G1Point(uint256(21685869598701747502602869356260040072202071791936602760677041477453356238587),uint256(1570490528987142417400349354081659284444484408158915693119127128346469764684)); - vk.IC[9] = Pairing.G1Point(uint256(14687796710661759670182543591397320527000297314362566109212833620898352944810),uint256(14435809464288477390543880429818949557411637937848005232403789999458897870591)); - vk.IC[10] = Pairing.G1Point(uint256(4062878755941944424289598715546694691639070862682597049472966026221368157214),uint256(16596126292359214329416908692838229109530151425321455496930453385135619684735)); - - } - - /* - * @returns Whether the proof is valid given the hardcoded verifying key - * above and the public inputs - */ - function verifyProof( - uint256[2] memory a, - uint256[2][2] memory b, - uint256[2] memory c, - uint256[] memory input - ) public view returns (bool) { - - Proof memory proof; - proof.A = Pairing.G1Point(a[0], a[1]); - proof.B = Pairing.G2Point([b[0][0], b[0][1]], [b[1][0], b[1][1]]); - proof.C = Pairing.G1Point(c[0], c[1]); - - VerifyingKey memory vk = verifyingKey(); - - // Compute the linear combination vk_x - Pairing.G1Point memory vk_x = Pairing.G1Point(0, 0); - - // Make sure that proof.A, B, and C are each less than the prime q - require(proof.A.X < PRIME_Q, "verifier-aX-gte-prime-q"); - require(proof.A.Y < PRIME_Q, "verifier-aY-gte-prime-q"); - - require(proof.B.X[0] < PRIME_Q, "verifier-bX0-gte-prime-q"); - require(proof.B.Y[0] < PRIME_Q, "verifier-bY0-gte-prime-q"); - - require(proof.B.X[1] < PRIME_Q, "verifier-bX1-gte-prime-q"); - require(proof.B.Y[1] < PRIME_Q, "verifier-bY1-gte-prime-q"); - - require(proof.C.X < PRIME_Q, "verifier-cX-gte-prime-q"); - require(proof.C.Y < PRIME_Q, "verifier-cY-gte-prime-q"); - - // Make sure that every input is less than the snark scalar field - //for (uint256 i = 0; i < input.length; i++) { - for (uint256 i = 0; i < 10; i++) { - require(input[i] < SNARK_SCALAR_FIELD,"verifier-gte-snark-scalar-field"); - vk_x = Pairing.plus(vk_x, Pairing.scalar_mul(vk.IC[i + 1], input[i])); - } - - vk_x = Pairing.plus(vk_x, vk.IC[0]); - - return Pairing.pairing( - Pairing.negate(proof.A), - proof.B, - vk.alpha1, - vk.beta2, - vk_x, - vk.gamma2, - proof.C, - vk.delta2 - ); - } -} diff --git a/contracts/contracts/snarkVerifiers/README.md b/contracts/contracts/snarkVerifiers/README.md deleted file mode 100644 index 29d65dae2..000000000 --- a/contracts/contracts/snarkVerifiers/README.md +++ /dev/null @@ -1,51 +0,0 @@ -# SNARK verifiers - -## Trusted setup: - -- 'test' circuits: https://gateway.pinata.cloud/ipfs/Qmbi3nqjBwANPMk5BRyKjCJ4QSHK6WNp7v9NLLo4uwrG1f -- 'medium' circuits: https://gateway.pinata.cloud/ipfs/QmRzp3vkFPNHPpXiu7iKpPqVnZB97wq7gyih2mp6pa5bmD -- 'x32' circuits: https://gateway.pinata.cloud/ipfs/QmWSxPBNYDtsK23KwYdMtcDaJg3gWS3LBsqMnENrVG6nmc -- 'batch64' circuits: https://gateway.pinata.cloud/ipfs/QmbVzVWqNTjEv5S3Vvyq7NkLVkpqWuA9DGMRibZYJXKJqy - - -## Generating circuits -Instead of downloading the above circuits from the ipfs, they can be generated using the MACI scripts. For example, to build the x32 circuits on linux Ubuntu 22.04 + Node v16.13.2: - -``` -# Clone the MACI repo and switch to version v0.10.1: -git clone https://github.com/privacy-scaling-explorations/maci.git -cd maci/ -git checkout v0.10.1 - -# install deps -sudo apt-get install build-essential libgmp-dev libsodium-dev nasm git - -# recompile binaries (takes time: ~5min to ~10min), the output files are in ./params folder -cd circuits -./scripts/buildSnarks32.sh - -``` - - -### Generating batch64 circuits -The batch64 circuits can be generated using the [buildCustomSnarks.sh](https://github.com/privacy-scaling-explorations/maci/blob/master/circuits/scripts/buildCustomSnarks.sh) as follow: - -``` -./scripts/buildCustomSnarks.sh -s 32 -m 32 -v 3 -i 6 -b 64 -``` - -After generating the files, set the c binaries with executable permission and rename files as follow so they can be used with the tally scripts as described [here](../../../docs/tally-verify.md) - -``` -mv batchUstCustom batchUst32 -mv batchUstCustom.r1cs batchUst32.r1cs -mv batchUstCustom.params batchUst32.params -mv batchUstCustom.dat batchUst32.dat -mv batchUstCustom.sym batchUst32.sym -mv qvtCustom qvt32 -mv qvtCircuitCustom.r1cs qvtCircuit32.r1cs -mv qvtCustom.params qvt32.params -mv qvtCustom.dat qvt32.dat -mv qvtCustom.sym qvt32.sym -chmod u+x batchUst32 qvt32 -``` diff --git a/contracts/contracts/userRegistry/BrightIdSponsor.sol b/contracts/contracts/userRegistry/BrightIdSponsor.sol index 312e1e7b4..302a80b13 100644 --- a/contracts/contracts/userRegistry/BrightIdSponsor.sol +++ b/contracts/contracts/userRegistry/BrightIdSponsor.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-3.0 -pragma solidity ^0.6.12; +pragma solidity ^0.8.10; contract BrightIdSponsor { event Sponsor(address indexed addr); diff --git a/contracts/contracts/userRegistry/BrightIdUserRegistry.sol b/contracts/contracts/userRegistry/BrightIdUserRegistry.sol index e47bfd059..09557af3a 100644 --- a/contracts/contracts/userRegistry/BrightIdUserRegistry.sol +++ b/contracts/contracts/userRegistry/BrightIdUserRegistry.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-3.0 -pragma solidity ^0.6.12; +pragma solidity ^0.8.10; import './IUserRegistry.sol'; import './BrightIdSponsor.sol'; @@ -32,7 +32,7 @@ contract BrightIdUserRegistry is Ownable, IUserRegistry { * @param _verifier BrightID verifier address that signs BrightID verifications * @param _sponsor Contract address that emits BrightID sponsor event */ - constructor(bytes32 _context, address _verifier, address _sponsor) public { + constructor(bytes32 _context, address _verifier, address _sponsor) { // ecrecover returns zero on error require(_verifier != address(0), ERROR_INVALID_VERIFIER); require(_sponsor != address(0), ERROR_INVALID_SPONSOR); diff --git a/contracts/contracts/userRegistry/IUserRegistry.sol b/contracts/contracts/userRegistry/IUserRegistry.sol index 14b56c7ad..cce90ae42 100644 --- a/contracts/contracts/userRegistry/IUserRegistry.sol +++ b/contracts/contracts/userRegistry/IUserRegistry.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-3.0 -pragma solidity ^0.6.12; +pragma solidity ^0.8.10; /** * @dev Interface of the registry of verified users. diff --git a/contracts/contracts/userRegistry/MerkleUserRegistry.sol b/contracts/contracts/userRegistry/MerkleUserRegistry.sol index 3a5c82960..e6ff85c0f 100644 --- a/contracts/contracts/userRegistry/MerkleUserRegistry.sol +++ b/contracts/contracts/userRegistry/MerkleUserRegistry.sol @@ -1,11 +1,11 @@ // SPDX-License-Identifier: GPL-3.0 -pragma solidity ^0.6.12; +pragma solidity ^0.8.10; import '@openzeppelin/contracts/access/Ownable.sol'; import './IUserRegistry.sol'; -import {MerkleProof} from "../utils/cryptography/MerkleProof.sol"; +import {MerkleProof} from '../utils/cryptography/MerkleProof.sol'; /** diff --git a/contracts/contracts/userRegistry/SemaphoreUserRegistry.sol b/contracts/contracts/userRegistry/SemaphoreUserRegistry.sol new file mode 100644 index 000000000..a141e422e --- /dev/null +++ b/contracts/contracts/userRegistry/SemaphoreUserRegistry.sol @@ -0,0 +1,77 @@ +// SPDX-License-Identifier: GPL-3.0 + +pragma solidity ^0.8.10; + +import '@openzeppelin/contracts/access/Ownable.sol'; + +import './IUserRegistry.sol'; + +/** + * @dev A simple semaphore user registry managed by a trusted entity. + */ +contract SemaphoreUserRegistry is Ownable, IUserRegistry { + + mapping(address => bool) private users; + mapping(uint256 => bool) private semaphoreIds; + mapping(address => uint256) private userToSemaphoreId; + + // Events + event UserAdded(address indexed _user, uint256 _semaphoreId); + event UserRemoved(address indexed _user); + + /** + * @dev Add verified unique user to the registry. + */ + function addUser(address _user, uint256 _semaphoreId) + external + onlyOwner + { + require(_user != address(0), 'UserRegistry: User address is zero'); + require(_semaphoreId != 0, 'UserRegistry: Semaphore Id is zero'); + require(!users[_user], 'UserRegistry: User already verified'); + require(!semaphoreIds[_semaphoreId], 'UserRegistry: Semaphore Id already registered' ); + users[_user] = true; + semaphoreIds[_semaphoreId] = true; + userToSemaphoreId[_user] = _semaphoreId; + emit UserAdded(_user, _semaphoreId); + } + + /** + * @dev Remove user from the registry. + */ + function removeUser(address _user) + external + onlyOwner + { + require(users[_user], 'UserRegistry: User is not in the registry'); + uint256 _semaphoreId = userToSemaphoreId[_user]; + delete users[_user]; + delete semaphoreIds[_semaphoreId]; + delete userToSemaphoreId[_user]; + emit UserRemoved(_user); + } + + /** + * @dev Check if the user is verified. + */ + function isVerifiedUser(address _user) + override + external + view + returns (bool) + { + return users[_user]; + } + + /** + * @dev Check if the semaphore Id is verified. + */ + function isVerifiedSemaphoreId(uint256 _semaphoreId) + external + view + returns (bool) + { + return semaphoreIds[_semaphoreId]; + } + +} diff --git a/contracts/contracts/userRegistry/SimpleUserRegistry.sol b/contracts/contracts/userRegistry/SimpleUserRegistry.sol index 5e4520650..4f4a7ff00 100644 --- a/contracts/contracts/userRegistry/SimpleUserRegistry.sol +++ b/contracts/contracts/userRegistry/SimpleUserRegistry.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-3.0 -pragma solidity ^0.6.12; +pragma solidity ^0.8.10; import '@openzeppelin/contracts/access/Ownable.sol'; diff --git a/contracts/contracts/userRegistry/SnapshotUserRegistry.sol b/contracts/contracts/userRegistry/SnapshotUserRegistry.sol index 857399ed3..754bf869c 100644 --- a/contracts/contracts/userRegistry/SnapshotUserRegistry.sol +++ b/contracts/contracts/userRegistry/SnapshotUserRegistry.sol @@ -1,13 +1,13 @@ // SPDX-License-Identifier: GPL-3.0 -pragma solidity ^0.6.12; +pragma solidity ^0.8.10; import '@openzeppelin/contracts/access/Ownable.sol'; import './IUserRegistry.sol'; -import {RLPReader} from "solidity-rlp/contracts/RLPReader.sol"; -import {StateProofVerifier} from "../utils/cryptography/StateProofVerifier.sol"; +import {RLPReader} from 'solidity-rlp/contracts/RLPReader.sol'; +import {StateProofVerifier} from '../utils/cryptography/StateProofVerifier.sol'; /** diff --git a/contracts/contracts/utils/cryptography/MerklePatriciaProofVerifier.sol b/contracts/contracts/utils/cryptography/MerklePatriciaProofVerifier.sol index 236fc2715..b0a6df1d3 100644 --- a/contracts/contracts/utils/cryptography/MerklePatriciaProofVerifier.sol +++ b/contracts/contracts/utils/cryptography/MerklePatriciaProofVerifier.sol @@ -4,9 +4,9 @@ * Modified from https://github.com/lidofinance/curve-merkle-oracle/blob/main/contracts/MerklePatriciaProofVerifier.sol * git commit hash 1033b3e84142317ffd8f366b52e489d5eb49c73f */ -pragma solidity ^0.6.12; +pragma solidity ^0.8.10; -import {RLPReader} from "solidity-rlp/contracts/RLPReader.sol"; +import {RLPReader} from 'solidity-rlp/contracts/RLPReader.sol'; library MerklePatriciaProofVerifier { @@ -40,7 +40,7 @@ library MerklePatriciaProofVerifier { if (stack.length == 0) { // Root hash of empty Merkle-Patricia-Trie - require(rootHash == 0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421, "MerklePatriciaProofVerifier: Invalid empty root hash"); + require(rootHash == 0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421, 'MerklePatriciaProofVerifier: Invalid empty root hash'); return new bytes(0); } @@ -53,12 +53,12 @@ library MerklePatriciaProofVerifier { // The root node is hashed with Keccak-256 ... if (i == 0 && rootHash != stack[i].rlpBytesKeccak256()) { - revert("MerklePatriciaProofVerifier: Invalid first root hash"); + revert('MerklePatriciaProofVerifier: Invalid first root hash'); } // ... whereas all other nodes are hashed with the MPT // hash function. if (i != 0 && nodeHashHash != _mptHashHash(stack[i])) { - revert("MerklePatriciaProofVerifier: Invalid node hash"); + revert('MerklePatriciaProofVerifier: Invalid node hash'); } // We verified that stack[i] has the correct hash, so we // may safely decode it. @@ -89,7 +89,7 @@ library MerklePatriciaProofVerifier { // Sanity check if (i < stack.length - 1) { // divergent node must come last in proof - revert("MerklePatriciaProofVerifier: divergent node must come last in the proof"); + revert('MerklePatriciaProofVerifier: divergent node must come last in the proof'); } return new bytes(0); @@ -99,7 +99,7 @@ library MerklePatriciaProofVerifier { // Sanity check if (i < stack.length - 1) { // leaf node must come last in proof - revert("MerklePatriciaProofVerifier: leaf node must come last in the proof"); + revert('MerklePatriciaProofVerifier: leaf node must come last in the proof'); } if (mptKeyOffset < mptKey.length) { @@ -112,7 +112,7 @@ library MerklePatriciaProofVerifier { // Sanity check if (i == stack.length - 1) { // shouldn't be at last level - revert("MerklePatriciaProofVerifier: unexpected last level for extension"); + revert('MerklePatriciaProofVerifier: unexpected last level for extension'); } if (!node[1].isList()) { @@ -134,14 +134,14 @@ library MerklePatriciaProofVerifier { mptKeyOffset += 1; if (nibble >= 16) { // each element of the path has to be a nibble - revert("MerklePatriciaProofVerifier: Each element of the path has to be a nibble"); + revert('MerklePatriciaProofVerifier: Each element of the path has to be a nibble'); } if (_isEmptyBytesequence(node[nibble])) { // Sanity if (i != stack.length - 1) { // leaf node should be at last level - revert("MerklePatriciaProofVerifier: leaf node should be at the last level"); + revert('MerklePatriciaProofVerifier: leaf node should be at the last level'); } return new bytes(0); @@ -156,7 +156,7 @@ library MerklePatriciaProofVerifier { // Sanity if (i != stack.length - 1) { // should be at last level - revert("MerklePatriciaProofVerifier: Should be at the last level"); + revert('MerklePatriciaProofVerifier: Should be at the last level'); } return node[16].toBytes(); @@ -214,7 +214,7 @@ library MerklePatriciaProofVerifier { isLeaf = true; } else { // Not supposed to happen! - revert("MerklePatriciaProofVerifier: Unexpected firstNibble value"); + revert('MerklePatriciaProofVerifier: Unexpected firstNibble value'); } return (isLeaf, _decodeNibbles(compact, skipNibbles)); } diff --git a/contracts/contracts/utils/cryptography/MerkleProof.sol b/contracts/contracts/utils/cryptography/MerkleProof.sol index 686125ec6..08c4a87ed 100644 --- a/contracts/contracts/utils/cryptography/MerkleProof.sol +++ b/contracts/contracts/utils/cryptography/MerkleProof.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: MIT // Modified from OpenZeppelin Contracts (last updated v4.9.2) (utils/cryptography/MerkleProof.sol) -pragma solidity ^0.6.12; +pragma solidity ^0.8.10; /** * @dev These functions deal with verification of Merkle Tree proofs. @@ -55,4 +55,4 @@ library MerkleProof { value := keccak256(0x00, 0x40) } } -} \ No newline at end of file +} diff --git a/contracts/contracts/utils/cryptography/StateProofVerifier.sol b/contracts/contracts/utils/cryptography/StateProofVerifier.sol index d3230a901..407ccd0bc 100644 --- a/contracts/contracts/utils/cryptography/StateProofVerifier.sol +++ b/contracts/contracts/utils/cryptography/StateProofVerifier.sol @@ -1,9 +1,9 @@ // SPDX-License-Identifier: MIT -pragma solidity ^0.6.12; +pragma solidity ^0.8.10; -import {RLPReader} from "solidity-rlp/contracts/RLPReader.sol"; -import {MerklePatriciaProofVerifier} from "./MerklePatriciaProofVerifier.sol"; +import {RLPReader} from 'solidity-rlp/contracts/RLPReader.sol'; +import {MerklePatriciaProofVerifier} from './MerklePatriciaProofVerifier.sol'; /** * @title A helper library for verification of Merkle Patricia account and state proofs. @@ -55,7 +55,7 @@ library StateProofVerifier { } RLPReader.RLPItem[] memory acctFields = acctRlpBytes.toRlpItem().toList(); - require(acctFields.length == 4, "ProofVerifier: Invalid account length"); + require(acctFields.length == 4, 'ProofVerifier: Invalid account length'); account.exists = true; account.nonce = acctFields[0].toUint(); diff --git a/contracts/deploy-config-example.json b/contracts/deploy-config-example.json new file mode 100644 index 000000000..77032cfed --- /dev/null +++ b/contracts/deploy-config-example.json @@ -0,0 +1,50 @@ +{ + "localhost": { + "VkRegistry": { + "circuit": "micro", + "paramsDirectory": "./params" + }, + "ClrFund": { + "coordinator": "", + "token": "", + "userRegistry": "SimpleUserRegistry", + "recipientRegistry": "SimpleRecipientRegistry" + }, + "AnyOldERC20Token": { + "initialSupply": "10000000000000000000000" + }, + "OptimisticRecipientRegistry": { + "challengePeriodSeconds": 9007199254740990, + "deposit": "0.001" + }, + "BrightIdUserRegistry": { + "deploy": false, + "context": "clrfund-arbitrum-goerli", + "verifier": "0xdbf0b2ee9887fe11934789644096028ed3febe9c" + } + }, + "arbitrum-sepolia": { + "VkRegistry": { + "circuit": "micro", + "paramsDirectory": "./params" + }, + "ClrFund": { + "coordinator": "", + "token": "0x65bc8dd04808d99cf8aa6749f128d55c2051edde", + "userRegistry": "BrightIdUserRegistry", + "recipientRegistry": "OptimisticRecipientRegistry" + }, + "AnyOldERC20Token": { + "initialSupply": "10000000000000000000000" + }, + "OptimisticRecipientRegistry": { + "challengePeriodSeconds": 9007199254740990, + "deposit": "0.001" + }, + "BrightIdUserRegistry": { + "context": "clrfund-arbitrum-goerli", + "verifier": "0xdbf0b2ee9887fe11934789644096028ed3febe9c", + "sponsor": "0xC7c81634Dac2de4E7f2Ba407B638ff003ce4534C" + } + } +} diff --git a/contracts/e2e/index.ts b/contracts/e2e/index.ts index 75182e9a1..76e21525c 100644 --- a/contracts/e2e/index.ts +++ b/contracts/e2e/index.ts @@ -1,38 +1,122 @@ -/* eslint-disable @typescript-eslint/camelcase */ -import { ethers, waffle } from 'hardhat' -import { use, expect } from 'chai' -import { solidity } from 'ethereum-waffle' -import { BigNumber, Contract, Signer, Wallet, utils } from 'ethers' -import { genProofs, proveOnChain } from 'maci-cli' -import { Keypair, createMessage, Message, PubKey } from '@clrfund/maci-utils' - -import { UNIT } from '../utils/constants' -import { getEventArg } from '../utils/contracts' +import { ethers, config } from 'hardhat' +import { time, mine } from '@nomicfoundation/hardhat-network-helpers' +import { expect } from 'chai' +import { BaseContract, Contract, toNumber, Signer } from 'ethers' +import { + Keypair, + createMessage, + Message, + PubKey, + genTallyResultCommitment, +} from '@clrfund/common' + import { - deployContract, - deployMaciFactory, - deployPoseidon, - CIRCUITS, -} from '../utils/deployment' + UNIT, + ALPHA_PRECISION, + DEFAULT_GET_LOG_BATCH_SIZE, + DEFAULT_SR_QUEUE_OPS, +} from '../utils/constants' +import { getEventArg } from '../utils/contracts' +import { deployPoseidonLibraries, deployMaciFactory } from '../utils/testutils' import { getIpfsHash } from '../utils/ipfs' import { - MaciParameters, + bnSqrt, + genProofs, + proveOnChain, + mergeMaciSubtrees, addTallyResultsBatch, getRecipientClaimData, + getGenProofArgs, + TallyData, } from '../utils/maci' +import { DEFAULT_CIRCUIT } from '../utils/circuits' +import { MaciParameters } from '../utils/maciParameters' +import { existsSync, mkdirSync } from 'fs' +import path from 'path' +import { FundingRound } from '../typechain-types' +import { JSONFile } from '../utils/JSONFile' +import { EContracts } from '../utils/types' +import { getTalyFilePath } from '../utils/misc' + +type VoteData = { recipientIndex: number; voiceCredits: bigint } +type ClaimData = { [index: number]: bigint } + +const ZERO = BigInt(0) +// funding round duration +const roundDuration = 7 * 86400 + +// log output for debugging +const quiet = !(process.env.DEBUG || false) +console.log('quiet', quiet) +function debugLog(message?: any, ...optionalParams: any[]) { + if (!quiet) console.log(message, ...optionalParams) +} + +// MACI zkFiles +const circuit = process.env.CIRCUIT_TYPE || DEFAULT_CIRCUIT +const circuitDirectory = process.env.CIRCUIT_DIRECTORY || './params' +const rapidsnark = process.env.RAPID_SNARK || '~/rapidsnark/package/bin/prover' +const proofOutputDirectory = process.env.PROOF_OUTPUT_DIR || './proof_output' +const tallyBatchSize = Number(process.env.TALLY_BATCH_SIZE || 8) + +function sumVoiceCredits(voiceCredits: bigint[]): string { + const total = voiceCredits.reduce((sum, credits) => sum + credits, BigInt(0)) + return total.toString() +} -use(solidity) +/* + * tally up votes received by each recipient + * recipientsVotes[i][j] is the jth vote received by recipient i + * returns the tally result for each recipient + */ +function tallyVotes(recipientsVotes: bigint[][]): bigint[] { + const result = recipientsVotes.map((votes) => { + return votes.reduce( + (sum, voiceCredits) => sum + bnSqrt(voiceCredits), + BigInt(0) + ) + }) + return result +} -const ZERO = BigNumber.from(0) +/* + * Calculate the funds that each recipient can claim + * votes[i][j] is the jth vote received by recipient i + * returns the tally result for each recipient + */ +async function calculateClaims( + fundingRound: Contract, + votes: bigint[][] +): Promise { + const alpha = await fundingRound.alpha() + const factor = await fundingRound.voiceCreditFactor() + const tallyResult = tallyVotes(votes) + return tallyResult.map((quadraticVotes, i) => { + const spent = sumVoiceCredits(votes[i]) + const quadratic = quadraticVotes * quadraticVotes * factor * alpha + const linear = BigInt(spent) * factor * (ALPHA_PRECISION - alpha) + return (quadratic + linear) / ALPHA_PRECISION + }) +} + +/** + * Make a vote with recipient and voice credits information + * @param recipientIndex recipient index + * @param voiceCredits voice credits in the vote + * @returns a Vote + */ +function makeVote(recipientIndex: number, voiceCredits: bigint): VoteData { + return { recipientIndex, voiceCredits } +} describe('End-to-end Tests', function () { this.timeout(60 * 60 * 1000) this.bail(true) - const provider = waffle.provider + let maciTransactionHash: string let deployer: Signer - let coordinator: Wallet + let coordinator: Signer let poolContributor1: Signer let poolContributor2: Signer let recipient1: Signer @@ -40,18 +124,29 @@ describe('End-to-end Tests', function () { let recipient3: Signer let contributors: Signer[] + let poseidonLibraries: { [key: string]: string } let userRegistry: Contract let recipientRegistry: Contract - let fundingRoundFactory: Contract + let clrfund: Contract let token: Contract let fundingRound: Contract + let pollContract: Contract let maci: Contract - - let maciParameters: MaciParameters + let pollId: bigint let coordinatorKeypair: Keypair + let params: MaciParameters + + before(async () => { + params = await MaciParameters.fromConfig(circuit, circuitDirectory) + poseidonLibraries = await deployPoseidonLibraries({ + ethers, + signer: deployer, + }) + }) beforeEach(async () => { ;[ + coordinator, deployer, poolContributor1, poolContributor2, @@ -61,83 +156,79 @@ describe('End-to-end Tests', function () { ...contributors ] = await ethers.getSigners() - // Workaround for https://github.com/nomiclabs/buidler/issues/759 - coordinator = Wallet.createRandom().connect(provider) - await deployer.sendTransaction({ - to: coordinator.address, - value: UNIT.mul(10), - }) - // Deploy funding round factory - const poseidonT3 = await deployPoseidon(deployer, 'PoseidonT3') - const poseidonT6 = await deployPoseidon(deployer, 'PoseidonT6') - const circuit = process.env.CIRCUIT_TYPE || 'prod' - const params = CIRCUITS[circuit] - const batchUstVerifier = await deployContract( - deployer, - params.batchUstVerifier - ) - const qvtVerifier = await deployContract(deployer, params.qvtVerifier) - const maciFactory = await deployMaciFactory(deployer, circuit, { - poseidonT3, - poseidonT6, - batchUstVerifier, - qvtVerifier, + debugLog('Deploying MACI factory') + const maciFactory = await deployMaciFactory({ + libraries: poseidonLibraries, + signer: deployer, + ethers, + maciParameters: params, }) - const FundingRoundFactory = await ethers.getContractFactory( - 'FundingRoundFactory', + + clrfund = await ethers.deployContract(EContracts.ClrFund, deployer) + await clrfund.waitForDeployment() + + const roundFactory = await ethers.deployContract( + EContracts.FundingRoundFactory, deployer ) - fundingRoundFactory = await FundingRoundFactory.deploy(maciFactory.address) - await maciFactory.transferOwnership(fundingRoundFactory.address) - const SimpleUserRegistry = await ethers.getContractFactory( - 'SimpleUserRegistry', - deployer + await roundFactory.waitForDeployment() + + const initClrfundTx = await clrfund.init( + maciFactory.target, + roundFactory.target ) - userRegistry = await SimpleUserRegistry.deploy() - await fundingRoundFactory.setUserRegistry(userRegistry.address) - const SimpleRecipientRegistry = await ethers.getContractFactory( - 'SimpleRecipientRegistry', + await initClrfundTx.wait() + const transferTx = await maciFactory.transferOwnership(clrfund.target) + await transferTx.wait() + + userRegistry = await ethers.deployContract( + EContracts.SimpleUserRegistry, deployer ) - recipientRegistry = await SimpleRecipientRegistry.deploy( - fundingRoundFactory.address + await clrfund.setUserRegistry(userRegistry.target) + recipientRegistry = await ethers.deployContract( + EContracts.SimpleRecipientRegistry, + [clrfund.target], + { signer: deployer } ) - await fundingRoundFactory.setRecipientRegistry(recipientRegistry.address) - maciParameters = await MaciParameters.read(maciFactory) + await clrfund.setRecipientRegistry(recipientRegistry.target) // Deploy ERC20 token contract - const Token = await ethers.getContractFactory('AnyOldERC20Token', deployer) - const tokenInitialSupply = UNIT.mul(10000) + const Token = await ethers.getContractFactory( + EContracts.AnyOldERC20Token, + deployer + ) + const tokenInitialSupply = UNIT * BigInt(10000) token = await Token.deploy(tokenInitialSupply) - await token.transfer(await poolContributor1.getAddress(), UNIT.mul(50)) - await token.transfer(await poolContributor2.getAddress(), UNIT.mul(50)) + await token.transfer(await poolContributor1.getAddress(), UNIT * BigInt(50)) + await token.transfer(await poolContributor2.getAddress(), UNIT * BigInt(50)) for (const contributor of contributors) { - await token.transfer(await contributor.getAddress(), UNIT.mul(100)) + await token.transfer(await contributor.getAddress(), UNIT * BigInt(100)) } // Configure factory - await fundingRoundFactory.setToken(token.address) + await clrfund.setToken(token.target) coordinatorKeypair = new Keypair() - await fundingRoundFactory.setCoordinator( - coordinator.address, + const coordinatorAddress = await coordinator.getAddress() + await clrfund.setCoordinator( + coordinatorAddress, coordinatorKeypair.pubKey.asContractParam() ) - await fundingRoundFactory.setMaciParameters(...maciParameters.values()) // Add funds to matching pool - const poolContributionAmount = UNIT.mul(5) - await token - .connect(poolContributor1) - .transfer(fundingRoundFactory.address, poolContributionAmount) + const poolContributionAmount = UNIT * BigInt(5) + await (token.connect(poolContributor1) as Contract).transfer( + clrfund.target, + poolContributionAmount + ) // Add additional funding source - await fundingRoundFactory.addFundingSource( - await poolContributor2.getAddress() + await clrfund.addFundingSource(await poolContributor2.getAddress()) + await (token.connect(poolContributor2) as Contract).approve( + clrfund.target, + poolContributionAmount ) - await token - .connect(poolContributor2) - .approve(fundingRoundFactory.address, poolContributionAmount) // Add recipients await recipientRegistry.addRecipient( @@ -166,17 +257,25 @@ describe('End-to-end Tests', function () { ) // Deploy new funding round and MACI - await fundingRoundFactory.deployNewRound() - const fundingRoundAddress = await fundingRoundFactory.getCurrentRound() + const newRoundTx = await clrfund.deployNewRound(roundDuration) + maciTransactionHash = newRoundTx.hash + + const fundingRoundAddress = await clrfund.getCurrentRound() fundingRound = await ethers.getContractAt( - 'FundingRound', + EContracts.FundingRound, fundingRoundAddress ) const maciAddress = await fundingRound.maci() - maci = await ethers.getContractAt('MACI', maciAddress) + maci = await ethers.getContractAt(EContracts.MACI, maciAddress) + + pollId = await fundingRound.pollId() + const pollAddress = await fundingRound.poll() + pollContract = await ethers.getContractAt(EContracts.Poll, pollAddress) + + await mine() }) - async function makeContributions(amounts: BigNumber[]) { + async function makeContributions(amounts: bigint[]) { const contributions: { [key: string]: any }[] = [] for (let index = 0; index < contributors.length; index++) { const contributionAmount = amounts[index] @@ -188,17 +287,18 @@ describe('End-to-end Tests', function () { const contributorAddress = await contributor.getAddress() await userRegistry.addUser(contributorAddress) // Approve transfer - await token - .connect(contributor) - .approve(fundingRound.address, contributionAmount) + await (token.connect(contributor) as Contract).approve( + fundingRound.target, + contributionAmount + ) // Contribute const contributorKeypair = new Keypair() - const contributionTx = await fundingRound - .connect(contributor) - .contribute( - contributorKeypair.pubKey.asContractParam(), - contributionAmount - ) + const contributionTx = await ( + fundingRound.connect(contributor) as Contract + ).contribute( + contributorKeypair.pubKey.asContractParam(), + contributionAmount + ) const stateIndex = await getEventArg( contributionTx, maci, @@ -214,61 +314,153 @@ describe('End-to-end Tests', function () { contributions.push({ signer: contributor, keypair: contributorKeypair, - stateIndex: parseInt(stateIndex), + stateIndex: toNumber(stateIndex), contribution: contributionAmount, - voiceCredits: voiceCredits, + voiceCredits: BigInt(voiceCredits), }) } return contributions } - function makeMaciFilename(): string { - return `macistate_${utils.hexlify(utils.randomBytes(10))}` + /** + * Get the tally and message processor contract address from the funding round + * @returns tally and message processor contract addresses + */ + async function getTallyAndMessageProcessor(): Promise<{ + tallyAddress: string + messageProcessorAddress: string + }> { + const tallyAddress = await fundingRound.tally() + const tallyContact = await ethers.getContractAt( + EContracts.Tally, + tallyAddress + ) + const messageProcessorAddress = await tallyContact.messageProcessor() + + return { tallyAddress, messageProcessorAddress } } - async function finalizeRound(): Promise { - const providerUrl = (provider as any)._hardhatNetwork.config.url + async function finalizeRound( + testResetTally = false + ): Promise<{ tally: TallyData; claims: ClaimData }> { + debugLog('Finalizing round') // Process messages and tally votes - const results = await genProofs({ - contract: maci.address, - eth_provider: providerUrl, - privkey: coordinatorKeypair.privKey.serialize(), - macistate: makeMaciFilename(), + const maciAddress = await maci.getAddress() + await mergeMaciSubtrees({ + maciAddress, + pollId, + numQueueOps: DEFAULT_SR_QUEUE_OPS, + signer: coordinator, }) - if (!results) { - throw new Error('generation of proofs failed') + debugLog('Merged MACI trees') + + const random = Math.floor(Math.random() * 10 ** 8) + const outputDir = path.join(proofOutputDirectory, `${random}`) + if (!existsSync(outputDir)) { + mkdirSync(outputDir, { recursive: true }) } - const { proofs, tally } = results + const tallyFile = getTalyFilePath(outputDir) + + // past an end block that's later than the MACI start block + const genProofArgs = getGenProofArgs({ + maciAddress, + pollId, + coordinatorMacisk: coordinatorKeypair.privKey.serialize(), + rapidsnark, + circuitType: circuit, + circuitDirectory, + outputDir, + tallyFile, + blocksPerBatch: DEFAULT_GET_LOG_BATCH_SIZE, + maciTxHash: maciTransactionHash, + signer: coordinator, + quiet, + }) + + debugLog('Generating proof') + await genProofs(genProofArgs) + debugLog('Generated proof') + + const { tallyAddress, messageProcessorAddress } = + await getTallyAndMessageProcessor() + + debugLog('Proving on chain') // Submit proofs to MACI contract await proveOnChain({ - contract: maci.address, - eth_privkey: coordinator.privateKey, - eth_provider: providerUrl, - privkey: coordinatorKeypair.privKey.serialize(), - proof_file: proofs, + pollId, + proofDir: genProofArgs.outputDir, + subsidyEnabled: false, + maciAddress, + messageProcessorAddress, + tallyAddress, + signer: coordinator, + quiet, }) + + if (testResetTally) { + console.log('resetting tally and message processor contracts') + const resetTx = await fundingRound.resetTally() + await resetTx.wait() + + const { tallyAddress, messageProcessorAddress } = + await getTallyAndMessageProcessor() + console.log('redoing proveOnChain with new tallyAddress', tallyAddress) + + await proveOnChain({ + pollId, + proofDir: genProofArgs.outputDir, + subsidyEnabled: false, + maciAddress, + messageProcessorAddress, + tallyAddress, + signer: coordinator, + quiet, + }) + } + console.log('finished proveOnChain') + + const tally = JSONFile.read(genProofArgs.tallyFile) as TallyData const tallyHash = await getIpfsHash(tally) - await fundingRound.connect(coordinator).publishTallyHash(tallyHash) + await (fundingRound.connect(coordinator) as Contract).publishTallyHash( + tallyHash + ) + console.log('Tally hash', tallyHash) // add tally results to funding round - const batchSize = Number(process.env.TALLY_BATCH_SIZE) || 20 - const recipientTreeDepth = (await maci.treeDepths()).voteOptionTreeDepth + const recipientTreeDepth = params.treeDepths.voteOptionTreeDepth + console.log('Adding tally result on chain in batches of', tallyBatchSize) await addTallyResultsBatch( - fundingRound.connect(coordinator), + fundingRound.connect(coordinator) as BaseContract as FundingRound, recipientTreeDepth, tally, - batchSize + tallyBatchSize + ) + console.log('Finished adding tally results') + + const newResultCommitment = genTallyResultCommitment( + tally.results.tally.map((x: string) => BigInt(x)), + BigInt(tally.results.salt), + recipientTreeDepth + ) + + const perVOSpentVoiceCreditsCommitment = genTallyResultCommitment( + tally.perVOSpentVoiceCredits.tally.map((x: string) => BigInt(x)), + BigInt(tally.perVOSpentVoiceCredits.salt), + recipientTreeDepth ) // Finalize round - await fundingRoundFactory.transferMatchingFunds( - tally.totalVoiceCredits.spent, - tally.totalVoiceCredits.salt + debugLog('Transfering matching funds') + await clrfund.transferMatchingFunds( + tally.totalSpentVoiceCredits.spent, + tally.totalSpentVoiceCredits.salt, + newResultCommitment.toString(), + perVOSpentVoiceCreditsCommitment.toString() ) // Claim funds - const claims: { [index: number]: BigNumber } = {} + const claims: ClaimData = {} for (const recipientIndex of [1, 2]) { const recipient = recipientIndex === 1 ? recipient1 : recipient2 @@ -277,24 +469,24 @@ describe('End-to-end Tests', function () { recipientTreeDepth, tally ) - const claimTx = await fundingRound - .connect(recipient) - .claimFunds(...claimData) + const claimTx = await ( + fundingRound.connect(recipient) as Contract + ).claimFunds(...claimData) const claimedAmount = await getEventArg( claimTx, fundingRound, 'FundsClaimed', '_amount' ) - claims[recipientIndex] = claimedAmount + claims[recipientIndex] = BigInt(claimedAmount) } return { tally, claims } } it('should allocate funds correctly when users change keys', async () => { const contributions = await makeContributions([ - UNIT.mul(8).div(10), - UNIT.mul(8).div(10), + (UNIT * BigInt(50)) / BigInt(10), + (UNIT * BigInt(50)) / BigInt(10), ]) // Submit messages for (const contribution of contributions) { @@ -312,7 +504,8 @@ describe('End-to-end Tests', function () { coordinatorKeypair.pubKey, null, null, - nonce + nonce, + pollId ) messages.push(message) encPubKeys.push(encPubKey) @@ -320,7 +513,7 @@ describe('End-to-end Tests', function () { // Spend voice credits on both recipients for (const recipientIndex of [1, 2]) { - const voiceCredits = contribution.voiceCredits.div(2) + const voiceCredits = BigInt(contribution.voiceCredits) / BigInt(2) const [message, encPubKey] = createMessage( contribution.stateIndex, newContributorKeypair, @@ -328,37 +521,49 @@ describe('End-to-end Tests', function () { coordinatorKeypair.pubKey, recipientIndex, voiceCredits, - nonce + nonce, + pollId ) messages.push(message) encPubKeys.push(encPubKey) nonce += 1 } - await fundingRound.connect(contributor).submitMessageBatch( + await (pollContract.connect(contributor) as Contract).publishMessageBatch( messages.reverse().map((msg) => msg.asContractParam()), encPubKeys.reverse().map((key) => key.asContractParam()) ) } - await provider.send('evm_increaseTime', [maciParameters.signUpDuration]) - await provider.send('evm_increaseTime', [maciParameters.votingDuration]) + await time.increase(roundDuration) const { tally, claims } = await finalizeRound() - expect(tally.totalVoiceCredits.spent).to.equal('160000') - expect(claims[1]).to.equal(UNIT.mul(58).div(10)) - expect(claims[2]).to.equal(UNIT.mul(58).div(10)) + const expectedTotalVoiceCredits = sumVoiceCredits( + contributions.map((x) => x.voiceCredits) + ) + expect(tally.totalSpentVoiceCredits.spent).to.equal( + expectedTotalVoiceCredits + ) + const expectedClaims = await calculateClaims( + fundingRound, + new Array(2).fill( + contributions.map((x) => BigInt(x.voiceCredits) / BigInt(2)) + ) + ) + console.log('expected claim', claims[1], expectedClaims[0]) + expect(claims[1]).to.equal(expectedClaims[0]) + expect(claims[2]).to.equal(expectedClaims[1]) }) it('should allocate funds correctly if not all voice credits are spent', async () => { const contributions = await makeContributions([ - UNIT.mul(8).div(10), - UNIT.mul(8).div(10), + (UNIT * BigInt(36)) / BigInt(10), + (UNIT * BigInt(36)) / BigInt(10), ]) // 2 contirbutors, divide their contributions into 4 parts, only contribute 2 parts to 2 projects for (const contribution of contributions) { const contributor = contribution.signer - const voiceCredits = contribution.voiceCredits.div(4) + const voiceCredits = BigInt(contribution.voiceCredits) / BigInt(4) let nonce = 1 const messages: Message[] = [] const encPubKeys: PubKey[] = [] @@ -371,41 +576,53 @@ describe('End-to-end Tests', function () { coordinatorKeypair.pubKey, recipientIndex, voiceCredits, - nonce + nonce, + pollId ) messages.push(message) encPubKeys.push(encPubKey) nonce += 1 } - await fundingRound.connect(contributor).submitMessageBatch( + await (pollContract.connect(contributor) as Contract).publishMessageBatch( messages.reverse().map((msg) => msg.asContractParam()), encPubKeys.reverse().map((key) => key.asContractParam()) ) } - await provider.send('evm_increaseTime', [maciParameters.signUpDuration]) - await provider.send('evm_increaseTime', [maciParameters.votingDuration]) + await time.increase(roundDuration) const { tally, claims } = await finalizeRound() - expect(tally.totalVoiceCredits.spent).to.equal('79524') - expect(claims[1].toString()).to.equal('5799999999999999999') - expect(claims[2].toString()).to.equal('5799999999999999999') + const expectedTotalVoiceCredits = sumVoiceCredits( + contributions.map((x) => BigInt(x.voiceCredits) / BigInt(2)) + ) + expect(tally.totalSpentVoiceCredits.spent).to.equal( + expectedTotalVoiceCredits + ) + + const expectedClaims = await calculateClaims( + fundingRound, + new Array(2).fill( + contributions.map((x) => BigInt(x.voiceCredits) / BigInt(4)) + ) + ) + expect(claims[1]).to.equal(expectedClaims[0]) + expect(claims[2]).to.equal(expectedClaims[1]) }) it('should overwrite votes 1', async () => { const [contribution, contribution2] = await makeContributions([ - UNIT.mul(8).div(10), - UNIT.mul(4).div(10), + UNIT * BigInt(5), + UNIT * BigInt(90), ]) const contributor = contribution.signer - const votes = [ - [1, contribution.voiceCredits.div(8)], - [2, contribution.voiceCredits.div(2)], - [1, contribution.voiceCredits.div(2)], + const votes: VoteData[] = [ + makeVote(1, BigInt(contribution.voiceCredits) / BigInt(6)), + makeVote(2, BigInt(contribution.voiceCredits) / BigInt(2)), + makeVote(1, BigInt(contribution.voiceCredits) / BigInt(2)), ] const messages: Message[] = [] const encPubKeys: PubKey[] = [] let nonce = 1 - for (const [recipientIndex, voiceCredits] of votes) { + for (const { recipientIndex, voiceCredits } of votes) { const [message, encPubKey] = createMessage( contribution.stateIndex, contribution.keypair, @@ -413,13 +630,14 @@ describe('End-to-end Tests', function () { coordinatorKeypair.pubKey, recipientIndex, voiceCredits, - nonce + nonce, + pollId ) nonce += 1 messages.push(message) encPubKeys.push(encPubKey) } - await fundingRound.connect(contributor).submitMessageBatch( + await (pollContract.connect(contributor) as Contract).publishMessageBatch( messages.reverse().map((msg) => msg.asContractParam()), encPubKeys.reverse().map((key) => key.asContractParam()) ) @@ -430,41 +648,58 @@ describe('End-to-end Tests', function () { coordinatorKeypair.pubKey, 2, contribution2.voiceCredits, - 1 + 1, + pollId + ) + await ( + pollContract.connect(contribution2.signer) as Contract + ).publishMessageBatch( + [message.asContractParam()], + [encPubKey.asContractParam()] ) - await fundingRound - .connect(contribution2.signer) - .submitMessageBatch( - [message.asContractParam()], - [encPubKey.asContractParam()] - ) - await provider.send('evm_increaseTime', [maciParameters.signUpDuration]) - await provider.send('evm_increaseTime', [maciParameters.votingDuration]) + await time.increase(roundDuration) const { tally, claims } = await finalizeRound() - expect(tally.totalVoiceCredits.spent).to.equal('120000') - expect(tally.results.tally[1]).to.equal('200') - expect(tally.results.tally[2]).to.equal('400') - expect(claims[1].toString()).to.equal('400000000000000000') - expect(claims[2].toString()).to.equal('10800000000000000000') + const expectedTotalVoiceCredits = sumVoiceCredits([ + contribution.voiceCredits, + contribution2.voiceCredits, + ]) + expect(tally.totalSpentVoiceCredits.spent).to.equal( + expectedTotalVoiceCredits + ) + + const voiceCredits1 = BigInt(contribution.voiceCredits) / BigInt(2) + const submittedVoiceCredits = [ + [voiceCredits1], + [voiceCredits1, contribution2.voiceCredits], + ] + const expectedTally = tallyVotes(submittedVoiceCredits) + expect(BigInt(tally.results.tally[1])).to.equal(expectedTally[0]) + expect(BigInt(tally.results.tally[2])).to.equal(expectedTally[1]) + const expectedClaims = await calculateClaims( + fundingRound, + submittedVoiceCredits + ) + expect(claims[1]).to.equal(expectedClaims[0]) + expect(claims[2]).to.equal(expectedClaims[1]) }) it('should overwrite votes 2', async () => { const [contribution, contribution2] = await makeContributions([ - UNIT.mul(4).div(10), - UNIT.mul(4).div(10), + UNIT * BigInt(90), + UNIT * BigInt(40), ]) const contributor = contribution.signer - const votes = [ - [1, contribution.voiceCredits.div(2)], - [2, contribution.voiceCredits.div(2)], - [1, ZERO], - [2, contribution.voiceCredits], + const votes: VoteData[] = [ + makeVote(1, BigInt(contribution.voiceCredits) / BigInt(2)), + makeVote(2, BigInt(contribution.voiceCredits) / BigInt(2)), + makeVote(1, ZERO), + makeVote(2, BigInt(contribution.voiceCredits)), ] const messages: Message[] = [] const encPubKeys: PubKey[] = [] let nonce = 1 - for (const [recipientIndex, voiceCredits] of votes) { + for (const { recipientIndex, voiceCredits } of votes) { const [message, encPubKey] = createMessage( contribution.stateIndex, contribution.keypair, @@ -472,13 +707,14 @@ describe('End-to-end Tests', function () { coordinatorKeypair.pubKey, recipientIndex, voiceCredits, - nonce + nonce, + pollId ) nonce += 1 messages.push(message) encPubKeys.push(encPubKey) } - await fundingRound.connect(contributor).submitMessageBatch( + await (pollContract.connect(contributor) as Contract).publishMessageBatch( messages.reverse().map((msg) => msg.asContractParam()), encPubKeys.reverse().map((key) => key.asContractParam()) ) @@ -491,48 +727,63 @@ describe('End-to-end Tests', function () { coordinatorKeypair.pubKey, 2, contribution2.voiceCredits, - 1 + 1, + pollId + ) + await ( + pollContract.connect(contribution2.signer) as Contract + ).publishMessageBatch( + [message.asContractParam()], + [encPubKey.asContractParam()] ) - await fundingRound - .connect(contribution2.signer) - .submitMessageBatch( - [message.asContractParam()], - [encPubKey.asContractParam()] - ) - await provider.send('evm_increaseTime', [maciParameters.signUpDuration]) - await provider.send('evm_increaseTime', [maciParameters.votingDuration]) + await time.increase(roundDuration) const { tally, claims } = await finalizeRound() - expect(tally.totalVoiceCredits.spent).to.equal('80000') + const expectedTotalVoiceCredits = sumVoiceCredits([ + contribution.voiceCredits, + contribution2.voiceCredits, + ]) + expect(tally.totalSpentVoiceCredits.spent).to.equal( + expectedTotalVoiceCredits + ) + + const submittedVoiceCredits = [ + [contribution.voiceCredits, contribution2.voiceCredits], + ] + const expectedTally = tallyVotes(submittedVoiceCredits) expect(tally.results.tally[1]).to.equal('0') - expect(tally.results.tally[2]).to.equal('400') + expect(BigInt(tally.results.tally[2])).to.equal(expectedTally[0]) + const expectedClaims = await calculateClaims( + fundingRound, + submittedVoiceCredits + ) expect(claims[1]).to.equal(ZERO) - expect(claims[2]).to.equal(UNIT.mul(108).div(10)) + expect(claims[2]).to.equal(expectedClaims[0]) }) it('should overwrite previous batch of votes', async () => { const [contribution, contribution2] = await makeContributions([ - UNIT.mul(8).div(10), - UNIT.mul(4).div(10), + UNIT * BigInt(5), + UNIT * BigInt(40), ]) const contributor = contribution.signer - const votes = [ + const votes: VoteData[][] = [ [ - [1, contribution.voiceCredits.div(3)], - [2, contribution.voiceCredits.div(3)], - [3, contribution.voiceCredits.div(3)], + makeVote(1, BigInt(contribution.voiceCredits) / BigInt(3)), + makeVote(2, BigInt(contribution.voiceCredits) / BigInt(3)), + makeVote(3, BigInt(contribution.voiceCredits) / BigInt(3)), ], [ - [1, contribution.voiceCredits.div(2)], - [2, contribution.voiceCredits.div(2)], - [3, ZERO], + makeVote(1, BigInt(contribution.voiceCredits) / BigInt(2)), + makeVote(2, BigInt(contribution.voiceCredits) / BigInt(2)), + makeVote(3, ZERO), ], ] for (const batch of votes) { const messages: Message[] = [] const encPubKeys: PubKey[] = [] let nonce = 1 - for (const [recipientIndex, voiceCredits] of batch) { + for (const { recipientIndex, voiceCredits } of batch) { const [message, encPubKey] = createMessage( contribution.stateIndex, contribution.keypair, @@ -540,13 +791,14 @@ describe('End-to-end Tests', function () { coordinatorKeypair.pubKey, recipientIndex, voiceCredits, - nonce + nonce, + pollId ) nonce += 1 messages.push(message) encPubKeys.push(encPubKey) } - await fundingRound.connect(contributor).submitMessageBatch( + await (pollContract.connect(contributor) as Contract).publishMessageBatch( messages.reverse().map((msg) => msg.asContractParam()), encPubKeys.reverse().map((key) => key.asContractParam()) ) @@ -560,30 +812,49 @@ describe('End-to-end Tests', function () { coordinatorKeypair.pubKey, 2, contribution2.voiceCredits, - 1 + 1, + pollId + ) + await ( + pollContract.connect(contribution2.signer) as Contract + ).publishMessageBatch( + [message.asContractParam()], + [encPubKey.asContractParam()] ) - await fundingRound - .connect(contribution2.signer) - .submitMessageBatch( - [message.asContractParam()], - [encPubKey.asContractParam()] - ) - await provider.send('evm_increaseTime', [maciParameters.signUpDuration]) - await provider.send('evm_increaseTime', [maciParameters.votingDuration]) + await time.increase(roundDuration) const { tally, claims } = await finalizeRound() - expect(tally.totalVoiceCredits.spent).to.equal('120000') - expect(tally.results.tally[1]).to.equal('200') - expect(tally.results.tally[2]).to.equal('400') + const expectedTotalVoiceCredits = sumVoiceCredits([ + contribution.voiceCredits, + contribution2.voiceCredits, + ]) + expect(tally.totalSpentVoiceCredits.spent).to.equal( + expectedTotalVoiceCredits + ) + + const voiceCredits1 = BigInt(contribution.voiceCredits) / BigInt(2) + const submittedVoiceCredits = [ + [voiceCredits1], + [voiceCredits1, contribution2.voiceCredits], + ] + const expectedTally = tallyVotes(submittedVoiceCredits) + + expect(BigInt(tally.results.tally[1])).to.equal(expectedTally[0]) + expect(BigInt(tally.results.tally[2])).to.equal(expectedTally[1]) expect(tally.results.tally[3]).to.equal('0') - expect(claims[1]).to.equal(UNIT.mul(4).div(10)) - expect(claims[2]).to.equal(UNIT.mul(108).div(10)) + + const expectedClaims = await calculateClaims( + fundingRound, + submittedVoiceCredits + ) + expect(claims[1]).to.equal(expectedClaims[0]) + expect(claims[2]).to.equal(expectedClaims[1]) }) it('should invalidate votes in case of bribe', async () => { const [contribution, contribution2] = await makeContributions([ - UNIT.mul(4).div(10), - UNIT.mul(4).div(10), + UNIT * BigInt(90), + UNIT * BigInt(40), ]) const contributor = contribution.signer let message @@ -599,7 +870,8 @@ describe('End-to-end Tests', function () { coordinatorKeypair.pubKey, 1, contribution.voiceCredits, - 1 + 1, + pollId ) messageBatch1.push(message) encPubKeyBatch1.push(encPubKey) @@ -611,17 +883,17 @@ describe('End-to-end Tests', function () { coordinatorKeypair.pubKey, null, null, - 2 + 2, + pollId ) messageBatch1.push(message) encPubKeyBatch1.push(encPubKey) - await fundingRound.connect(contributor).submitMessageBatch( + await (pollContract.connect(contributor) as Contract).publishMessageBatch( messageBatch1.reverse().map((msg) => msg.asContractParam()), encPubKeyBatch1.reverse().map((key) => key.asContractParam()) ) - // Wait for signup period to end to override votes - await provider.send('evm_increaseTime', [maciParameters.signUpDuration]) + // override votes const messageBatch2: Message[] = [] const encPubKeyBatch2: PubKey[] = [] // Change key @@ -633,7 +905,8 @@ describe('End-to-end Tests', function () { coordinatorKeypair.pubKey, null, null, - 1 + 1, + pollId ) messageBatch2.push(message) encPubKeyBatch2.push(encPubKey) @@ -644,8 +917,9 @@ describe('End-to-end Tests', function () { null, coordinatorKeypair.pubKey, 1, - BigNumber.from(0), - 2 + BigInt(0), + 2, + pollId ) messageBatch2.push(message) encPubKeyBatch2.push(encPubKey) @@ -657,11 +931,12 @@ describe('End-to-end Tests', function () { coordinatorKeypair.pubKey, 2, contribution.voiceCredits, - 3 + 3, + pollId ) messageBatch2.push(message) encPubKeyBatch2.push(encPubKey) - await fundingRound.connect(contributor).submitMessageBatch( + await (pollContract.connect(contributor) as Contract).publishMessageBatch( messageBatch2.reverse().map((msg) => msg.asContractParam()), encPubKeyBatch2.reverse().map((key) => key.asContractParam()) ) @@ -674,19 +949,86 @@ describe('End-to-end Tests', function () { coordinatorKeypair.pubKey, 2, contribution2.voiceCredits, - 1 + 1, + pollId + ) + await ( + pollContract.connect(contribution2.signer) as Contract + ).publishMessageBatch( + [message.asContractParam()], + [encPubKey.asContractParam()] ) - await fundingRound - .connect(contribution2.signer) - .submitMessageBatch( - [message.asContractParam()], - [encPubKey.asContractParam()] - ) - await provider.send('evm_increaseTime', [maciParameters.votingDuration]) + await time.increase(roundDuration) const { tally, claims } = await finalizeRound() - expect(tally.totalVoiceCredits.spent).to.equal('80000') - expect(claims[1]).to.equal(BigNumber.from(0)) - expect(claims[2]).to.equal(UNIT.mul(108).div(10)) + const expectedTotalVoiceCredits = sumVoiceCredits([ + contribution.voiceCredits, + contribution2.voiceCredits, + ]) + expect(tally.totalSpentVoiceCredits.spent).to.equal( + expectedTotalVoiceCredits + ) + expect(claims[1]).to.equal(BigInt(0)) + + const expectedClaims = await calculateClaims(fundingRound, [ + [contribution.voiceCredits, contribution2.voiceCredits], + ]) + expect(claims[2]).to.equal(expectedClaims[0]) + }) + + it('should allow reset and re-run tally', async () => { + const contributions = await makeContributions([ + (UNIT * BigInt(50)) / BigInt(10), + (UNIT * BigInt(50)) / BigInt(10), + ]) + // Submit messages + for (const contribution of contributions) { + const contributor = contribution.signer + const messages: Message[] = [] + const encPubKeys: PubKey[] = [] + let nonce = 1 + + // Spend voice credits on both recipients + for (const recipientIndex of [1, 2]) { + const voiceCredits = BigInt(contribution.voiceCredits) / BigInt(2) + const [message, encPubKey] = createMessage( + contribution.stateIndex, + contribution.keypair, + null, + coordinatorKeypair.pubKey, + recipientIndex, + voiceCredits, + nonce, + pollId + ) + messages.push(message) + encPubKeys.push(encPubKey) + nonce += 1 + } + + await (pollContract.connect(contributor) as Contract).publishMessageBatch( + messages.reverse().map((msg) => msg.asContractParam()), + encPubKeys.reverse().map((key) => key.asContractParam()) + ) + } + + await time.increase(roundDuration) + const testResetTally = true + const { tally, claims } = await finalizeRound(testResetTally) + const expectedTotalVoiceCredits = sumVoiceCredits( + contributions.map((x) => x.voiceCredits) + ) + expect(tally.totalSpentVoiceCredits.spent).to.equal( + expectedTotalVoiceCredits + ) + const expectedClaims = await calculateClaims( + fundingRound, + new Array(2).fill( + contributions.map((x) => BigInt(x.voiceCredits) / BigInt(2)) + ) + ) + console.log('expected claim', claims[1], expectedClaims[0]) + expect(claims[1]).to.equal(expectedClaims[0]) + expect(claims[2]).to.equal(expectedClaims[1]) }) }) diff --git a/contracts/hardhat.config.ts b/contracts/hardhat.config.ts index be598ff63..e9fcb6931 100644 --- a/contracts/hardhat.config.ts +++ b/contracts/hardhat.config.ts @@ -2,11 +2,10 @@ import fs from 'fs' import path from 'path' import dotenv from 'dotenv' -import { HardhatUserConfig, task } from 'hardhat/config' -import '@nomiclabs/hardhat-waffle' +import { task } from 'hardhat/config' +import '@nomicfoundation/hardhat-toolbox' import '@nomiclabs/hardhat-ganache' import 'hardhat-contract-sizer' -import '@nomiclabs/hardhat-etherscan' import './tasks' dotenv.config() @@ -14,7 +13,6 @@ dotenv.config() const GAS_LIMIT = 20000000 const WALLET_MNEMONIC = process.env.WALLET_MNEMONIC const WALLET_PRIVATE_KEY = process.env.WALLET_PRIVATE_KEY -const WALLET_PRIVATE_KEY_2 = process.env.WALLET_PRIVATE_KEY_2 let accounts if (WALLET_MNEMONIC) { @@ -24,11 +22,7 @@ if (WALLET_PRIVATE_KEY) { accounts = [WALLET_PRIVATE_KEY] } -if (WALLET_PRIVATE_KEY_2) { - accounts = [...accounts, WALLET_PRIVATE_KEY_2] -} - -const config: HardhatUserConfig = { +export default { networks: { hardhat: { gas: GAS_LIMIT, @@ -59,12 +53,26 @@ const config: HardhatUserConfig = { process.env.JSONRPC_HTTP_URL || 'https://goerli-rollup.arbitrum.io/rpc', accounts, }, - 'mantle-testnet': { - url: process.env.JSONRPC_HTTP_URL || 'https://rpc.testnet.mantle.xyz', + 'arbitrum-sepolia': { + url: + process.env.JSONRPC_HTTP_URL || + 'https://sepolia-rollup.arbitrum.io/rpc', accounts, }, - rinkarby: { - url: process.env.JSONRPC_HTTP_URL || 'https://rinkeby.arbitrum.io/rpc', + optimism: { + url: process.env.JSONRPC_HTTP_URL || 'https://mainnet.optimism.io', + accounts, + }, + 'optimism-sepolia': { + url: process.env.JSONRPC_HTTP_URL || 'https://sepolia.optimism.io', + accounts, + }, + sepolia: { + url: process.env.JSONRPC_HTTP_URL || 'http://127.0.0.1:8545', + accounts, + }, + 'mantle-testnet': { + url: process.env.JSONRPC_HTTP_URL || 'https://rpc.testnet.mantle.xyz', accounts, }, arbitrum: { @@ -73,7 +81,36 @@ const config: HardhatUserConfig = { }, }, etherscan: { - apiKey: process.env.ETHERSCAN_API_KEY || 'YOUR_ETHERSCAN_API_KEY', + apiKey: { + arbitrumOne: process.env.ARBISCAN_API_KEY || 'YOUR_ARBISCAN_API_KEY', + 'arbitrum-sepolia': + process.env.ARBISCAN_API_KEY || 'YOUR_ARBISCAN_API_KEY', + optimisticEthereum: + process.env.OPTIMISMSCAN_API_KEY || 'YOUR_OPTIMISMSCAN_API_KEY', + 'optimism-sepolia': + process.env.OPTIMISMSCAN_API_KEY || 'YOUR_OPTIMISMSCAN_API_KEY', + }, + customChains: [ + { + network: 'arbitrum-sepolia', + chainId: 421614, + urls: { + apiURL: 'https://api-sepolia.arbiscan.io/api', + browserURL: 'https://sepolia.arbiscan.io', + }, + }, + { + network: 'optimism-sepolia', + chainId: 11155420, + urls: { + apiURL: 'https://api-sepolia-optimistic.etherscan.io/api', + browserURL: 'https://sepolia-optimism.etherscan.io', + }, + }, + ], + }, + sourcify: { + enabled: false, }, paths: { artifacts: 'build/contracts', @@ -85,7 +122,7 @@ const config: HardhatUserConfig = { disambiguatePaths: false, }, solidity: { - version: '0.6.12', + version: '0.8.10', settings: { optimizer: { enabled: true, @@ -94,7 +131,7 @@ const config: HardhatUserConfig = { }, overrides: { 'contracts/FundingRoundFactory.sol': { - version: '0.6.12', + version: '0.8.10', settings: { optimizer: { enabled: true, @@ -103,7 +140,7 @@ const config: HardhatUserConfig = { }, }, 'contracts/FundingRound.sol': { - version: '0.6.12', + version: '0.8.10', settings: { optimizer: { enabled: true, @@ -111,26 +148,8 @@ const config: HardhatUserConfig = { }, }, }, - 'contracts/snarkVerifiers/BatchUpdateStateTreeVerifier32.sol': { - version: '0.6.12', - settings: { - optimizer: { - enabled: true, - runs: 10000000, - }, - }, - }, - 'contracts/snarkVerifiers/QuadVoteTallyVerifier32.sol': { - version: '0.6.12', - settings: { - optimizer: { - enabled: true, - runs: 10000000, - }, - }, - }, 'contracts/recipientRegistry/OptimisticRecipientRegistry.sol': { - version: '0.6.12', + version: '0.8.10', settings: { optimizer: { enabled: true, @@ -139,7 +158,7 @@ const config: HardhatUserConfig = { }, }, 'contracts/userRegistry/SimpleUserRegistry.sol': { - version: '0.6.12', + version: '0.8.10', settings: { optimizer: { enabled: true, @@ -148,7 +167,7 @@ const config: HardhatUserConfig = { }, }, 'contracts/userRegistry/BrightIdUserRegistry.sol': { - version: '0.6.12', + version: '0.8.10', settings: { optimizer: { enabled: true, @@ -166,12 +185,17 @@ task( async (_, { config }, runSuper) => { await runSuper() // Copy Poseidon artifacts - const poseidons = ['PoseidonT3', 'PoseidonT6'] - for (const contractName of poseidons) { + const externalContracts: Array = [ + 'PoseidonT3', + 'PoseidonT4', + 'PoseidonT5', + 'PoseidonT6', + ] + for (const contractName of externalContracts) { const artifact = JSON.parse( fs .readFileSync( - `../node_modules/maci-contracts/compiled/${contractName}.json` + `./node_modules/maci-contracts/build/artifacts/contracts/crypto/${contractName}.sol/${contractName}.json` ) .toString() ) @@ -182,5 +206,3 @@ task( } } ) - -export default config diff --git a/contracts/package.json b/contracts/package.json index d0f1e64f1..94bb91a88 100644 --- a/contracts/package.json +++ b/contracts/package.json @@ -1,20 +1,13 @@ { "name": "@clrfund/contracts", - "version": "4.3.1", + "version": "5.1.1", "license": "GPL-3.0", "scripts": { "hardhat": "hardhat", "build": "hardhat compile", "node": "hardhat node --port 18545 --hostname 0.0.0.0", - "deploy:local": "yarn clean && yarn build && hardhat run --network localhost scripts/deploy.ts", - "deploy:arbitrum": "hardhat run --network arbitrum scripts/deploy.ts", - "deployTestRound:local": "hardhat run --network localhost scripts/deployTestRound.ts", - "contribute:local": "hardhat run --network localhost scripts/contribute.ts", - "vote:local": "hardhat run --network localhost scripts/vote.ts", - "tally:local": "hardhat --network localhost tally", - "finalize:local": "hardhat run --network localhost scripts/finalize.ts", - "claim:local": "hardhat run --network localhost scripts/claim.ts", "test": "hardhat test", + "deploy:local": "./sh/deployLocal.sh", "e2e": "NODE_OPTIONS=--max-old-space-size=4096 hardhat test --network localhost e2e/index.ts", "lint:js": "eslint '{tests,e2e,scripts}/**/*.ts'", "lint:solidity": "solhint 'contracts/**/*.sol'", @@ -22,37 +15,37 @@ "clean": "rm -rf cache && rm -rf build" }, "dependencies": { - "@openzeppelin/contracts": "3.2.0", + "@openzeppelin/contracts": "4.9.0", + "@pinata/sdk": "^2.1.0", "dotenv": "^8.2.0", - "maci-contracts": "0.10.1", + "maci-contracts": "^1.2.0", "solidity-rlp": "2.0.8" }, "devDependencies": { - "@clrfund/maci-utils": "^0.0.1", "@clrfund/common": "^0.0.1", - "@ethereum-waffle/mock-contract": "^3.4.4", + "@clrfund/waffle-mock-contract": "^0.0.4", "@kleros/gtcr-encoder": "^1.4.0", - "@nomiclabs/hardhat-ethers": "^2.2.1", - "@nomiclabs/hardhat-etherscan": "^3.1.4", + "@nomicfoundation/hardhat-chai-matchers": "^2.0.3", + "@nomicfoundation/hardhat-ethers": "^3.0.5", + "@nomicfoundation/hardhat-network-helpers": "^1.0.10", + "@nomicfoundation/hardhat-toolbox": "^4.0.0", + "@nomicfoundation/hardhat-verify": "^2.0.3", "@nomiclabs/hardhat-ganache": "^2.0.1", - "@nomiclabs/hardhat-waffle": "^2.0.3", - "@types/chai": "^4.2.11", - "@types/mocha": "^7.0.2", - "@types/node": "^13.9.2", - "@typescript-eslint/eslint-plugin": "^5.44.0", - "@typescript-eslint/parser": "^5.44.0", - "chai": "^4.2.0", - "eslint": "^8.28.0", - "eslint-config-prettier": "^8.5.0", - "ethereum-waffle": "^3.4.4", - "ethers": "^5.7.2", - "hardhat": "^2.12.5", - "hardhat-contract-sizer": "^2.6.1", + "@typechain/ethers-v6": "^0.5.1", + "@typechain/hardhat": "^9.1.0", + "@types/mocha": "^10.0.6", + "ethers": "^6.11.1", + "hardhat": "^2.19.4", + "hardhat-contract-sizer": "^2.10.0", + "hardhat-gas-reporter": "^1.0.8", "ipfs-only-hash": "^2.0.1", - "maci-cli": "npm:@clrfund/maci-cli@0.10.2", - "solhint": "^3.3.2", - "ts-generator": "^0.0.8", - "ts-node": "^8.8.1", + "maci-circuits": "^1.2.0", + "maci-cli": "^1.2.0", + "maci-domainobjs": "^1.2.0", + "mocha": "^10.2.0", + "solidity-coverage": "^0.8.1", + "ts-node": "^10.9.2", + "typechain": "^8.3.2", "typescript": "^4.9.3" } } diff --git a/contracts/scripts/claim.ts b/contracts/scripts/claim.ts deleted file mode 100644 index 1085d0bec..000000000 --- a/contracts/scripts/claim.ts +++ /dev/null @@ -1,47 +0,0 @@ -import fs from 'fs' -import { ethers } from 'hardhat' - -import { getEventArg } from '../utils/contracts' -import { getRecipientClaimData } from '../utils/maci' - -async function main() { - const [, , , recipient1, recipient2] = await ethers.getSigners() - const state = JSON.parse(fs.readFileSync('state.json').toString()) - const tally = JSON.parse(fs.readFileSync('tally.json').toString()) - - const fundingRound = await ethers.getContractAt( - 'FundingRound', - state.fundingRound - ) - const maciAddress = await fundingRound.maci() - const maci = await ethers.getContractAt('MACI', maciAddress) - const recipientTreeDepth = (await maci.treeDepths()).voteOptionTreeDepth - - // Claim funds - for (const recipientIndex of [1, 2]) { - const recipient = recipientIndex === 1 ? recipient1 : recipient2 - const recipientClaimData = getRecipientClaimData( - recipientIndex, - recipientTreeDepth, - tally - ) - const fundingRoundAsRecipient = fundingRound.connect(recipient) - const claimTx = await fundingRoundAsRecipient.claimFunds( - ...recipientClaimData - ) - const claimedAmount = await getEventArg( - claimTx, - fundingRound, - 'FundsClaimed', - '_amount' - ) - console.log(`Recipient ${recipientIndex} claimed ${claimedAmount} tokens.`) - } -} - -main() - .then(() => process.exit(0)) - .catch((error) => { - console.error(error) - process.exit(1) - }) diff --git a/contracts/scripts/contribute.ts b/contracts/scripts/contribute.ts deleted file mode 100644 index 7d7dedd77..000000000 --- a/contracts/scripts/contribute.ts +++ /dev/null @@ -1,66 +0,0 @@ -import fs from 'fs' -import { ethers } from 'hardhat' -import { Keypair } from '@clrfund/maci-utils' - -import { UNIT } from '../utils/constants' -import { getEventArg } from '../utils/contracts' - -async function main() { - const [, , , , , , , , , , , , contributor1, contributor2] = - await ethers.getSigners() - const state = JSON.parse(fs.readFileSync('state.json').toString()) - const fundingRound = await ethers.getContractAt( - 'FundingRound', - state.fundingRound - ) - const tokenAddress = await fundingRound.nativeToken() - const token = await ethers.getContractAt('AnyOldERC20Token', tokenAddress) - const maciAddress = await fundingRound.maci() - const maci = await ethers.getContractAt('MACI', maciAddress) - - const contributionAmount = UNIT.mul(16).div(10) - state.contributors = {} - - for (const contributor of [contributor1, contributor2]) { - const contributorAddress = await contributor.getAddress() - const contributorKeypair = new Keypair() - const tokenAsContributor = token.connect(contributor) - await tokenAsContributor.approve(fundingRound.address, contributionAmount) - const fundingRoundAsContributor = fundingRound.connect(contributor) - const contributionTx = await fundingRoundAsContributor.contribute( - contributorKeypair.pubKey.asContractParam(), - contributionAmount - ) - const stateIndex = await getEventArg( - contributionTx, - maci, - 'SignUp', - '_stateIndex' - ) - const voiceCredits = await getEventArg( - contributionTx, - maci, - 'SignUp', - '_voiceCreditBalance' - ) - state.contributors[contributorAddress] = { - privKey: contributorKeypair.privKey.serialize(), - pubKey: contributorKeypair.pubKey.serialize(), - stateIndex: parseInt(stateIndex), - voiceCredits: voiceCredits.toString(), - } - console.log( - `Contributor ${contributorAddress} registered. State index: ${stateIndex}. Voice credits: ${voiceCredits.toString()}.` - ) - } - - // Update state file - fs.writeFileSync('state.json', JSON.stringify(state)) -} - -main() - .then(() => process.exit(0)) - .catch((error) => { - console.error(error) - process.exit(1) - }) diff --git a/contracts/scripts/deploy.ts b/contracts/scripts/deploy.ts deleted file mode 100644 index e65d93654..000000000 --- a/contracts/scripts/deploy.ts +++ /dev/null @@ -1,142 +0,0 @@ -import { ethers } from 'hardhat' -import { Contract, Wallet } from 'ethers' - -import { UNIT } from '../utils/constants' -import { - deployMaciFactory, - deployUserRegistry, - getBrightIdParams, -} from '../utils/deployment' -import { Keypair, PrivKey } from '@clrfund/maci-utils' - -// Number.MAX_SAFE_INTEGER - 1 -const challengePeriodSeconds = 9007199254740990 - -/** - * Set the coordinator address and maci public key in the funding round factory - * - * @param fundingRoundFactory funding round factory contract - * @param coordinatorAddress - * @param MaciPrivateKey - */ -async function setCoordinator( - fundingRoundFactory: Contract, - coordinatorAddress: string, - coordinatorKey?: string -) { - // Generate or use the passed in coordinator key - const privKey = coordinatorKey - ? PrivKey.unserialize(coordinatorKey) - : undefined - const keypair = new Keypair(privKey) - const coordinatorPubKey = keypair.pubKey - const serializedCoordinatorPrivKey = keypair.privKey.serialize() - const serializedCoordinatorPubKey = keypair.pubKey.serialize() - const setCoordinatorTx = await fundingRoundFactory.setCoordinator( - coordinatorAddress, - coordinatorPubKey.asContractParam() - ) - await setCoordinatorTx.wait() - console.log('coordinator address:', coordinatorAddress) - console.log('serializedCoordinatorPrivKey: ', serializedCoordinatorPrivKey) - console.log('serializedCoordinatorPubKey: ', serializedCoordinatorPubKey) -} - -async function main() { - const [deployer] = await ethers.getSigners() - console.log(`Deploying from address: ${deployer.address}`) - - const circuit = 'prod' - const maciFactory = await deployMaciFactory(deployer, circuit) - await maciFactory.deployTransaction.wait() - console.log(`MACIFactory deployed: ${maciFactory.address}`) - - const FundingRoundFactory = await ethers.getContractFactory( - 'FundingRoundFactory', - deployer - ) - const fundingRoundFactory = await FundingRoundFactory.deploy( - maciFactory.address - ) - await fundingRoundFactory.deployTransaction.wait() - console.log(`FundingRoundFactory deployed: ${fundingRoundFactory.address}`) - - const transferOwnershipTx = await maciFactory.transferOwnership( - fundingRoundFactory.address - ) - await transferOwnershipTx.wait() - - const userRegistryType = process.env.USER_REGISTRY_TYPE || 'simple' - const brightidParams = getBrightIdParams(userRegistryType) - const userRegistry: Contract = await deployUserRegistry( - userRegistryType, - deployer, - brightidParams - ) - console.log( - `User registry (${userRegistryType}) deployed: ${userRegistry.address}` - ) - - const setUserRegistryTx = await fundingRoundFactory.setUserRegistry( - userRegistry.address - ) - await setUserRegistryTx.wait() - - const recipientRegistryType = process.env.RECIPIENT_REGISTRY_TYPE || 'simple' - let recipientRegistry: Contract - if (recipientRegistryType === 'simple') { - const SimpleRecipientRegistry = await ethers.getContractFactory( - 'SimpleRecipientRegistry', - deployer - ) - recipientRegistry = await SimpleRecipientRegistry.deploy( - fundingRoundFactory.address - ) - } else if (recipientRegistryType === 'optimistic') { - const OptimisticRecipientRegistry = await ethers.getContractFactory( - 'OptimisticRecipientRegistry', - deployer - ) - recipientRegistry = await OptimisticRecipientRegistry.deploy( - UNIT.div(1000), - challengePeriodSeconds, - fundingRoundFactory.address - ) - } else { - throw new Error('unsupported recipient registry type') - } - await recipientRegistry.deployTransaction.wait() - console.log(`Recipient registry deployed: ${recipientRegistry.address}`) - - const setRecipientRegistryTx = await fundingRoundFactory.setRecipientRegistry( - recipientRegistry.address - ) - await setRecipientRegistryTx.wait() - - if (process.env.NATIVE_TOKEN_ADDRESS) { - const setTokenTx = await fundingRoundFactory.setToken( - process.env.NATIVE_TOKEN_ADDRESS - ) - await setTokenTx.wait() - console.log('Set token', process.env.NATIVE_TOKEN_ADDRESS) - } - - const coordinatorAddress = process.env.COORDINATOR_ETH_PK - ? new Wallet(process.env.COORDINATOR_ETH_PK).address - : await deployer.getAddress() - - await setCoordinator( - fundingRoundFactory, - coordinatorAddress, - process.env.COORDINATOR_PK - ) - - console.log(`Deployment complete!`) -} - -main() - .then(() => process.exit(0)) - .catch((error) => { - console.error(error) - process.exit(1) - }) diff --git a/contracts/scripts/deployBrightIdSponsor.ts b/contracts/scripts/deployBrightIdSponsor.ts deleted file mode 100644 index c2967cdd5..000000000 --- a/contracts/scripts/deployBrightIdSponsor.ts +++ /dev/null @@ -1,30 +0,0 @@ -import { ethers } from 'hardhat' - -async function main() { - console.log('**************************************') - console.log('Deploying a BrightId sponsor contract!') - console.log('**************************************') - - const [deployer] = await ethers.getSigners() - console.log('Deployer address', deployer.address) - - const BrightIdSponsor = await ethers.getContractFactory( - 'BrightIdSponsor', - deployer - ) - const sponsor = await BrightIdSponsor.deploy() - console.log('Transaction hash', sponsor.deployTransaction.hash) - await sponsor.deployTransaction.wait() - console.log('Sponsor contract', sponsor.address) - - console.log('*******************') - console.log('Deploy complete!') - console.log('*******************') -} - -main() - .then(() => process.exit(0)) - .catch((error) => { - console.error(error) - process.exit(1) - }) diff --git a/contracts/scripts/deployTestRound.ts b/contracts/scripts/deployTestRound.ts deleted file mode 100644 index 469269d20..000000000 --- a/contracts/scripts/deployTestRound.ts +++ /dev/null @@ -1,380 +0,0 @@ -import fs from 'fs' -import { ethers } from 'hardhat' -import { Keypair } from '@clrfund/maci-utils' - -import { UNIT } from '../utils/constants' -import { getEventArg } from '../utils/contracts' -import { MaciParameters } from '../utils/maci' - -async function main() { - // We're hardcoding factory address due to a buidler limitation: - // https://github.com/nomiclabs/buidler/issues/651 - const factoryAddress = '0x5FC8d32690cc91D4c39d9d3abcBD16989F875707' - const [ - deployer, - , - poolContributor, - recipient1, - recipient2, - recipient3, - recipient4, - recipient5, - recipient6, - recipient7, - recipient8, - recipient9, - contributor1, - contributor2, - ] = await ethers.getSigners() - - // Deploy ERC20 token contract - const Token = await ethers.getContractFactory('AnyOldERC20Token', deployer) - const tokenInitialSupply = UNIT.mul(1000) - const token = await Token.deploy(tokenInitialSupply) - await token.deployTransaction.wait() - console.log(`Token deployed: ${token.address}`) - - const tokenReceivers = [poolContributor, contributor1, contributor2] - let transferTx - for (const account of tokenReceivers) { - transferTx = await token.transfer(account.getAddress(), UNIT.mul(100)) - transferTx.wait() - } - - // Configure factory - const factory = await ethers.getContractAt( - 'FundingRoundFactory', - factoryAddress - ) - const setTokenTx = await factory.setToken(token.address) - await setTokenTx.wait() - const coordinatorKeyPair = new Keypair() - const setCoordinatorTx = await factory.setCoordinator( - deployer.getAddress(), - coordinatorKeyPair.pubKey.asContractParam() - ) - await setCoordinatorTx.wait() - - // Configure MACI factory - const maciFactoryAddress = await factory.maciFactory() - const maciFactory = await ethers.getContractAt( - 'MACIFactory', - maciFactoryAddress - ) - const maciParameters = await MaciParameters.read(maciFactory) - maciParameters.update({ - signUpDuration: 60 * 5, // 5 minutes - votingDuration: 60 * 5, - }) - const setMaciParametersTx = await factory.setMaciParameters( - ...maciParameters.values() - ) - await setMaciParametersTx.wait() - - // Add to matching pool - const poolContributionAmount = UNIT.mul(10) - const poolContributorToken = token.connect(poolContributor) - const poolContributionTx = await poolContributorToken.transfer( - factory.address, - poolContributionAmount - ) - await poolContributionTx.wait() - - // Add contributors - const userRegistryType = process.env.USER_REGISTRY_TYPE || 'simple' - if (userRegistryType === 'simple') { - const userRegistryAddress = await factory.userRegistry() - const userRegistry = await ethers.getContractAt( - 'SimpleUserRegistry', - userRegistryAddress - ) - const users = [contributor1, contributor2] - let addUserTx - for (const account of users) { - addUserTx = await userRegistry.addUser(account.getAddress()) - addUserTx.wait() - } - } - - // Add dummy recipients - // TODO add better dummy data - const metadataRecipient1 = { - name: 'Commons Simulator', - description: - 'Funding open-source projects & other public goods is the killer app of blockchain tech. Giveth & BlockScience are joining forces to build the Commons Stack: a modular library of well engineered components that can be used to create economic models for projects that are creating value, yet have trouble finding sustainable business models.', - imageHash: 'QmbMP2fMiy6ek5uQZaxG3bzT9gSqMWxpdCUcQg1iSeEFMU', - tagline: 'Modeling Sustainable Funding for Public Good', - category: 'Data', - problemSpace: 'metadata.problemSpace', - plans: 'metadata.plans', - teamName: 'metadata.teamName', - teamDescription: 'metadata.teamDescription', - githubUrl: 'https://github.com/', - radicleUrl: 'https://radicle.xyz/', - websiteUrl: 'https://website.com/', - twitterUrl: 'https://twitter.com/', - discordUrl: 'https://discord.com/', - bannerImageHash: 'QmaDy75RkRVtZcbYeqMDLcCK8dDvahfik68zP7FbpxvD2F', - thumbnailImageHash: 'QmaDy75RkRVtZcbYeqMDLcCK8dDvahfik68zP7FbpxvD2F', - } - - const metadataRecipient2 = { - name: 'Synthereum', - description: - 'The aim of our synthetic assets is to help creating fiat-based wallet and applications on any local currencies, and help to create stock, commodities portfolio in order to bring more traditional users within the DeFi ecosystem.', - imageHash: 'QmbMP2fMiy6ek5uQZaxG3bzT9gSqMWxpdCUcQg1iSeEFMU', - tagline: - 'Synthetic assets with liquidity pools to bridge traditional and digital finance.', - category: 'Content', - problemSpace: 'metadata.problemSpace', - plans: 'metadata.plans', - teamName: 'metadata.teamName', - teamDescription: 'metadata.teamDescription', - githubUrl: 'https://github.com/', - radicleUrl: 'https://radicle.xyz/', - websiteUrl: 'https://website.com/', - twitterUrl: 'https://twitter.com/', - discordUrl: 'https://discord.com/', - bannerImageHash: 'QmaDy75RkRVtZcbYeqMDLcCK8dDvahfik68zP7FbpxvD2F', - thumbnailImageHash: 'QmaDy75RkRVtZcbYeqMDLcCK8dDvahfik68zP7FbpxvD2F', - } - - const metadataRecipient3 = { - name: 'Commons Simulator', - description: - 'Funding open-source projects & other public goods is the killer app of blockchain tech. Giveth & BlockScience are joining forces to build the Commons Stack: a modular library of well engineered components that can be used to create economic models for projects that are creating value, yet have trouble finding sustainable business models.', - imageHash: 'QmbMP2fMiy6ek5uQZaxG3bzT9gSqMWxpdCUcQg1iSeEFMU', - tagline: 'Modeling Sustainable Funding for Public Good', - category: 'Data', - problemSpace: 'metadata.problemSpace', - plans: 'metadata.plans', - teamName: 'metadata.teamName', - teamDescription: 'metadata.teamDescription', - githubUrl: 'https://github.com/', - radicleUrl: 'https://radicle.xyz/', - websiteUrl: 'https://website.com/', - twitterUrl: 'https://twitter.com/', - discordUrl: 'https://discord.com/', - bannerImageHash: 'QmaDy75RkRVtZcbYeqMDLcCK8dDvahfik68zP7FbpxvD2F', - thumbnailImageHash: 'QmaDy75RkRVtZcbYeqMDLcCK8dDvahfik68zP7FbpxvD2F', - } - const metadataRecipient4 = { - name: 'Synthereum', - description: - 'The aim of our synthetic assets is to help creating fiat-based wallet and applications on any local currencies, and help to create stock, commodities portfolio in order to bring more traditional users within the DeFi ecosystem.', - imageHash: 'QmbMP2fMiy6ek5uQZaxG3bzT9gSqMWxpdCUcQg1iSeEFMU', - tagline: - 'Synthetic assets with liquidity pools to bridge traditional and digital finance.', - category: 'Content', - problemSpace: 'metadata.problemSpace', - plans: 'metadata.plans', - teamName: 'metadata.teamName', - teamDescription: 'metadata.teamDescription', - githubUrl: 'https://github.com/', - radicleUrl: 'https://radicle.xyz/', - websiteUrl: 'https://website.com/', - twitterUrl: 'https://twitter.com/', - discordUrl: 'https://discord.com/', - bannerImageHash: 'QmaDy75RkRVtZcbYeqMDLcCK8dDvahfik68zP7FbpxvD2F', - thumbnailImageHash: 'QmaDy75RkRVtZcbYeqMDLcCK8dDvahfik68zP7FbpxvD2F', - } - const metadataRecipient5 = { - name: 'Commons Simulator', - description: - 'Funding open-source projects & other public goods is the killer app of blockchain tech. Giveth & BlockScience are joining forces to build the Commons Stack: a modular library of well engineered components that can be used to create economic models for projects that are creating value, yet have trouble finding sustainable business models.', - imageHash: 'QmbMP2fMiy6ek5uQZaxG3bzT9gSqMWxpdCUcQg1iSeEFMU', - tagline: 'Modeling Sustainable Funding for Public Good', - category: 'Data', - problemSpace: 'metadata.problemSpace', - plans: 'metadata.plans', - teamName: 'metadata.teamName', - teamDescription: 'metadata.teamDescription', - githubUrl: 'https://github.com/', - radicleUrl: 'https://radicle.xyz/', - websiteUrl: 'https://website.com/', - twitterUrl: 'https://twitter.com/', - discordUrl: 'https://discord.com/', - bannerImageHash: 'QmaDy75RkRVtZcbYeqMDLcCK8dDvahfik68zP7FbpxvD2F', - thumbnailImageHash: 'QmaDy75RkRVtZcbYeqMDLcCK8dDvahfik68zP7FbpxvD2F', - } - const metadataRecipient6 = { - name: 'Synthereum', - description: - 'The aim of our synthetic assets is to help creating fiat-based wallet and applications on any local currencies, and help to create stock, commodities portfolio in order to bring more traditional users within the DeFi ecosystem.', - imageHash: 'QmbMP2fMiy6ek5uQZaxG3bzT9gSqMWxpdCUcQg1iSeEFMU', - tagline: - 'Synthetic assets with liquidity pools to bridge traditional and digital finance.', - category: 'Content', - problemSpace: 'metadata.problemSpace', - plans: 'metadata.plans', - teamName: 'metadata.teamName', - teamDescription: 'metadata.teamDescription', - githubUrl: 'https://github.com/', - radicleUrl: 'https://radicle.xyz/', - websiteUrl: 'https://website.com/', - twitterUrl: 'https://twitter.com/', - discordUrl: 'https://discord.com/', - bannerImageHash: 'QmaDy75RkRVtZcbYeqMDLcCK8dDvahfik68zP7FbpxvD2F', - thumbnailImageHash: 'QmaDy75RkRVtZcbYeqMDLcCK8dDvahfik68zP7FbpxvD2F', - } - const metadataRecipient7 = { - name: 'Commons Simulator', - description: - 'Funding open-source projects & other public goods is the killer app of blockchain tech. Giveth & BlockScience are joining forces to build the Commons Stack: a modular library of well engineered components that can be used to create economic models for projects that are creating value, yet have trouble finding sustainable business models.', - imageHash: 'QmbMP2fMiy6ek5uQZaxG3bzT9gSqMWxpdCUcQg1iSeEFMU', - tagline: 'Modeling Sustainable Funding for Public Good', - category: 'Data', - problemSpace: 'metadata.problemSpace', - plans: 'metadata.plans', - teamName: 'metadata.teamName', - teamDescription: 'metadata.teamDescription', - githubUrl: 'https://github.com/', - radicleUrl: 'https://radicle.xyz/', - websiteUrl: 'https://website.com/', - twitterUrl: 'https://twitter.com/', - discordUrl: 'https://discord.com/', - bannerImageHash: 'QmaDy75RkRVtZcbYeqMDLcCK8dDvahfik68zP7FbpxvD2F', - thumbnailImageHash: 'QmaDy75RkRVtZcbYeqMDLcCK8dDvahfik68zP7FbpxvD2F', - } - const metadataRecipient8 = { - name: 'Synthereum', - description: - 'The aim of our synthetic assets is to help creating fiat-based wallet and applications on any local currencies, and help to create stock, commodities portfolio in order to bring more traditional users within the DeFi ecosystem.', - imageHash: 'QmbMP2fMiy6ek5uQZaxG3bzT9gSqMWxpdCUcQg1iSeEFMU', - tagline: - 'Synthetic assets with liquidity pools to bridge traditional and digital finance.', - category: 'Content', - problemSpace: 'metadata.problemSpace', - plans: 'metadata.plans', - teamName: 'metadata.teamName', - teamDescription: 'metadata.teamDescription', - githubUrl: 'https://github.com/', - radicleUrl: 'https://radicle.xyz/', - websiteUrl: 'https://website.com/', - twitterUrl: 'https://twitter.com/', - discordUrl: 'https://discord.com/', - bannerImageHash: 'QmaDy75RkRVtZcbYeqMDLcCK8dDvahfik68zP7FbpxvD2F', - thumbnailImageHash: 'QmaDy75RkRVtZcbYeqMDLcCK8dDvahfik68zP7FbpxvD2F', - } - const metadataRecipient9 = { - name: 'Commons Simulator', - description: - 'Funding open-source projects & other public goods is the killer app of blockchain tech. Giveth & BlockScience are joining forces to build the Commons Stack: a modular library of well engineered components that can be used to create economic models for projects that are creating value, yet have trouble finding sustainable business models.', - imageHash: 'QmbMP2fMiy6ek5uQZaxG3bzT9gSqMWxpdCUcQg1iSeEFMU', - tagline: 'Modeling Sustainable Funding for Public Good', - category: 'Data', - problemSpace: 'metadata.problemSpace', - plans: 'metadata.plans', - teamName: 'metadata.teamName', - teamDescription: 'metadata.teamDescription', - githubUrl: 'https://github.com/', - radicleUrl: 'https://radicle.xyz/', - websiteUrl: 'https://website.com/', - twitterUrl: 'https://twitter.com/', - discordUrl: 'https://discord.com/', - bannerImageHash: 'QmaDy75RkRVtZcbYeqMDLcCK8dDvahfik68zP7FbpxvD2F', - thumbnailImageHash: 'QmaDy75RkRVtZcbYeqMDLcCK8dDvahfik68zP7FbpxvD2F', - } - - // Deploy new funding round and MACI - const deployNewRoundTx = await factory.deployNewRound() - await deployNewRoundTx.wait() - const fundingRoundAddress = await factory.getCurrentRound() - console.log(`Funding round deployed: ${fundingRoundAddress}`) - const fundingRound = await ethers.getContractAt( - 'FundingRound', - fundingRoundAddress - ) - const maciAddress = await fundingRound.maci() - console.log(`MACI address: ${maciAddress}`) - - const recipientRegistryType = process.env.RECIPIENT_REGISTRY_TYPE || 'simple' - const recipientRegistryAddress = await factory.recipientRegistry() - if (recipientRegistryType === 'simple') { - const recipientRegistry = await ethers.getContractAt( - 'SimpleRecipientRegistry', - recipientRegistryAddress - ) - const recipients = [ - { account: recipient1, metadata: metadataRecipient1 }, - { account: recipient2, metadata: metadataRecipient2 }, - { account: recipient3, metadata: metadataRecipient3 }, - { account: recipient4, metadata: metadataRecipient4 }, - { account: recipient5, metadata: metadataRecipient5 }, - { account: recipient6, metadata: metadataRecipient6 }, - { account: recipient7, metadata: metadataRecipient7 }, - { account: recipient8, metadata: metadataRecipient8 }, - { account: recipient9, metadata: metadataRecipient9 }, - ] - let addRecipientTx - for (const recipient of recipients) { - addRecipientTx = await recipientRegistry.addRecipient( - recipient.account.getAddress(), - JSON.stringify(recipient.metadata) - ) - addRecipientTx.wait() - } - } else if (recipientRegistryType === 'optimistic') { - const recipientRegistry = await ethers.getContractAt( - 'OptimisticRecipientRegistry', - recipientRegistryAddress - ) - const deposit = await recipientRegistry.baseDeposit() - const recipient1Added = await recipientRegistry.addRecipient( - recipient1.getAddress(), - JSON.stringify(metadataRecipient1), - { value: deposit } - ) - await recipient1Added.wait() - - const recipient1Id = await getEventArg( - recipient1Added, - recipientRegistry, - 'RequestSubmitted', - '_recipientId' - ) - const executeRequest1 = await recipientRegistry.executeRequest(recipient1Id) - await executeRequest1.wait() - - const recipient2Added = await recipientRegistry.addRecipient( - recipient2.getAddress(), - JSON.stringify(metadataRecipient2), - { value: deposit } - ) - await recipient2Added.wait() - - const recipient2Id = await getEventArg( - recipient2Added, - recipientRegistry, - 'RequestSubmitted', - '_recipientId' - ) - const executeRequest2 = await recipientRegistry.executeRequest(recipient2Id) - await executeRequest2.wait() - - // Add recipient without executing - const recipient3Added = await recipientRegistry.addRecipient( - recipient3.getAddress(), - JSON.stringify(metadataRecipient3), - { value: deposit } - ) - recipient3Added.wait() - } - - // Save the current state of the round - fs.writeFileSync( - 'state.json', - JSON.stringify({ - factory: factory.address, - fundingRound: fundingRoundAddress, - coordinatorPrivKey: coordinatorKeyPair.privKey.serialize(), - }) - ) -} - -main() - .then(() => process.exit(0)) - .catch((error) => { - console.error(error) - process.exit(1) - }) diff --git a/contracts/scripts/deployUserRegistry.ts b/contracts/scripts/deployUserRegistry.ts deleted file mode 100644 index 2373d5451..000000000 --- a/contracts/scripts/deployUserRegistry.ts +++ /dev/null @@ -1,52 +0,0 @@ -import { ethers } from 'hardhat' -import { deployUserRegistry, getBrightIdParams } from '../utils/deployment' - -async function main() { - console.log('*******************') - console.log('Deploying a user registry!') - console.log('*******************') - const [deployer] = await ethers.getSigners() - console.log('deployer.address: ', deployer.address) - - const fundingRoundFactoryAddress = process.env.FACTORY_ADDRESS - - if (!fundingRoundFactoryAddress) { - throw new Error('Environment variable FACTORY_ADDRESS is not setup') - } - const fundingRoundFactory = await ethers.getContractAt( - 'FundingRoundFactory', - fundingRoundFactoryAddress - ) - console.log('funding round factory address ', fundingRoundFactory.address) - - const userRegistryType = process.env.USER_REGISTRY_TYPE || 'simple' - const brightidParams = getBrightIdParams(userRegistryType) - const userRegistry = await deployUserRegistry( - userRegistryType, - deployer, - brightidParams - ) - console.log( - `deployed ${userRegistryType} user registry at ${userRegistry.address}` - ) - - const setUserRegistryTx = await fundingRoundFactory.setUserRegistry( - userRegistry.address - ) - await setUserRegistryTx.wait() - console.log( - 'set user registry in funding round factory at tx hash', - setUserRegistryTx.hash - ) - - console.log('*******************') - console.log('Deploy complete!') - console.log('*******************') -} - -main() - .then(() => process.exit(0)) - .catch((error) => { - console.error(error) - process.exit(1) - }) diff --git a/contracts/scripts/finalize.ts b/contracts/scripts/finalize.ts deleted file mode 100644 index 12f544aad..000000000 --- a/contracts/scripts/finalize.ts +++ /dev/null @@ -1,53 +0,0 @@ -import fs from 'fs' -import { Wallet } from 'ethers' -import { ethers, network } from 'hardhat' - -async function main() { - let factoryAddress, coordinator - if (network.name === 'localhost') { - const state = JSON.parse(fs.readFileSync('state.json').toString()) - factoryAddress = state.factory - - const signers = await ethers.getSigners() - coordinator = signers[0] - } else { - factoryAddress = process.env.FACTORY_ADDRESS || '' - // default to the first account - const coordinatorEthPrivKey = - process.env.COORDINATOR_ETH_PK || - '0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80' - coordinator = new Wallet(coordinatorEthPrivKey, ethers.provider) - } - - const tally = JSON.parse(fs.readFileSync('tally.json').toString()) - const factory = await ethers.getContractAt( - 'FundingRoundFactory', - factoryAddress, - coordinator - ) - console.log('Funding round factory address', factory.address) - - const currentRoundAddress = await factory.getCurrentRound() - const fundingRound = await ethers.getContractAt( - 'FundingRound', - currentRoundAddress, - coordinator - ) - console.log('Current round', fundingRound.address) - - const totalSpent = parseInt(tally.totalVoiceCredits.spent) - const totalSpentSalt = tally.totalVoiceCredits.salt - const tx = await factory.transferMatchingFunds(totalSpent, totalSpentSalt) - const receipt = await tx.wait() - console.log( - 'Round finalized, totals verified. Gas used:', - receipt.gasUsed.toString() - ) -} - -main() - .then(() => process.exit(0)) - .catch((error) => { - console.error(error) - process.exit(1) - }) diff --git a/contracts/scripts/generate-key.ts b/contracts/scripts/generate-key.ts deleted file mode 100644 index d5b3293c3..000000000 --- a/contracts/scripts/generate-key.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { Keypair } from '@clrfund/maci-utils' - -async function main() { - const keypair = new Keypair() - const serializedPrivKey = keypair.privKey.serialize() - const serializedPubKey = keypair.pubKey.serialize() - console.log('Private key:', serializedPrivKey) - console.log('Public key: ', serializedPubKey) -} - -main() - .then(() => process.exit(0)) - .catch((error) => { - console.error(error) - process.exit(1) - }) diff --git a/contracts/scripts/get-bytecode.ts b/contracts/scripts/get-bytecode.ts deleted file mode 100644 index 0e45b9adc..000000000 --- a/contracts/scripts/get-bytecode.ts +++ /dev/null @@ -1,27 +0,0 @@ -// Usage: yarn ts-node scripts/get-bytecode.ts MACI -import { artifacts } from 'hardhat' -import { linkBytecode } from '../utils/deployment' - -async function main() { - const contractName = process.argv[2] - const poseidonT3Address = process.argv[3] - const poseidonT6Address = process.argv[4] - const artifact = await artifacts.readArtifact(contractName) - let result: string - if (poseidonT3Address && poseidonT6Address) { - result = linkBytecode(artifact.deployedBytecode, { - 'maci-contracts/sol/Poseidon.sol:PoseidonT3': poseidonT3Address, - 'maci-contracts/sol/Poseidon.sol:PoseidonT6': poseidonT6Address, - }) - } else { - result = artifact.deployedBytecode - } - console.info(result) -} - -main() - .then(() => process.exit(0)) - .catch((error) => { - console.error(error) - process.exit(1) - }) diff --git a/contracts/scripts/newRound.ts b/contracts/scripts/newRound.ts deleted file mode 100644 index 3cf0d6a43..000000000 --- a/contracts/scripts/newRound.ts +++ /dev/null @@ -1,90 +0,0 @@ -import { ethers } from 'hardhat' -import { utils, constants } from 'ethers' - -async function main() { - console.log('*******************') - console.log('Start a new funding round!') - console.log('*******************') - const [deployer] = await ethers.getSigners() - console.log('deployer.address: ', deployer.address) - - const fundingRoundFactoryAddress = process.env.FACTORY_ADDRESS - const userRegistryType = process.env.USER_REGISTRY_TYPE - const brightIdSponsor = process.env.BRIGHTID_SPONSOR - const brightIdVerifier = process.env.BRIGHTID_VERIFIER_ADDR - - if (!fundingRoundFactoryAddress) { - throw new Error('Environment variable FACTORY_ADDRESS is not setup') - } - - if (userRegistryType === 'brightid') { - if (!brightIdSponsor) { - throw new Error('Environment variable BRIGHTID_SPONSOR is not setup') - } - if (!brightIdVerifier) { - throw new Error( - 'Environment variable BRIGHTID_VERIFIER_ADDR is not setup' - ) - } - } - - const factory = await ethers.getContractAt( - 'FundingRoundFactory', - fundingRoundFactoryAddress - ) - console.log('funding round factory address ', factory.address) - - // check if the current round is finalized before starting a new round to avoid revert - const currentRoundAddress = await factory.getCurrentRound() - if (currentRoundAddress !== constants.AddressZero) { - const currentRound = await ethers.getContractAt( - 'FundingRound', - currentRoundAddress - ) - const isFinalized = await currentRound.isFinalized() - if (!isFinalized) { - throw new Error( - 'Cannot start a new round as the current round is not finalized' - ) - } - } - - // deploy a new BrightId user registry for each new round - // to force users to link with BrightId every round - if (userRegistryType === 'brightid') { - const BrightIdUserRegistry = await ethers.getContractFactory( - 'BrightIdUserRegistry', - deployer - ) - - const userRegistry = await BrightIdUserRegistry.deploy( - utils.formatBytes32String(process.env.BRIGHTID_CONTEXT || 'clr.fund'), - brightIdVerifier, - brightIdSponsor - ) - console.log('BrightId user registry address: ', userRegistry.address) - await userRegistry.deployTransaction.wait() - - const setUserRegistryTx = await factory.setUserRegistry( - userRegistry.address - ) - await setUserRegistryTx.wait() - console.log('Set user registry in factory', setUserRegistryTx.hash) - } - - const tx = await factory.deployNewRound() - console.log('Deployed new round, tx hash: ', tx.hash) - await tx.wait() - console.log('New funding round address: ', await factory.getCurrentRound()) - - console.log('*******************') - console.log('Script complete!') - console.log('*******************') -} - -main() - .then(() => process.exit(0)) - .catch((error) => { - console.error(error) - process.exit(1) - }) diff --git a/contracts/scripts/prepare-results.ts b/contracts/scripts/prepare-results.ts deleted file mode 100644 index e979d2f27..000000000 --- a/contracts/scripts/prepare-results.ts +++ /dev/null @@ -1,97 +0,0 @@ -import fetch from 'node-fetch' -import { ethers } from 'hardhat' -import { Event } from 'ethers' -import { gtcrDecode } from '@kleros/gtcr-encoder' -import { DEFAULT_IPFS_GATEWAY } from '../utils/constants' - -const ipfsGatewayUrl = process.env.IPFS_GATEWAY_URL || DEFAULT_IPFS_GATEWAY - -interface Project { - id: string - name: string - index: number - result?: number - spent?: number -} - -interface TcrColumn { - label: string - type: string -} - -function decodeRecipientAdded(event: Event, columns: TcrColumn[]): Project { - const args = event.args as any - const consoleError = console.error - console.error = function () {} // eslint-disable-line @typescript-eslint/no-empty-function - const decodedMetadata = gtcrDecode({ columns, values: args._metadata }) - console.error = consoleError - /* eslint-enable no-console */ - return { - id: args._tcrItemId, - name: decodedMetadata[0] as string, - index: args._index.toNumber(), - } -} - -async function main() { - const fundingRound = await ethers.getContractAt( - 'FundingRound', - process.env.ROUND_ADDRESS as string - ) - const startBlock = await fundingRound.startBlock() - const maci = await ethers.getContractAt('MACI', await fundingRound.maci()) - const signUpDuration = await maci.signUpDurationSeconds() - const votingDuration = await maci.votingDurationSeconds() - const endBlock = startBlock.add(signUpDuration.add(votingDuration).div(15)) - const tallyHash = await fundingRound.tallyHash() - const tallyResponse = await fetch(`${ipfsGatewayUrl}/ipfs/${tallyHash}`) - const tally = await tallyResponse.json() - const registry = await ethers.getContractAt( - 'KlerosGTCRAdapter', - await fundingRound.recipientRegistry() - ) - const tcr = await ethers.getContractAt('KlerosGTCRMock', await registry.tcr()) - const metaEvidenceFilter = tcr.filters.MetaEvidence() - const metaEvidenceEvents = await tcr.queryFilter(metaEvidenceFilter, 0) - const regMetaEvidenceEvent = metaEvidenceEvents[metaEvidenceEvents.length - 2] - const tcrEvidenceIpfsPath = (regMetaEvidenceEvent.args as any)._evidence - const tcrDataResponse = await fetch(`${ipfsGatewayUrl}${tcrEvidenceIpfsPath}`) - const tcrData = await tcrDataResponse.json() - const tcrColumns = tcrData.metadata.columns - const recipientAddedFilter = registry.filters.RecipientAdded() - const recipientAddedEvents = await registry.queryFilter( - recipientAddedFilter, - 0 - ) - const recipientRemovedFilter = registry.filters.RecipientRemoved() - const recipientRemovedEvents = await registry.queryFilter( - recipientRemovedFilter, - 0 - ) - const projects: Project[] = [] - for (const event of recipientAddedEvents) { - const project = decodeRecipientAdded(event, tcrColumns) - if (event.blockNumber >= endBlock.toNumber()) { - continue - } - const removed = recipientRemovedEvents.find((event) => { - return (event.args as any)._tcrItemId === project.id - }) - if (removed) { - continue - } - project.result = parseInt(tally.results.tally[project.index]) - project.spent = parseInt( - tally.totalVoiceCreditsPerVoteOption.tally[project.index] - ) - projects.push(project) - } - console.log(JSON.stringify(projects)) -} - -main() - .then(() => process.exit(0)) - .catch((error) => { - console.error(error) - process.exit(1) - }) diff --git a/contracts/scripts/verify.ts b/contracts/scripts/verify.ts deleted file mode 100644 index 0cb07c074..000000000 --- a/contracts/scripts/verify.ts +++ /dev/null @@ -1,16 +0,0 @@ -// Usage: yarn ts-node scripts/verify.ts tally.json -import { verify } from 'maci-cli' - -async function main() { - const tallyFile = process.argv[2] - await verify({ - tally_file: tallyFile, // eslint-disable-line @typescript-eslint/camelcase - }) -} - -main() - .then(() => process.exit(0)) - .catch((error) => { - console.error(error) - process.exit(1) - }) diff --git a/contracts/scripts/vote.ts b/contracts/scripts/vote.ts deleted file mode 100644 index 881307cb3..000000000 --- a/contracts/scripts/vote.ts +++ /dev/null @@ -1,74 +0,0 @@ -import fs from 'fs' -import { ethers } from 'hardhat' -import { BigNumber } from 'ethers' -import { PrivKey, Keypair } from '@clrfund/maci-utils' - -import { createMessage } from '../utils/maci' - -async function main() { - const [, , , , , , , , , , , , contributor1, contributor2] = - await ethers.getSigners() - const state = JSON.parse(fs.readFileSync('state.json').toString()) - const coordinatorKeyPair = new Keypair( - PrivKey.unserialize(state.coordinatorPrivKey) - ) - - for (const contributor of [contributor1, contributor2]) { - const contributorAddress = await contributor.getAddress() - const contributorData = state.contributors[contributorAddress] - const contributorKeyPair = new Keypair( - PrivKey.unserialize(contributorData.privKey) - ) - const messages = [] - const encPubKeys = [] - let nonce = 1 - // Change key - const newContributorKeypair = new Keypair() - const [message, encPubKey] = createMessage( - contributorData.stateIndex, - contributorKeyPair, - newContributorKeypair, - coordinatorKeyPair.pubKey, - null, - null, - nonce - ) - messages.push(message.asContractParam()) - encPubKeys.push(encPubKey.asContractParam()) - nonce += 1 - // Vote - for (const recipientIndex of [1, 2]) { - const votes = BigNumber.from(contributorData.voiceCredits).div(4) - const [message, encPubKey] = createMessage( - contributorData.stateIndex, - newContributorKeypair, - null, - coordinatorKeyPair.pubKey, - recipientIndex, - votes, - nonce - ) - messages.push(message.asContractParam()) - encPubKeys.push(encPubKey.asContractParam()) - nonce += 1 - } - - const fundingRoundAsContributor = await ethers.getContractAt( - 'FundingRound', - state.fundingRound, - contributor - ) - await fundingRoundAsContributor.submitMessageBatch( - messages.reverse(), - encPubKeys.reverse() - ) - console.log(`Contributor ${contributorAddress} voted.`) - } -} - -main() - .then(() => process.exit(0)) - .catch((error) => { - console.error(error) - process.exit(1) - }) diff --git a/contracts/sh/deployLocal.sh b/contracts/sh/deployLocal.sh new file mode 100755 index 000000000..d0c1aac73 --- /dev/null +++ b/contracts/sh/deployLocal.sh @@ -0,0 +1,29 @@ +#!/bin/bash +set -e + +# +# Run the hardhat tasks to deploy contracts to local network +# + +# Local settings +export CLRFUND_ROOT=$(cd $(dirname $0) && cd ../.. && pwd) +export CONTRACTS_DIRECTORY=${CLRFUND_ROOT}/contracts +export NETWORK=localhost + +# the sample config has default configuration for localhost deployment +cp deploy-config-example.json deploy-config.json + +# download the circuit params if not exists +if ! [ -f "${CONTRACTS_DIRECTORY}/params/ProcessMessages_6-9-2-3/ProcessMessages_6-9-2-3.zkey" ]; then + ${CLRFUND_ROOT}/.github/scripts/download-6-9-2-3.sh +fi + +# create a new maci key for the coordinator +MACI_KEYPAIR=$(yarn hardhat new-maci-key) +export COORDINATOR_MACISK=$(echo "${MACI_KEYPAIR}" | grep -o "macisk.*$") + +# create a new instance of ClrFund +yarn hardhat new-clrfund --network ${NETWORK} + +# deploy a new funding round +yarn hardhat new-round --network ${NETWORK} diff --git a/contracts/sh/runScriptTests.sh b/contracts/sh/runScriptTests.sh new file mode 100755 index 000000000..11cde09a2 --- /dev/null +++ b/contracts/sh/runScriptTests.sh @@ -0,0 +1,49 @@ +#!/bin/bash +set -e + +# +# Run the hardhat scripts/tasks to simulate e2e testing +# + +# Test settings +NOW=$(date +%s) +export OUTPUT_DIR="./proof_output/${NOW}" +export TALLY_FILE=${OUTPUT_DIR}/tally.json +export HARDHAT_NETWORK=localhost +export RAPID_SNARK=${RAPID_SNARK:-~/rapidsnark/package/bin/prover} +export ROUND_DURATION=1000 + +mkdir -p ${OUTPUT_DIR} + +# create a deploy config using the example version +cp deploy-config-example.json deploy-config.json + +# create a new maci key for the coordinator +MACI_KEYPAIR=$(yarn hardhat new-maci-key) +export COORDINATOR_MACISK=$(echo "${MACI_KEYPAIR}" | grep -o "macisk.*$") + +# create a new instance of ClrFund +yarn hardhat new-clrfund --network ${HARDHAT_NETWORK} + +# deploy a new funding round +yarn hardhat new-round --round-duration ${ROUND_DURATION} --network ${HARDHAT_NETWORK} + +yarn hardhat add-recipients --network ${HARDHAT_NETWORK} +yarn hardhat contribute --network ${HARDHAT_NETWORK} + +yarn hardhat time-travel --seconds ${ROUND_DURATION} --network ${HARDHAT_NETWORK} + +# tally the votes +NODE_OPTIONS="--max-old-space-size=4096" +yarn hardhat tally \ + --rapidsnark ${RAPID_SNARK} \ + --proof-dir ${OUTPUT_DIR} \ + --maci-start-block 0 \ + --network "${HARDHAT_NETWORK}" + +# finalize the round +yarn hardhat finalize --proof-dir ${OUTPUT_DIR} --network ${HARDHAT_NETWORK} + +# claim funds +yarn hardhat claim --recipient 1 --proof-dir ${OUTPUT_DIR} --network ${HARDHAT_NETWORK} +yarn hardhat claim --recipient 2 --proof-dir ${OUTPUT_DIR} --network ${HARDHAT_NETWORK} diff --git a/contracts/tasks/auditTally.ts b/contracts/tasks/auditTally.ts deleted file mode 100644 index 03c7c294b..000000000 --- a/contracts/tasks/auditTally.ts +++ /dev/null @@ -1,288 +0,0 @@ -/** - * This script is used for auditing the tally result for a round - * - * Sample usage: - * yarn hardhat audit-tally --round-address 0x4a2d90844eb9c815ef10db0371726f0ceb2848b0 --network arbitrum --output ./ethcolombia.json - */ - -import { task, types } from 'hardhat/config' -import { utils, providers, Contract, BigNumber } from 'ethers' -import { EventFilter, Log } from '@ethersproject/abstract-provider' -import { Ipfs } from '../utils/ipfs' -import fs from 'fs' - -interface Project { - id: string - recipientIndex?: number - address: string - name: string - state: string - removedAt?: Date - tallyIndex?: number - tallyVotes?: string - tallyVoiceCredits?: string - donationAmount?: string - fundingAmount?: string -} - -function isRemoval(state: number): boolean { - return state === 1 -} - -async function fetchLogs({ - provider, - filter, - startBlock, - lastBlock, - blocksPerBatch, -}: { - provider: providers.Provider - filter: EventFilter - startBlock: number - lastBlock: number - blocksPerBatch: number -}): Promise { - let eventLogs: Log[] = [] - - for (let i = startBlock; i <= lastBlock; i += blocksPerBatch + 1) { - const toBlock = - i + blocksPerBatch >= lastBlock ? lastBlock : i + blocksPerBatch - - const logs = await provider.getLogs({ - ...filter, - fromBlock: i, - toBlock, - }) - eventLogs = eventLogs.concat(logs) - } - - return eventLogs -} - -async function genProjectRecords({ - submitLogs, - resolveLogs, - recipientRegistry, -}: { - submitLogs: Log[] - resolveLogs: Log[] - recipientRegistry: Contract -}): Promise> { - const requests: Record = {} - submitLogs.forEach((log) => { - const { args } = recipientRegistry.interface.parseLog(log) - - const recipientId = args._recipientId - const recipientIndex = args._recipientIndex - const state = isRemoval(args._type) ? 'Removed' : 'Accepted' - - if (!requests[recipientId]) { - let name = '' - try { - const metadata = JSON.parse(args._metadata) - name = metadata.name - // eslint-disable-next-line no-empty - } catch {} - - requests[recipientId] = { - id: recipientId, - recipientIndex, - address: args._recipient, - name, - state, - } - } - }) - - resolveLogs.forEach((log) => { - const { args } = recipientRegistry.interface.parseLog(log) - const recipientId = args._recipientId - const recipientIndex = args._recipientIndex.toString() - - if (!requests[recipientId]) { - throw new Error( - 'Missing SubmitRequest logs, make sure startBlock and endBlock is set correctly' - ) - } - - if (args._rejected) { - requests[recipientId].removedAt = args._timestamp.toString() - requests[recipientId].state = 'Rejected' - } else if (isRemoval(args._type)) { - requests[recipientId].removedAt = args._timestamp.toString() - requests[recipientId].state = 'Removed' - } else { - requests[recipientId].recipientIndex = recipientIndex - } - }) - - return Object.values(requests).reduce( - (records: Record, req) => { - records[req.address] = req - return records - }, - {} - ) -} - -function tsvStringify(projects: Project[]): string { - const firstRow = - `projectIndex` + - `\tstate` + - `\tprojectId` + - `\taddress` + - `\tprojectName` + - `\tvotes` + - `\tvoiceCreditsSpent` + - `\tdonationAmount` + - `\tfundingAmount` - - const outputString = projects.reduce((output, project) => { - const row = - `\n${project.tallyIndex || ''}` + - `\t${project.state || ''}` + - `\t${project.id || ''}` + - `\t${project.address || ''}` + - `\t${project.name || ''}` + - `\t${project.tallyVotes || ''}` + - `\t${project.tallyVoiceCredits || ''}` + - `\t${project.donationAmount || ''}` + - `\t${project.fundingAmount || ''}` - return output.concat(row) - }, firstRow) - - return outputString -} - -task('audit-tally', 'Audit the tally result for a round') - .addParam('roundAddress', 'Funding round contract address') - .addParam('output', 'Output file path') - .addOptionalParam('ipfs', 'The IPFS gateway url') - .addOptionalParam( - 'tsv', - 'Create tab seperated values as output file format, default JSON format', - false, - types.boolean - ) - .addOptionalParam( - 'startBlock', - 'First block to process from the recipient registry contract', - 0, - types.int - ) - .addOptionalParam( - 'endBlock', - 'Last block to process from the recipient registry', - undefined, - types.int - ) - .addOptionalParam( - 'blocksPerBatch', - 'Number of blocks of logs to process per batch', - 50000, - types.int - ) - .setAction( - async ( - { roundAddress, output, tsv, ipfs, startBlock, endBlock, blocksPerBatch }, - { ethers, network } - ) => { - console.log('Processing on ', network.name) - console.log('Funding round address', roundAddress) - - const round = await ethers.getContractAt('FundingRound', roundAddress) - const voiceCreditFactor = await round.voiceCreditFactor() - const nativeToken = await round.nativeToken() - const token = await ethers.getContractAt('ERC20', nativeToken) - const decimals = await token.decimals() - - const maciAddress = await round.maci() - const maci = await ethers.getContractAt('MACI', maciAddress) - const startTime = await maci.signUpTimestamp() - const signUpDuration = await maci.signUpDurationSeconds() - const votingDuration = await maci.votingDurationSeconds() - const endTime = startTime.add(signUpDuration).add(votingDuration) - - const recipientRegistryAddress = await round.recipientRegistry() - const recipientRegistry = await ethers.getContractAt( - 'OptimisticRecipientRegistry', - recipientRegistryAddress - ) - - // fetch event logs containing project information - const submitFilter = recipientRegistry.filters.RequestSubmitted() - const resolveFilter = recipientRegistry.filters.RequestResolved() - const lastBlock = endBlock - ? endBlock - : await ethers.provider.getBlockNumber() - - console.log('Fetching SubmitRequest event logs...') - const submitLogs = await fetchLogs({ - provider: ethers.provider, - filter: submitFilter, - startBlock, - lastBlock, - blocksPerBatch, - }) - console.log(`Fetched ${submitLogs.length} SubmitRequest logs`) - - console.log('Fetching ResolveRequest event logs...') - const resolveLogs = await fetchLogs({ - provider: ethers.provider, - filter: resolveFilter, - startBlock, - lastBlock, - blocksPerBatch, - }) - console.log(`Fetched ${resolveLogs.length} ResolvedRequest logs`) - - const projectRecords = await genProjectRecords({ - submitLogs, - resolveLogs, - recipientRegistry, - }) - - const tallyHash = await round.tallyHash() - const tally = await Ipfs.fetchJson(tallyHash, ipfs) - - console.log('Merging projects and tally results...') - const projects: Project[] = [] - for (let i = 0; i < tally.results.tally.length; i++) { - const address = await recipientRegistry.getRecipientAddress( - i, - startTime, - endTime - ) - - const tallyVotes = tally.results.tally[i] - const tallyVoiceCredits = tally.totalVoiceCreditsPerVoteOption.tally[i] - const donationAmount = utils.formatUnits( - BigNumber.from(tallyVoiceCredits).mul(voiceCreditFactor), - decimals - ) - - const fundingAmount = await round.getAllocatedAmount( - tallyVotes, - tallyVoiceCredits - ) - - const project = projectRecords[address] - projects.push({ - ...project, - address, - tallyIndex: i, - tallyVotes, - tallyVoiceCredits, - donationAmount, - fundingAmount: utils.formatUnits(fundingAmount, decimals), - }) - } - - const outputString = tsv - ? tsvStringify(projects) - : JSON.stringify(projects, null, 2) - - fs.writeFileSync(output, outputString) - console.log('Finished writing results to', output) - } - ) diff --git a/contracts/tasks/cancelRound.ts b/contracts/tasks/cancelRound.ts deleted file mode 100644 index f32aeabbe..000000000 --- a/contracts/tasks/cancelRound.ts +++ /dev/null @@ -1,17 +0,0 @@ -import { task } from 'hardhat/config' - -task('cancel-round', 'Cancel the current round') - .addParam('factory', 'The funding round factory contract address') - .setAction(async ({ factory }, { ethers }) => { - const [deployer] = await ethers.getSigners() - console.log('deployer', deployer.address) - const fundingRoundFactory = await ethers.getContractAt( - 'FundingRoundFactory', - factory, - deployer - ) - - const cancelTx = await fundingRoundFactory.cancelCurrentRound() - await cancelTx.wait() - console.log('Cancel transaction hash: ', cancelTx.hash) - }) diff --git a/contracts/tasks/deploySponsor.ts b/contracts/tasks/deploySponsor.ts deleted file mode 100644 index 58ddaaa0c..000000000 --- a/contracts/tasks/deploySponsor.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { task } from 'hardhat/config' - -task('deploy-sponsor', 'Deploy the BrightID sponsor contract').setAction( - async (_, { ethers }) => { - const SponsorContract = await ethers.getContractFactory('BrightIdSponsor') - const sponsor = await SponsorContract.deploy() - console.log('Deployed the sponsor contract at', sponsor.address) - } -) diff --git a/contracts/tasks/evmIncreaseTime.ts b/contracts/tasks/evmIncreaseTime.ts deleted file mode 100644 index 7ee995fcf..000000000 --- a/contracts/tasks/evmIncreaseTime.ts +++ /dev/null @@ -1,14 +0,0 @@ -import { task, types } from 'hardhat/config' - -task('evm-increase-time', 'Increase block timestamp by seconds') - .addPositionalParam( - 'seconds', - 'The number of seconds to increase', - undefined, - types.int, - false - ) - .setAction(async ({ seconds }, { network }) => { - await network.provider.send('evm_increaseTime', [seconds]) - await network.provider.send('evm_mine') - }) diff --git a/contracts/tasks/helpers/ConstructorArguments.ts b/contracts/tasks/helpers/ConstructorArguments.ts new file mode 100644 index 000000000..6f9f3d5b4 --- /dev/null +++ b/contracts/tasks/helpers/ConstructorArguments.ts @@ -0,0 +1,339 @@ +import type { HardhatRuntimeEnvironment } from 'hardhat/types' +import { BaseContract, Interface } from 'ethers' +import { ContractStorage } from './ContractStorage' +import { EContracts } from './types' +import { HardhatEthersHelpers } from '@nomicfoundation/hardhat-ethers/types' +import { + BrightIdUserRegistry, + ClrFundDeployer, + MACIFactory, + MessageProcessor, + OptimisticRecipientRegistry, + Poll, + Tally, +} from '../../typechain-types' + +/** A list of functions to get contract constructor arguments from the contract */ +const ConstructorArgumentsGetters: Record< + string, + (address: string, ethers: HardhatEthersHelpers) => Promise> +> = { + [EContracts.FundingRound]: getFundingRoundConstructorArguments, + [EContracts.MACI]: getMaciConstructorArguments, + [EContracts.Poll]: getPollConstructorArguments, + [EContracts.Tally]: getTallyConstructorArguments, + [EContracts.MessageProcessor]: getMessageProcessorConstructorArguments, + [EContracts.BrightIdUserRegistry]: + getBrightIdUserRegistryConstructorArguments, + [EContracts.OptimisticRecipientRegistry]: + getOptimisticRecipientRegistryConstructorArguments, + [EContracts.ClrFundDeployer]: getClrFundDeployerConstructorArguments, + [EContracts.MACIFactory]: getMACIFactoryConstructorArguments, +} + +/** + * Get the constructor arguments for FundingRound + * @param address The funding round contract address + * @param ethers The Hardhat Ethers helper + * @returns The funding round constructor arguments + */ +async function getFundingRoundConstructorArguments( + address: string, + ethers: HardhatEthersHelpers +): Promise> { + const round = await ethers.getContractAt(EContracts.FundingRound, address) + + const args = await Promise.all([ + round.nativeToken(), + round.userRegistry(), + round.recipientRegistry(), + round.coordinator(), + ]) + + return args +} + +/** + * Get the constructor arguments for MACI + * @param address The MACI contract address + * @param ethers The Hardhat Ethers helper + * @returns The constructor arguments + */ +async function getMaciConstructorArguments( + address: string, + ethers: HardhatEthersHelpers +): Promise> { + const maci = await ethers.getContractAt(EContracts.MACI, address) + + const args = await Promise.all([ + maci.pollFactory(), + maci.messageProcessorFactory(), + maci.tallyFactory(), + maci.subsidyFactory(), + maci.signUpGatekeeper(), + maci.initialVoiceCreditProxy(), + maci.topupCredit(), + maci.stateTreeDepth(), + ]) + + return args +} + +/** + * Get the constructor arguments for Poll + * @param address The Poll contract address + * @param ethers The Hardhat Ethers helper + * @returns The constructor arguments + */ +async function getPollConstructorArguments( + address: string, + ethers: HardhatEthersHelpers +): Promise> { + const pollContract = (await ethers.getContractAt( + EContracts.Poll, + address + )) as BaseContract as Poll + + const [, duration] = await pollContract.getDeployTimeAndDuration() + const [maxValues, treeDepths, coordinatorPubKey, extContracts] = + await Promise.all([ + pollContract.maxValues(), + pollContract.treeDepths(), + pollContract.coordinatorPubKey(), + pollContract.extContracts(), + ]) + + const args = [ + duration, + { + maxMessages: maxValues.maxMessages, + maxVoteOptions: maxValues.maxVoteOptions, + }, + { + intStateTreeDepth: treeDepths.intStateTreeDepth, + messageTreeSubDepth: treeDepths.messageTreeSubDepth, + messageTreeDepth: treeDepths.messageTreeDepth, + voteOptionTreeDepth: treeDepths.voteOptionTreeDepth, + }, + { + x: coordinatorPubKey.x, + y: coordinatorPubKey.y, + }, + { + maci: extContracts.maci, + messageAq: extContracts.messageAq, + topupCredit: extContracts.topupCredit, + }, + ] + + return args +} + +/** + * Get the constructor arguments for Tally + * @param address The Tally contract address + * @param ethers The Hardhat Ethers helper + * @returns The constructor arguments + */ +async function getTallyConstructorArguments( + address: string, + ethers: HardhatEthersHelpers +): Promise> { + const tallyContract = (await ethers.getContractAt( + EContracts.Tally, + address + )) as BaseContract as Tally + + const args = await Promise.all([ + tallyContract.verifier(), + tallyContract.vkRegistry(), + tallyContract.poll(), + tallyContract.messageProcessor(), + ]) + + return args +} + +/** + * Get the constructor arguments for MessageProcessor + * @param address The MessageProcessor contract address + * @param ethers The Hardhat Ethers helper + * @returns The constructor arguments + */ +async function getMessageProcessorConstructorArguments( + address: string, + ethers: HardhatEthersHelpers +): Promise> { + const messageProcesor = (await ethers.getContractAt( + EContracts.MessageProcessor, + address + )) as BaseContract as MessageProcessor + + const args = await Promise.all([ + messageProcesor.verifier(), + messageProcesor.vkRegistry(), + messageProcesor.poll(), + ]) + + return args +} + +/** + * Get the constructor arguments for BrightIdUserRegistry + * @param address The BrightIdUserRegistry contract address + * @param ethers The Hardhat Ethers helper + * @returns The constructor arguments + */ +async function getBrightIdUserRegistryConstructorArguments( + address: string, + ethers: HardhatEthersHelpers +): Promise> { + const registry = (await ethers.getContractAt( + EContracts.BrightIdUserRegistry, + address + )) as BaseContract as BrightIdUserRegistry + + const args = await Promise.all([ + registry.context(), + registry.verifier(), + registry.brightIdSponsor(), + ]) + + return args +} + +/** + * Get the constructor arguments for OptimisticRecipientRegistry + * @param address The OptimisticRecipientRegistry contract address + * @param ethers The Hardhat Ethers helper + * @returns The constructor arguments + */ +async function getOptimisticRecipientRegistryConstructorArguments( + address: string, + ethers: HardhatEthersHelpers +): Promise> { + const registry = (await ethers.getContractAt( + EContracts.OptimisticRecipientRegistry, + address + )) as BaseContract as OptimisticRecipientRegistry + + const args = await Promise.all([ + registry.baseDeposit(), + registry.challengePeriodDuration(), + registry.controller(), + ]) + + return args +} + +/** + * Get the constructor arguments for ClrFundDeployer + * @param address The ClrFundDeployer contract address + * @param ethers The Hardhat Ethers helper + * @returns The constructor arguments + */ +async function getClrFundDeployerConstructorArguments( + address: string, + ethers: HardhatEthersHelpers +): Promise> { + const registry = (await ethers.getContractAt( + EContracts.ClrFundDeployer, + address + )) as BaseContract as ClrFundDeployer + + const args = await Promise.all([ + registry.clrfundTemplate(), + registry.maciFactory(), + registry.roundFactory(), + ]) + + return args +} + +/** + * Get the constructor arguments for MACIFactory + * @param address The MACIFactory contract address + * @param ethers The Hardhat Ethers helper + * @returns The constructor arguments + */ +async function getMACIFactoryConstructorArguments( + address: string, + ethers: HardhatEthersHelpers +): Promise> { + const registry = (await ethers.getContractAt( + EContracts.MACIFactory, + address + )) as BaseContract as MACIFactory + + const args = await Promise.all([ + registry.vkRegistry(), + registry.factories(), + registry.verifier(), + ]) + + return args +} + +/** + * @notice A helper to retrieve contract constructor arguments + */ +export class ConstructorArguments { + /** + * Hardhat runtime environment + */ + private hre: HardhatRuntimeEnvironment + + /** + * Local contract deployment information + */ + private storage: ContractStorage + + /** + * Initialize class properties + * + * @param hre - Hardhat runtime environment + */ + constructor(hre: HardhatRuntimeEnvironment) { + this.hre = hre + this.storage = ContractStorage.getInstance() + } + + /** + * Get the contract constructor arguments + * @param name - contract name + * @param address - contract address + * @param ethers = Hardhat Ethers helper + * @returns - stringified constructor arguments + */ + async get( + name: string, + address: string, + ethers: HardhatEthersHelpers + ): Promise> { + const contractArtifact = this.hre.artifacts.readArtifactSync(name) + const contractInterface = new Interface(contractArtifact.abi) + if (contractInterface.deploy.inputs.length === 0) { + // no argument + return [] + } + + // try to get arguments from deployed-contract.json file + const constructorArguments = this.storage.getConstructorArguments( + address, + this.hre.network.name + ) + if (constructorArguments) { + return constructorArguments + } + + // try to get custom constructor arguments from contract + let args: Array = [] + + const getConstructorArguments = ConstructorArgumentsGetters[name] + if (getConstructorArguments) { + args = await getConstructorArguments(address, ethers) + } + + return args + } +} diff --git a/contracts/tasks/helpers/ContractStorage.ts b/contracts/tasks/helpers/ContractStorage.ts new file mode 100644 index 000000000..56db46e6e --- /dev/null +++ b/contracts/tasks/helpers/ContractStorage.ts @@ -0,0 +1,347 @@ +// Modified from https://github.com/privacy-scaling-explorations/maci/blob/dev/contracts/tasks/helpers/ContractStorage.ts +import { + IStorageNamedEntry, + IStorageInstanceEntry, + IRegisterContract, +} from './types' + +import { EContracts } from '../../utils/types' +import { JSONFile } from '../../utils/JSONFile' +import { Libraries } from 'hardhat/types' + +const DEPLOYED_CONTRACTS = './deployed-contracts.json' + +/** + * Used by JSON.stringify to serialize bigint + * @param _key JSON key + * @param value JSON value + */ +function bigintReplacer(_key: string, value: any) { + if (typeof value === 'bigint') { + return value.toString() + } + return value +} + +/** + * Internal storage structure type. + * named: contracts can be queried by name + * instance: contract can be queried by address + * verified: mark contracts which are already verified + */ +type TStorage = Record< + string, + Partial<{ + named: Record + instance: Record + verified: Record + }> +> + +/** + * @notice Contract storage keeps all deployed contracts with addresses, arguments in the json file. + * This class is using for incremental deployment and verification. + */ +export class ContractStorage { + /** + * Singleton instance for class + */ + private static INSTANCE?: ContractStorage + + /** + * Json file database instance + */ + private db: TStorage + + /** + * Initialize class properties only once + */ + private constructor() { + try { + this.db = JSONFile.read(DEPLOYED_CONTRACTS) as TStorage + } catch { + this.db = {} as TStorage + } + } + + /** + * Get singleton object + * + * @returns {ContractStorage} singleton object + */ + static getInstance(): ContractStorage { + if (!ContractStorage.INSTANCE) { + ContractStorage.INSTANCE = new ContractStorage() + } + + return ContractStorage.INSTANCE + } + + /** + * Register contract and save contract address, constructor args in the json file + * + * @param {IRegisterContract} args - register arguments + */ + async register({ + id, + contract, + network, + args, + tx, + }: IRegisterContract): Promise { + const contractAddress = await contract.getAddress() + + const deploymentTx = contract.deploymentTransaction() + + console.log(`*** ${id} ***\n`) + console.log(`Network: ${network}`) + console.log(`contract address: ${contractAddress}`) + + if (deploymentTx) { + console.log(`tx: ${deploymentTx.hash}`) + console.log(`nonce: ${deploymentTx.nonce}`) + console.log(`deployer address: ${deploymentTx.from}`) + console.log(`gas price: ${deploymentTx.gasPrice}`) + console.log(`gas used: ${deploymentTx.gasLimit}`) + } + + console.log(`\n******`) + console.log() + + const logEntry: IStorageInstanceEntry = { + id, + txHash: deploymentTx?.hash || tx?.hash, + } + + if (args !== undefined) { + logEntry.verify = { + args: JSON.stringify(args, bigintReplacer), + } + } + + if (!this.db[network]) { + this.db[network] = {} + } + + const { instance, named } = this.db[network] + + this.db[network].instance = { + ...instance, + ...{ [contractAddress]: logEntry }, + } + + const count = named?.[id] ? named[id].count : 0 + const namedValue = { + address: contractAddress, + count: count + 1, + } + + this.db[network].named = { + ...named, + ...{ [id]: namedValue }, + } + + JSONFile.write(DEPLOYED_CONTRACTS, this.db) + } + + /** + * Get contract instances from the json file + * + * @param network - selected network + * @returns {[string, IStorageInstanceEntry][]} storage instance entries + */ + getInstances(network: string): [string, IStorageInstanceEntry][] { + if (!this.db[network]) { + return Object.entries([]) + } + + const collection = this.db[network].instance + const value = collection as IStorageInstanceEntry[] | undefined + + return Object.entries(value || []) + } + + /** + * Check if contract is verified or not locally + * + * @param address - contract address + * @param network - selected network + * @returns contract verified or not + */ + getVerified(address: string, network: string): boolean { + return Boolean(this.db[network].verified?.[address]) + } + + /** + * Set contract verification in the json file + * + * @param address - contract address + * @param network - selected network + * @param verified - verified or not + */ + setVerified = (address: string, network: string, verified: boolean): void => { + const verifiedInfo = { [address]: verified } + this.db[network].verified = { + ...this.db[network].verified, + ...verifiedInfo, + } + JSONFile.write(DEPLOYED_CONTRACTS, this.db) + } + + /** + * Get contract deployment transaction haash by address from the json file + * + * @param address - contract address + * @param network - selected network + * @returns contract deployment transaction hash + */ + getTxHash(address: string, network: string): string | undefined { + if (!this.db[network]) { + return undefined + } + + const instance = this.db[network].instance?.[address] + return instance?.txHash + } + + /** + * Get contract constructor argument by address from the json file + * + * @param address - contract address + * @param network - selected network + * @returns contract constructor arguments + */ + getConstructorArguments( + address: string, + network: string + ): Array | undefined { + if (!this.db[network]) { + return undefined + } + + const instance = this.db[network].instance?.[address] + const args = instance?.verify?.args + return args ? JSON.parse(args) : undefined + } + + /** + * Get contract address by name from the json file + * + * @param id - contract name + * @param network - selected network + * @returns contract address + */ + getAddress(id: EContracts, network: string): string | undefined { + if (!this.db[network]) { + return undefined + } + const collection = this.db[network].named?.[id] + const namedEntry = collection as IStorageNamedEntry | undefined + + return namedEntry?.address + } + + /** + * Get contract address by name from the json file + * + * @param id - contract name + * @param network - selected network + * @throws {Error} if there is no address the error will be thrown + * @returns contract address + */ + mustGetAddress(id: EContracts, network: string): string { + const address = this.getAddress(id, network) + + if (!address) { + throw new Error(`Contract ${id} is not saved`) + } + + return address + } + + /** + * Get poseidon library addresses from the json file + * + * @param network - selected network + * @throws {Error} if there is no address the error will be thrown + * @returns Poseidon libraries + */ + mustGetPoseidonLibraries(network: string): Libraries { + const poseidonT3ContractAddress = this.mustGetAddress( + EContracts.PoseidonT3, + network + ) + const poseidonT4ContractAddress = this.mustGetAddress( + EContracts.PoseidonT4, + network + ) + const poseidonT5ContractAddress = this.mustGetAddress( + EContracts.PoseidonT5, + network + ) + const poseidonT6ContractAddress = this.mustGetAddress( + EContracts.PoseidonT6, + network + ) + + return { + PoseidonT3: poseidonT3ContractAddress, + PoseidonT4: poseidonT4ContractAddress, + PoseidonT5: poseidonT5ContractAddress, + PoseidonT6: poseidonT6ContractAddress, + } + } + + /** + * Get contract from the json file with sizes and multi count + * + * @param deployer - deployer address + * @param network - selected network + * @returns {[entries: Map, length: number, multiCount: number]} + */ + printContracts( + deployer: string, + network: string + ): [Map, number, number] { + console.log('Contracts deployed at', network, 'by', deployer) + console.log('---------------------------------') + + const entryMap = new Map() + const { named, instance } = this.db[network] + const namedEntries = Object.entries(named || {}) + const instanceEntries = Object.entries( + instance || {} + ) + + let multiCount = 0 + + namedEntries.forEach(([key, value]) => { + if (value.count > 1) { + console.log(`\t${key}: ${value.address} (N=${value.count})`) + multiCount += value.count + } else { + console.log(`\t${key}: ${value.address}`) + entryMap.set(key, value.address) + } + }) + + console.log('---------------------------------') + console.log( + 'N# Contracts:', + entryMap.size + multiCount, + '/', + instanceEntries.length + ) + + return [entryMap, instanceEntries.length, multiCount] + } + + /** + * Clean json file for selected network + * + * @param network - selected network + */ + cleanup(network: string): void { + this.db[network] = {} + } +} diff --git a/contracts/tasks/helpers/ContractVerifier.ts b/contracts/tasks/helpers/ContractVerifier.ts new file mode 100644 index 000000000..3a517373f --- /dev/null +++ b/contracts/tasks/helpers/ContractVerifier.ts @@ -0,0 +1,62 @@ +// Modified from https://github.com/privacy-scaling-explorations/maci/blob/dev/contracts/tasks/helpers/ContractVerifier.ts + +import type { IVerificationSubtaskArgs } from './types' +import type { HardhatRuntimeEnvironment, Libraries } from 'hardhat/types' + +/** + * @notice Contract verifier allows to verify contract using hardhat-etherscan plugin. + */ +export class ContractVerifier { + /** + * Hardhat runtime environment + */ + private hre: HardhatRuntimeEnvironment + + /** + * Initialize class properties + * + * @param hre - Hardhat runtime environment + */ + constructor(hre: HardhatRuntimeEnvironment) { + this.hre = hre + } + + /** + * Verify contract through etherscan + * + * @param address - contract address + * @param constructorArguments - stringified constructor arguments + * @param libraries - stringified libraries which can't be detected automatically + * @returns + */ + async verify( + address: string, + constructorArguments: unknown[], + libraries?: string, + contract?: string + ): Promise<[boolean, string]> { + const params: IVerificationSubtaskArgs = { + address, + constructorArguments, + contract, + } + + if (libraries) { + params.libraries = JSON.parse(libraries) as Libraries + } + + // Run etherscan task + const error = await this.hre + .run('verify:verify', params) + .then(() => '') + .catch((err: Error) => { + if (err.message && err.message.match(/already verified/i)) { + return '' + } + + return err.message + }) + + return [!error, error] + } +} diff --git a/contracts/tasks/helpers/Subtask.ts b/contracts/tasks/helpers/Subtask.ts new file mode 100644 index 000000000..089cf06d6 --- /dev/null +++ b/contracts/tasks/helpers/Subtask.ts @@ -0,0 +1,548 @@ +// Modified from https://github.com/privacy-scaling-explorations/maci/blob/dev/contracts/tasks/helpers/Deployment.ts + +import { + BaseContract, + Signer, + NonceManager, + ContractTransactionResponse, + formatUnits, +} from 'ethers' +import { subtask as HardhatSubtask } from 'hardhat/config' + +import { exit } from 'process' + +import type { HardhatEthersSigner } from '@nomicfoundation/hardhat-ethers/signers' +import type { + ConfigurableTaskDefinition, + TaskArguments, + HardhatRuntimeEnvironment, +} from 'hardhat/types' + +import { deployContract } from '../../utils/contracts' +import { EContracts } from '../../utils/types' +import { ContractStorage } from './ContractStorage' +import { + ISubtaskParams, + ISubtaskStep, + ISubtaskStepCatalog, + IGetContractParams, + IDeployContractOptions, +} from './types' +import { JSONFile } from '../../utils/JSONFile' +import { SUBTASK_CATALOGS } from '../subtasks' + +const DEPLOY_CONFIG = './deploy-config.json' + +/** + * Internal deploy config structure type. + */ +type TConfig = { + [key: string]: { [key: string]: { [key: string]: string | number | boolean } } +} + +/** + * @notice Deployment helper class to run sequential deploy using steps and deploy contracts. + */ +export class Subtask { + /** + * Singleton instance for class + */ + private static INSTANCE?: Subtask + + /** + * Hardhat runtime environment + */ + private hre?: HardhatRuntimeEnvironment + + /** + * Whether to use nonce manager to manually set nonce + */ + private nonceManager?: NonceManager + + /** + * Step catalog to create sequential tasks + */ + private stepCatalog: Map + + /** + * Json file database instance + */ + private config: TConfig + + /** + * Contract storage + */ + private storage: ContractStorage + + /** + * Record the start of deployer's balance here + */ + private startBalance: bigint + + /** + * Initialize class properties only once + */ + private constructor(hre?: any) { + this.stepCatalog = new Map(SUBTASK_CATALOGS.map((catalog) => [catalog, []])) + this.hre = hre + try { + this.config = JSONFile.read(DEPLOY_CONFIG) as TConfig + } catch (e) { + if (e instanceof Error) { + const regex = new RegExp('ENOENT: no such file or directory') + if (regex.test(e.message)) { + // silent about no deploy-config.json file error to allow + // unit test to run without error + } else { + console.log('=======================') + console.log('Failed to read', DEPLOY_CONFIG, e.message) + } + } + this.config = {} + } + + this.storage = ContractStorage.getInstance() + + // this will be set when start() or logStart() is called + this.startBalance = 0n + } + + /** + * Get singleton object + * + * @returns {Subtask} singleton object + */ + static getInstance(hre?: HardhatRuntimeEnvironment): Subtask { + if (!Subtask.INSTANCE) { + Subtask.INSTANCE = new Subtask(hre) + } + + return Subtask.INSTANCE + } + + /** + * Start deploy with console log information + * + * @param {ISubtaskParams} params - deploy params + */ + async start({ incremental }: ISubtaskParams): Promise { + this.checkHre(this.hre) + const deployer = await this.getDeployer() + const deployerAddress = await deployer.getAddress() + this.startBalance = await deployer.provider.getBalance(deployer) + + console.log('Deployer address:', deployerAddress) + console.log('Deployer start balance: ', formatUnits(this.startBalance)) + + if (incremental) { + console.log( + '======================================================================' + ) + console.log( + '======================================================================' + ) + console.log( + '==================== ATTENTION! INCREMENTAL MODE ===============' + ) + console.log( + '======================================================================' + ) + console.log( + "=========== Delete 'deployed-contracts.json' to start a new ==========" + ) + console.log( + '======================================================================' + ) + console.log( + '======================================================================' + ) + } else { + this.storage.cleanup(this.hre.network.name) + } + + console.log('Deployment started\n') + } + + /** + * Log the start of deployment with console log information + * + */ + async logStart(): Promise { + this.checkHre(this.hre) + const deployer = await this.getDeployer() + const deployerAddress = await deployer.getAddress() + this.startBalance = await deployer.provider.getBalance(deployer) + + console.log('Deployer address:', deployerAddress) + console.log('Deployer start balance: ', formatUnits(this.startBalance)) + + console.log('Deployment started\n') + } + + /** + * Run deploy steps + * + * @param steps - deploy steps + * @param skip - skip steps with less or equal index + */ + async runSteps(steps: ISubtaskStep[], skip: number): Promise { + this.checkHre(this.hre) + + let stepNumber = 1 + // eslint-disable-next-line no-restricted-syntax + for (const step of steps) { + const stepId = `0${stepNumber}` + console.log( + '\n======================================================================' + ) + console.log(stepId.slice(stepId.length - 2), step.name) + console.log( + '======================================================================\n' + ) + + if (stepNumber <= skip) { + console.log(`STEP ${stepNumber} WAS SKIPPED`) + } else { + // eslint-disable-next-line no-await-in-loop + await this.hre.run(step.taskName, step.args) + } + stepNumber++ + } + } + + /** + * Print deployment results and check warnings + * + * @param strict - fail on warnings is enabled + * @throws error if strict is enabled and warning is found + */ + async checkResults(strict?: boolean): Promise { + this.checkHre(this.hre) + const deployer = await this.getDeployer() + const deployerAddress = await deployer.getAddress() + const [entryMap, instanceCount, multiCount] = this.storage.printContracts( + deployerAddress, + this.hre.network.name + ) + let hasWarn = false + + if (multiCount > 0) { + console.warn('WARNING: multi-deployed contract(s) detected') + hasWarn = true + } else if (entryMap.size !== instanceCount) { + console.warn('WARNING: unknown contract(s) detected') + hasWarn = true + } + + entryMap.forEach((_, key) => { + if (key.startsWith('Mock')) { + console.warn('WARNING: mock contract detected:', key) + hasWarn = true + } + }) + + if (hasWarn && strict) { + throw new Error('Warnings are present') + } + } + + /** + * Finish deployment with console log information + * + * @param success - success or not + */ + async finish(success: boolean): Promise { + this.checkHre(this.hre) + const deployer = await this.getDeployer() + const { gasPrice } = this.hre.network.config + const endBalance = await deployer.provider.getBalance(deployer) + + console.log( + '======================================================================' + ) + console.log('Deployer end balance: ', formatUnits(endBalance)) + console.log( + 'Deploy expenses: ', + formatUnits(this.startBalance - endBalance) + ) + + if (gasPrice !== 'auto') { + console.log( + 'Deploy gas: ', + (this.startBalance - endBalance) / BigInt(gasPrice), + '@', + gasPrice / 1e9, + ' gwei' + ) + } + + console.log( + '======================================================================' + ) + + if (!success) { + console.log('\nDeployment has failed') + exit(1) + } + + console.log('\nDeployment has finished') + } + + /** + * Get deployer (first signer) from hardhat runtime environment + * + * @returns {Promise} - signer + */ + async getDeployer(signer?: Signer): Promise { + this.checkHre(this.hre) + + let deployer: Signer | NonceManager + + if (this.nonceManager) { + deployer = this.nonceManager + } else { + if (signer) { + deployer = signer + } else { + ;[deployer] = await this.hre.ethers.getSigners() + } + } + + return deployer as unknown as HardhatEthersSigner + } + + /** + * Set hardhat runtime environment + * + * @param hre - hardhat runtime environment + */ + setHre(hre: HardhatRuntimeEnvironment): void { + this.hre = hre + } + + /** + * Check if hardhat runtime environment is set + * + * @throws {Error} error if there is no hardhat runtime environment set + */ + private checkHre( + hre: HardhatRuntimeEnvironment | undefined + ): asserts hre is HardhatRuntimeEnvironment { + if (!hre) { + throw new Error('Hardhat Runtime Environment is not set') + } + } + + /** + * Create a nonce manager to manage nonce for the signer + * + * @param signer - signer + */ + setNonceManager(signer: Signer): void { + this.nonceManager = new NonceManager(signer) + } + + /** + * Register a subtask by updating step catalog and return task definition + * + * @param taskName - unique task name + * @param stepName - task description + * @param paramsFn - optional function to override default task arguments + * @returns {ConfigurableTaskDefinition} hardhat task definition + */ + addTask( + taskName: string, + stepName: string, + paramsFn?: (params: ISubtaskParams) => Promise + ): ConfigurableTaskDefinition { + const deployType = taskName.substring(0, taskName.indexOf(':')) + this.addStep(deployType, { + name: stepName, + taskName, + paramsFn: paramsFn || this.getDefaultParams, + }) + + return HardhatSubtask(taskName, stepName) + } + + /** + * Register deployment step + * + * @param deployType - deploy type + * @param {ISubtaskStepCatalog} - deploy step catalog name, description and param mapper + */ + private addStep( + deployType: string, + { name, taskName, paramsFn }: ISubtaskStepCatalog + ): void { + const steps = this.stepCatalog.get(deployType) + + if (!steps) { + throw new Error(`Unknown deploy type: ${deployType}`) + } + + steps.push({ name, taskName, paramsFn }) + } + + /** + * Get default params from hardhat task + * + * @param {ISubtaskParams} params - hardhat task arguments + * @returns {Promise} params for deploy workflow + */ + private getDefaultParams = ({ + verify, + incremental, + clrfund, + roundDuration, + }: ISubtaskParams): Promise => + Promise.resolve({ verify, incremental, clrfund, roundDuration }) + + /** + * Get deploy step sequence + * + * @param deployTypes - list of deploy types + * @param {ISubtaskParams} params - deploy params + * @returns {Promise} deploy steps + */ + async getDeploySteps( + deployTypes: string[], + params: ISubtaskParams + ): Promise { + const catalogSteps = deployTypes.map((deployType) => + this.stepCatalog.get(deployType) + ) + + let stepList: ISubtaskStepCatalog[] = [] + for (let i = 0; i < catalogSteps.length; i++) { + const steps = catalogSteps[i] + if (!steps) { + throw new Error(`Unknown deploy type: ${deployTypes[i]}`) + } + + stepList = stepList.concat(steps) + } + + return Promise.all(stepList.map(({ paramsFn }) => paramsFn(params))).then( + (stepArgs) => + stepArgs.map((args, index) => ({ + name: stepList[index].name, + taskName: stepList[index].taskName, + args: args as unknown, + })) + ) + } + + /** + * Deploy contract and return it + * + * @param contractName - contract name + * @param signer - signer + * @param args - constructor arguments + * @returns deployed contract + */ + async deployContract( + contractName: EContracts, + options?: IDeployContractOptions + ): Promise { + this.checkHre(this.hre) + const signer = options?.signer + const deployer = await this.getDeployer(signer) + const args = options?.args || [] + const libraries = options?.libraries + + const contract = await deployContract(contractName, this.hre.ethers, { + args, + signer: deployer, + libraries, + }) + await contract.waitForDeployment() + + return contract as unknown as T + } + + /** + * Get deploy config field (see deploy-config.json) + * + * @param id - contract name + * @param field - config field key + * @returns config field value + */ + getConfigField( + id: EContracts, + field: string + ): T { + this.checkHre(this.hre) + + let value: T | null | undefined + try { + value = this.config[this.hre.network.name][id][field] as T + } catch { + value = undefined + } + + if (value === null || value === undefined) { + throw new Error( + `Can't find ${this.hre.network.name}.${id}.${field} in ${DEPLOY_CONFIG}` + ) + } + + return value + } + + /** + * Try to get deploy config field (see deploy-config.json) + * + * @param id - contract name + * @param field - config field key + * @returns config field value or undefined + */ + tryGetConfigField( + id: EContracts, + field: string + ): T | undefined { + let value: T | undefined + try { + value = this.getConfigField(id, field) + } catch { + value = undefined + } + + return value + } + + /** + * Get contract by name + * + * @param {IGetContractParams} params - params + * @returns contract wrapper + */ + async getContract({ + name, + address, + signer, + }: IGetContractParams): Promise { + this.checkHre(this.hre) + const deployer = await this.getDeployer(signer) + const contractAddress = + address || this.storage.mustGetAddress(name, this.hre.network.name) + + const { abi } = await this.hre.artifacts.readArtifact(name.toString()) + + return new BaseContract(contractAddress, abi, deployer) as T + } + + /** + * Log transaction information to console + * + * @param {ContractTransactionResponse} tx - transaction + */ + logTransaction(tx: ContractTransactionResponse): void { + console.log(`tx: ${tx.hash}`) + console.log(`nonce: ${tx.nonce}`) + console.log(`deployer address: ${tx.from}`) + console.log(`gas price: ${tx.gasPrice}`) + console.log(`gas used: ${tx.gasLimit}`) + console.log() + } +} diff --git a/contracts/tasks/helpers/types.ts b/contracts/tasks/helpers/types.ts new file mode 100644 index 000000000..920f135da --- /dev/null +++ b/contracts/tasks/helpers/types.ts @@ -0,0 +1,235 @@ +// Modified from https://github.com/privacy-scaling-explorations/maci/blob/dev/contracts/tasks/helpers/types.ts + +import { BaseContract, ContractTransactionResponse, Signer } from 'ethers' +import { EContracts } from '../../utils/types' +import type { Libraries, TaskArguments } from 'hardhat/types' + +/** + * Interface that represents contract storage named entry + */ +export interface IStorageNamedEntry { + /** + * Contract address + */ + address: string + + /** + * Count of deployed instances + */ + count: number +} + +/** + * Interface that represents contract storage instance entry + */ +export interface IStorageInstanceEntry { + /** + * Entry identificator + */ + id: string + + /** + * The transaction hash that this instance was created + */ + txHash?: string + + /** + * Params for verification + */ + verify?: { + args?: string + impl?: string + subType?: string + } +} + +/** + * Interface that represents subtask params + */ +export interface ISubtaskParams { + /** + * Param for verification toggle + */ + verify: boolean + + /** + * Param for incremental task toggle + */ + incremental: boolean + + /** + * Param for manually managed nonce + * This is useful for interacting with testnet nodes + * that are not optimally configured causing nonce too low error + */ + manageNonce?: boolean + + /** + * Consider warning as errors + */ + strict?: boolean + + /** + * Skip steps with less or equal index + */ + skip?: number + + /** + * The duration of a new funding round. This is only used when starting + * a new round + */ + roundDuration?: number + + /** + * The ClrFund contract address + */ + clrfund?: string +} + +/** + * Interface that represents register contract arguments + */ +export interface IRegisterContract { + /** + * Contract enum identifier + */ + id: EContracts + + /** + * Contract instance + */ + contract: BaseContract + + /** + * network name + */ + network: string + + /** + * Contract deployment arguments + */ + args?: unknown[] + + /** + * Contract deployment transaction + */ + tx?: ContractTransactionResponse +} + +/** + * Interface that represents subtask step catalog + */ +export interface ISubtaskStepCatalog { + /** + * Step name + */ + name: string + + /** + * Task name + */ + taskName: string + + /** + * Params function with task arguments + * + * @param params task params + * @returns task arguments + */ + paramsFn: (params: ISubtaskParams) => Promise +} + +/** + * Interface that represents subtask step + */ +export interface ISubtaskStep { + /** + * Step name + */ + name: string + + /** + * Subtask name + */ + taskName: string + + /** + * Subtask arguments + */ + args: TaskArguments +} + +/** + * Interface that represents `Subtask#getContract` params + */ +export interface IGetContractParams { + /** + * Contract name + */ + name: EContracts + + /** + * Contract address + */ + address?: string + + /** + * Eth signer + */ + signer?: Signer +} + +/** + * Interface that represents verify arguments + */ +export interface IVerifyAllArgs { + /** + * Ignore verified status + */ + force?: boolean +} + +/** + * Interface that represents verification subtask arguments + * This is extracted from hardhat etherscan plugin + */ +export interface IVerificationSubtaskArgs { + /** + * Contract address + */ + address: string + + /** + * Constructor arguments + */ + constructorArguments: unknown[] + + /** + * Fully qualified name of the contract + */ + contract?: string + + /** + * Libraries + */ + libraries?: Libraries +} + +export interface IDeployContractOptions { + /** + * Contract constructor argument + */ + args?: unknown[] + + /** + * Eth signer + */ + signer?: Signer + + /** + * Libraries + */ + libraries?: Libraries +} + +export { EContracts } diff --git a/contracts/tasks/index.ts b/contracts/tasks/index.ts index 8cd3f1ac2..59f1c9699 100644 --- a/contracts/tasks/index.ts +++ b/contracts/tasks/index.ts @@ -1,19 +1,30 @@ -import './verifyMaciFactory' -import './verifyRoundFactory' -import './verifyRound' -import './verifyMaci' -import './verifyRecipientRegistry' -import './verifyUserRegistry' -import './verifyAll' -import './cancelRound' -import './evmIncreaseTime' -import './auditTally' -import './exportRound' -import './mergeAllocations' -import './setDurations' -import './deploySponsor' -import './loadUsers' -import './tally' -import './findStorageSlot' -import './setStorageRoot' -import './loadMerkleUsers' +import './subtasks' +import './runners/newMaciKey' +import './runners/newDeployer' +import './runners/newClrFund' +import './runners/newRound' +import './runners/timeTravel' +import './runners/setCoordinator' +import './runners/setRecipientRegistry' +import './runners/setMaciParameters' +import './runners/setToken' +import './runners/setUserRegistry' +import './runners/setStorageRoot' +import './runners/tally' +import './runners/finalize' +import './runners/claim' +import './runners/cancel' +import './runners/exportRound' +import './runners/mergeAllocation' +import './runners/loadSimpleUsers' +import './runners/loadMerkleUsers' +import './runners/contribute' +import './runners/addRecipients' +import './runners/findStorageSlot' +import './runners/verifyTallyFile' +import './runners/verifyAll' +import './runners/verifyDeployer' +import './runners/genProofs' +import './runners/proveOnChain' +import './runners/publishTallyResults' +import './runners/resetTally' diff --git a/contracts/tasks/runners/addRecipients.ts b/contracts/tasks/runners/addRecipients.ts new file mode 100644 index 000000000..8f453b450 --- /dev/null +++ b/contracts/tasks/runners/addRecipients.ts @@ -0,0 +1,61 @@ +/** + * Add recipients for testing purposes + * + * Sample usage: + * + * yarn hardat test-add-recipients --clrfund --network + * + */ +import { task } from 'hardhat/config' +import { EContracts } from '../../utils/types' +import { ContractStorage } from '../helpers/ContractStorage' + +const bannerImageHash = 'QmPAZJkV2TH2hmudpSwj8buxwiG1ckNa2ZbrPFop3Td5oD' +const thumbnailImageHash = 'QmPAZJkV2TH2hmudpSwj8buxwiG1ckNa2ZbrPFop3Td5oD' + +task('add-recipients', 'Add test recipients').setAction( + async (_, { ethers, network }) => { + const [signer, ...recipients] = await ethers.getSigners() + console.log('Add recipients by', signer.address) + + const storage = ContractStorage.getInstance() + const clrfund = storage.mustGetAddress(EContracts.ClrFund, network.name) + + const clrfundContract = await ethers.getContractAt( + EContracts.ClrFund, + clrfund, + signer + ) + const recipientRegistryAddress = await clrfundContract.recipientRegistry() + console.log('Recipient registry', recipientRegistryAddress) + + const recipientRegistry = await ethers.getContractAt( + EContracts.SimpleRecipientRegistry, + recipientRegistryAddress, + signer + ) + + let numAdded = 0 + for (let i = 1; i < 10; i++) { + const recipient = recipients[i] + const recipientAddress = recipient?.address || signer.address + const addRecipientTx = await recipientRegistry.addRecipient( + recipientAddress, + JSON.stringify({ + name: `recipient ${i}`, + description: `recipient ${i}`, + bannerImageHash, + thumbnailImageHash, + }) + ) + const receipt = await addRecipientTx.wait() + if (receipt.status === 1) { + numAdded++ + } else { + console.log('Failed to add recipient', i) + } + } + + console.log(`Added ${numAdded} test recipients`) + } +) diff --git a/contracts/tasks/runners/cancel.ts b/contracts/tasks/runners/cancel.ts new file mode 100644 index 000000000..7c7e3d88b --- /dev/null +++ b/contracts/tasks/runners/cancel.ts @@ -0,0 +1,30 @@ +/** + * Cancel the current round + * + * Sample usage: + * yarn hardhat cancel-round --clrfund --network + */ +import { task } from 'hardhat/config' +import { EContracts } from '../../utils/types' + +task('cancel-round', 'Cancel the current round') + .addParam('clrfund', 'The ClrFund contract address') + .setAction(async ({ clrfund }, { ethers, network }) => { + const [deployer] = await ethers.getSigners() + console.log('deployer', deployer.address) + console.log('network', network.name) + + const clrfundContract = await ethers.getContractAt( + EContracts.ClrFund, + clrfund, + deployer + ) + + const cancelTx = await clrfundContract.cancelCurrentRound() + const receipt = await cancelTx.wait() + if (receipt.status !== 1) { + throw new Error('Failed to cancel current round') + } + + console.log('Cancel transaction hash: ', cancelTx.hash) + }) diff --git a/contracts/tasks/runners/claim.ts b/contracts/tasks/runners/claim.ts new file mode 100644 index 000000000..e5135aa24 --- /dev/null +++ b/contracts/tasks/runners/claim.ts @@ -0,0 +1,88 @@ +/** + * Claim funds. This script is mainly used by e2e testing + * + * Sample usage: + * yarn hardhat claim --recipient --network + */ + +import { getEventArg } from '../../utils/contracts' +import { getRecipientClaimData } from '@clrfund/common' +import { JSONFile } from '../../utils/JSONFile' +import { + getProofDirForRound, + getTalyFilePath, + isPathExist, +} from '../../utils/misc' +import { getNumber } from 'ethers' +import { task, types } from 'hardhat/config' +import { EContracts } from '../../utils/types' +import { ContractStorage } from '../helpers/ContractStorage' + +task('claim', 'Claim funnds for test recipients') + .addOptionalParam('roundAddress', 'Funding round contract address') + .addParam( + 'recipient', + 'The recipient index in the tally file', + undefined, + types.int + ) + .addParam('proofDir', 'The proof output directory', './proof_output') + .setAction( + async ({ proofDir, recipient, roundAddress }, { ethers, network }) => { + if (recipient <= 0) { + throw new Error('Recipient must be greater than 0') + } + + const storage = ContractStorage.getInstance() + const fundingRound = + roundAddress ?? + storage.mustGetAddress(EContracts.FundingRound, network.name) + + const proofDirForRound = getProofDirForRound( + proofDir, + network.name, + fundingRound + ) + + const tallyFile = getTalyFilePath(proofDirForRound) + if (!isPathExist(tallyFile)) { + throw new Error(`Path ${tallyFile} does not exist`) + } + + const tally = JSONFile.read(tallyFile) + + const fundingRoundContract = await ethers.getContractAt( + EContracts.FundingRound, + fundingRound + ) + + const recipientStatus = await fundingRoundContract.recipients(recipient) + if (recipientStatus.fundsClaimed) { + throw new Error(`Recipient already claimed funds`) + } + + const pollAddress = await fundingRoundContract.poll() + console.log('pollAddress', pollAddress) + + const poll = await ethers.getContractAt(EContracts.Poll, pollAddress) + const treeDepths = await poll.treeDepths() + const recipientTreeDepth = getNumber(treeDepths.voteOptionTreeDepth) + + // Claim funds + const recipientClaimData = getRecipientClaimData( + recipient, + recipientTreeDepth, + tally + ) + const claimTx = await fundingRoundContract.claimFunds( + ...recipientClaimData + ) + const claimedAmount = await getEventArg( + claimTx, + fundingRoundContract, + 'FundsClaimed', + '_amount' + ) + console.log(`Recipient ${recipient} claimed ${claimedAmount} tokens.`) + } + ) diff --git a/contracts/tasks/runners/contribute.ts b/contracts/tasks/runners/contribute.ts new file mode 100644 index 000000000..6060c17a1 --- /dev/null +++ b/contracts/tasks/runners/contribute.ts @@ -0,0 +1,200 @@ +/** + * Contribute to a funding round. This script is mainly used by e2e testing + * All the input used by the script comes from the state.json file + * + * Sample usage: + * yarn hardhat contribute --network + * + * Make sure deployed-contracts.json exists with the funding round address + */ + +import { Keypair, createMessage, Message, PubKey } from '@clrfund/common' + +import { UNIT } from '../../utils/constants' +import { getEventArg } from '../../utils/contracts' +import type { FundingRound, ERC20, Poll } from '../../typechain-types' +import { task } from 'hardhat/config' +import { EContracts } from '../../utils/types' +import { ContractStorage } from '../helpers/ContractStorage' + +/** + * Cast a vote by the contributor + * + * @param stateIndex The contributor stateIndex + * @param pollId The pollId + * @param contributorKeyPair The contributor MACI key pair + * @param coordinatorPubKey The coordinator MACI public key + * @param voiceCredits The total voice credits the contributor can use + * @param pollContract The poll contract with the vote function + */ +async function vote( + stateIndex: number, + pollId: bigint, + contributorKeyPair: Keypair, + coordinatorPubKey: PubKey, + voiceCredits: bigint, + pollContract: Poll +) { + const messages: Message[] = [] + const encPubKeys: PubKey[] = [] + let nonce = 1 + // Change key + const newContributorKeypair = new Keypair() + const [message, encPubKey] = createMessage( + stateIndex, + contributorKeyPair, + newContributorKeypair, + coordinatorPubKey, + null, + null, + nonce, + pollId + ) + messages.push(message) + encPubKeys.push(encPubKey) + nonce += 1 + // Vote + for (const recipientIndex of [1, 2]) { + const votes = BigInt(voiceCredits) / BigInt(4) + const [message, encPubKey] = createMessage( + stateIndex, + newContributorKeypair, + null, + coordinatorPubKey, + recipientIndex, + votes, + nonce, + pollId + ) + messages.push(message) + encPubKeys.push(encPubKey) + nonce += 1 + } + + const tx = await pollContract.publishMessageBatch( + messages.reverse().map((msg) => msg.asContractParam()), + encPubKeys.reverse().map((key) => key.asContractParam()) + ) + const receipt = await tx.wait() + if (receipt?.status !== 1) { + throw new Error(`Contributor ${stateIndex} failed to vote`) + } +} + +task('contribute', 'Contribute to a funding round').setAction( + async (_, { ethers, network }) => { + const [deployer, , , , , , , , , , , , contributor1, contributor2] = + await ethers.getSigners() + + const storage = ContractStorage.getInstance() + const fundingRoundContractAddress = storage.mustGetAddress( + EContracts.FundingRound, + network.name + ) + const fundingRound = await ethers.getContractAt( + EContracts.FundingRound, + fundingRoundContractAddress + ) + + const pollId = await fundingRound.pollId() + const pollAddress = await fundingRound.poll() + const pollContract = await ethers.getContractAt( + EContracts.Poll, + pollAddress + ) + + const rawCoordinatorPubKey = await pollContract.coordinatorPubKey() + const coordinatorPubKey = new PubKey([ + BigInt(rawCoordinatorPubKey.x), + BigInt(rawCoordinatorPubKey.y), + ]) + + const tokenAddress = await fundingRound.nativeToken() + const token = await ethers.getContractAt( + EContracts.AnyOldERC20Token, + tokenAddress + ) + + const maciAddress = await fundingRound.maci() + const maci = await ethers.getContractAt(EContracts.MACI, maciAddress) + + const userRegistryAddress = await fundingRound.userRegistry() + const userRegistry = await ethers.getContractAt( + EContracts.SimpleUserRegistry, + userRegistryAddress + ) + + const contributionAmount = (UNIT * BigInt(16)) / BigInt(10) + + for (const contributor of [contributor1, contributor2]) { + const contributorAddress = await contributor.getAddress() + + let tx = await userRegistry.addUser(contributorAddress) + let receipt = await tx.wait() + if (receipt.status !== 1) { + throw new Error(`Failed to add user to the user registry`) + } + + // transfer token to contributor first + tx = await token.transfer(contributorAddress, contributionAmount) + receipt = await tx.wait() + if (receipt.status !== 1) { + throw new Error(`Failed to transfer token for ${contributorAddress}`) + } + + const contributorKeypair = new Keypair() + const tokenAsContributor = token.connect(contributor) as ERC20 + tx = await tokenAsContributor.approve( + fundingRound.target, + contributionAmount + ) + receipt = await tx.wait() + if (receipt.status !== 1) { + throw new Error('Failed to approve token') + } + + const fundingRoundAsContributor = fundingRound.connect( + contributor + ) as FundingRound + const contributionTx = await fundingRoundAsContributor.contribute( + contributorKeypair.pubKey.asContractParam(), + contributionAmount + ) + receipt = await contributionTx.wait() + if (receipt.status !== 1) { + throw new Error('Failed to contribute') + } + + const stateIndex = await getEventArg( + contributionTx, + maci, + 'SignUp', + '_stateIndex' + ) + const voiceCredits = await getEventArg( + contributionTx, + maci, + 'SignUp', + '_voiceCreditBalance' + ) + + console.log( + `Contributor ${contributorAddress} registered. State index: ${stateIndex}. Voice credits: ${voiceCredits.toString()}.` + ) + + const pollContractAsContributor = pollContract.connect( + contributor + ) as Poll + + await vote( + stateIndex, + pollId, + contributorKeypair, + coordinatorPubKey, + voiceCredits, + pollContractAsContributor + ) + console.log(`Contributor ${contributorAddress} voted.`) + } + } +) diff --git a/contracts/tasks/exportRound.ts b/contracts/tasks/runners/exportRound.ts similarity index 62% rename from contracts/tasks/exportRound.ts rename to contracts/tasks/runners/exportRound.ts index 83304385b..fa3e332b1 100644 --- a/contracts/tasks/exportRound.ts +++ b/contracts/tasks/runners/exportRound.ts @@ -3,19 +3,21 @@ * * Sample usage: * - * yarn hardhat export-round --round-address
--out-dir ../vue-app/src/rounds --operator --ipfs --start-block --network + * yarn hardhat export-round --round-address
\ + * --output-dir ../vue-app/src/rounds \ + * --operator --ipfs \ + * --start-block --network * * To generate the leaderboard view, deploy the clrfund website with the generated round data in the vue-app/src/rounds folder */ import { task, types } from 'hardhat/config' -import { HardhatConfig } from 'hardhat/types' -import { utils, Contract, BigNumber } from 'ethers' -import { Ipfs } from '../utils/ipfs' -import { Project, Round, RoundFileContent } from '../utils/types' -import { RecipientRegistryLogProcessor } from '../utils/RecipientRegistryLogProcessor' -import { getRecipientAddressAbi } from '../utils/abi' -import { writeToFile } from '../utils/file' +import { Contract, formatUnits, getNumber } from 'ethers' +import { Ipfs } from '../../utils/ipfs' +import { Project, Round, RoundFileContent } from '../../utils/types' +import { RecipientRegistryLogProcessor } from '../../utils/RecipientRegistryLogProcessor' +import { getRecipientAddressAbi, MaciV0Abi } from '../../utils/abi' +import { JSONFile } from '../../utils/JSONFile' import path from 'path' import fs from 'fs' @@ -28,8 +30,8 @@ type RoundListEntry = { } const toUndefined = () => undefined -const toString = (val: BigNumber) => BigNumber.from(val).toString() -const toZero = () => BigNumber.from(0) +const toString = (val: bigint) => BigInt(val).toString() +const toZero = () => BigInt(0) function roundFileName(directory: string, address: string): string { return path.join(directory, `${address}.json`) @@ -39,19 +41,6 @@ function roundListFileName(directory: string): string { return path.join(directory, 'rounds.json') } -function getEtherscanApiKey(config: HardhatConfig, network: string): string { - let etherscanApiKey = '' - if (config.etherscan.apiKey) { - if (typeof config.etherscan.apiKey === 'string') { - etherscanApiKey = config.etherscan.apiKey - } else { - etherscanApiKey = config.etherscan.apiKey[network] - } - } - - return etherscanApiKey -} - function roundMapKey(round: RoundListEntry): string { return `${round.network}.${round.address}` } @@ -74,8 +63,12 @@ async function updateRoundList(filePath: string, round: RoundListEntry) { const rounds: RoundListEntry[] = Array.from(roundMap.values()) // sort in ascending start time order - rounds.sort((round1, round2) => round1.startTime - round2.startTime) - writeToFile(filePath, rounds) + rounds.sort( + (round1, round2) => + getNumber(round1.startTime) - getNumber(round2.startTime) + ) + JSONFile.write(filePath, rounds) + console.log('Finished writing to', filePath) } async function mergeRecipientTally({ @@ -127,15 +120,20 @@ async function mergeRecipientTally({ startTime, endTime ) - } catch { + } catch (err) { + console.log('err', err) // some older recipient registry contract does not have // the getRecipientAddress function, ignore error } const tallyResult = tally.results.tally[i] - const spentVoiceCredits = tally.totalVoiceCreditsPerVoteOption.tally[i] - const formattedDonationAmount = utils.formatUnits( - BigNumber.from(spentVoiceCredits).mul(voiceCreditFactor), + + // In MACI V1, totalVoiceCreditsPerVoteOption is called perVOSpentVoiceCredits + const spentVoiceCredits = tally.perVOSpentVoiceCredits + ? tally.perVOSpentVoiceCredits.tally[i] + : tally.totalVoiceCreditsPerVoteOption.tally[i] + const formattedDonationAmount = formatUnits( + BigInt(spentVoiceCredits) * BigInt(voiceCreditFactor), nativeTokenDecimals ) @@ -163,10 +161,14 @@ async function getRoundInfo( ethers: any, operator: string ): Promise { - console.log('Fetching round data for', roundContract.address) - const round: any = { address: roundContract.address } + console.log('Fetching round data for', roundContract.target) + const address = await roundContract.getAddress() + + let nativeTokenAddress: string + let nativeTokenDecimals = BigInt(0) + let nativeTokenSymbol = '' try { - round.nativeTokenAddress = await roundContract.nativeToken() + nativeTokenAddress = await roundContract.nativeToken() } catch (err) { const errorMessage = `Failed to get nativeToken. Make sure the environment variable JSONRPC_HTTP_URL is set properly: ${ (err as Error).message @@ -175,14 +177,14 @@ async function getRoundInfo( } try { - const token = await ethers.getContractAt('ERC20', round.nativeTokenAddress) - round.nativeTokenDecimals = await token.decimals().catch(toUndefined) - round.nativeTokenSymbol = await token.symbol().catch(toUndefined) + const token = await ethers.getContractAt('ERC20', nativeTokenAddress) + nativeTokenDecimals = await token.decimals().catch(toUndefined) + nativeTokenSymbol = await token.symbol().catch(toUndefined) console.log( 'Fetched token data', - round.nativeTokenAddress, - round.nativeTokenSymbol, - round.nativeTokenDecimals + nativeTokenAddress, + nativeTokenSymbol, + nativeTokenDecimals ) } catch (err) { const errorMessage = err instanceof Error ? err.message : '' @@ -190,67 +192,114 @@ async function getRoundInfo( } const contributorCount = await roundContract.contributorCount().catch(toZero) - round.contributorCount = contributorCount.toNumber() - const matchingPoolSize = await roundContract.matchingPoolSize().catch(toZero) - round.matchingPoolSize = matchingPoolSize.toString() - round.totalSpent = await roundContract + const totalSpent = await roundContract .totalSpent() .then(toString) .catch(toUndefined) const voiceCreditFactor = await roundContract.voiceCreditFactor() - round.voiceCreditFactor = voiceCreditFactor.toString() - - round.isFinalized = await roundContract.isFinalized() - round.isCancelled = await roundContract.isCancelled() - round.tallyHash = await roundContract.tallyHash() + const isFinalized = await roundContract.isFinalized() + const isCancelled = await roundContract.isCancelled() + const tallyHash = await roundContract.tallyHash() + const maciAddress = await roundContract.maci().catch(toUndefined) + const pollAddress = await roundContract.poll().catch(toUndefined) + let startTime = 0 + let endTime = 0 + let pollId: bigint | undefined + let messages: bigint + let maxMessages: bigint + let maxRecipients: bigint + let signUpDuration = BigInt(0) + let votingDuration = BigInt(0) try { - round.maciAddress = await roundContract.maci().catch(toUndefined) - const maci = await ethers.getContractAt('MACI', round.maciAddress) - const startTime = await maci.signUpTimestamp().catch(toZero) - round.startTime = startTime.toNumber() - const signUpDuration = await maci.signUpDurationSeconds().catch(toZero) - const votingDuration = await maci.votingDurationSeconds().catch(toZero) - const endTime = startTime.add(signUpDuration).add(votingDuration) - round.endTime = endTime.toNumber() - round.signUpDuration = signUpDuration.toNumber() - round.votingDuration = votingDuration.toNumber() - - const maciTreeDepths = await maci.treeDepths() - const messages = await maci.numMessages() - - round.messages = messages.toNumber() - round.maxMessages = 2 ** maciTreeDepths.messageTreeDepth - 1 - round.maxRecipients = 5 ** maciTreeDepths.voteOptionTreeDepth - 1 + if (pollAddress) { + const pollContract = await ethers.getContractAt('Poll', pollAddress) + const [roundStartTime, roundDuration] = + await pollContract.getDeployTimeAndDuration() + startTime = getNumber(roundStartTime) + signUpDuration = roundDuration + votingDuration = roundDuration + endTime = startTime + getNumber(roundDuration) + + pollId = await roundContract.pollId() + + messages = await pollContract.numMessages() + const maxValues = await pollContract.maxValues() + maxMessages = maxValues.maxMessages + maxRecipients = maxValues.maxVoteOptions + } else { + const maci = await ethers.getContractAt(MaciV0Abi, maciAddress) + startTime = await maci.signUpTimestamp().catch(toZero) + signUpDuration = await maci.signUpDurationSeconds().catch(toZero) + votingDuration = await maci.votingDurationSeconds().catch(toZero) + endTime = + getNumber(startTime) + + getNumber(signUpDuration) + + getNumber(votingDuration) + + const treeDepths = await maci.treeDepths() + messages = await maci.numMessages() + maxMessages = BigInt(2) ** BigInt(treeDepths.messageTreeDepth) - BigInt(1) + maxRecipients = + BigInt(5) ** BigInt(treeDepths.voteOptionTreeDepth) - BigInt(1) + } } catch (err) { const errorMessage = err instanceof Error ? err.message : '' - throw new Error(`Failed to get MACI data ${errorMessage}`) + throw new Error(`Failed to get round duration ${errorMessage}`) } - round.userRegistryAddress = await roundContract + const userRegistryAddress = await roundContract .userRegistry() .catch(toUndefined) - round.recipientRegistryAddress = await roundContract.recipientRegistry() + const recipientRegistryAddress = await roundContract.recipientRegistry() + let recipientDepositAmount = '0' try { const recipientRegistry = await ethers.getContractAt( 'OptimisticRecipientRegistry', - round.recipientRegistryAddress + recipientRegistryAddress ) - round.recipientDepositAmount = await recipientRegistry + recipientDepositAmount = await recipientRegistry .baseDeposit() .then(toString) } catch { // ignore error - non optimistic recipient registry does not have deposit } - round.operator = operator const providerNetwork = await ethers.provider.getNetwork() - round.chainId = providerNetwork.chainId - + const chainId = getNumber(providerNetwork.chainId) + + const round: Round = { + chainId, + operator, + address, + userRegistryAddress, + recipientRegistryAddress, + recipientDepositAmount, + maciAddress, + pollAddress, + pollId, + contributorCount, + totalSpent: totalSpent || '', + matchingPoolSize, + voiceCreditFactor, + isFinalized, + isCancelled, + tallyHash, + nativeTokenAddress, + nativeTokenSymbol, + nativeTokenDecimals: getNumber(nativeTokenDecimals), + startTime, + endTime, + signUpDuration: getNumber(signUpDuration), + votingDuration: getNumber(votingDuration), + messages, + maxMessages, + maxRecipients, + } console.log('Round', round) return round } @@ -297,11 +346,6 @@ task('export-round', 'Export round data for the leaderboard') console.log('Processing on ', network.name) console.log('Funding round address', roundAddress) - const etherscanApiKey = getEtherscanApiKey(config, network.name) - if (!etherscanApiKey) { - throw new Error('Etherscan API key not set') - } - const outputSubDir = path.join(outputDir, network.name) try { fs.statSync(outputSubDir) @@ -328,7 +372,7 @@ task('export-round', 'Export round data for the leaderboard') endBlock, blocksPerBatch, network: network.name, - etherscanApiKey, + config, }) console.log('Parsing logs...') @@ -371,7 +415,8 @@ task('export-round', 'Export round data for the leaderboard') projects, tally, } - writeToFile(filename, roundData) + JSONFile.write(filename, roundData) + console.log('Finished writing to', filename) // update round list const listFilename = roundListFileName(outputDir) diff --git a/contracts/tasks/runners/finalize.ts b/contracts/tasks/runners/finalize.ts new file mode 100644 index 000000000..e48a6c2b6 --- /dev/null +++ b/contracts/tasks/runners/finalize.ts @@ -0,0 +1,103 @@ +/** + * Finalize a funding round + * + * Make sure to set the following environment variables in the .env file + * 1) WALLET_PRIVATE_KEY or WALLET_MNEMONIC + * - clrfund owner's wallet private key to interact with the contract + * + * Sample usage: + * yarn hardhat finalize --clrfund --network + */ + +import { JSONFile } from '../../utils/JSONFile' +import { genTallyResultCommitment } from '@clrfund/common' +import { getNumber } from 'ethers' +import { task } from 'hardhat/config' +import { EContracts } from '../../utils/types' +import { ContractStorage } from '../helpers/ContractStorage' +import { Subtask } from '../helpers/Subtask' +import { getProofDirForRound, getTalyFilePath } from '../../utils/misc' + +task('finalize', 'Finalize a funding round') + .addOptionalParam('clrfund', 'The ClrFund contract address') + .addParam('proofDir', 'The proof output directory', './proof_output') + .setAction(async ({ clrfund, proofDir }, hre) => { + const { ethers, network } = hre + + const storage = ContractStorage.getInstance() + const subtask = Subtask.getInstance(hre) + subtask.setHre(hre) + + await subtask.logStart() + + const clrfundContractAddress = + clrfund ?? storage.mustGetAddress(EContracts.ClrFund, network.name) + + const clrfundContract = await ethers.getContractAt( + EContracts.ClrFund, + clrfundContractAddress + ) + console.log('ClrFund address', clrfundContractAddress) + + const currentRoundAddress = await clrfundContract.getCurrentRound() + const fundingRound = await ethers.getContractAt( + EContracts.FundingRound, + currentRoundAddress + ) + console.log('Current round', fundingRound.target) + + const pollAddress = await fundingRound.poll() + const pollContract = await ethers.getContractAt( + EContracts.Poll, + pollAddress + ) + console.log('Poll', pollAddress) + + const treeDepths = await pollContract.treeDepths() + console.log('voteOptionTreeDepth', treeDepths.voteOptionTreeDepth) + + const currentRoundProofDir = getProofDirForRound( + proofDir, + network.name, + currentRoundAddress + ) + const tallyFile = getTalyFilePath(currentRoundProofDir) + const tally = JSONFile.read(tallyFile) + if (!tally.maci) { + throw Error('Bad tally file ' + tallyFile) + } + + const totalSpent = tally.totalSpentVoiceCredits.spent + const totalSpentSalt = tally.totalSpentVoiceCredits.salt + + const voteOptionTreeDepth = getNumber( + treeDepths.voteOptionTreeDepth, + 'voteOptionTreeDepth' + ) + const resultsCommitment = genTallyResultCommitment( + tally.results.tally.map((x: string) => BigInt(x)), + BigInt(tally.results.salt), + voteOptionTreeDepth + ) + + const perVOVoiceCreditCommitment = genTallyResultCommitment( + tally.perVOSpentVoiceCredits.tally.map((x: string) => BigInt(x)), + BigInt(tally.perVOSpentVoiceCredits.salt), + voteOptionTreeDepth + ) + + const tx = await clrfundContract.transferMatchingFunds( + totalSpent, + totalSpentSalt, + resultsCommitment, + perVOVoiceCreditCommitment + ) + const receipt = await tx.wait() + console.log( + 'Round finalized, totals verified. Gas used:', + receipt.gasUsed.toString() + ) + + const success = true + await subtask.finish(success) + }) diff --git a/contracts/tasks/findStorageSlot.ts b/contracts/tasks/runners/findStorageSlot.ts similarity index 69% rename from contracts/tasks/findStorageSlot.ts rename to contracts/tasks/runners/findStorageSlot.ts index c4c4f0452..35cd795b1 100644 --- a/contracts/tasks/findStorageSlot.ts +++ b/contracts/tasks/runners/findStorageSlot.ts @@ -7,26 +7,27 @@ * https://github.com/vocdoni/storage-proofs-eth-js/blob/main/src/erc20.ts#L62 * * - * Usage: hardhat find-storage-slot --token --holder --network arbitrum + * Usage: hardhat find-storage-slot --token --holder --network */ import { task, types } from 'hardhat/config' -import { Contract, BigNumber } from 'ethers' +import { Contract, toBeHex } from 'ethers' import { getStorageKey } from '@clrfund/common' const ERC20_ABI = [ 'function balanceOf(address _owner) public view returns (uint256 balance)', ] -task('find-storage-slot', 'Find the storage slot for an ERC20 token') +task('find-storage-slot', 'Find the balanceOf storage slot for an ERC20 token') .addParam('token', 'ERC20 contract address') .addParam('holder', 'The address of a token holder') .addOptionalParam('maxSlot', 'Maximum slots to try', 50, types.int) - .setAction(async ({ token, holder, maxSlot }, { ethers }) => { + .setAction(async ({ token, holder, maxSlot }, { ethers, network }) => { const blockNumber = await ethers.provider.getBlockNumber() + const blockNumberHex = toBeHex(blockNumber) const tokenInstance = new Contract(token, ERC20_ABI, ethers.provider) - const balance = (await tokenInstance.balanceOf(holder)) as BigNumber - if (balance.isZero()) { + const balance = BigInt(await tokenInstance.balanceOf(holder)) + if (balance === BigInt(0)) { console.log( 'The holder has no balance, try a different holder with a positive balance of tokens' ) @@ -37,14 +38,14 @@ task('find-storage-slot', 'Find the storage slot for an ERC20 token') try { const storageKey = getStorageKey(holder, pos) - const value = await ethers.provider.getStorageAt( + const value = await network.provider.send('eth_getStorageAt', [ token, storageKey, - blockNumber - ) + blockNumberHex, + ]) - const onChainBalance = BigNumber.from(value) - if (!onChainBalance.eq(balance)) continue + const onChainBalance = BigInt(value) + if (onChainBalance !== balance) continue console.log('Storage slot index', pos) return diff --git a/contracts/tasks/runners/genProofs.ts b/contracts/tasks/runners/genProofs.ts new file mode 100644 index 000000000..ed3061edb --- /dev/null +++ b/contracts/tasks/runners/genProofs.ts @@ -0,0 +1,220 @@ +/** + * Script for generating MACI proofs + * + * Make sure to set the following environment variables in the .env file + * 1) WALLET_PRIVATE_KEY or WALLET_MNEMONIC + * - coordinator's wallet private key to interact with contracts + * 2) COORDINATOR_MACISK - coordinator's MACI private key to decrypt messages + * + * Sample usage: + * + * yarn hardhat gen-proofs --clrfund --proof-dir \ + * --maci-tx-hash --network + * + */ +import { getNumber, NonceManager } from 'ethers' +import { task, types } from 'hardhat/config' + +import { + DEFAULT_GET_LOG_BATCH_SIZE, + DEFAULT_SR_QUEUE_OPS, +} from '../../utils/constants' +import { + getGenProofArgs, + genProofs, + genLocalState, + mergeMaciSubtrees, +} from '../../utils/maci' +import { + getMaciStateFilePath, + getTalyFilePath, + isPathExist, + makeDirectory, +} from '../../utils/misc' +import { EContracts } from '../../utils/types' +import { Subtask } from '../helpers/Subtask' +import { getCurrentFundingRoundContract } from '../../utils/contracts' +import { ContractStorage } from '../helpers/ContractStorage' +import { DEFAULT_CIRCUIT } from '../../utils/circuits' +import { JSONFile } from '../../utils/JSONFile' + +/** + * Check if the tally file with the maci contract address exists + * @param tallyFile The tally file path + * @param maciAddress The MACI contract address + * @returns true if the file exists and it contains the MACI contract address + */ +function tallyFileExists(tallyFile: string, maciAddress: string): boolean { + if (!isPathExist(tallyFile)) { + return false + } + try { + const tallyData = JSONFile.read(tallyFile) + return ( + tallyData.maci && + tallyData.maci.toLowerCase() === maciAddress.toLowerCase() + ) + } catch { + // in case the file does not have the expected format/field + return false + } +} + +task('gen-proofs', 'Generate MACI proofs offchain') + .addOptionalParam('clrfund', 'FundingRound contract address') + .addParam('proofDir', 'The proof output directory') + .addOptionalParam('maciTxHash', 'MACI creation transaction hash') + .addOptionalParam( + 'maciStartBlock', + 'MACI creation block', + undefined, + types.int + ) + .addFlag('manageNonce', 'Whether to manually manage transaction nonce') + .addOptionalParam('rapidsnark', 'The rapidsnark prover path') + .addParam('paramsDir', 'The circuit zkeys directory', './params') + .addOptionalParam( + 'blocksPerBatch', + 'The number of blocks per batch of logs to fetch on-chain', + DEFAULT_GET_LOG_BATCH_SIZE, + types.int + ) + .addOptionalParam( + 'numQueueOps', + 'The number of operations for MACI tree merging', + getNumber(DEFAULT_SR_QUEUE_OPS), + types.int + ) + .addOptionalParam('sleep', 'Number of seconds to sleep between log fetch') + .addOptionalParam( + 'quiet', + 'Whether to disable verbose logging', + false, + types.boolean + ) + .setAction( + async ( + { + clrfund, + maciStartBlock, + maciTxHash, + quiet, + proofDir, + paramsDir, + blocksPerBatch, + rapidsnark, + numQueueOps, + sleep, + manageNonce, + }, + hre + ) => { + console.log('Verbose logging enabled:', !quiet) + + const { ethers, network } = hre + const storage = ContractStorage.getInstance() + const subtask = Subtask.getInstance(hre) + subtask.setHre(hre) + + const [coordinatorSigner] = await ethers.getSigners() + if (!coordinatorSigner) { + throw new Error('Env. variable WALLET_PRIVATE_KEY not set') + } + const coordinator = manageNonce + ? new NonceManager(coordinatorSigner) + : coordinatorSigner + console.log('Coordinator address: ', await coordinator.getAddress()) + + const coordinatorMacisk = process.env.COORDINATOR_MACISK + if (!coordinatorMacisk) { + throw new Error('Env. variable COORDINATOR_MACISK not set') + } + + const circuit = + subtask.tryGetConfigField(EContracts.VkRegistry, 'circuit') || + DEFAULT_CIRCUIT + + const circuitDirectory = + subtask.tryGetConfigField( + EContracts.VkRegistry, + 'paramsDirectory' + ) || paramsDir + + await subtask.logStart() + + const clrfundContractAddress = + clrfund ?? storage.mustGetAddress(EContracts.ClrFund, network.name) + const fundingRoundContract = await getCurrentFundingRoundContract( + clrfundContractAddress, + coordinator, + ethers + ) + console.log('Funding round contract', fundingRoundContract.target) + + const pollId = await fundingRoundContract.pollId() + console.log('PollId', pollId) + + const maciAddress = await fundingRoundContract.maci() + await mergeMaciSubtrees({ + maciAddress, + pollId, + numQueueOps, + signer: coordinator, + quiet, + }) + + if (!isPathExist(proofDir)) { + makeDirectory(proofDir) + } + + const tallyFile = getTalyFilePath(proofDir) + const maciStateFile = getMaciStateFilePath(proofDir) + const providerUrl = (network.config as any).url + + if (tallyFileExists(tallyFile, maciAddress)) { + console.log('The tally file has already been generated.') + return + } + + if (!isPathExist(maciStateFile)) { + if (!maciTxHash && maciStartBlock == null) { + throw new Error( + 'Please provide a value for --maci-tx-hash or --maci-start-block' + ) + } + + await genLocalState({ + quiet, + outputPath: maciStateFile, + pollId, + maciContractAddress: maciAddress, + coordinatorPrivateKey: coordinatorMacisk, + ethereumProvider: providerUrl, + transactionHash: maciTxHash, + startBlock: maciStartBlock, + blockPerBatch: blocksPerBatch, + signer: coordinator, + sleep, + }) + } + + const genProofArgs = getGenProofArgs({ + maciAddress, + pollId, + coordinatorMacisk, + rapidsnark, + circuitType: circuit, + circuitDirectory, + outputDir: proofDir, + blocksPerBatch: getNumber(blocksPerBatch), + maciStateFile, + tallyFile, + signer: coordinator, + quiet, + }) + await genProofs(genProofArgs) + + const success = true + await subtask.finish(success) + } + ) diff --git a/contracts/tasks/loadMerkleUsers.ts b/contracts/tasks/runners/loadMerkleUsers.ts similarity index 90% rename from contracts/tasks/loadMerkleUsers.ts rename to contracts/tasks/runners/loadMerkleUsers.ts index ea1eb6179..e26560251 100644 --- a/contracts/tasks/loadMerkleUsers.ts +++ b/contracts/tasks/runners/loadMerkleUsers.ts @@ -1,8 +1,8 @@ import { task, types } from 'hardhat/config' -import { Contract, utils } from 'ethers' +import { Contract, isAddress } from 'ethers' import fs from 'fs' import { StandardMerkleTree } from '@clrfund/common' -import { getIpfsHash } from '../utils/ipfs' +import { getIpfsHash } from '../../utils/ipfs' /* * Load users into the the merkle user registry by generating a merkle tree and @@ -14,7 +14,7 @@ import { getIpfsHash } from '../utils/ipfs' * * Sample usage: * - * yarn hardhat load-merkle-users --address-file addresses.txt --user-registry
--network goerli + * yarn hardhat load-merkle-users --address-file addresses.txt --user-registry
--network */ const MAX_ADDRESSES_SUPPORTED = 10000 @@ -51,7 +51,7 @@ async function loadFile( console.log('Processing addresses...') for (let i = 0; i < addresses.length; i++) { const address = addresses[i] - const isValidAddress = Boolean(address) && utils.isAddress(address) + const isValidAddress = Boolean(address) && isAddress(address) if (isValidAddress) { try { validAddresses.push(address) @@ -97,7 +97,7 @@ async function loadFile( return tx } -task('load-merkle-users', 'Bulkload recipients into the simple user registry') +task('load-merkle-users', 'Bulkload users into the merkle user registry') .addParam('userRegistry', 'The merkle user registry contract address') .addParam( 'addressFile', @@ -117,13 +117,14 @@ task('load-merkle-users', 'Bulkload recipients into the simple user registry') ) .setAction( async ({ userRegistry, addressFile, output, silent }, { ethers }) => { + const [deployer] = await ethers.getSigners() const registry = await ethers.getContractAt( 'MerkleUserRegistry', userRegistry ) console.log('User merkle registry', userRegistry) - console.log('Deployer', await registry.signer.getAddress()) + console.log('Deployer', await deployer.getAddress()) const timeMs = new Date().getTime() const outputFile = output ? output : `./merkle_users_${timeMs}.json` const tx = await loadFile(registry, addressFile, outputFile, silent) diff --git a/contracts/tasks/loadUsers.ts b/contracts/tasks/runners/loadSimpleUsers.ts similarity index 80% rename from contracts/tasks/loadUsers.ts rename to contracts/tasks/runners/loadSimpleUsers.ts index 3a0515d95..d48abbe82 100644 --- a/contracts/tasks/loadUsers.ts +++ b/contracts/tasks/runners/loadSimpleUsers.ts @@ -1,5 +1,5 @@ -import { task } from 'hardhat/config' -import { Contract, utils, ContractReceipt } from 'ethers' +import { task, types } from 'hardhat/config' +import { Contract, ContractTransactionReceipt, isAddress } from 'ethers' import fs from 'fs' /* @@ -9,7 +9,7 @@ import fs from 'fs' * * Sample usage: * - * yarn hardhat load-users --file-path addresses.txt --user-registry
--network goerli + * yarn hardhat load-simple-users --file-path addresses.txt --user-registry
--network */ /** @@ -22,7 +22,7 @@ import fs from 'fs' async function addUser( registry: Contract, address: string -): Promise { +): Promise { const tx = await registry.addUser(address) const receipt = await tx.wait() return receipt @@ -50,14 +50,14 @@ async function loadFile(registry: Contract, filePath: string) { for (let i = 0; i < addresses.length; i++) { const address = addresses[i] - const isValidAddress = Boolean(address) && utils.isAddress(address) + const isValidAddress = Boolean(address) && isAddress(address) if (isValidAddress) { console.log('Adding address', address) try { const result = await addUser(registry, address) if (result.status !== 1) { throw new Error( - `Transaction ${result.transactionHash} failed with status ${result.status}` + `Transaction ${result.hash} failed with status ${result.status}` ) } } catch (err: any) { @@ -67,13 +67,13 @@ async function loadFile(registry: Contract, filePath: string) { console.error('Failed to add address', address, err) } } - } else { + } else if (address) { console.warn('Skipping invalid address', address) } } } -task('load-users', 'Bulkload recipients into the simple user registry') +task('load-simple-users', 'Bulkload users into the simple user registry') .addParam('userRegistry', 'The simple user registry contract address') .addParam( 'filePath', diff --git a/contracts/tasks/runners/maciPubkey.ts b/contracts/tasks/runners/maciPubkey.ts new file mode 100644 index 000000000..c69ff002a --- /dev/null +++ b/contracts/tasks/runners/maciPubkey.ts @@ -0,0 +1,33 @@ +/** + * Print the serialized MACI public key given either the secret key or + * the x and y values of the public key + * + * Usage: hardhat maci-pubkey --macisk + */ +import { id } from 'ethers' +import { task } from 'hardhat/config' +import { PubKey, PrivKey, Keypair } from '@clrfund/common' + +task('maci-pubkey', 'Get the serialized MACI public key') + .addOptionalParam('x', 'MACI public key x') + .addOptionalParam('y', 'MACI public key y') + .addOptionalParam('macisk', 'MACI secret key') + .setAction(async ({ x, y, macisk }) => { + if (macisk) { + const isValid = PrivKey.isValidSerializedPrivKey(macisk) + console.log('isValid', isValid) + const keypair = new Keypair(PrivKey.deserialize(macisk)) + console.log(`Public Key: ${keypair.pubKey.serialize()}`) + console.log(keypair.pubKey.asContractParam()) + } else { + if (!x || !y) { + console.error('Must provide either macisk or x y values') + return + } + const pubKey = new PubKey([BigInt(x), BigInt(y)]) + console.log(`Public Key: ${pubKey.serialize()}`) + + const subgraphId = id(x + '.' + y) + console.log(`Subgraph id: ${subgraphId}`) + } + }) diff --git a/contracts/tasks/mergeAllocations.ts b/contracts/tasks/runners/mergeAllocation.ts similarity index 88% rename from contracts/tasks/mergeAllocations.ts rename to contracts/tasks/runners/mergeAllocation.ts index d6beab4fb..ea38e2178 100644 --- a/contracts/tasks/mergeAllocations.ts +++ b/contracts/tasks/runners/mergeAllocation.ts @@ -8,10 +8,10 @@ */ import { task, types } from 'hardhat/config' -import { utils, BigNumber } from 'ethers' +import { formatUnits, parseUnits } from 'ethers' import fs from 'fs' -import { Project, RoundFileContent, Tally } from '../utils/types' -import { writeToFile } from '../utils/file' +import { Project, RoundFileContent } from '../../utils/types' +import { JSONFile } from '../../utils/JSONFile' const COLUMN_PROJECT_NAME = 0 const COLUMN_RECIPIENT_ADDRESS = 1 @@ -25,6 +25,16 @@ type Allocation = { payoutAmount: string } +// legacy Tally file format +interface Tally { + results: { + tally: string[] + } + totalVoiceCreditsPerVoteOption: { + tally: string[] + } +} + /** * Map null in the array to zero * @param array array to check for null and map nulls to zero @@ -153,7 +163,7 @@ task('merge-allocations', 'Merge the allocations data into the round JSON file') totalVoiceCreditsPerVoteOption: { tally: [] }, } - let totalPayout = BigNumber.from(0) + let totalPayout = BigInt(0) for (let index = 0; index < allocations.length; index++) { const { recipientAddress, projectName, payoutAmount, votes } = allocations[index] @@ -167,13 +177,13 @@ task('merge-allocations', 'Merge the allocations data into the round JSON file') continue } - const allocatedAmountBN = utils.parseUnits(payoutAmount, decimals) + const allocatedAmountBN = parseUnits(payoutAmount, decimals) const allocatedAmount = allocatedAmountBN.toString() const projectKey = makeProjectKey(recipientAddress) if (projects[projectKey]) { projects[projectKey].allocatedAmount = allocatedAmount console.log(index, projectName, '-', payoutAmount) - totalPayout = totalPayout.add(allocatedAmount) + totalPayout = totalPayout + BigInt(allocatedAmount) const { recipientIndex } = projects[projectKey] if (recipientIndex) { @@ -186,12 +196,17 @@ task('merge-allocations', 'Merge the allocations data into the round JSON file') } } - if (roundData && Object.keys(projects).length > 0 && totalPayout.gt(0)) { + if ( + roundData && + Object.keys(projects).length > 0 && + totalPayout > BigInt(0) + ) { roundData.projects = Object.values(projects) - console.log('totalPayout ', utils.formatUnits(totalPayout, decimals)) + console.log('totalPayout ', formatUnits(totalPayout, decimals)) roundData.round.matchingPoolSize = totalPayout.toString() roundData.tally = sanitizeTally(tally) - writeToFile(roundFile, roundData) + JSONFile.write(roundFile, roundData) + console.log('Finished writing to', roundFile) } }) diff --git a/contracts/tasks/runners/newClrFund.ts b/contracts/tasks/runners/newClrFund.ts new file mode 100644 index 000000000..9986ca223 --- /dev/null +++ b/contracts/tasks/runners/newClrFund.ts @@ -0,0 +1,72 @@ +/* eslint-disable no-console */ +/** + * Deploy a new instance of ClrFund + * + * Sample usage: + * yarn hardhat new-clrfund --verify --network + * + * Note: + * 1) Make sure you have deploy-config.json (see deploy-config-example.json). + * 2) Make sure you set environment variable COORDINATOR_MACISK with the coordinator MACI private key + * 3) use --incremental to resume a deployment stopped due to a failure + * 4) use --manage-nonce to manually set nonce; useful on optimism-sepolia + * where `nonce too low` errors occur occasionally + */ +import { task, types } from 'hardhat/config' +import { ContractStorage } from '../helpers/ContractStorage' +import { Subtask } from '../helpers/Subtask' +import { EContracts, type ISubtaskParams } from '../helpers/types' + +task('new-clrfund', 'Deploy a new instance of ClrFund') + .addFlag('incremental', 'Incremental deployment') + .addFlag('strict', 'Fail on warnings') + .addFlag('verify', 'Verify contracts at Etherscan') + .addFlag('manageNonce', 'Manually increment nonce for each transaction') + .addOptionalParam('skip', 'Skip steps with less or equal index', 0, types.int) + .setAction(async (params: ISubtaskParams, hre) => { + const { verify, manageNonce } = params + const subtask = Subtask.getInstance(hre) + const storage = ContractStorage.getInstance() + + subtask.setHre(hre) + const deployer = await subtask.getDeployer() + + if (manageNonce) { + subtask.setNonceManager(deployer) + } + + if (!process.env.COORDINATOR_MACISK) { + throw new Error('Please set environment variable COORDINATOR_MACISK') + } + + let success: boolean + try { + await subtask.start(params) + const steps = await subtask.getDeploySteps( + ['clrfund', 'maci', 'coordinator', 'token', 'user', 'recipient'], + params + ) + + const skip = params.skip || 0 + await subtask.runSteps(steps, skip) + await subtask.checkResults(params.strict) + success = true + } catch (err) { + console.error( + '\n=========================================================\nERROR:', + err, + '\n' + ) + success = false + } + + await subtask.finish(success) + + if (verify) { + const clrfund = storage.getAddress(EContracts.ClrFund, hre.network.name) + if (clrfund) { + console.log('Verify all contracts') + await hre.run('verify-all', { clrfund }) + } + } + }) diff --git a/contracts/tasks/runners/newDeployer.ts b/contracts/tasks/runners/newDeployer.ts new file mode 100644 index 000000000..e0023e9b2 --- /dev/null +++ b/contracts/tasks/runners/newDeployer.ts @@ -0,0 +1,74 @@ +/* eslint-disable no-console */ +/** + * Deploy a new ClrFundDeployer contract + * + * Sample usage: + * yarn hardhat new-deployer --verify --network + * + * Note: + * 1) Make sure you have deploy-config.json (see deploy-config-example.json). + * 2) Make sure you set environment variable COORDINATOR_MACISK with the coordinator MACI private key + * 3) use --incremental to resume a deployment stopped due to a failure + * 4) use --manage-nonce to manually set nonce; useful on optimism-sepolia + * where `nonce too low` errors occur occasionally + */ +import { task, types } from 'hardhat/config' + +import { Subtask } from '../helpers/Subtask' +import { ContractStorage } from '../helpers/ContractStorage' +import { EContracts, type ISubtaskParams } from '../helpers/types' + +task('new-deployer', 'Deploy a new instance of ClrFund') + .addFlag('incremental', 'Incremental deployment') + .addFlag('strict', 'Fail on warnings') + .addFlag('verify', 'Verify contracts at Etherscan') + .addFlag('manageNonce', 'Manually increment nonce for each transaction') + .addOptionalParam('skip', 'Skip steps with less or equal index', 0, types.int) + .setAction(async (params: ISubtaskParams, hre) => { + const { verify, manageNonce } = params + const subtask = Subtask.getInstance(hre) + const storage = ContractStorage.getInstance() + + subtask.setHre(hre) + const deployer = await subtask.getDeployer() + + if (manageNonce) { + subtask.setNonceManager(deployer) + } + + let success: boolean + try { + await subtask.start(params) + const steps = await subtask.getDeploySteps( + ['clrfund', 'deployer', 'maci'], + params + ) + + const skip = params.skip || 0 + + // run all the steps except for the init-clrfund step + await subtask.runSteps( + steps.filter((step) => step.taskName !== 'clrfund:init-clrfund'), + skip + ) + await subtask.checkResults(params.strict) + success = true + } catch (err) { + console.error( + '\n=========================================================\nERROR:', + err, + '\n' + ) + success = false + } + + await subtask.finish(success) + + if (verify) { + const address = storage.mustGetAddress( + EContracts.ClrFundDeployer, + hre.network.name + ) + await hre.run('verify-deployer', { address }) + } + }) diff --git a/contracts/tasks/runners/newMaciKey.ts b/contracts/tasks/runners/newMaciKey.ts new file mode 100644 index 000000000..4132e91e5 --- /dev/null +++ b/contracts/tasks/runners/newMaciKey.ts @@ -0,0 +1,16 @@ +/** + * Create a new MACI key + * + * Sample usage: + * + * yarn hardhat new-maci-key + */ + +import { newMaciPrivateKey } from '../../utils/maci' + +import { task } from 'hardhat/config' + +task('new-maci-key', 'Generate a new MACI key').setAction(async () => { + const privateKey = newMaciPrivateKey() + console.log('MACI private key:', privateKey) +}) diff --git a/contracts/tasks/runners/newRound.ts b/contracts/tasks/runners/newRound.ts new file mode 100644 index 000000000..51ece6374 --- /dev/null +++ b/contracts/tasks/runners/newRound.ts @@ -0,0 +1,95 @@ +/** + * Create a new instance of Funding Round + * + * Sample usage: + * yarn hardhat new-round --round-duration --network + * + * Note: + * 1) Make sure you have deploy-config.json (see deploy-config-example.json). + * 2) Make sure you have deployed-contracts.json created from the new-clrfund task + */ +import { types } from 'hardhat/config' +import { ZERO_ADDRESS } from '../../utils/constants' +import { task } from 'hardhat/config' +import { EContracts } from '../../utils/types' +import { Subtask } from '../helpers/Subtask' +import { ISubtaskParams } from '../helpers/types' +import { ClrFund, FundingRound } from '../../typechain-types' + +task('new-round', 'Deploy a new funding round contract') + .addFlag('verify', 'Verify contracts at Etherscan') + .addFlag('manageNonce', 'Manually increment nonce for each transaction') + .addParam( + 'roundDuration', + 'The duration of the funding round in seconds', + undefined, + types.int + ) + .addOptionalParam('clrfund', 'The ClrFund contract address') + .addOptionalParam('skip', 'Skip steps with less or equal index', 0, types.int) + .setAction(async (params: ISubtaskParams, hre) => { + const { verify, manageNonce, roundDuration, clrfund } = params + const subtask = Subtask.getInstance(hre) + + subtask.setHre(hre) + + if (manageNonce) { + const signer = await subtask.getDeployer() + subtask.setNonceManager(signer) + } + + const deployer = await subtask.getDeployer() + + const clrfundContract = await subtask.getContract({ + name: EContracts.ClrFund, + signer: deployer, + address: clrfund, + }) + + // check if the current round is finalized before starting a new round to avoid revert + const currentRoundAddress = await clrfundContract.getCurrentRound() + if (currentRoundAddress !== ZERO_ADDRESS) { + const currentRound = await subtask.getContract({ + name: EContracts.FundingRound, + address: currentRoundAddress, + }) + const isFinalized = await currentRound.isFinalized() + if (!isFinalized) { + throw new Error( + 'Cannot start a new round as the current round is not finalized' + ) + } + } + + let success: boolean + try { + await subtask.logStart() + const params: ISubtaskParams = { + manageNonce, + verify, + incremental: false, + roundDuration, + clrfund, + } + const steps = await subtask.getDeploySteps(['round'], params) + + const skip = params.skip || 0 + await subtask.runSteps(steps, skip) + await subtask.checkResults(params.strict) + success = true + } catch (err) { + console.error( + '\n=========================================================\nERROR:', + err, + '\n' + ) + success = false + } + + await subtask.finish(success) + + if (verify) { + console.log('Verify all contracts') + await hre.run('verify-all') + } + }) diff --git a/contracts/tasks/runners/proveOnChain.ts b/contracts/tasks/runners/proveOnChain.ts new file mode 100644 index 000000000..af777ed12 --- /dev/null +++ b/contracts/tasks/runners/proveOnChain.ts @@ -0,0 +1,103 @@ +/** + * Prove on chain the MACI proofs generated using genProofs + * + * Make sure to set the following environment variables in the .env file + * 1) WALLET_PRIVATE_KEY or WALLET_MNEMONIC + * - coordinator's wallet private key to interact with contracts + * + * Sample usage: + * + * yarn hardhat prove-on-chain --clrfund --proof-dir --network + * + */ +import { BaseContract, NonceManager } from 'ethers' +import { task, types } from 'hardhat/config' + +import { proveOnChain } from '../../utils/maci' +import { Tally } from '../../typechain-types' +import { HardhatEthersHelpers } from '@nomicfoundation/hardhat-ethers/types' +import { EContracts } from '../../utils/types' +import { Subtask } from '../helpers/Subtask' +import { getCurrentFundingRoundContract } from '../../utils/contracts' +import { ContractStorage } from '../helpers/ContractStorage' + +/** + * Get the message processor contract address from the tally contract + * @param tallyAddress Tally contract address + * @param ethers Hardhat ethers helper + * @returns Message processor contract address + */ +async function getMessageProcessorAddress( + tallyAddress: string, + ethers: HardhatEthersHelpers +): Promise { + const tallyContract = (await ethers.getContractAt( + EContracts.Tally, + tallyAddress + )) as BaseContract as Tally + + const messageProcessorAddress = await tallyContract.messageProcessor() + return messageProcessorAddress +} + +task('prove-on-chain', 'Prove on chain with the MACI proofs') + .addOptionalParam('clrfund', 'ClrFund contract address') + .addParam('proofDir', 'The proof output directory') + .addFlag('manageNonce', 'Whether to manually manage transaction nonce') + .addOptionalParam( + 'quiet', + 'Whether to disable verbose logging', + false, + types.boolean + ) + .setAction(async ({ clrfund, quiet, manageNonce, proofDir }, hre) => { + console.log('Verbose logging enabled:', !quiet) + + const { ethers, network } = hre + const storage = ContractStorage.getInstance() + const subtask = Subtask.getInstance(hre) + subtask.setHre(hre) + + const [coordinatorSigner] = await ethers.getSigners() + if (!coordinatorSigner) { + throw new Error('Env. variable WALLET_PRIVATE_KEY not set') + } + const coordinator = manageNonce + ? new NonceManager(coordinatorSigner) + : coordinatorSigner + console.log('Coordinator address: ', await coordinator.getAddress()) + + await subtask.logStart() + + const clrfundContractAddress = + clrfund ?? storage.mustGetAddress(EContracts.ClrFund, network.name) + const fundingRoundContract = await getCurrentFundingRoundContract( + clrfundContractAddress, + coordinator, + ethers + ) + console.log('Funding round contract', fundingRoundContract.target) + + const pollId = await fundingRoundContract.pollId() + const maciAddress = await fundingRoundContract.maci() + const tallyAddress = await fundingRoundContract.tally() + const messageProcessorAddress = await getMessageProcessorAddress( + tallyAddress, + ethers + ) + + // proveOnChain if not already processed + await proveOnChain({ + pollId, + proofDir, + subsidyEnabled: false, + maciAddress, + messageProcessorAddress, + tallyAddress, + signer: coordinator, + quiet, + }) + + const success = true + await subtask.finish(success) + }) diff --git a/contracts/tasks/runners/publishTallyResults.ts b/contracts/tasks/runners/publishTallyResults.ts new file mode 100644 index 000000000..5651ac353 --- /dev/null +++ b/contracts/tasks/runners/publishTallyResults.ts @@ -0,0 +1,183 @@ +/** + * Script for tallying votes which involves fetching MACI logs, generating proofs, + * and proving on chain + * + * Make sure to set the following environment variables in the .env file + * 1) WALLET_PRIVATE_KEY or WALLET_MNEMONIC + * - coordinator's wallet private key to interact with contracts + * 2) PINATA_API_KEY - The Pinata api key for pinning file to IPFS + * 3) PINATA_SECRET_API_KEY - The Pinata secret api key for pinning file to IPFS + * + * Sample usage: + * + * yarn hardhat publish-tally-results --clrfund + * --proof-dir --network + * + */ +import { BaseContract, getNumber, NonceManager } from 'ethers' +import { task, types } from 'hardhat/config' + +import { Ipfs } from '../../utils/ipfs' +import { JSONFile } from '../../utils/JSONFile' +import { addTallyResultsBatch, TallyData, verify } from '../../utils/maci' +import { FundingRound, Poll } from '../../typechain-types' +import { HardhatEthersHelpers } from '@nomicfoundation/hardhat-ethers/types' +import { EContracts } from '../../utils/types' +import { Subtask } from '../helpers/Subtask' +import { getCurrentFundingRoundContract } from '../../utils/contracts' +import { getTalyFilePath } from '../../utils/misc' +import { ContractStorage } from '../helpers/ContractStorage' +import { PINATA_PINNING_URL } from '../../utils/constants' + +/** + * Publish the tally IPFS hash on chain if it's not already published + * @param fundingRoundContract Funding round contract + * @param tallyHash Tally hash + */ +async function publishTallyHash( + fundingRoundContract: FundingRound, + tallyHash: string +) { + console.log(`Tally hash is ${tallyHash}`) + + const tallyHashOnChain = await fundingRoundContract.tallyHash() + if (tallyHashOnChain !== tallyHash) { + const tx = await fundingRoundContract.publishTallyHash(tallyHash) + const receipt = await tx.wait() + if (receipt?.status !== 1) { + throw new Error('Failed to publish tally hash on chain') + } + + console.log('Published tally hash on chain') + } +} +/** + * Submit tally data to funding round contract + * @param fundingRoundContract Funding round contract + * @param batchSize Number of tally results per batch + * @param tallyData Tally file content + */ +async function submitTallyResults( + fundingRoundContract: FundingRound, + recipientTreeDepth: number, + tallyData: TallyData, + batchSize: number +) { + const startIndex = await fundingRoundContract.totalTallyResults() + const total = tallyData.results.tally.length + if (startIndex < total) { + console.log('Uploading tally results in batches of', batchSize) + } + const addTallyGas = await addTallyResultsBatch( + fundingRoundContract, + recipientTreeDepth, + tallyData, + getNumber(batchSize), + getNumber(startIndex), + (processed: number) => { + console.log(`Processed ${processed} / ${total}`) + } + ) + console.log('Tally results uploaded. Gas used:', addTallyGas.toString()) +} + +/** + * Get the recipient tree depth (aka vote option tree depth) + * @param fundingRoundContract Funding round conract + * @param ethers Hardhat Ethers Helper + * @returns Recipient tree depth + */ +async function getRecipientTreeDepth( + fundingRoundContract: FundingRound, + ethers: HardhatEthersHelpers +): Promise { + const pollAddress = await fundingRoundContract.poll() + const pollContract = await ethers.getContractAt(EContracts.Poll, pollAddress) + const treeDepths = await (pollContract as BaseContract as Poll).treeDepths() + const voteOptionTreeDepth = treeDepths.voteOptionTreeDepth + return getNumber(voteOptionTreeDepth) +} + +task('publish-tally-results', 'Publish tally results') + .addOptionalParam('clrfund', 'ClrFund contract address') + .addParam('proofDir', 'The proof output directory') + .addOptionalParam( + 'batchSize', + 'The batch size to upload tally result on-chain', + 8, + types.int + ) + .addFlag('manageNonce', 'Whether to manually manage transaction nonce') + .addFlag('quiet', 'Whether to log on the console') + .setAction( + async ({ clrfund, proofDir, batchSize, manageNonce, quiet }, hre) => { + const { ethers, network } = hre + const storage = ContractStorage.getInstance() + const subtask = Subtask.getInstance(hre) + subtask.setHre(hre) + + const [signer] = await ethers.getSigners() + if (!signer) { + throw new Error('Env. variable WALLET_PRIVATE_KEY not set') + } + const coordinator = manageNonce ? new NonceManager(signer) : signer + console.log('Coordinator address: ', await coordinator.getAddress()) + + const apiKey = process.env.PINATA_API_KEY + if (!apiKey) { + throw new Error('Env. variable PINATA_API_KEY not set') + } + + const secretApiKey = process.env.PINATA_SECRET_API_KEY + if (!secretApiKey) { + throw new Error('Env. variable PINATA_SECRET_API_KEY not set') + } + + await subtask.logStart() + + const clrfundContractAddress = + clrfund ?? storage.mustGetAddress(EContracts.ClrFund, network.name) + const fundingRoundContract = await getCurrentFundingRoundContract( + clrfundContractAddress, + coordinator, + ethers + ) + console.log('Funding round contract', fundingRoundContract.target) + + const recipientTreeDepth = await getRecipientTreeDepth( + fundingRoundContract, + ethers + ) + + const tallyFile = getTalyFilePath(proofDir) + const tallyData = JSONFile.read(tallyFile) + const tallyAddress = await fundingRoundContract.tally() + + await verify({ + pollId: BigInt(tallyData.pollId), + subsidyEnabled: false, + tallyData, + maciAddress: tallyData.maci, + tallyAddress, + signer: coordinator, + quiet, + }) + + const tallyHash = await Ipfs.pinFile(tallyFile, apiKey, secretApiKey) + + // Publish tally hash if it is not already published + await publishTallyHash(fundingRoundContract, tallyHash) + + // Submit tally results to the funding round contract + // This function can be re-run from where it left off + await submitTallyResults( + fundingRoundContract, + recipientTreeDepth, + tallyData, + batchSize + ) + + const success = true + await subtask.finish(success) + } + ) diff --git a/contracts/tasks/runners/resetTally.ts b/contracts/tasks/runners/resetTally.ts new file mode 100644 index 000000000..adc9ebb4e --- /dev/null +++ b/contracts/tasks/runners/resetTally.ts @@ -0,0 +1,53 @@ +/** + * WARNING: + * This script will create a new instance of the tally contract in the funding round contract + * + * Usage: + * hardhat resetTally --funding-round --network + * + * Note: + * 1) This script needs to be run by the coordinator + * 2) It can only be run if the funding round hasn't been finalized + */ +import { task } from 'hardhat/config' +import { getCurrentFundingRoundContract } from '../../utils/contracts' +import { Subtask } from '../helpers/Subtask' + +task('reset-tally', 'Reset the tally contract') + .addParam('clrfund', 'The clrfund contract address') + .setAction(async ({ clrfund }, hre) => { + const subtask = Subtask.getInstance(hre) + subtask.setHre(hre) + + let success = false + try { + await subtask.logStart() + + const [coordinator] = await hre.ethers.getSigners() + console.log('Coordinator address: ', await coordinator.getAddress()) + + const fundingRoundContract = await getCurrentFundingRoundContract( + clrfund, + coordinator, + hre.ethers + ) + + const tx = await fundingRoundContract.resetTally() + const receipt = await tx.wait() + if (receipt?.status !== 1) { + throw new Error('Failed to reset the tally contract') + } + + subtask.logTransaction(tx) + success = true + } catch (err) { + console.error( + '\n=========================================================\nERROR:', + err, + '\n' + ) + success = false + } + + await subtask.finish(success) + }) diff --git a/contracts/tasks/runners/setCoordinator.ts b/contracts/tasks/runners/setCoordinator.ts new file mode 100644 index 000000000..10408dd6d --- /dev/null +++ b/contracts/tasks/runners/setCoordinator.ts @@ -0,0 +1,48 @@ +/** + * Set the coordinator in clrfund + * + * Usage: + * hardhat set-coordinator --network + * + * Note: + * 1) The script will use the signer address as the coordinator address if + * it is not configured in the clrfund.coordinator field in the deploy-config.json file (see deploy-config-example.json). + * 2) Use --clrfund to specify the clrfund address if you do not have the deployed-contracts.json file + * 3) Make sure that the COORDINATOR_MACISK (the coordinator's MACI private key) is set in the .env file + */ +import { task } from 'hardhat/config' +import { Subtask } from '../helpers/Subtask' +import { ISubtaskParams } from '../helpers/types' + +task('set-coordinator', 'Set the Clrfund coordinator') + .addOptionalParam('clrfund', 'The ClrFund contract address') + .setAction(async ({ clrfund }, hre) => { + const subtask = Subtask.getInstance(hre) + subtask.setHre(hre) + + let success: boolean + try { + await subtask.logStart() + + // set incremental to avoid resetting contract de + const params: ISubtaskParams = { + verify: false, + incremental: false, + clrfund, + } + const steps = await subtask.getDeploySteps(['coordinator'], params) + + const skip = 0 + await subtask.runSteps(steps, skip) + success = true + } catch (err) { + console.error( + '\n=========================================================\nERROR:', + err, + '\n' + ) + success = false + } + + await subtask.finish(success) + }) diff --git a/contracts/tasks/runners/setMaciParameters.ts b/contracts/tasks/runners/setMaciParameters.ts new file mode 100644 index 000000000..88a1ac745 --- /dev/null +++ b/contracts/tasks/runners/setMaciParameters.ts @@ -0,0 +1,52 @@ +/** + * Set the zkeys parameters in the MACI factory + * + * Sample usage: + * + * yarn hardhat set-maci-params --network + * + * Make sure you have deploy-config.json (see deploy-config-example.json). + */ + +import { task, types } from 'hardhat/config' +import { Subtask } from '../helpers/Subtask' +import { type ISubtaskParams } from '../helpers/types' + +task('set-maci-params', 'Set the MACI parameters') + .addFlag('incremental', 'Incremental deployment') + .addFlag('strict', 'Fail on warnings') + .addFlag('verify', 'Verify contracts at Etherscan') + .addFlag('manageNonce', 'Manually increment nonce for each transaction') + .addOptionalParam('skip', 'Skip steps with less or equal index', 0, types.int) + .setAction(async (params: ISubtaskParams, hre) => { + const { manageNonce } = params + const subtask = Subtask.getInstance(hre) + + subtask.setHre(hre) + const deployer = await subtask.getDeployer() + + if (manageNonce) { + subtask.setNonceManager(deployer) + } + + let success: boolean + try { + await subtask.logStart() + const steps = await subtask.getDeploySteps(['maciParams'], params) + + const skip = params.skip || 0 + + console.log('steps', steps) + await subtask.runSteps(steps, skip) + success = true + } catch (err) { + console.error( + '\n=========================================================\nERROR:', + err, + '\n' + ) + success = false + } + + await subtask.finish(success) + }) diff --git a/contracts/tasks/runners/setRecipientRegistry.ts b/contracts/tasks/runners/setRecipientRegistry.ts new file mode 100644 index 000000000..69f4b1412 --- /dev/null +++ b/contracts/tasks/runners/setRecipientRegistry.ts @@ -0,0 +1,63 @@ +/* eslint-disable no-console */ +/** + * Set the recipient registry in the ClrFund contract. It will create + * the recipient registry contract if it is not deployed and recorded in the + * deployed-contract.json file + * + * Sample usage: + * yarn hardhat set-recipient-registry --verify --network + * + * Note: + * 1) use --incremental to resume a previously interrupted deployment + * 2) use --manage-nonce to manually set the nonce. This is useful on the optimism-sepolia + * public node where `nonce too low` errors occur occasionally + * 3) use --clrfund to provide the clrfund address if you do not have the deployed-contracts.json file + * 4) Make sure you have the deploy-config.json file (see deploy-config-example.json). + */ +import { task, types } from 'hardhat/config' + +import { Subtask } from '../helpers/Subtask' +import { type ISubtaskParams } from '../helpers/types' + +task('set-recipient-registry', 'Set recipient registry in ClrFund') + .addFlag('incremental', 'Incremental deployment') + .addFlag('strict', 'Fail on warnings') + .addFlag('verify', 'Verify contracts at Etherscan') + .addFlag('manageNonce', 'Manually increment nonce for each transaction') + .addOptionalParam('clrfund', 'The ClrFund contract address') + .setAction(async (params: ISubtaskParams, hre) => { + const { verify, manageNonce } = params + const subtask = Subtask.getInstance(hre) + + subtask.setHre(hre) + const deployer = await subtask.getDeployer() + + if (manageNonce) { + subtask.setNonceManager(deployer) + } + + let success: boolean + try { + await subtask.logStart() + const steps = await subtask.getDeploySteps(['recipient'], params) + + const skip = params.skip || 0 + await subtask.runSteps(steps, skip) + await subtask.checkResults(params.strict) + success = true + } catch (err) { + console.error( + '\n=========================================================\nERROR:', + err, + '\n' + ) + success = false + } + + await subtask.finish(success) + + if (verify) { + console.log('Verify all contracts') + await hre.run('verify-all') + } + }) diff --git a/contracts/tasks/setStorageRoot.ts b/contracts/tasks/runners/setStorageRoot.ts similarity index 87% rename from contracts/tasks/setStorageRoot.ts rename to contracts/tasks/runners/setStorageRoot.ts index adc537dc5..3ed3d84ae 100644 --- a/contracts/tasks/setStorageRoot.ts +++ b/contracts/tasks/runners/setStorageRoot.ts @@ -1,14 +1,14 @@ /** * This script set the storage root in the snapshot user registry * - * Usage: hardhat set-storage-root --registry --slot --token --block --network arbitrum-goerli + * Usage: hardhat set-storage-root --registry --slot --token --block --network * * Note: get the slot number using the `find-storage-slot` task */ import { task, types } from 'hardhat/config' import { getBlock, getAccountProof, rlpEncodeProof } from '@clrfund/common' -import { providers } from 'ethers' +import { JsonRpcProvider } from 'ethers' task('set-storage-root', 'Set the storage root in the snapshot user registry') .addParam('registry', 'The snapshot user registry contract address') @@ -26,9 +26,9 @@ task('set-storage-root', 'Set the storage root in the snapshot user registry') registry ) - const blockInfo = await getBlock(block, ethers.provider) const providerUrl = (network.config as any).url - const jsonRpcProvider = new providers.JsonRpcProvider(providerUrl) + const jsonRpcProvider = new JsonRpcProvider(providerUrl) + const blockInfo = await getBlock(block, jsonRpcProvider) const proof = await getAccountProof(token, blockInfo.hash, jsonRpcProvider) const accountProofRlp = rlpEncodeProof(proof.accountProof) const tx = await userRegistry.setStorageRoot( diff --git a/contracts/tasks/runners/setToken.ts b/contracts/tasks/runners/setToken.ts new file mode 100644 index 000000000..348aac137 --- /dev/null +++ b/contracts/tasks/runners/setToken.ts @@ -0,0 +1,55 @@ +/** + * Set the native token in the ClrFund contract, create a test token + * if a token address is not configured in the ClrFund.token field in + * the deploy-config.json file + * + * Sample usage: + * yarn hardhat set-token --network + * + * Notes: + * 1) Make sure you have the deploy-config.json file (see deploy-config-example.json). + * 2) Use --clrfund
to provide the clrfund address if deployed-contracts.json does not exist + */ + +import { task, types } from 'hardhat/config' +import { Subtask } from '../helpers/Subtask' +import { type ISubtaskParams } from '../helpers/types' + +task('set-token', 'Set the token in ClrFund') + .addFlag('incremental', 'Incremental deployment') + .addFlag('strict', 'Fail on warnings') + .addFlag('manageNonce', 'Manually increment nonce for each transaction') + .addOptionalParam('clrfund', 'The ClrFund contract address') + .addOptionalParam('skip', 'Skip steps with less or equal index', 0, types.int) + .setAction(async (params: ISubtaskParams, hre) => { + const { manageNonce } = params + const subtask = Subtask.getInstance(hre) + + subtask.setHre(hre) + const deployer = await subtask.getDeployer() + + if (manageNonce) { + subtask.setNonceManager(deployer) + } + + let success: boolean + try { + await subtask.logStart() + const steps = await subtask.getDeploySteps(['token'], params) + + const skip = params.skip || 0 + + await subtask.runSteps(steps, skip) + await subtask.checkResults(params.strict) + success = true + } catch (err) { + console.error( + '\n=========================================================\nERROR:', + err, + '\n' + ) + success = false + } + + await subtask.finish(success) + }) diff --git a/contracts/tasks/runners/setUserRegistry.ts b/contracts/tasks/runners/setUserRegistry.ts new file mode 100644 index 000000000..c8f9487a5 --- /dev/null +++ b/contracts/tasks/runners/setUserRegistry.ts @@ -0,0 +1,62 @@ +/** + * Set the user registry in the ClrFund contract. It will create the user registry + * contract if it is not deployed and found in the deployed-contracts.json file. + * + * Sample usage: + * + * yarn hardhat set-user-registry --verify --network + * + * Note: + * 1) Make sure you have the deploy-config.json (see deploy-config-example.json). + * 2) Use --clrfund to specify clrfund address if you don't have the deployed-contracts.json + * + */ + +import { task, types } from 'hardhat/config' + +import { Subtask } from '../helpers/Subtask' +import { type ISubtaskParams } from '../helpers/types' + +task('set-user-registry', 'Set the user registry in ClrFund') + .addFlag('incremental', 'Incremental deployment') + .addFlag('strict', 'Fail on warnings') + .addFlag('verify', 'Verify contracts at Etherscan') + .addFlag('manageNonce', 'Manually increment nonce for each transaction') + .addOptionalParam('skip', 'Skip steps with less or equal index', 0, types.int) + .addOptionalParam('clrfund', 'The ClrFund contract address') + .setAction(async (params: ISubtaskParams, hre) => { + const { verify, manageNonce } = params + const subtask = Subtask.getInstance(hre) + + subtask.setHre(hre) + const deployer = await subtask.getDeployer() + + if (manageNonce) { + subtask.setNonceManager(deployer) + } + + let success: boolean + try { + await subtask.logStart() + const steps = await subtask.getDeploySteps(['user'], params) + + const skip = params.skip || 0 + await subtask.runSteps(steps, skip) + await subtask.checkResults(params.strict) + success = true + } catch (err) { + console.error( + '\n=========================================================\nERROR:', + err, + '\n' + ) + success = false + } + + await subtask.finish(success) + + if (verify) { + console.log('Verify all contracts') + await hre.run('verify-all') + } + }) diff --git a/contracts/tasks/runners/tally.ts b/contracts/tasks/runners/tally.ts new file mode 100644 index 000000000..94482b679 --- /dev/null +++ b/contracts/tasks/runners/tally.ts @@ -0,0 +1,149 @@ +/** + * Script for tallying votes which involves fetching MACI logs, generating proofs, + * proving on chain, and uploading tally results on chain + * + * Sample usage: + * yarn hardhat tally --clrfund --maci-tx-hash --network + * + * This script can be re-run with the same input parameters + */ +import { getNumber } from 'ethers' +import { task, types } from 'hardhat/config' +import { ClrFund } from '../../typechain-types' + +import { + DEFAULT_SR_QUEUE_OPS, + DEFAULT_GET_LOG_BATCH_SIZE, +} from '../../utils/constants' +import { getProofDirForRound } from '../../utils/misc' +import { EContracts } from '../../utils/types' +import { ContractStorage } from '../helpers/ContractStorage' +import { Subtask } from '../helpers/Subtask' + +task('tally', 'Tally votes') + .addOptionalParam('clrfund', 'ClrFund contract address') + .addOptionalParam('maciTxHash', 'MACI creation transaction hash') + .addOptionalParam( + 'maciStartBlock', + 'MACI creation block', + undefined, + types.int + ) + .addFlag('manageNonce', 'Whether to manually manage transaction nonce') + .addOptionalParam( + 'batchSize', + 'The batch size to upload tally result on-chain', + 8, + types.int + ) + .addParam('proofDir', 'The proof output directory', './proof_output') + .addParam('paramsDir', 'The circuit zkeys directory', './params') + .addOptionalParam('rapidsnark', 'The rapidsnark prover path') + .addOptionalParam( + 'numQueueOps', + 'The number of operations for MACI tree merging', + getNumber(DEFAULT_SR_QUEUE_OPS), + types.int + ) + .addOptionalParam( + 'blocksPerBatch', + 'The number of blocks per batch of logs to fetch on-chain', + DEFAULT_GET_LOG_BATCH_SIZE, + types.int + ) + .addOptionalParam('sleep', 'Number of seconds to sleep between log fetch') + .addOptionalParam( + 'quiet', + 'Whether to disable verbose logging', + false, + types.boolean + ) + .setAction( + async ( + { + clrfund, + maciTxHash, + maciStartBlock, + quiet, + proofDir, + paramsDir, + numQueueOps, + blocksPerBatch, + rapidsnark, + sleep, + batchSize, + manageNonce, + }, + hre + ) => { + console.log('Verbose logging enabled:', !quiet) + + const apiKey = process.env.PINATA_API_KEY + if (!apiKey) { + throw new Error('Env. variable PINATA_API_KEY not set') + } + + const secretApiKey = process.env.PINATA_SECRET_API_KEY + if (!secretApiKey) { + throw new Error('Env. variable PINATA_SECRET_API_KEY not set') + } + + const storage = ContractStorage.getInstance() + const subtask = Subtask.getInstance(hre) + subtask.setHre(hre) + + await subtask.logStart() + + const clrfundContractAddress = + clrfund ?? storage.mustGetAddress(EContracts.ClrFund, hre.network.name) + + const clrfundContract = subtask.getContract({ + name: EContracts.ClrFund, + address: clrfundContractAddress, + }) + + const fundingRoundContractAddress = await ( + await clrfundContract + ).getCurrentRound() + + const outputDir = getProofDirForRound( + proofDir, + hre.network.name, + fundingRoundContractAddress + ) + + await hre.run('gen-proofs', { + clrfund: clrfundContractAddress, + maciStartBlock, + maciTxHash, + numQueueOps, + blocksPerBatch, + rapidsnark, + sleep, + proofDir: outputDir, + paramsDir, + manageNonce, + quiet, + }) + + // proveOnChain if not already processed + await hre.run('prove-on-chain', { + clrfund: clrfundContractAddress, + proofDir: outputDir, + manageNonce, + quiet, + }) + + // Publish tally hash if it is not already published + await hre.run('publish-tally-results', { + clrfund: clrfundContractAddress, + proofDir: outputDir, + batchSize, + manageNonce, + quiet, + }) + + const success = true + await subtask.finish(success) + } + ) diff --git a/contracts/tasks/runners/timeTravel.ts b/contracts/tasks/runners/timeTravel.ts new file mode 100644 index 000000000..f8f6ab225 --- /dev/null +++ b/contracts/tasks/runners/timeTravel.ts @@ -0,0 +1,15 @@ +/** + * Travel to block timestamp in seconds, for testing + * + * Sample usage: + * yarn hardhat time-travel --seconds --network + */ + +import { time } from '@nomicfoundation/hardhat-network-helpers' +import { task, types } from 'hardhat/config' + +task('time-travel', 'Travel to block timestamp in seconds') + .addParam('seconds', 'The number of seconds to travel', undefined, types.int) + .setAction(async ({ seconds }) => { + await time.increase(seconds) + }) diff --git a/contracts/tasks/runners/verifyAll.ts b/contracts/tasks/runners/verifyAll.ts new file mode 100644 index 000000000..c010df8ff --- /dev/null +++ b/contracts/tasks/runners/verifyAll.ts @@ -0,0 +1,333 @@ +/* eslint-disable no-console */ +import { task } from 'hardhat/config' + +import { EContracts } from '../helpers/types' + +import { ContractStorage } from '../helpers/ContractStorage' +import { ContractVerifier } from '../helpers/ContractVerifier' +import { + BrightIdUserRegistry, + ClrFund, + MerkleUserRegistry, + SemaphoreUserRegistry, + SnapshotUserRegistry, +} from '../../typechain-types' +import { BaseContract } from 'ethers' +import { HardhatEthersHelpers } from '@nomicfoundation/hardhat-ethers/types' +import { ZERO_ADDRESS } from '../../utils/constants' +import { ConstructorArguments } from '../helpers/ConstructorArguments' + +type ContractInfo = { + name: string + address: string +} + +type VerificationSummary = { + contract: string + ok: boolean + err?: string +} + +/** + * Get the recipient registry contract name + * @param registryAddress The recipient registry contract address + * @param ethers The Hardhat Ethers helper + * @returns The recipient registry contract name + */ +async function getRecipientRegistryName( + registryAddress: string, + ethers: HardhatEthersHelpers +): Promise { + try { + const contract = await ethers.getContractAt( + EContracts.KlerosGTCRAdapter, + registryAddress + ) + const tcr = await contract.tcr() + if (tcr === ZERO_ADDRESS) { + throw new Error( + 'Unexpected zero tcr from a Kleros recipient registry: ' + + registryAddress + ) + } + return EContracts.KlerosGTCRAdapter + } catch { + // not a kleros registry + } + + // try optimistic + const contract = await ethers.getContractAt( + EContracts.OptimisticRecipientRegistry, + registryAddress + ) + + try { + await contract.challengePeriodDuration() + return EContracts.OptimisticRecipientRegistry + } catch { + // not optimistic, use simple registry + return EContracts.SimpleRecipientRegistry + } +} + +/** + * Get the user registry contract name + * @param registryAddress The user registry contract address + * @param ethers The Hardhat Ethers helper + * @returns The user registry contract name + */ +async function getUserRegistryName( + registryAddress: string, + ethers: HardhatEthersHelpers +): Promise { + try { + const contract = (await ethers.getContractAt( + EContracts.BrightIdUserRegistry, + registryAddress + )) as BaseContract as BrightIdUserRegistry + await contract.context() + return EContracts.BrightIdUserRegistry + } catch { + // not a BrightId user registry + } + + // try semaphore user registry + try { + const contract = (await ethers.getContractAt( + EContracts.SemaphoreUserRegistry, + registryAddress + )) as BaseContract as SemaphoreUserRegistry + await contract.isVerifiedSemaphoreId(1) + return EContracts.SemaphoreUserRegistry + } catch { + // not a semaphore user registry + } + + // try snapshot user regitry + try { + const contract = (await ethers.getContractAt( + EContracts.SnapshotUserRegistry, + registryAddress + )) as BaseContract as SnapshotUserRegistry + await contract.storageRoot() + } catch { + // not snapshot user registry + } + + // try merkle user regitry + try { + const contract = (await ethers.getContractAt( + EContracts.MerkleUserRegistry, + registryAddress + )) as BaseContract as MerkleUserRegistry + await contract.merkleRoot() + } catch { + // not merkle user registry + } + + return EContracts.SimpleUserRegistry +} + +/** + * Get the list of contracts to verify + * @param clrfund The ClrFund contract address + * @param ethers The Hardhat Ethers helper + * @returns The list of contracts to verify + */ +async function getContractList( + clrfund: string, + ethers: HardhatEthersHelpers +): Promise { + const contractList: ContractInfo[] = [ + { + name: EContracts.ClrFund, + address: clrfund, + }, + ] + + const clrfundContract = (await ethers.getContractAt( + EContracts.ClrFund, + clrfund + )) as BaseContract as ClrFund + + const fundingRoundFactoryAddress = await clrfundContract.roundFactory() + if (fundingRoundFactoryAddress !== ZERO_ADDRESS) { + contractList.push({ + name: EContracts.FundingRoundFactory, + address: fundingRoundFactoryAddress, + }) + } + + const maciFactoryAddress = await clrfundContract.maciFactory() + if (maciFactoryAddress !== ZERO_ADDRESS) { + contractList.push({ + name: EContracts.MACIFactory, + address: maciFactoryAddress, + }) + + const maciFactory = await ethers.getContractAt( + EContracts.MACIFactory, + maciFactoryAddress + ) + const vkRegistryAddress = await maciFactory.vkRegistry() + contractList.push({ + name: EContracts.VkRegistry, + address: vkRegistryAddress, + }) + + const factories = await maciFactory.factories() + contractList.push({ + name: EContracts.PollFactory, + address: factories.pollFactory, + }) + + contractList.push({ + name: EContracts.TallyFactory, + address: factories.tallyFactory, + }) + + contractList.push({ + name: EContracts.MessageProcessorFactory, + address: factories.messageProcessorFactory, + }) + } + + const fundingRoundAddress = await clrfundContract.getCurrentRound() + if (fundingRoundAddress !== ZERO_ADDRESS) { + contractList.push({ + name: EContracts.FundingRound, + address: fundingRoundAddress, + }) + + const fundingRound = await ethers.getContractAt( + EContracts.FundingRound, + fundingRoundAddress + ) + + const maciAddress = await fundingRound.maci() + if (maciAddress !== ZERO_ADDRESS) { + contractList.push({ + name: EContracts.MACI, + address: maciAddress, + }) + } + + // Poll + const pollAddress = await fundingRound.poll() + if (pollAddress !== ZERO_ADDRESS) { + contractList.push({ + name: EContracts.Poll, + address: pollAddress, + }) + } + + // Tally + const tallyAddress = await fundingRound.tally() + if (tallyAddress !== ZERO_ADDRESS) { + contractList.push({ + name: EContracts.Tally, + address: tallyAddress, + }) + + // Verifier + const tallyContract = await ethers.getContractAt( + EContracts.Tally, + tallyAddress + ) + const verifierAddress = await tallyContract.verifier() + if (verifierAddress !== ZERO_ADDRESS) { + contractList.push({ + name: EContracts.Verifier, + address: verifierAddress, + }) + } + + // MessageProcessor + const messageProcessorAddress = await tallyContract.messageProcessor() + if (messageProcessorAddress !== ZERO_ADDRESS) { + contractList.push({ + name: EContracts.MessageProcessor, + address: messageProcessorAddress, + }) + } + } + + // User Registry + const userRegistryAddress = await fundingRound.userRegistry() + if (userRegistryAddress !== ZERO_ADDRESS) { + const name = await getUserRegistryName(userRegistryAddress, ethers) + contractList.push({ + name, + address: userRegistryAddress, + }) + } + + // Recipient Registry + const recipientRegistryAddress = await fundingRound.recipientRegistry() + if (recipientRegistryAddress !== ZERO_ADDRESS) { + const name = await getRecipientRegistryName( + recipientRegistryAddress, + ethers + ) + contractList.push({ + name, + address: recipientRegistryAddress, + }) + } + } + + return contractList +} + +/** + * Main verification task which runs hardhat-etherscan task for all the deployed contract. + */ +task('verify-all', 'Verify contracts listed in storage') + .addOptionalParam('clrfund', 'The ClrFund contract address') + .addFlag('force', 'Ignore verified status') + .setAction(async ({ clrfund }, hre) => { + const { ethers, config, network } = hre + + const storage = ContractStorage.getInstance() + const clrfundContractAddress = + clrfund ?? storage.mustGetAddress(EContracts.ClrFund, network.name) + + const contractList = await getContractList(clrfundContractAddress, ethers) + const constructorArguments = new ConstructorArguments(hre) + const verifier = new ContractVerifier(hre) + const summary: VerificationSummary[] = [] + + for (let i = 0; i < contractList.length; i += 1) { + const { name, address } = contractList[i] + + try { + const args = await constructorArguments.get(name, address, ethers) + let contract: string | undefined + let libraries: string | undefined + const [ok, err] = await verifier.verify( + address, + args, + libraries, + contract + ) + + summary.push({ contract: `${address} ${name}`, ok, err }) + } catch (e) { + // error getting the constructors, skipping + summary.push({ + contract: `${address} ${name}`, + ok: false, + err: 'Failed to get constructor. ' + (e as Error).message, + }) + } + } + + summary.forEach(({ contract, ok, err }, i) => { + const color = ok ? '32' : '31' + console.log( + `${i + 1} ${contract}: \x1b[%sm%s\x1b[0m`, + color, + ok ? 'ok' : err + ) + }) + }) diff --git a/contracts/tasks/runners/verifyDeployer.ts b/contracts/tasks/runners/verifyDeployer.ts new file mode 100644 index 000000000..284689063 --- /dev/null +++ b/contracts/tasks/runners/verifyDeployer.ts @@ -0,0 +1,33 @@ +import { task } from 'hardhat/config' +import { EContracts } from '../../utils/types' +import { ContractVerifier } from '../helpers/ContractVerifier' +import { ConstructorArguments } from '../helpers/ConstructorArguments' + +/** + * Verifies the ClrFundDeployer contract + * - it constructs the constructor arguments by querying the ClrFundDeployer contract + * - it calls the etherscan hardhat plugin to verify the contract + */ +task('verify-deployer', 'Verify a ClrFundDeployer contract') + .addParam('address', 'ClrFundDeployer contract address') + .setAction(async ({ address }, hre) => { + const contractVerifier = new ContractVerifier(hre) + const getter = new ConstructorArguments(hre) + + const name = EContracts.ClrFundDeployer + const constructorArgument = await getter.get( + EContracts.ClrFundDeployer, + address, + hre.ethers + ) + const [ok, err] = await contractVerifier.verify( + address, + constructorArgument + ) + + console.log( + `${address} ${name}: \x1b[%sm%s\x1b[0m`, + ok ? 32 : 31, + ok ? 'ok' : err + ) + }) diff --git a/contracts/tasks/runners/verifyTallyFile.ts b/contracts/tasks/runners/verifyTallyFile.ts new file mode 100644 index 000000000..381f3f806 --- /dev/null +++ b/contracts/tasks/runners/verifyTallyFile.ts @@ -0,0 +1,37 @@ +/** + * Verify the content of a tally file + * + * Usage: + * hardhat verify-tally-file --tally-file --network + */ +import { task } from 'hardhat/config' +import { JSONFile } from '../../utils/JSONFile' +import { verify } from '../../utils/maci' +import { ContractStorage } from '../helpers/ContractStorage' +import { EContracts } from '../helpers/types' + +const storage = ContractStorage.getInstance() + +task('verify-tally-file', 'Verify the content of a tally file') + .addParam('tallyFile', 'The tally file path') + .addOptionalParam('tallyAddress', 'The tally contract address') + .addFlag('quiet', 'Whether to log on the console') + .setAction(async ({ quiet, tallyFile, tallyAddress }, hre) => { + const [signer] = await hre.ethers.getSigners() + const tallyData = JSONFile.read(tallyFile) + + // get the tally contract address from contract storage because the tally file is missing it + const tallyContractAddress = + tallyAddress ?? + (await storage.mustGetAddress(EContracts.Tally, hre.network.name)) + + await verify({ + pollId: tallyData.pollId, + subsidyEnabled: false, + tallyData, + maciAddress: tallyData.maci, + tallyAddress: tallyContractAddress, + signer, + quiet, + }) + }) diff --git a/contracts/tasks/setDurations.ts b/contracts/tasks/setDurations.ts deleted file mode 100644 index 29567f812..000000000 --- a/contracts/tasks/setDurations.ts +++ /dev/null @@ -1,34 +0,0 @@ -import { task, types } from 'hardhat/config' -import { MaciParameters } from '../utils/maci' - -task('set-durations', 'Set the signup and voting durations for future rounds') - .addParam('factory', 'The funding round factory contract address') - .addParam('signup', 'Sign up duration in minutes', 60, types.int) - .addParam('voting', 'Voting duration in minutes', 10, types.int) - .setAction(async ({ factory, signup, voting }, { ethers }) => { - const signUpDuration = signup * 60 - const votingDuration = voting * 60 - - const fundingRoundFactory = await ethers.getContractAt( - 'FundingRoundFactory', - factory - ) - - const maciFactoryAddress = await fundingRoundFactory.maciFactory() - const maciFactory = await ethers.getContractAt( - 'MACIFactory', - maciFactoryAddress - ) - const maciParameters = await MaciParameters.read(maciFactory) - maciParameters.update({ - signUpDuration, - votingDuration, - }) - const setMaciParametersTx = await fundingRoundFactory.setMaciParameters( - ...maciParameters.values() - ) - await setMaciParametersTx.wait() - - const newParams = await MaciParameters.read(maciFactory) - console.log('New durations set', newParams) - }) diff --git a/contracts/tasks/subtasks/clrfund/01-poseidon.ts b/contracts/tasks/subtasks/clrfund/01-poseidon.ts new file mode 100644 index 000000000..96455dffd --- /dev/null +++ b/contracts/tasks/subtasks/clrfund/01-poseidon.ts @@ -0,0 +1,55 @@ +import { ContractStorage } from '../../helpers/ContractStorage' +import { Subtask } from '../../helpers/Subtask' +import { ISubtaskParams } from '../../helpers/types' +import { EContracts } from '../../../utils/types' +import { Signer } from 'ethers' + +const subtask = Subtask.getInstance() +const storage = ContractStorage.getInstance() + +/** + * Deploy a Poseidon contract + * @param poseidonName Poseidon contract name + * @param network Deployment network + * @param signer Signer of the transaction + * @param incremental Whether to check for previous deployment + */ +async function deployPoseidon( + poseidonName: EContracts, + network: string, + signer: Signer, + incremental?: boolean +) { + const poseidonAddress = storage.getAddress(poseidonName, network) + + if (incremental && poseidonAddress) { + return + } + + const PoseidonContract = await subtask.deployContract(poseidonName, { + signer, + }) + + await storage.register({ + id: poseidonName, + contract: PoseidonContract, + args: [], + network, + }) +} + +/** + * Deploy step registration and task itself + */ +subtask + .addTask('clrfund:deploy-poseidon', 'Deploy poseidon contracts') + .setAction(async ({ incremental }: ISubtaskParams, hre) => { + subtask.setHre(hre) + const deployer = await subtask.getDeployer() + const network = hre.network.name + + await deployPoseidon(EContracts.PoseidonT3, network, deployer, incremental) + await deployPoseidon(EContracts.PoseidonT4, network, deployer, incremental) + await deployPoseidon(EContracts.PoseidonT5, network, deployer, incremental) + await deployPoseidon(EContracts.PoseidonT6, network, deployer, incremental) + }) diff --git a/contracts/tasks/subtasks/clrfund/02-vkRegistry.ts b/contracts/tasks/subtasks/clrfund/02-vkRegistry.ts new file mode 100644 index 000000000..c4a656ee2 --- /dev/null +++ b/contracts/tasks/subtasks/clrfund/02-vkRegistry.ts @@ -0,0 +1,39 @@ +import type { VkRegistry } from '../../../typechain-types' + +import { ContractStorage } from '../../helpers/ContractStorage' +import { Subtask } from '../../helpers/Subtask' +import { EContracts, type ISubtaskParams } from '../../helpers/types' + +const subtask = Subtask.getInstance() +const storage = ContractStorage.getInstance() + +/** + * Deploy step registration and task itself + */ +subtask + .addTask('clrfund:deploy-vk-registry', 'Deploy Vk Registry') + .setAction(async ({ incremental }: ISubtaskParams, hre) => { + subtask.setHre(hre) + const deployer = await subtask.getDeployer() + + const vkRegistryContractAddress = storage.getAddress( + EContracts.VkRegistry, + hre.network.name + ) + + if (incremental && vkRegistryContractAddress) { + return + } + + const vkRegistryContract = await subtask.deployContract( + EContracts.VkRegistry, + { signer: deployer } + ) + + await storage.register({ + id: EContracts.VkRegistry, + contract: vkRegistryContract, + args: [], + network: hre.network.name, + }) + }) diff --git a/contracts/tasks/subtasks/clrfund/03-setVkRegsitry.ts b/contracts/tasks/subtasks/clrfund/03-setVkRegsitry.ts new file mode 100644 index 000000000..a3fefb412 --- /dev/null +++ b/contracts/tasks/subtasks/clrfund/03-setVkRegsitry.ts @@ -0,0 +1,68 @@ +import { VkRegistry } from '../../../typechain-types' +import { setVerifyingKeys } from '../../../utils/contracts' +import { MaciParameters } from '../../../utils/maciParameters' +import { Subtask } from '../../helpers/Subtask' +import { EContracts, ISubtaskParams } from '../../helpers/types' + +const subtask = Subtask.getInstance() + +/** + * Deploy step registration and task itself + */ +subtask + .addTask('clrfund:set-vkRegistry', 'Set verifying keys in VkRegistry') + .setAction(async ({ incremental }: ISubtaskParams, hre) => { + subtask.setHre(hre) + const deployer = await subtask.getDeployer() + + const vkRegistryContract = await subtask.getContract({ + name: EContracts.VkRegistry, + signer: deployer, + }) + + const circuit = subtask.getConfigField( + EContracts.VkRegistry, + 'circuit' + ) + const directory = subtask.getConfigField( + EContracts.VkRegistry, + 'paramsDirectory' + ) + + const maciParameters = await MaciParameters.fromConfig(circuit, directory) + const messageBatchSize = maciParameters.getMessageBatchSize() + const stateTreeDepth = maciParameters.stateTreeDepth + const voteOptionTreeDepth = maciParameters.treeDepths.voteOptionTreeDepth + const messageTreeDepth = maciParameters.treeDepths.messageTreeDepth + const intStateTreeDepth = maciParameters.treeDepths.intStateTreeDepth + const hasProcessVk = await vkRegistryContract.hasProcessVk( + stateTreeDepth, + messageTreeDepth, + voteOptionTreeDepth, + messageBatchSize + ) + + const hasTallyVk = await vkRegistryContract.hasTallyVk( + stateTreeDepth, + intStateTreeDepth, + voteOptionTreeDepth + ) + + if (incremental) { + if (hasProcessVk && hasTallyVk) { + console.log('VkRegistry has already been set, skipping...') + return + } + } + + if (hasProcessVk) { + throw new Error('Error: process verification key has already been set') + } + + if (hasTallyVk) { + throw new Error('Error: tally verification key has already been set') + } + + const tx = await setVerifyingKeys(vkRegistryContract, maciParameters) + subtask.logTransaction(tx) + }) diff --git a/contracts/tasks/subtasks/clrfund/04-verifier.ts b/contracts/tasks/subtasks/clrfund/04-verifier.ts new file mode 100644 index 000000000..0b1ec1030 --- /dev/null +++ b/contracts/tasks/subtasks/clrfund/04-verifier.ts @@ -0,0 +1,36 @@ +import { ContractStorage } from '../../helpers/ContractStorage' +import { Subtask } from '../../helpers/Subtask' +import { EContracts, ISubtaskParams } from '../../helpers/types' + +const subtask = Subtask.getInstance() +const storage = ContractStorage.getInstance() + +/** + * Deploy step registration and task itself + */ +subtask + .addTask('clrfund:deploy-verifier', 'Deploy verifier') + .setAction(async ({ incremental }: ISubtaskParams, hre) => { + subtask.setHre(hre) + const deployer = await subtask.getDeployer() + + const verifierContractAddress = storage.getAddress( + EContracts.Verifier, + hre.network.name + ) + + if (incremental && verifierContractAddress) { + return + } + + const verifierContract = await subtask.deployContract(EContracts.Verifier, { + signer: deployer, + }) + + await storage.register({ + id: EContracts.Verifier, + contract: verifierContract, + args: [], + network: hre.network.name, + }) + }) diff --git a/contracts/tasks/subtasks/clrfund/05-messageProcessorFactory.ts b/contracts/tasks/subtasks/clrfund/05-messageProcessorFactory.ts new file mode 100644 index 000000000..5fec1d700 --- /dev/null +++ b/contracts/tasks/subtasks/clrfund/05-messageProcessorFactory.ts @@ -0,0 +1,44 @@ +import { ContractStorage } from '../../helpers/ContractStorage' +import { Subtask } from '../../helpers/Subtask' +import { EContracts, ISubtaskParams } from '../../helpers/types' + +const subtask = Subtask.getInstance() +const storage = ContractStorage.getInstance() + +/** + * Deploy step registration and task itself + */ +subtask + .addTask( + 'clrfund:deploy-message-processor-factory', + 'Deploy message processor factory' + ) + .setAction(async ({ incremental }: ISubtaskParams, hre) => { + subtask.setHre(hre) + const deployer = await subtask.getDeployer() + + const messageProcessorFactoryContractAddress = storage.getAddress( + EContracts.MessageProcessorFactory, + hre.network.name + ) + + if (incremental && messageProcessorFactoryContractAddress) { + return + } + + const libraries = await storage.mustGetPoseidonLibraries(hre.network.name) + const messageProcessorFactoryContract = await subtask.deployContract( + EContracts.MessageProcessorFactory, + { + signer: deployer, + libraries, + } + ) + + await storage.register({ + id: EContracts.MessageProcessorFactory, + contract: messageProcessorFactoryContract, + args: [], + network: hre.network.name, + }) + }) diff --git a/contracts/tasks/subtasks/clrfund/06-pollFactory.ts b/contracts/tasks/subtasks/clrfund/06-pollFactory.ts new file mode 100644 index 000000000..c84f1ed98 --- /dev/null +++ b/contracts/tasks/subtasks/clrfund/06-pollFactory.ts @@ -0,0 +1,41 @@ +import { ContractStorage } from '../../helpers/ContractStorage' +import { Subtask } from '../../helpers/Subtask' +import { EContracts, ISubtaskParams } from '../../helpers/types' + +const subtask = Subtask.getInstance() +const storage = ContractStorage.getInstance() + +/** + * Deploy step registration and task itself + */ +subtask + .addTask('clrfund:deploy-poll-factory', 'Deploy poll factory') + .setAction(async ({ incremental }: ISubtaskParams, hre) => { + subtask.setHre(hre) + const deployer = await subtask.getDeployer() + + const pollFactoryContractAddress = storage.getAddress( + EContracts.PollFactory, + hre.network.name + ) + + if (incremental && pollFactoryContractAddress) { + return + } + + const libraries = storage.mustGetPoseidonLibraries(hre.network.name) + const pollFactoryContract = await subtask.deployContract( + EContracts.PollFactory, + { + signer: deployer, + libraries, + } + ) + + await storage.register({ + id: EContracts.PollFactory, + contract: pollFactoryContract, + args: [], + network: hre.network.name, + }) + }) diff --git a/contracts/tasks/subtasks/clrfund/07-tallyFactory.ts b/contracts/tasks/subtasks/clrfund/07-tallyFactory.ts new file mode 100644 index 000000000..673e77089 --- /dev/null +++ b/contracts/tasks/subtasks/clrfund/07-tallyFactory.ts @@ -0,0 +1,41 @@ +import { ContractStorage } from '../../helpers/ContractStorage' +import { Subtask } from '../../helpers/Subtask' +import { EContracts, ISubtaskParams } from '../../helpers/types' + +const subtask = Subtask.getInstance() +const storage = ContractStorage.getInstance() + +/** + * Deploy step registration and task itself + */ +subtask + .addTask('clrfund:deploy-tally-factory', 'Deploy tally factory') + .setAction(async ({ incremental }: ISubtaskParams, hre) => { + subtask.setHre(hre) + const deployer = await subtask.getDeployer() + + const tallyFactoryContractAddress = storage.getAddress( + EContracts.TallyFactory, + hre.network.name + ) + + if (incremental && tallyFactoryContractAddress) { + return + } + + const libraries = storage.mustGetPoseidonLibraries(hre.network.name) + const tallyFactoryContract = await subtask.deployContract( + EContracts.TallyFactory, + { + libraries, + signer: deployer, + } + ) + + await storage.register({ + id: EContracts.TallyFactory, + contract: tallyFactoryContract, + args: [], + network: hre.network.name, + }) + }) diff --git a/contracts/tasks/subtasks/clrfund/08-maciFactory.ts b/contracts/tasks/subtasks/clrfund/08-maciFactory.ts new file mode 100644 index 000000000..cfaf146a6 --- /dev/null +++ b/contracts/tasks/subtasks/clrfund/08-maciFactory.ts @@ -0,0 +1,74 @@ +import { ContractStorage } from '../../helpers/ContractStorage' +import { Subtask } from '../../helpers/Subtask' +import { EContracts, ISubtaskParams } from '../../helpers/types' +import { ZERO_ADDRESS } from '../../../utils/constants' + +const subtask = Subtask.getInstance() +const storage = ContractStorage.getInstance() + +/** + * Deploy step registration and task itself + */ +subtask + .addTask('clrfund:deploy-maci-factory', 'Deploy maci factory') + .setAction(async ({ incremental }: ISubtaskParams, hre) => { + subtask.setHre(hre) + const deployer = await subtask.getDeployer() + + const maciFactoryContractAddress = storage.getAddress( + EContracts.MACIFactory, + hre.network.name + ) + + if (incremental && maciFactoryContractAddress) { + return + } + + const verifierContractAddress = storage.mustGetAddress( + EContracts.Verifier, + hre.network.name + ) + const vkRegistryContractAddress = storage.mustGetAddress( + EContracts.VkRegistry, + hre.network.name + ) + const pollFactoryContractAddress = storage.mustGetAddress( + EContracts.PollFactory, + hre.network.name + ) + const tallyFactoryContractAddress = storage.mustGetAddress( + EContracts.TallyFactory, + hre.network.name + ) + const messageProcessorFactoryContractAddress = storage.mustGetAddress( + EContracts.MessageProcessorFactory, + hre.network.name + ) + // all the factories to deploy MACI contracts + const factories = { + pollFactory: pollFactoryContractAddress, + tallyFactory: tallyFactoryContractAddress, + // subsidy is not currently used + subsidyFactory: ZERO_ADDRESS, + messageProcessorFactory: messageProcessorFactoryContractAddress, + } + + const args = [vkRegistryContractAddress, factories, verifierContractAddress] + const libraries = storage.mustGetPoseidonLibraries(hre.network.name) + + const maciFactoryContract = await subtask.deployContract( + EContracts.MACIFactory, + { + args, + signer: deployer, + libraries, + } + ) + + await storage.register({ + id: EContracts.MACIFactory, + contract: maciFactoryContract, + args, + network: hre.network.name, + }) + }) diff --git a/contracts/tasks/subtasks/clrfund/09-fundingRoundFactory.ts b/contracts/tasks/subtasks/clrfund/09-fundingRoundFactory.ts new file mode 100644 index 000000000..7c617df4e --- /dev/null +++ b/contracts/tasks/subtasks/clrfund/09-fundingRoundFactory.ts @@ -0,0 +1,40 @@ +import { ContractStorage } from '../../helpers/ContractStorage' +import { Subtask } from '../../helpers/Subtask' +import { EContracts, ISubtaskParams } from '../../helpers/types' + +const subtask = Subtask.getInstance() +const storage = ContractStorage.getInstance() + +/** + * Deploy step registration and task itself + */ +subtask + .addTask( + 'clrfund:deploy-funding-round-factory', + 'Deploy funding round factory' + ) + .setAction(async ({ incremental }: ISubtaskParams, hre) => { + subtask.setHre(hre) + const deployer = await subtask.getDeployer() + + const fundingRoundFactoryContractAddress = storage.getAddress( + EContracts.FundingRoundFactory, + hre.network.name + ) + + if (incremental && fundingRoundFactoryContractAddress) { + return + } + + const fundingRoundFactoryContract = await subtask.deployContract( + EContracts.FundingRoundFactory, + { signer: deployer } + ) + + await storage.register({ + id: EContracts.FundingRoundFactory, + contract: fundingRoundFactoryContract, + args: [], + network: hre.network.name, + }) + }) diff --git a/contracts/tasks/subtasks/clrfund/10-clrfund.ts b/contracts/tasks/subtasks/clrfund/10-clrfund.ts new file mode 100644 index 000000000..56ac40f35 --- /dev/null +++ b/contracts/tasks/subtasks/clrfund/10-clrfund.ts @@ -0,0 +1,38 @@ +import { ClrFund } from '../../../typechain-types' +import { ContractStorage } from '../../helpers/ContractStorage' +import { Subtask } from '../../helpers/Subtask' +import { EContracts, ISubtaskParams } from '../../helpers/types' + +const subtask = Subtask.getInstance() +const storage = ContractStorage.getInstance() + +/** + * Deploy step registration and task itself + */ +subtask + .addTask('clrfund:deploy-clrfund', 'Deploy ClrFund') + .setAction(async ({ incremental }: ISubtaskParams, hre) => { + subtask.setHre(hre) + const deployer = await subtask.getDeployer() + + const clrfundContractAddress = storage.getAddress( + EContracts.ClrFund, + hre.network.name + ) + + if (incremental && clrfundContractAddress) { + return + } + + const clrfundContract = await subtask.deployContract( + EContracts.ClrFund, + { signer: deployer } + ) + + await storage.register({ + id: EContracts.ClrFund, + contract: clrfundContract, + args: [], + network: hre.network.name, + }) + }) diff --git a/contracts/tasks/subtasks/clrfund/11-initClrfund.ts b/contracts/tasks/subtasks/clrfund/11-initClrfund.ts new file mode 100644 index 000000000..0e68f8773 --- /dev/null +++ b/contracts/tasks/subtasks/clrfund/11-initClrfund.ts @@ -0,0 +1,51 @@ +import { ClrFund } from '../../../typechain-types' +import { ContractStorage } from '../../helpers/ContractStorage' +import { Subtask } from '../../helpers/Subtask' +import { EContracts } from '../../helpers/types' +import { ZERO_ADDRESS } from '../../../utils/constants' + +const subtask = Subtask.getInstance() +const storage = ContractStorage.getInstance() + +/** + * Deploy step registration and task itself + */ +subtask + .addTask('clrfund:init-clrfund', 'Initialize ClrFund') + .setAction(async (_, hre) => { + subtask.setHre(hre) + const deployer = await subtask.getDeployer() + + const clrfundContract = await subtask.getContract({ + name: EContracts.ClrFund, + signer: deployer, + }) + + const clrfundMaciFactoryAddress = await clrfundContract.maciFactory() + if (clrfundMaciFactoryAddress !== ZERO_ADDRESS) { + const clrfundContractAddress = await clrfundContract.getAddress() + console.log( + `Clrfund contract ${clrfundContractAddress} already initialized, skipping...` + ) + return + } + + const maciFactoryAddress = storage.mustGetAddress( + EContracts.MACIFactory, + hre.network.name + ) + const fundingRoundFactoryAddress = storage.mustGetAddress( + EContracts.FundingRoundFactory, + hre.network.name + ) + + const tx = await clrfundContract.init( + maciFactoryAddress, + fundingRoundFactoryAddress + ) + const receipt = await tx.wait() + if (receipt?.status !== 1) { + throw new Error('Failed to initialize ClrFund') + } + subtask.logTransaction(tx) + }) diff --git a/contracts/tasks/subtasks/coordinator/01-coordinator.ts b/contracts/tasks/subtasks/coordinator/01-coordinator.ts new file mode 100644 index 000000000..3b2f0b767 --- /dev/null +++ b/contracts/tasks/subtasks/coordinator/01-coordinator.ts @@ -0,0 +1,81 @@ +/** + * Deploy an instance of the BrightID sponsor contract + * + */ +import { Subtask } from '../../helpers/Subtask' +import { EContracts } from '../../../utils/types' +import { Contract, getAddress } from 'ethers' +import { Keypair, PrivKey, PubKey } from '@clrfund/common' +import { ISubtaskParams } from '../../helpers/types' + +const subtask = Subtask.getInstance() + +/** + * Deploy step registration and task itself + */ +subtask + .addTask( + 'coordinator:set-coordinator', + 'Set the clrfund coordinator', + ({ clrfund }) => Promise.resolve({ clrfund }) + ) + .setAction(async ({ clrfund }: ISubtaskParams, hre) => { + subtask.setHre(hre) + const deployer = await subtask.getDeployer() + + const clrfundContract = await subtask.getContract({ + name: EContracts.ClrFund, + address: clrfund, + }) + + const coordinator = await subtask.tryGetConfigField( + EContracts.ClrFund, + 'coordinator' + ) + const coordinatorAddress = coordinator || (await deployer.getAddress()) + + if (!process.env.COORDINATOR_MACISK) { + throw new Error('Please set environment variable COORDINATOR_MACISK') + } + const coordinatorMacisk = process.env.COORDINATOR_MACISK + + const [currentCoordinator, coordinatorPubKey] = await Promise.all([ + clrfundContract.coordinator(), + clrfundContract.coordinatorPubKey(), + ]) + + const currentPubKey = new PubKey([coordinatorPubKey.x, coordinatorPubKey.y]) + const newPrivKey = PrivKey.deserialize(coordinatorMacisk) + const newKeypair = new Keypair(newPrivKey) + + const normalizedCurrentCoordinator = getAddress(currentCoordinator) + const normalizedNewCoordinator = getAddress(coordinatorAddress) + console.log('Current coordinator', normalizedCurrentCoordinator) + console.log(' New coordinator', normalizedNewCoordinator) + + const serializedCurrentPubKey = currentPubKey.serialize() + const serializedNewPubKey = newKeypair.pubKey.serialize() + console.log('Current MACI key', serializedCurrentPubKey) + console.log(' New MACI key', serializedNewPubKey) + console.log() + + if ( + normalizedCurrentCoordinator === normalizedNewCoordinator && + serializedCurrentPubKey === serializedNewPubKey + ) { + console.log('Coordinator address and MACI key already set, skipping...') + return + } + + const tx = await clrfundContract.setCoordinator( + normalizedNewCoordinator, + newKeypair.pubKey.asContractParam() + ) + + const receipt = await tx.wait() + if (receipt?.status !== 1) { + throw new Error('Failed to set coordinator') + } + + subtask.logTransaction(tx) + }) diff --git a/contracts/tasks/subtasks/deployer/01-clrfundDeployer.ts b/contracts/tasks/subtasks/deployer/01-clrfundDeployer.ts new file mode 100644 index 000000000..0f26fd734 --- /dev/null +++ b/contracts/tasks/subtasks/deployer/01-clrfundDeployer.ts @@ -0,0 +1,63 @@ +/** + * Create a new instance of the ClrFundDeployer contract + */ +import { ContractStorage } from '../../helpers/ContractStorage' +import { Subtask } from '../../helpers/Subtask' +import { ISubtaskParams } from '../../helpers/types' +import { EContracts } from '../../../utils/types' + +const subtask = Subtask.getInstance() +const storage = ContractStorage.getInstance() + +subtask + .addTask( + 'deployer:deploy-clrfund-deployer', + 'Deploy ClrFundDeployer contract' + ) + .setAction(async ({ incremental }: ISubtaskParams, hre) => { + subtask.setHre(hre) + const deployer = await subtask.getDeployer() + const network = hre.network.name + + const clrfundDeployerContractAddress = storage.getAddress( + EContracts.ClrFundDeployer, + network + ) + + if (incremental && clrfundDeployerContractAddress) { + return + } + + const clrfundContractAddress = storage.mustGetAddress( + EContracts.ClrFund, + network + ) + + const maciFactoryContractAddress = storage.mustGetAddress( + EContracts.MACIFactory, + network + ) + + const fundingRoundFactoryContractAddress = storage.mustGetAddress( + EContracts.FundingRoundFactory, + network + ) + + const args = [ + clrfundContractAddress, + maciFactoryContractAddress, + fundingRoundFactoryContractAddress, + ] + + const ClrfundDeployerContract = await subtask.deployContract( + EContracts.ClrFundDeployer, + { signer: deployer, args } + ) + + await storage.register({ + id: EContracts.ClrFundDeployer, + contract: ClrfundDeployerContract, + args, + network: hre.network.name, + }) + }) diff --git a/contracts/tasks/subtasks/index.ts b/contracts/tasks/subtasks/index.ts new file mode 100644 index 000000000..ca942d851 --- /dev/null +++ b/contracts/tasks/subtasks/index.ts @@ -0,0 +1,23 @@ +import fs from 'fs' +import path from 'path' + +// get the names of the directories under subtasks +export const SUBTASK_CATALOGS = fs + .readdirSync(__dirname, { withFileTypes: true }) + .filter((p) => p.isDirectory()) + .map((p) => p.name) + +/** + * The same as individual imports but doesn't require to add new import line every time + */ +SUBTASK_CATALOGS.forEach((catalog) => { + const tasksPath = path.resolve(__dirname, catalog) + + if (fs.existsSync(tasksPath)) { + fs.readdirSync(tasksPath) + .filter((p) => p.includes('.ts') && !p.includes('index.ts')) + .forEach((task) => { + import(`${tasksPath}/${task}`) + }) + } +}) diff --git a/contracts/tasks/subtasks/maci/01-setMaciParams.ts b/contracts/tasks/subtasks/maci/01-setMaciParams.ts new file mode 100644 index 000000000..964cd0a8c --- /dev/null +++ b/contracts/tasks/subtasks/maci/01-setMaciParams.ts @@ -0,0 +1,67 @@ +/** + * Deploy an instance of the BrightID sponsor contract + * + */ +import { Subtask } from '../../helpers/Subtask' +import { EContracts } from '../../../utils/types' +import { Contract, getNumber } from 'ethers' +import { MaciParameters } from '../../../utils/maciParameters' + +const subtask = Subtask.getInstance() + +/** + * Deploy step registration and task itself + */ +subtask + .addTask('maci:set-maci-params', 'Set the MACI parameters') + .setAction(async (_, hre) => { + subtask.setHre(hre) + + const circuit = subtask.getConfigField( + EContracts.VkRegistry, + 'circuit' + ) + const directory = subtask.getConfigField( + EContracts.VkRegistry, + 'paramsDirectory' + ) + const maciParameters = await MaciParameters.fromConfig(circuit, directory) + + const maciFactoryContract = await subtask.getContract({ + name: EContracts.MACIFactory, + }) + + const stateTreeDepth = await maciFactoryContract.stateTreeDepth() + const treeDepths = await maciFactoryContract.treeDepths() + + const { + intStateTreeDepth, + messageTreeSubDepth, + messageTreeDepth, + voteOptionTreeDepth, + } = maciParameters.treeDepths + + if ( + getNumber(stateTreeDepth) === maciParameters.stateTreeDepth && + getNumber(treeDepths.intStateTreeDepth) === intStateTreeDepth && + getNumber(treeDepths.messageTreeSubDepth) === messageTreeSubDepth && + getNumber(treeDepths.messageTreeDepth) === messageTreeDepth && + getNumber(treeDepths.voteOptionTreeDepth) === voteOptionTreeDepth + ) { + // MACI parameters already set + console.log('Skip - parameters already set') + return + } + + const tx = await maciFactoryContract.setMaciParameters( + ...maciParameters.asContractParam() + ) + await tx.wait() + + const receipt = await tx.wait() + if (receipt?.status !== 1) { + throw new Error('Failed to set MACI parameters') + } + + subtask.logTransaction(tx) + }) diff --git a/contracts/tasks/subtasks/recipient/01-simpleRecipientRegistry.ts b/contracts/tasks/subtasks/recipient/01-simpleRecipientRegistry.ts new file mode 100644 index 000000000..ee072465b --- /dev/null +++ b/contracts/tasks/subtasks/recipient/01-simpleRecipientRegistry.ts @@ -0,0 +1,61 @@ +/** + * Deploy a new recipient registry + */ + +import { ContractStorage } from '../../helpers/ContractStorage' +import { Subtask } from '../../helpers/Subtask' +import { ISubtaskParams } from '../../helpers/types' +import { EContracts } from '../../../utils/types' + +const subtask = Subtask.getInstance() +const storage = ContractStorage.getInstance() + +/** + * Deploy step registration and task itself + */ +subtask + .addTask( + 'recipient:deploy-simple-recipient-registry', + 'Deploy a simple recipient regsitry' + ) + .setAction(async ({ incremental, clrfund }: ISubtaskParams, hre) => { + subtask.setHre(hre) + const deployer = await subtask.getDeployer() + + const recipientRegistryName = subtask.getConfigField( + EContracts.ClrFund, + 'recipientRegistry' + ) + + if (recipientRegistryName !== EContracts.SimpleRecipientRegistry) { + return + } + + const simpleRecipientRegistryContractAddress = storage.getAddress( + EContracts.SimpleRecipientRegistry, + hre.network.name + ) + + if (incremental && simpleRecipientRegistryContractAddress) { + return + } + + const clrfundContract = await subtask.getContract({ + name: EContracts.ClrFund, + address: clrfund, + }) + + const clrfundContractAddress = await clrfundContract.getAddress() + const args = [clrfundContractAddress] + const simpleRecipientRegistryContract = await subtask.deployContract( + EContracts.SimpleRecipientRegistry, + { signer: deployer, args } + ) + + await storage.register({ + id: EContracts.SimpleRecipientRegistry, + contract: simpleRecipientRegistryContract, + args, + network: hre.network.name, + }) + }) diff --git a/contracts/tasks/subtasks/recipient/02-optimisticRecipientRegistry.ts b/contracts/tasks/subtasks/recipient/02-optimisticRecipientRegistry.ts new file mode 100644 index 000000000..4db14252f --- /dev/null +++ b/contracts/tasks/subtasks/recipient/02-optimisticRecipientRegistry.ts @@ -0,0 +1,98 @@ +/** + * Deploy a new recipient registry + * + */ +import { ContractStorage } from '../../helpers/ContractStorage' +import { Subtask } from '../../helpers/Subtask' +import { ISubtaskParams } from '../../helpers/types' +import { EContracts } from '../../../utils/types' +import { parseUnits } from 'ethers' +import { AnyOldERC20Token, ClrFund } from '../../../typechain-types' + +// Number.MAX_SAFE_INTEGER - 1 +const defaultChallengePeriodSeconds = 9007199254740990 + +const subtask = Subtask.getInstance() +const storage = ContractStorage.getInstance() + +/** + * Get the deposit token decimals + * + * @param clrfund Clrfund contract + * @returns Token decimals + */ +async function getTokenDecimals(clrfundContract: ClrFund): Promise { + const nativeTokenAddress = await clrfundContract.nativeToken() + const tokenContract = await subtask.getContract({ + name: EContracts.AnyOldERC20Token, + address: nativeTokenAddress, + }) + const decimals = await tokenContract.decimals() + return decimals +} + +/** + * Deploy step registration and task itself + */ + +subtask + .addTask( + 'recipient:deploy-optimistic-recipient-registry', + 'Deploy an optimistic recipient regsitry' + ) + .setAction(async ({ incremental, clrfund }: ISubtaskParams, hre) => { + subtask.setHre(hre) + const deployer = await subtask.getDeployer() + const network = hre.network.name + + const recipientRegistryName = subtask.getConfigField( + EContracts.ClrFund, + 'recipientRegistry' + ) + if (recipientRegistryName !== EContracts.OptimisticRecipientRegistry) { + return + } + + const optimisticRecipientRegistryContractAddress = storage.getAddress( + EContracts.OptimisticRecipientRegistry, + network + ) + + if (incremental && optimisticRecipientRegistryContractAddress) { + return + } + + const deposit = subtask.getConfigField( + EContracts.OptimisticRecipientRegistry, + 'deposit' + ) + + const challengePeriodSeconds = subtask.getConfigField( + EContracts.OptimisticRecipientRegistry, + 'challengePeriodSeconds' + ) + + const clrfundContract = await subtask.getContract({ + name: EContracts.ClrFund, + address: clrfund, + }) + const decimals = await getTokenDecimals(clrfundContract) + + const clrfundContractAddress = await clrfundContract.getAddress() + const args = [ + parseUnits(deposit, decimals), + challengePeriodSeconds || defaultChallengePeriodSeconds, + clrfundContractAddress, + ] + const optimisticRecipientRegistryContract = await subtask.deployContract( + EContracts.OptimisticRecipientRegistry, + { signer: deployer, args } + ) + + await storage.register({ + id: EContracts.OptimisticRecipientRegistry, + contract: optimisticRecipientRegistryContract, + args, + network: hre.network.name, + }) + }) diff --git a/contracts/tasks/subtasks/recipient/99-setRecipientRegistry.ts b/contracts/tasks/subtasks/recipient/99-setRecipientRegistry.ts new file mode 100644 index 000000000..4bbc52faa --- /dev/null +++ b/contracts/tasks/subtasks/recipient/99-setRecipientRegistry.ts @@ -0,0 +1,68 @@ +/** + * Deploy a new recipient registry + * + */ +import { ContractStorage } from '../../helpers/ContractStorage' +import { Subtask } from '../../helpers/Subtask' +import { ISubtaskParams } from '../../helpers/types' +import { EContracts } from '../../../utils/types' +import { ClrFund } from '../../../typechain-types' +import { getAddress } from 'ethers' + +const subtask = Subtask.getInstance() +const storage = ContractStorage.getInstance() + +/** + * Deploy step registration and task itself + */ +subtask + .addTask( + 'recipient:set-recipient-registry', + 'Set recipient registry in the ClrFund contract' + ) + .setAction(async ({ incremental, clrfund }: ISubtaskParams, hre) => { + subtask.setHre(hre) + const network = hre.network.name + + const recipientRegistryName = subtask.getConfigField( + EContracts.ClrFund, + 'recipientRegistry' + ) + + const recipientRegistryContractAddress = storage.mustGetAddress( + recipientRegistryName as EContracts, + network + ) + + const clrfundContract = await subtask.getContract({ + name: EContracts.ClrFund, + address: clrfund, + }) + + if (incremental) { + const currentRecipientRegistryAddress = + await clrfundContract.recipientRegistry() + + if ( + getAddress(currentRecipientRegistryAddress) === + getAddress(recipientRegistryContractAddress) + ) { + // already set + console.log('Recipient registry already set, skipping..') + return + } + } + + const tx = await clrfundContract.setRecipientRegistry( + recipientRegistryContractAddress + ) + const receipt = await tx.wait() + + if (receipt?.status !== 1) { + throw new Error( + `Failed to set recipient registry ${recipientRegistryContractAddress}` + ) + } + + subtask.logTransaction(tx) + }) diff --git a/contracts/tasks/subtasks/round/01-deploy-brightid-user-registry.ts b/contracts/tasks/subtasks/round/01-deploy-brightid-user-registry.ts new file mode 100644 index 000000000..479f3f7e9 --- /dev/null +++ b/contracts/tasks/subtasks/round/01-deploy-brightid-user-registry.ts @@ -0,0 +1,44 @@ +/** + * Deploy a brightid user registry + */ + +import { Subtask } from '../../helpers/Subtask' +import { ISubtaskParams } from '../../helpers/types' +import { EContracts } from '../../../utils/types' + +const subtask = Subtask.getInstance() + +/** + * Deploy step registration and task itself + */ +subtask + .addTask( + 'round:deploy-brightid-user-registry', + 'Deploy a BrightId user registry for a new round' + ) + .setAction(async (params: ISubtaskParams, hre) => { + subtask.setHre(hre) + + const userRegistryName = subtask.tryGetConfigField( + EContracts.ClrFund, + 'userRegistry' + ) + + if (userRegistryName !== EContracts.BrightIdUserRegistry) { + // only create a new BrightID user registry for each new round + return + } + + const shouldDeploy = subtask.tryGetConfigField( + EContracts.BrightIdUserRegistry, + 'deploy' + ) + + if (shouldDeploy === false) { + // for testing, we don't deploy for every round + return + } + + const steps = await subtask.getDeploySteps(['user'], params) + await subtask.runSteps(steps, 0) + }) diff --git a/contracts/tasks/subtasks/round/02-deploy-round.ts b/contracts/tasks/subtasks/round/02-deploy-round.ts new file mode 100644 index 000000000..812bf75b7 --- /dev/null +++ b/contracts/tasks/subtasks/round/02-deploy-round.ts @@ -0,0 +1,253 @@ +/** + * Deploy a funding round + */ + +import { TaskArguments } from 'hardhat/types' +import { ContractStorage } from '../../helpers/ContractStorage' +import { Subtask } from '../../helpers/Subtask' +import { EContracts } from '../../../utils/types' +import { + ClrFund, + FundingRound, + MACI, + Poll, + Tally, +} from '../../../typechain-types' +import { ContractTransactionResponse } from 'ethers' +import { ISubtaskParams } from '../../helpers/types' + +const subtask = Subtask.getInstance() +const storage = ContractStorage.getInstance() + +/** + * Register the FundingRound contract in the contract storage for verification + * + * @param fundingRoundContract The funding round contract + * @param network The network + * @param tx The funding round deployment transaction + */ +async function registerFundingRound( + fundingRoundContract: FundingRound, + network: string, + tx: ContractTransactionResponse +) { + const args = await Promise.all([ + fundingRoundContract.nativeToken(), + fundingRoundContract.userRegistry(), + fundingRoundContract.recipientRegistry(), + fundingRoundContract.coordinator(), + ]) + + await storage.register({ + id: EContracts.FundingRound, + contract: fundingRoundContract, + network, + args, + tx, + }) +} + +/** + * Register MACI contract in the contract storage for verification + * + * @param fundingRoundContract The funding round contract + * @param network The network + * @param tx The funding round deployment transaction + */ +async function registerMaci( + fundingRoundContract: FundingRound, + network: string, + tx: ContractTransactionResponse +) { + const maciContractAddress = await fundingRoundContract.maci() + const maciContract = await subtask.getContract({ + name: EContracts.MACI, + address: maciContractAddress, + }) + + const args = await Promise.all([ + maciContract.pollFactory(), + maciContract.messageProcessorFactory(), + maciContract.tallyFactory(), + maciContract.subsidyFactory(), + maciContract.signUpGatekeeper(), + maciContract.initialVoiceCreditProxy(), + maciContract.topupCredit(), + maciContract.stateTreeDepth(), + ]) + + await storage.register({ + id: EContracts.MACI, + contract: maciContract, + network, + args, + tx, + }) +} + +/** + * Register the Poll contract in the contract storage + * + * @param duration The round duration + * @param fundingRoundContract The funding round contract + * @param network The network + * @param tx The funding round deployment transaction + + */ +async function registerPoll( + duration: number, + fundingRoundContract: FundingRound, + network: string, + tx: ContractTransactionResponse +) { + const pollContractAddress = await fundingRoundContract.poll() + const pollContract = await subtask.getContract({ + name: EContracts.Poll, + address: pollContractAddress, + }) + + const [maxValues, treeDepths, coordinatorPubKey, extContracts] = + await Promise.all([ + pollContract.maxValues(), + pollContract.treeDepths(), + pollContract.coordinatorPubKey(), + pollContract.extContracts(), + ]) + + const args = [ + duration, + { + maxMessages: maxValues.maxMessages, + maxVoteOptions: maxValues.maxVoteOptions, + }, + { + intStateTreeDepth: treeDepths.intStateTreeDepth, + messageTreeSubDepth: treeDepths.messageTreeSubDepth, + messageTreeDepth: treeDepths.messageTreeDepth, + voteOptionTreeDepth: treeDepths.voteOptionTreeDepth, + }, + { + x: coordinatorPubKey.x, + y: coordinatorPubKey.y, + }, + { + maci: extContracts.maci, + messageAq: extContracts.messageAq, + topupCredit: extContracts.topupCredit, + }, + ] + + await storage.register({ + id: EContracts.Poll, + contract: pollContract, + network, + args, + tx, + }) +} + +/** + * Register the Tally and the MessageProcessor contracts on the contract storage + * + * @param fundingRoundContract The funding round contract + * @param network The network + * @param tx The funding round deployment transaction + + */ +async function registerTallyAndMessageProcessor( + fundingRoundContract: FundingRound, + network: string, + tx: ContractTransactionResponse +) { + const [tally, poll] = await Promise.all([ + fundingRoundContract.tally(), + fundingRoundContract.poll(), + ]) + + const tallyContract = await subtask.getContract({ + name: EContracts.Tally, + address: tally, + }) + + const mp = await tallyContract.messageProcessor() + const messageProcessorContract = await subtask.getContract({ + name: EContracts.MessageProcessor, + address: mp, + }) + + const [verifier, vkRegistry] = await Promise.all([ + tallyContract.verifier(), + tallyContract.vkRegistry(), + ]) + + let args = [verifier, vkRegistry, poll, mp] + await storage.register({ + id: EContracts.Tally, + contract: tallyContract, + network, + args, + tx, + }) + + args = [verifier, vkRegistry, poll] + await storage.register({ + id: EContracts.MessageProcessor, + contract: messageProcessorContract, + network, + args, + tx, + }) +} + +/** + * Get the hardhat task params + * + * @param {ISubtaskParams} params - hardhat task arguments + * @returns {Promise} params for deploy workflow + */ +async function getParams({ + verify, + incremental, + roundDuration, + clrfund, +}: ISubtaskParams): Promise { + return Promise.resolve({ verify, incremental, clrfund, roundDuration }) +} + +/** + * Deploy step registration and task itself + */ +subtask + .addTask('round:deploy-round', 'Deploy a funding round', getParams) + .setAction(async ({ roundDuration, clrfund }, hre) => { + subtask.setHre(hre) + const network = hre.network.name + + if (!roundDuration) { + throw new Error('Missing the roundDuration subtask parameter') + } + + const clrfundContract = await subtask.getContract({ + name: EContracts.ClrFund, + address: clrfund, + }) + + const tx = await clrfundContract.deployNewRound(roundDuration) + const receipt = await tx.wait() + if (receipt?.status !== 1) { + throw new Error('Failed to deploy funding round') + } + subtask.logTransaction(tx) + + const fundingRoundContractAddress = await clrfundContract.getCurrentRound() + + const fundingRoundContract = await subtask.getContract({ + name: EContracts.FundingRound, + address: fundingRoundContractAddress, + }) + + await registerFundingRound(fundingRoundContract, network, tx) + await registerMaci(fundingRoundContract, network, tx) + await registerPoll(roundDuration, fundingRoundContract, network, tx) + await registerTallyAndMessageProcessor(fundingRoundContract, network, tx) + }) diff --git a/contracts/tasks/subtasks/token/01-anyOldERC20Token.ts b/contracts/tasks/subtasks/token/01-anyOldERC20Token.ts new file mode 100644 index 000000000..dc1fcaf06 --- /dev/null +++ b/contracts/tasks/subtasks/token/01-anyOldERC20Token.ts @@ -0,0 +1,54 @@ +/** + * Deploy an instance of the BrightID sponsor contract + * + */ +import { ContractStorage } from '../../helpers/ContractStorage' +import { Subtask } from '../../helpers/Subtask' +import { ISubtaskParams } from '../../helpers/types' +import { EContracts } from '../../../utils/types' +import { isAddress } from 'ethers' + +const subtask = Subtask.getInstance() +const storage = ContractStorage.getInstance() + +/** + * Deploy step registration and task itself + */ +subtask + .addTask('token:deploy-erc20-token', 'Deploy an ERC20 contract') + .setAction(async ({ incremental }: ISubtaskParams, hre) => { + subtask.setHre(hre) + const deployer = await subtask.getDeployer() + + const token = subtask.tryGetConfigField(EContracts.ClrFund, 'token') + if (token && isAddress(token)) { + // using an existing token, no need to deploy + return + } + + const anyOldERC20TokenContractAddress = storage.getAddress( + EContracts.AnyOldERC20Token, + hre.network.name + ) + + if (incremental && anyOldERC20TokenContractAddress) { + return + } + + const initialSupply = subtask.getConfigField( + EContracts.AnyOldERC20Token, + 'initialSupply' + ) + const args = [initialSupply] + const anyOldERC20TokenContract = await subtask.deployContract( + EContracts.AnyOldERC20Token, + { signer: deployer, args } + ) + + await storage.register({ + id: EContracts.AnyOldERC20Token, + contract: anyOldERC20TokenContract, + args, + network: hre.network.name, + }) + }) diff --git a/contracts/tasks/subtasks/token/02-setToken.ts b/contracts/tasks/subtasks/token/02-setToken.ts new file mode 100644 index 000000000..72a75557e --- /dev/null +++ b/contracts/tasks/subtasks/token/02-setToken.ts @@ -0,0 +1,58 @@ +/** + * Deploy an instance of the BrightID sponsor contract + * + */ +import { ContractStorage } from '../../helpers/ContractStorage' +import { Subtask } from '../../helpers/Subtask' +import { ISubtaskParams } from '../../helpers/types' +import { EContracts } from '../../../utils/types' +import { ClrFund } from '../../../typechain-types' +import { getAddress } from 'ethers' + +const subtask = Subtask.getInstance() +const storage = ContractStorage.getInstance() + +/** + * Register task and step + */ +subtask + .addTask('token:set-token', 'Set token in the ClrFund contract') + .setAction(async ({ incremental, clrfund }: ISubtaskParams, hre) => { + subtask.setHre(hre) + const network = hre.network.name + const deployer = await subtask.getDeployer() + + let tokenAddress = subtask.tryGetConfigField( + EContracts.ClrFund, + 'token' + ) + + if (!tokenAddress) { + tokenAddress = storage.mustGetAddress( + EContracts.AnyOldERC20Token, + network + ) + } + + const clrfundContract = await subtask.getContract({ + name: EContracts.ClrFund, + address: clrfund, + signer: deployer, + }) + + if (incremental) { + const currentTokenAddress = await clrfundContract.nativeToken() + if (getAddress(currentTokenAddress) === getAddress(tokenAddress)) { + // already set to this token + return + } + } + + const tx = await clrfundContract.setToken(tokenAddress) + const receipt = await tx.wait() + if (receipt?.status !== 1) { + throw new Error('Failed to set token') + } + + subtask.logTransaction(tx) + }) diff --git a/contracts/tasks/subtasks/user/01-simpleUserRegistry.ts b/contracts/tasks/subtasks/user/01-simpleUserRegistry.ts new file mode 100644 index 000000000..10ed2a9a3 --- /dev/null +++ b/contracts/tasks/subtasks/user/01-simpleUserRegistry.ts @@ -0,0 +1,52 @@ +/** + * Deploy a simple user registry + */ + +import { ContractStorage } from '../../helpers/ContractStorage' +import { Subtask } from '../../helpers/Subtask' +import { ISubtaskParams } from '../../helpers/types' +import { EContracts } from '../../../utils/types' + +const subtask = Subtask.getInstance() +const storage = ContractStorage.getInstance() + +/** + * Deploy step registration and task itself + */ +subtask + .addTask('user:deploy-simple-user-registry', 'Deploy a simple user registry') + .setAction(async ({ incremental }: ISubtaskParams, hre) => { + subtask.setHre(hre) + const deployer = await subtask.getDeployer() + + const userRegistryName = subtask.getConfigField( + EContracts.ClrFund, + 'userRegistry' + ) + + if (userRegistryName !== EContracts.SimpleUserRegistry) { + return + } + + const simpleUserRegistryContractAddress = storage.getAddress( + EContracts.SimpleUserRegistry, + hre.network.name + ) + + if (incremental && simpleUserRegistryContractAddress) { + return + } + + const args = [] + const simpleUserRegistryContract = await subtask.deployContract( + EContracts.SimpleUserRegistry, + { signer: deployer, args } + ) + + await storage.register({ + id: EContracts.SimpleUserRegistry, + contract: simpleUserRegistryContract, + args, + network: hre.network.name, + }) + }) diff --git a/contracts/tasks/subtasks/user/02-semaphoreUserRegistry.ts b/contracts/tasks/subtasks/user/02-semaphoreUserRegistry.ts new file mode 100644 index 000000000..5d15f3566 --- /dev/null +++ b/contracts/tasks/subtasks/user/02-semaphoreUserRegistry.ts @@ -0,0 +1,55 @@ +/** + * Deploy a semaphore user registry + */ + +import { ContractStorage } from '../../helpers/ContractStorage' +import { Subtask } from '../../helpers/Subtask' +import { ISubtaskParams } from '../../helpers/types' +import { EContracts } from '../../../utils/types' + +const subtask = Subtask.getInstance() +const storage = ContractStorage.getInstance() + +/** + * Deploy step registration and task itself + */ +subtask + .addTask( + 'user:deploy-semaphore-user-registry', + 'Deploy a semaphore user registry' + ) + .setAction(async ({ incremental }: ISubtaskParams, hre) => { + subtask.setHre(hre) + const deployer = await subtask.getDeployer() + + const userRegistryName = subtask.getConfigField( + EContracts.ClrFund, + 'userRegistry' + ) + + if (userRegistryName !== EContracts.SemaphoreUserRegistry) { + return + } + + const semaphoreUserRegistryContractAddress = storage.getAddress( + EContracts.SemaphoreUserRegistry, + hre.network.name + ) + + if (incremental && semaphoreUserRegistryContractAddress) { + return + } + + const args = [] + const semaphoreUserRegistryContract = await subtask.deployContract( + EContracts.SemaphoreUserRegistry, + { signer: deployer, args } + ) + + await storage.register({ + id: EContracts.SemaphoreUserRegistry, + contract: semaphoreUserRegistryContract, + args, + network: hre.network.name, + }) + }) diff --git a/contracts/tasks/subtasks/user/03-brightidSponsor.ts b/contracts/tasks/subtasks/user/03-brightidSponsor.ts new file mode 100644 index 000000000..9482a449e --- /dev/null +++ b/contracts/tasks/subtasks/user/03-brightidSponsor.ts @@ -0,0 +1,62 @@ +/** + * Deploy an instance of the BrightID sponsor contract + * + */ +import { ContractStorage } from '../../helpers/ContractStorage' +import { Subtask } from '../../helpers/Subtask' +import { EContracts } from '../../../utils/types' + +const subtask = Subtask.getInstance() +const storage = ContractStorage.getInstance() + +/** + * Deploy step registration and task itself + */ +subtask + .addTask('user:deploy-brightid-sponsor', 'Deploy BrightID sponsor contract') + .setAction(async (_, hre) => { + subtask.setHre(hre) + const deployer = await subtask.getDeployer() + + const userRegistryName = subtask.getConfigField( + EContracts.ClrFund, + 'userRegistry' + ) + + if (userRegistryName !== EContracts.BrightIdUserRegistry) { + return + } + + let brightidSponsorContractAddress = subtask.tryGetConfigField( + EContracts.BrightIdUserRegistry, + 'sponsor' + ) + + if (brightidSponsorContractAddress) { + console.log( + `Skip BrightIdSponsor deployment, use ${brightidSponsorContractAddress}` + ) + return + } + + brightidSponsorContractAddress = storage.getAddress( + EContracts.BrightIdSponsor, + hre.network.name + ) + + if (brightidSponsorContractAddress) { + return + } + + const BrightIdSponsorContract = await subtask.deployContract( + EContracts.BrightIdSponsor, + { signer: deployer } + ) + + await storage.register({ + id: EContracts.BrightIdSponsor, + contract: BrightIdSponsorContract, + args: [], + network: hre.network.name, + }) + }) diff --git a/contracts/tasks/subtasks/user/04-brightidUserRegistry.ts b/contracts/tasks/subtasks/user/04-brightidUserRegistry.ts new file mode 100644 index 000000000..6db98dc2c --- /dev/null +++ b/contracts/tasks/subtasks/user/04-brightidUserRegistry.ts @@ -0,0 +1,81 @@ +/** + * Deploy a new recipient registry + */ +import { encodeBytes32String } from 'ethers' +import { ContractStorage } from '../../helpers/ContractStorage' +import { Subtask } from '../../helpers/Subtask' +import { ISubtaskParams } from '../../helpers/types' +import { EContracts } from '../../../utils/types' + +const subtask = Subtask.getInstance() +const storage = ContractStorage.getInstance() + +/** + * Deploy step registration and task itself + */ +subtask + .addTask( + 'user:deploy-brightid-user-registry', + 'Deploy a brightid user registry' + ) + .setAction(async ({ incremental }: ISubtaskParams, hre) => { + subtask.setHre(hre) + const deployer = await subtask.getDeployer() + const network = hre.network.name + + const userRegistryName = subtask.getConfigField( + EContracts.ClrFund, + 'userRegistry' + ) + + if (userRegistryName !== EContracts.BrightIdUserRegistry) { + return + } + + const brightidUserRegistryContractAddress = storage.getAddress( + EContracts.BrightIdUserRegistry, + network + ) + + if (incremental && brightidUserRegistryContractAddress) { + return + } + + const shouldDeploy = subtask.tryGetConfigField( + EContracts.BrightIdUserRegistry, + 'deploy' + ) + if (shouldDeploy === false) { + return + } + + const context = subtask.getConfigField( + EContracts.BrightIdUserRegistry, + 'context' + ) + const verifier = subtask.getConfigField( + EContracts.BrightIdUserRegistry, + 'verifier' + ) + + let sponsor = subtask.tryGetConfigField( + EContracts.BrightIdUserRegistry, + 'sponsor' + ) + if (!sponsor) { + sponsor = storage.mustGetAddress(EContracts.BrightIdSponsor, network) + } + + const args = [encodeBytes32String(context), verifier, sponsor] + const brightidUserRegistryContract = await subtask.deployContract( + EContracts.BrightIdUserRegistry, + { signer: deployer, args } + ) + + await storage.register({ + id: EContracts.BrightIdUserRegistry, + contract: brightidUserRegistryContract, + args, + network, + }) + }) diff --git a/contracts/tasks/subtasks/user/99-setUserRegistry.ts b/contracts/tasks/subtasks/user/99-setUserRegistry.ts new file mode 100644 index 000000000..3589a1227 --- /dev/null +++ b/contracts/tasks/subtasks/user/99-setUserRegistry.ts @@ -0,0 +1,66 @@ +/** + * Deploy a new recipient registry + * + */ +import { ContractStorage } from '../../helpers/ContractStorage' +import { Subtask } from '../../helpers/Subtask' +import { ISubtaskParams } from '../../helpers/types' +import { EContracts } from '../../../utils/types' +import { ClrFund } from '../../../typechain-types' +import { getAddress } from 'ethers' + +const subtask = Subtask.getInstance() +const storage = ContractStorage.getInstance() + +/** + * Register task and step + */ +subtask + .addTask( + 'user:set-user-registry', + 'Set user registry in the ClrFund contract' + ) + .setAction(async ({ incremental, clrfund }: ISubtaskParams, hre) => { + subtask.setHre(hre) + const network = hre.network.name + + const userRegistryName = subtask.getConfigField( + EContracts.ClrFund, + 'userRegistry' + ) + + const userRegistryContractAddress = storage.mustGetAddress( + userRegistryName as EContracts, + network + ) + + const clrfundContract = await subtask.getContract({ + name: EContracts.ClrFund, + address: clrfund, + }) + + if (incremental) { + const currentUserRegistryAddress = await clrfundContract.userRegistry() + + if ( + getAddress(currentUserRegistryAddress) === + getAddress(userRegistryContractAddress) + ) { + // already set + return + } + } + + const tx = await clrfundContract.setUserRegistry( + userRegistryContractAddress + ) + const receipt = await tx.wait() + + if (receipt?.status !== 1) { + throw new Error( + `Failed to se user registry ${userRegistryContractAddress}` + ) + } + + subtask.logTransaction(tx) + }) diff --git a/contracts/tasks/tally.ts b/contracts/tasks/tally.ts deleted file mode 100644 index d767d4798..000000000 --- a/contracts/tasks/tally.ts +++ /dev/null @@ -1,256 +0,0 @@ -import { task, types } from 'hardhat/config' -import fs from 'fs' -import { Contract, Wallet } from 'ethers' -import { genProofs, proveOnChain, fetchLogs } from 'maci-cli' - -import { getIpfsHash } from '../utils/ipfs' -import { addTallyResultsBatch } from '../utils/maci' - -/** - * Tally votes for the specified funding round. This task can be rerun by - * passing in additional parameters: --maci-logs, --maci-state-file - * - * Make sure to set the following environment variables in the .env file - * if not running test using the localhost network - * 1) COORDINATOR_ETH_PK - coordinator's wallet private key to interact with contracts - * 2) COORDINATOR_PK - coordinator's MACI private key to decrypt messages - * - * Sample usage: - * - * yarn hardhat tally --round-address
--start-block --network - * - * To rerun: - * - * yarn hardhat tally --round-address
--network \ - * --maci-logs --maci-state-file - */ - -type TallyArgs = { - fundingRound: Contract - coordinatorMaciPrivKey: string - coordinator: Wallet - startBlock: number - numBlocksPerRequest: number - batchSize: number - logsFile: string - maciStateFile: string - providerUrl: string - voteOptionTreeDepth: number - shouldFetchLogs: boolean -} - -async function main(args: TallyArgs) { - const { - fundingRound, - coordinatorMaciPrivKey, - coordinator, - batchSize, - logsFile, - maciStateFile, - providerUrl, - voteOptionTreeDepth, - shouldFetchLogs, - startBlock, - numBlocksPerRequest, - } = args - - console.log('funding round address', fundingRound.address) - const maciAddress = await fundingRound.maci() - console.log('maci address', maciAddress) - - const publishedTallyHash = await fundingRound.tallyHash() - console.log('publishedTallyHash', publishedTallyHash) - - let tally - if (!publishedTallyHash) { - const maciAddress = await fundingRound.maci() - console.log('maci address', maciAddress) - - if (shouldFetchLogs) { - // Fetch Maci logs - console.log('Fetching MACI logs from block', startBlock) - try { - await fetchLogs({ - contract: maciAddress, - eth_provider: providerUrl, - privkey: coordinatorMaciPrivKey, - start_block: startBlock, - num_blocks_per_request: numBlocksPerRequest, - output: logsFile, - }) - console.log('MACI logs generated at', logsFile) - } catch (err) { - console.log('Failed to fetchLogs', err) - throw err - } - } - - // Process messages and tally votes - const results = await genProofs({ - contract: maciAddress, - eth_provider: providerUrl, - privkey: coordinatorMaciPrivKey, - tally_file: 'tally.json', - output: 'proofs.json', - logs_file: logsFile, - macistate: maciStateFile, - }) - if (!results) { - throw new Error('generation of proofs failed') - } - const { proofs } = results - tally = results.tally - - // Submit proofs to MACI contract - await proveOnChain({ - contract: maciAddress, - eth_privkey: coordinator.privateKey, - eth_provider: providerUrl, - privkey: coordinatorMaciPrivKey, - proof_file: proofs, - }) - - // Publish tally hash - const tallyHash = await getIpfsHash(tally) - await fundingRound.publishTallyHash(tallyHash) - console.log(`Tally hash is ${tallyHash}`) - } else { - // read the tally.json file - console.log(`Tally hash is ${publishedTallyHash}`) - try { - console.log(`Reading tally.json file...`) - const tallyStr = fs.readFileSync('tally.json').toString() - tally = JSON.parse(tallyStr) - } catch (err) { - console.log('Failed to get tally file', publishedTallyHash, err) - throw err - } - } - - // Submit results to the funding round contract - const startIndex = await fundingRound.totalTallyResults() - const total = tally.results.tally.length - console.log('Uploading tally results in batches of', batchSize) - const addTallyGas = await addTallyResultsBatch( - fundingRound, - voteOptionTreeDepth, - tally, - batchSize, - startIndex.toNumber(), - (processed: number) => { - console.log(`Processed ${processed} / ${total}`) - } - ) - console.log('Tally results uploaded. Gas used:', addTallyGas.toString()) -} - -task('tally', 'Tally votes for the current round') - .addParam( - 'roundAddress', - 'The funding round contract address', - '', - types.string - ) - .addParam( - 'batchSize', - 'Number of tally result to submit on chain per batch', - 20, - types.int - ) - .addParam( - 'numBlocksPerRequest', - 'The number of blocks to fetch for each get log request', - 200000, - types.int - ) - .addParam( - 'startBlock', - 'The first block containing the MACI events', - 0, - types.int - ) - .addOptionalParam('maciLogs', 'The file path containing the MACI logs') - .addOptionalParam( - 'maciStateFile', - 'The MACI state file, genProof will continue from it last run' - ) - .setAction( - async ( - { - roundAddress, - maciLogs, - maciStateFile, - batchSize, - startBlock, - numBlocksPerRequest, - }, - { ethers, network } - ) => { - let fundingRoundAddress = roundAddress - let coordinatorMaciPrivKey = process.env.COORDINATOR_PK || '' - let coordinatorEthPrivKey = - process.env.COORDINATOR_ETH_PK || process.env.WALLET_PRIVATE_KEY || '' - const providerUrl = (network.config as any).url - - if (network.name === 'localhost') { - const stateStr = fs.readFileSync('state.json').toString() - const state = JSON.parse(stateStr) - fundingRoundAddress = state.fundingRound - coordinatorMaciPrivKey = state.coordinatorPrivKey - // default to the first account - coordinatorEthPrivKey = coordinatorEthPrivKey - ? coordinatorEthPrivKey - : '0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80' - } else { - if (!coordinatorEthPrivKey) { - throw Error( - `Please set the environment variable COORDINATOR_ETH_PK, the coordinator's wallet private key` - ) - } - - if (!coordinatorMaciPrivKey) { - throw Error( - `Please set the environment variable COORDINATOR_PK, the coordinator's MACI private key` - ) - } - } - - if (!fundingRoundAddress) { - throw Error(`The '--round-address' parameter is required`) - } - - console.log('Funding round address: ', fundingRoundAddress) - const coordinator = new Wallet(coordinatorEthPrivKey, ethers.provider) - console.log('Coordinator address: ', coordinator.address) - - const fundingRound = await ethers.getContractAt( - 'FundingRound', - fundingRoundAddress, - coordinator - ) - - const maciAddress = await fundingRound.maci() - const maci = await ethers.getContractAt('MACI', maciAddress, coordinator) - const [, , voteOptionTreeDepth] = await maci.treeDepths() - console.log('Vote option tree depth', voteOptionTreeDepth) - - const timeMs = new Date().getTime() - const logsFile = maciLogs ? maciLogs : `maci_logs_${timeMs}.json` - - await main({ - fundingRound, - coordinatorMaciPrivKey, - coordinator, - startBlock, - numBlocksPerRequest, - batchSize, - voteOptionTreeDepth: Number(voteOptionTreeDepth), - logsFile, - providerUrl, - shouldFetchLogs: !maciLogs, - maciStateFile: maciStateFile - ? maciStateFile - : `maci_state_${timeMs}.json`, - }) - } - ) diff --git a/contracts/tasks/verifyAll.ts b/contracts/tasks/verifyAll.ts deleted file mode 100644 index bef27e87c..000000000 --- a/contracts/tasks/verifyAll.ts +++ /dev/null @@ -1,174 +0,0 @@ -import { Contract } from 'ethers' -import { task } from 'hardhat/config' - -const SUCCESS = 'success' - -type Result = { - name: string - status: string -} - -async function verifyMaciFactory(factory: Contract, run: any): Promise { - try { - const address = await factory.maciFactory() - await run('verify-maci-factory', { address }) - return SUCCESS - } catch (error) { - return error.message - } -} - -async function verifyRoundFactory(address: string, run: any): Promise { - try { - await run('verify-round-factory', { address }) - return SUCCESS - } catch (error) { - return error.message - } -} - -async function verifyRecipientRegistry( - factory: Contract, - run: any -): Promise { - try { - const address = await factory.recipientRegistry() - await run('verify-recipient-registry', { address }) - return SUCCESS - } catch (error) { - return error.message - } -} - -async function verifyUserRegistry( - factory: Contract, - run: any -): Promise { - try { - const address = await factory.userRegistry() - await run('verify-user-registry', { address }) - return SUCCESS - } catch (error) { - return error.message - } -} - -async function verifyRound(address: string, run: any): Promise { - try { - await run('verify-round', { address }) - return SUCCESS - } catch (error) { - return error.message - } -} - -async function verifyMaci(maciAddress: string, run: any): Promise { - try { - await run('verify-maci', { maciAddress }) - return SUCCESS - } catch (error) { - return error.message - } -} - -async function verifyStateTreeVerifier( - maciAddress: string, - run: any, - ethers: any -): Promise { - try { - const rawAddress = await ethers.provider.getStorageAt(maciAddress, 1) - const address = ethers.utils.hexDataSlice(rawAddress, 12) - await run('verify:verify', { address }) - return SUCCESS - } catch (error) { - return error.message - } -} - -async function verifyTallyVerifier( - maciAddress: string, - run: any, - ethers: any -): Promise { - try { - const rawAddress = await ethers.provider.getStorageAt(maciAddress, 2) - const address = ethers.utils.hexDataSlice(rawAddress, 12) - await run('verify:verify', { address }) - return SUCCESS - } catch (error) { - return error.message - } -} - -async function verifySponsor(address: string, run: any): Promise { - try { - await run('verify:verify', { address }) - return SUCCESS - } catch (error) { - return error.message - } -} - -async function getBrightIdSponsor( - factory: Contract, - ethers: any -): Promise { - const userRegistryAddress = await factory.userRegistry() - const userRegistry = await ethers.getContractAt( - 'BrightIdUserRegistry', - userRegistryAddress - ) - try { - const sponsor = await userRegistry.brightIdSponsor() - return sponsor - } catch { - return null - } -} - -/** - * Verifies all the contracts created for clrfund app - */ -task('verify-all', 'Verify all clrfund contracts') - .addPositionalParam('address', 'Funding round factory contract address') - .setAction(async ({ address }, { run, ethers }) => { - const factory = await ethers.getContractAt('FundingRoundFactory', address) - const roundAddress = await factory.getCurrentRound() - - const results: Result[] = [] - let status = await verifyMaciFactory(factory, run) - results.push({ name: 'Maci facotry', status }) - status = await verifyRoundFactory(address, run) - results.push({ name: 'Funding round factory', status }) - status = await verifyRecipientRegistry(factory, run) - results.push({ name: 'Recipient registry', status }) - status = await verifyUserRegistry(factory, run) - results.push({ name: 'User factory', status }) - - const sponsor = await getBrightIdSponsor(factory, ethers) - if (sponsor) { - status = await verifySponsor(sponsor, run) - results.push({ name: 'BrightId sponsor', status }) - } - - if (roundAddress !== ethers.constants.AddressZero) { - const round = await ethers.getContractAt('FundingRound', roundAddress) - const maciAddress = await round.maci() - status = await verifyRound(roundAddress, run) - results.push({ name: 'Funding round', status }) - status = await verifyMaci(maciAddress, run) - results.push({ name: 'MACI', status }) - - status = await verifyStateTreeVerifier(maciAddress, run, ethers) - results.push({ name: 'BatchUpdateStateTreeVerifier', status }) - - status = await verifyTallyVerifier(maciAddress, run, ethers) - results.push({ name: 'QuadVoteTallyVerifier', status }) - } - - results.forEach(({ name, status }, i) => { - const color = status === SUCCESS ? '32' : '31' - console.log(`${i} ${name}: \x1b[%sm%s\x1b[0m`, color, status) - }) - }) diff --git a/contracts/tasks/verifyMaci.ts b/contracts/tasks/verifyMaci.ts deleted file mode 100644 index 11d8057ae..000000000 --- a/contracts/tasks/verifyMaci.ts +++ /dev/null @@ -1,52 +0,0 @@ -import { task } from 'hardhat/config' - -/** - * Verifies the MACI contract - * - it constructs the constructor arguments by querying the MACI contract - * - it calls the etherscan hardhat plugin to verify the contract - */ -task('verify-maci', 'Verify a MACI contract') - .addPositionalParam('maciAddress', 'MACI contract address') - .setAction(async ({ maciAddress }, { run, ethers }) => { - const maci = await ethers.getContractAt('MACI', maciAddress) - const treeDepths = await maci.treeDepths() - const tallyBatchSize = await maci.tallyBatchSize() - const messageBatchSize = await maci.messageBatchSize() - const maxUsers = await maci.maxUsers() - const maxMessages = await maci.maxMessages() - const maxVoteOptions = await maci.voteOptionsMaxLeafIndex() - const signUpGatekeeper = await maci.signUpGatekeeper() - const batchUstVerifier = await ethers.provider.getStorageAt(maciAddress, 1) - const qvtVerifier = await ethers.provider.getStorageAt(maciAddress, 2) - const signUpDurationSeconds = await maci.signUpDurationSeconds() - const votingDurationSeconds = await maci.votingDurationSeconds() - const initialVoiceCreditProxy = await maci.initialVoiceCreditProxy() - const coordinatorAddress = await maci.coordinatorAddress() - const coordinatorPubKey = await maci.coordinatorPubKey() - - const constructorArguments = [ - { - stateTreeDepth: treeDepths[0], - messageTreeDepth: treeDepths[1], - voteOptionTreeDepth: treeDepths[2], - }, - { tallyBatchSize, messageBatchSize }, - { maxUsers, maxMessages, maxVoteOptions }, - signUpGatekeeper, - ethers.utils.hexDataSlice(batchUstVerifier, 12), - ethers.utils.hexDataSlice(qvtVerifier, 12), - signUpDurationSeconds, - votingDurationSeconds, - initialVoiceCreditProxy, - { x: coordinatorPubKey.x, y: coordinatorPubKey.y }, - coordinatorAddress, - ] - - console.log('Verifying the MACI contract', maciAddress) - console.log('Constructor arguments', constructorArguments) - - await run('verify:verify', { - address: maciAddress, - constructorArguments, - }) - }) diff --git a/contracts/tasks/verifyMaciFactory.ts b/contracts/tasks/verifyMaciFactory.ts deleted file mode 100644 index 31761119f..000000000 --- a/contracts/tasks/verifyMaciFactory.ts +++ /dev/null @@ -1,77 +0,0 @@ -import { task } from 'hardhat/config' -import { Contract } from 'ethers' - -type ProvidedArgs = { - signupDuration?: string - votingDuration?: string -} - -async function getConstructorArguments( - maciFactory: Contract, - provided: ProvidedArgs = {} -): Promise { - const signupPromise = provided.signupDuration - ? Promise.resolve(provided.signupDuration) - : maciFactory.signUpDuration() - - const votingPromise = provided.votingDuration - ? Promise.resolve(provided.votingDuration) - : maciFactory.votingDuration() - - const [ - treeDepths, - batchSizes, - batchUstVerifier, - qvtVerifier, - signUpDuration, - votingDuration, - ] = await Promise.all([ - maciFactory.treeDepths(), - maciFactory.batchSizes(), - maciFactory.batchUstVerifier(), - maciFactory.qvtVerifier(), - signupPromise, - votingPromise, - ]) - - const [stateTreeDepth, messageTreeDepth, voteOptionTreeDepth] = treeDepths - const [tallyBatchSize, messageBatchSize] = batchSizes - - return [ - stateTreeDepth, - messageTreeDepth, - voteOptionTreeDepth, - tallyBatchSize, - messageBatchSize, - batchUstVerifier, - qvtVerifier, - signUpDuration, - votingDuration, - ] -} - -/** - * Verifies the MACI factory contract - * - it constructs the constructor arguments by querying the MACI factory contract - * - it calls the etherscan hardhat plugin to verify the contract - */ -task('verify-maci-factory', 'Verify a MACI factory contract') - .addParam('address', 'MACI factory contract address') - .addOptionalParam('signupDuration', 'Signup duration in seconds') - .addOptionalParam('votingDuration', 'Voting duration in seconds') - .setAction( - async ({ address, signupDuration, votingDuration }, { run, ethers }) => { - const maciFactory = await ethers.getContractAt('MACIFactory', address) - - const constructorArguments = await getConstructorArguments(maciFactory, { - signupDuration, - votingDuration, - }) - console.log('Constructor arguments', constructorArguments) - - await run('verify:verify', { - address, - constructorArguments, - }) - } - ) diff --git a/contracts/tasks/verifyRecipientRegistry.ts b/contracts/tasks/verifyRecipientRegistry.ts deleted file mode 100644 index 95dbb916a..000000000 --- a/contracts/tasks/verifyRecipientRegistry.ts +++ /dev/null @@ -1,54 +0,0 @@ -import { task } from 'hardhat/config' - -type ProvidedArgs = { - baseDeposit?: string - challengePeriodDuration?: string -} - -async function getConstructorArguments( - address: string, - ethers: any, - provided: ProvidedArgs = {} -): Promise { - const registry = await ethers.getContractAt( - 'OptimisticRecipientRegistry', - address - ) - - const controller = await registry.controller() - try { - let baseDeposit = await registry.baseDeposit() - if (provided.baseDeposit) { - baseDeposit = provided.baseDeposit - } - - const challengePeriodDuration = provided.challengePeriodDuration - ? provided.challengePeriodDuration - : await registry.challengePeriodDuration() - - return [baseDeposit, challengePeriodDuration, controller] - } catch { - try { - const klerosRegistry = await ethers.getContractAt( - 'KlerosGTCRAdapter', - address - ) - const tcr = await klerosRegistry.tcr() - return [tcr, controller] - } catch { - return [controller] - } - } -} - -task('verify-recipient-registry', 'Verify a recipient registry contract') - .addPositionalParam('address', 'Recipient registry contract address') - .setAction(async ({ address }, { run, ethers }) => { - const constructorArguments = await getConstructorArguments(address, ethers) - console.log('Constructor arguments', constructorArguments) - - await run('verify:verify', { - address, - constructorArguments, - }) - }) diff --git a/contracts/tasks/verifyRound.ts b/contracts/tasks/verifyRound.ts deleted file mode 100644 index 3acab8db1..000000000 --- a/contracts/tasks/verifyRound.ts +++ /dev/null @@ -1,28 +0,0 @@ -import { task } from 'hardhat/config' - -async function getConstructorArguments( - address: string, - ethers: any -): Promise { - const round = await ethers.getContractAt('FundingRound', address) - - const args = await Promise.all([ - round.nativeToken(), - round.userRegistry(), - round.recipientRegistry(), - round.coordinator(), - ]) - return args -} - -task('verify-round', 'Verify a funding round contract') - .addParam('address', 'Funding round contract address') - .setAction(async ({ address }, { run, ethers }) => { - const constructorArguments = await getConstructorArguments(address, ethers) - console.log('Constructor arguments', constructorArguments) - - await run('verify:verify', { - address, - constructorArguments, - }) - }) diff --git a/contracts/tasks/verifyRoundFactory.ts b/contracts/tasks/verifyRoundFactory.ts deleted file mode 100644 index ccc768361..000000000 --- a/contracts/tasks/verifyRoundFactory.ts +++ /dev/null @@ -1,20 +0,0 @@ -import { task } from 'hardhat/config' - -task('verify-round-factory', 'Verify a funding round factory contract') - .addPositionalParam('address', 'Funding round factory contract address') - .setAction(async ({ address }, { run, ethers }) => { - const fundingRoundFactory = await ethers.getContractAt( - 'FundingRoundFactory', - address - ) - const maciFactoryAddress = await fundingRoundFactory.maciFactory() - - const constructorArguments = [maciFactoryAddress] - - console.log('Constructor arguments', constructorArguments) - - await run('verify:verify', { - address, - constructorArguments, - }) - }) diff --git a/contracts/tasks/verifyUserRegistry.ts b/contracts/tasks/verifyUserRegistry.ts deleted file mode 100644 index 255110cf7..000000000 --- a/contracts/tasks/verifyUserRegistry.ts +++ /dev/null @@ -1,56 +0,0 @@ -import { task } from 'hardhat/config' - -type ProvidedArgs = { - context?: string - verifier?: string - sponsor?: string -} - -async function getConstructorArguments( - address: string, - ethers: any, - provided: ProvidedArgs = {} -): Promise { - const registry = await ethers.getContractAt('BrightIdUserRegistry', address) - - try { - let verifier = await registry.verifier() - if (provided.verifier) { - verifier = provided.verifier - } - - const sponsor = provided.sponsor - ? provided.sponsor - : await registry.brightIdSponsor() - - const context = provided.context - ? provided.context - : await registry.context() - - return [context, verifier, sponsor] - } catch { - // simple user registry - return [] - } -} - -task('verify-user-registry', 'Verify a user registry contract') - .addParam('address', 'User registry contract address') - .addOptionalParam('sponsor', 'BrightId sponsor contract address') - .addOptionalParam('verifier', 'BrightId verifier address') - .addOptionalParam('context', 'BrightId context') - .setAction( - async ({ address, sponsor, verifier, context }, { run, ethers }) => { - const constructorArguments = await getConstructorArguments( - address, - ethers, - { sponsor, verifier, context } - ) - console.log('Constructor arguments', constructorArguments) - - await run('verify:verify', { - address, - constructorArguments, - }) - } - ) diff --git a/contracts/tests/data/testTallySmall.json b/contracts/tests/data/testTallySmall.json index 8e0fe8865..1c89ce7c7 100644 --- a/contracts/tests/data/testTallySmall.json +++ b/contracts/tests/data/testTallySmall.json @@ -1,6 +1,8 @@ { "provider": "https://arb-mainnet.g.alchemy.com/v2/S67DO8ELPSxGxsbeETgvuMqG6AFsr2ux", "maci": "0x938fedD63C6770Ba50266Fe4C548A09FD2D1c9f1", + "pollId": "0", + "newTallyCommitment": "0x83a547530d182de4996ce607108d95dd2c8a9a2e0de402575ed5f758eea1c4", "results": { "commitment": "0x2f44c97ce649078012fd686eaf996fc6b8d817e11ab574f0d0a0d750ee1ec101", "tally": [ @@ -32,12 +34,12 @@ ], "salt": "0xa1f71f9e48a5f2ec55020051a190f079ca43d66457879972554c3c2e8a07ea0" }, - "totalVoiceCredits": { + "totalSpentVoiceCredits": { "spent": "6457377088", "commitment": "0x18b52cbe2a91777772d10c80d1b883cdc98e0f19475bcd907c693fddd6c675b8", "salt": "0x2013aa4e350542684f78adbf3e716c3bcf96e12c64b8e8ef3d962e3568132778" }, - "totalVoiceCreditsPerVoteOption": { + "perVOSpentVoiceCredits": { "commitment": "0x26e6ae35c82006eff6408b713d477307b2da16c7a1ff15fb46c0762ee308e88a", "tally": [ "0", diff --git a/contracts/tests/deployer.ts b/contracts/tests/deployer.ts index caf27f4bf..f21353557 100644 --- a/contracts/tests/deployer.ts +++ b/contracts/tests/deployer.ts @@ -1,63 +1,122 @@ -import { ethers, waffle } from 'hardhat' -import { use, expect } from 'chai' -import { solidity } from 'ethereum-waffle' -import { Contract } from 'ethers' +import { ethers, config, artifacts } from 'hardhat' +import { time } from '@nomicfoundation/hardhat-network-helpers' +import { expect } from 'chai' +import { BaseContract, Contract } from 'ethers' import { genRandomSalt } from 'maci-crypto' -import { Keypair } from '@clrfund/maci-utils' - -import { ZERO_ADDRESS, UNIT } from '../utils/constants' -import { getGasUsage, getEventArg } from '../utils/contracts' -import { deployContract, deployMaciFactory } from '../utils/deployment' -import { MaciParameters } from '../utils/maci' - -use(solidity) - -describe('Clr fund deployer', () => { - const provider = waffle.provider - const [, deployer, coordinator, contributor] = provider.getWallets() - - let maciFactory: Contract +import { Keypair } from '@clrfund/common' + +import { TREE_ARITY, ZERO_ADDRESS, UNIT } from '../utils/constants' +import { getGasUsage, getEventArg, deployContract } from '../utils/contracts' +import { deployPoseidonLibraries, deployMaciFactory } from '../utils/testutils' +import { MaciParameters } from '../utils/maciParameters' +import { HardhatEthersSigner } from '@nomicfoundation/hardhat-ethers/signers' +import { + ClrFund, + ClrFundDeployer, + FundingRoundFactory, + MACIFactory, +} from '../typechain-types' +import { EContracts } from '../utils/types' + +const roundDuration = 10000 + +describe('Clr fund deployer', async () => { + let deployer: HardhatEthersSigner + let coordinator: HardhatEthersSigner + let contributor: HardhatEthersSigner + let maciFactory: MACIFactory let userRegistry: Contract let recipientRegistry: Contract - let factoryTemplate: Contract - let factory: Contract - let clrFundDeployer: Contract + let factoryTemplate: ClrFund + let clrfund: ClrFund + let clrFundDeployer: ClrFundDeployer let token: Contract - let maciParameters: MaciParameters const coordinatorPubKey = new Keypair().pubKey.asContractParam() + let poseidonContracts: { [name: string]: string } + let roundInterface: Contract - beforeEach(async () => { - const circuit = 'prod' - maciFactory = await deployMaciFactory(deployer, circuit) - maciParameters = await MaciParameters.read(maciFactory) + before(async () => { + ;[, deployer, coordinator, contributor] = await ethers.getSigners() - factoryTemplate = await deployContract(deployer, 'ClrFund') + // this is just a dummy funding round contract to be passed as the + // contract argument to the revertedByCustomError() as a way to + // pass the Abi. + const FundingRoundArtifacts = await artifacts.readArtifact('FundingRound') + roundInterface = new Contract(ZERO_ADDRESS, FundingRoundArtifacts.abi) + }) - expect(factoryTemplate.address).to.properAddress - expect(await getGasUsage(factoryTemplate.deployTransaction)).lessThan( - 5400000 + beforeEach(async () => { + if (!poseidonContracts) { + poseidonContracts = await deployPoseidonLibraries({ + ethers, + }) + } + + const params = MaciParameters.mock() + maciFactory = await deployMaciFactory({ + libraries: poseidonContracts, + signer: deployer, + ethers, + maciParameters: params, + }) + + factoryTemplate = await deployContract( + EContracts.ClrFund, + ethers, + { + signer: deployer, + } ) - clrFundDeployer = await deployContract(deployer, 'ClrFundDeployer', [ - factoryTemplate.address, - ]) - - expect(clrFundDeployer.address).to.properAddress - expect(await getGasUsage(clrFundDeployer.deployTransaction)).lessThan( - 5400000 + expect(await factoryTemplate.getAddress()).to.be.properAddress + const tx = factoryTemplate.deploymentTransaction() + if (tx) { + expect(await getGasUsage(tx)).lessThan(5400000) + } else { + expect(tx).to.not.be.null + } + + const roundFactory = await deployContract( + EContracts.FundingRoundFactory, + ethers ) + const roundFactoryTx = roundFactory.deploymentTransaction() + if (roundFactoryTx) { + expect(await getGasUsage(roundFactoryTx)).lessThan(4600000) + } else { + expect(roundFactoryTx).to.not.be.null + } + + clrFundDeployer = await deployContract( + EContracts.ClrFundDeployer, + ethers, + { + args: [factoryTemplate.target, maciFactory.target, roundFactory.target], + signer: deployer, + } + ) + + expect(clrFundDeployer.target).to.be.properAddress + const deployerTx = clrFundDeployer.deploymentTransaction() + if (deployerTx) { + expect(await getGasUsage(deployerTx)).lessThan(5400000) + } else { + expect(deployerTx).to.not.be.null + } - const newInstanceTx = await clrFundDeployer.deployFund(maciFactory.address) + const newInstanceTx = await clrFundDeployer.deployClrFund() const instanceAddress = await getEventArg( newInstanceTx, - clrFundDeployer, + clrFundDeployer as BaseContract as Contract, 'NewInstance', 'clrfund' ) - factory = await ethers.getContractAt('ClrFund', instanceAddress, deployer) - - await maciFactory.transferOwnership(instanceAddress) + clrfund = (await ethers.getContractAt( + EContracts.ClrFund, + instanceAddress, + deployer + )) as BaseContract as ClrFund const SimpleUserRegistry = await ethers.getContractFactory( 'SimpleUserRegistry', @@ -68,208 +127,171 @@ describe('Clr fund deployer', () => { 'SimpleRecipientRegistry', deployer ) - recipientRegistry = await SimpleRecipientRegistry.deploy(factory.address) + recipientRegistry = await SimpleRecipientRegistry.deploy(clrfund.target) // Deploy token contract and transfer tokens to contributor - const tokenInitialSupply = UNIT.mul(1000) + const tokenInitialSupply = UNIT * 1000n const Token = await ethers.getContractFactory('AnyOldERC20Token', deployer) token = await Token.deploy(tokenInitialSupply) - expect(token.address).to.properAddress + expect(token.target).to.properAddress await token.transfer(contributor.address, tokenInitialSupply) }) it('can only be initialized once', async () => { - await expect(factory.init(maciFactory.address)).to.be.revertedWith( - 'Initializable: contract is already initialized' - ) - }) - - it('can register with the subgraph', async () => { + const dummyRoundFactory = ZERO_ADDRESS await expect( - clrFundDeployer.registerInstance( - factory.address, - '{name:dead,title:beef}' - ) - ) - .to.emit(clrFundDeployer, 'Register') - .withArgs(factory.address, '{name:dead,title:beef}') + clrfund.init(maciFactory.target, dummyRoundFactory) + ).to.be.revertedWith('Initializable: contract is already initialized') }) - it('cannot register with the subgraph twice', async () => { - await expect( - clrFundDeployer.registerInstance( - factory.address, - '{name:dead,title:beef}' - ) - ) - .to.emit(clrFundDeployer, 'Register') - .withArgs(factory.address, '{name:dead,title:beef}') - await expect( - clrFundDeployer.registerInstance( - factory.address, - '{name:dead,title:beef}' - ) - ).to.be.revertedWith('ClrFund: metadata already registered') - }) - - it('initializes factory', async () => { - expect(await factory.coordinator()).to.equal(ZERO_ADDRESS) - expect(await factory.nativeToken()).to.equal(ZERO_ADDRESS) - expect(await factory.maciFactory()).to.equal(maciFactory.address) - expect(await factory.userRegistry()).to.equal(ZERO_ADDRESS) - expect(await factory.recipientRegistry()).to.equal(ZERO_ADDRESS) + it('initializes clrfund', async () => { + expect(await clrfund.coordinator()).to.equal(ZERO_ADDRESS) + expect(await clrfund.nativeToken()).to.equal(ZERO_ADDRESS) + expect(await clrfund.maciFactory()).to.equal(maciFactory.target) + expect(await clrfund.userRegistry()).to.equal(ZERO_ADDRESS) + expect(await clrfund.recipientRegistry()).to.equal(ZERO_ADDRESS) }) it('transfers ownership to another address', async () => { - await expect(factory.transferOwnership(coordinator.address)) - .to.emit(factory, 'OwnershipTransferred') + await expect(clrfund.transferOwnership(coordinator.address)) + .to.emit(clrfund, 'OwnershipTransferred') .withArgs(deployer.address, coordinator.address) }) describe('changing user registry', () => { it('allows owner to set user registry', async () => { - await factory.setUserRegistry(userRegistry.address) - expect(await factory.userRegistry()).to.equal(userRegistry.address) + await clrfund.setUserRegistry(userRegistry.target) + expect(await clrfund.userRegistry()).to.equal(userRegistry.target) }) it('allows only owner to set user registry', async () => { await expect( - factory.connect(contributor).setUserRegistry(userRegistry.address) + clrfund.connect(contributor).setUserRegistry(userRegistry.target) ).to.be.revertedWith('Ownable: caller is not the owner') }) it('allows owner to change recipient registry', async () => { - await factory.setRecipientRegistry(recipientRegistry.address) + await clrfund.setRecipientRegistry(recipientRegistry.target) const SimpleUserRegistry = await ethers.getContractFactory( 'SimpleUserRegistry', deployer ) const anotherUserRegistry = await SimpleUserRegistry.deploy() - await factory.setUserRegistry(anotherUserRegistry.address) - expect(await factory.userRegistry()).to.equal(anotherUserRegistry.address) + await clrfund.setUserRegistry(anotherUserRegistry.target) + expect(await clrfund.userRegistry()).to.equal(anotherUserRegistry.target) }) }) describe('changing recipient registry', () => { it('allows owner to set recipient registry', async () => { - await factory.setRecipientRegistry(recipientRegistry.address) - expect(await factory.recipientRegistry()).to.equal( - recipientRegistry.address + await clrfund.setCoordinator(coordinator.address, coordinatorPubKey) + await clrfund.setRecipientRegistry(recipientRegistry.target) + expect(await clrfund.recipientRegistry()).to.equal( + recipientRegistry.target ) - expect(await recipientRegistry.controller()).to.equal(factory.address) + expect(await recipientRegistry.controller()).to.equal(clrfund.target) + const params = MaciParameters.mock() expect(await recipientRegistry.maxRecipients()).to.equal( - 5 ** maciParameters.voteOptionTreeDepth - 1 + BigInt(TREE_ARITY) ** BigInt(params.treeDepths.voteOptionTreeDepth) - + BigInt(1) ) }) it('allows only owner to set recipient registry', async () => { await expect( - factory + clrfund .connect(contributor) - .setRecipientRegistry(recipientRegistry.address) + .setRecipientRegistry(recipientRegistry.target) ).to.be.revertedWith('Ownable: caller is not the owner') }) it('allows owner to change recipient registry', async () => { - await factory.setRecipientRegistry(recipientRegistry.address) + await clrfund.setRecipientRegistry(recipientRegistry.target) const SimpleRecipientRegistry = await ethers.getContractFactory( 'SimpleRecipientRegistry', deployer ) const anotherRecipientRegistry = await SimpleRecipientRegistry.deploy( - factory.address + clrfund.target ) - await factory.setRecipientRegistry(anotherRecipientRegistry.address) - expect(await factory.recipientRegistry()).to.equal( - anotherRecipientRegistry.address + await clrfund.setRecipientRegistry(anotherRecipientRegistry.target) + expect(await clrfund.recipientRegistry()).to.equal( + anotherRecipientRegistry.target ) }) }) describe('managing funding sources', () => { it('allows owner to add funding source', async () => { - await expect(factory.addFundingSource(contributor.address)) - .to.emit(factory, 'FundingSourceAdded') + await expect(clrfund.addFundingSource(contributor.address)) + .to.emit(clrfund, 'FundingSourceAdded') .withArgs(contributor.address) }) it('allows only owner to add funding source', async () => { await expect( - factory.connect(contributor).addFundingSource(contributor.address) + clrfund.connect(contributor).addFundingSource(contributor.address) ).to.be.revertedWith('Ownable: caller is not the owner') }) it('reverts if funding source is already added', async () => { - await factory.addFundingSource(contributor.address) + await clrfund.addFundingSource(contributor.address) await expect( - factory.addFundingSource(contributor.address) - ).to.be.revertedWith('Factory: Funding source already added') + clrfund.addFundingSource(contributor.address) + ).to.be.revertedWithCustomError(clrfund, 'FundingSourceAlreadyAdded') }) it('allows owner to remove funding source', async () => { - await factory.addFundingSource(contributor.address) - await expect(factory.removeFundingSource(contributor.address)) - .to.emit(factory, 'FundingSourceRemoved') + await clrfund.addFundingSource(contributor.address) + await expect(clrfund.removeFundingSource(contributor.address)) + .to.emit(clrfund, 'FundingSourceRemoved') .withArgs(contributor.address) }) it('allows only owner to remove funding source', async () => { - await factory.addFundingSource(contributor.address) + await clrfund.addFundingSource(contributor.address) await expect( - factory.connect(contributor).removeFundingSource(contributor.address) + clrfund.connect(contributor).removeFundingSource(contributor.address) ).to.be.revertedWith('Ownable: caller is not the owner') }) it('reverts if funding source is already removed', async () => { - await factory.addFundingSource(contributor.address) - await factory.removeFundingSource(contributor.address) + await clrfund.addFundingSource(contributor.address) + await clrfund.removeFundingSource(contributor.address) await expect( - factory.removeFundingSource(contributor.address) - ).to.be.revertedWith('Factory: Funding source not found') + clrfund.removeFundingSource(contributor.address) + ).to.be.revertedWithCustomError(clrfund, 'FundingSourceNotFound') }) }) it('allows direct contributions to the matching pool', async () => { - const contributionAmount = UNIT.mul(10) - await factory.setToken(token.address) + const contributionAmount = UNIT * 10n + await clrfund.setToken(token.target) await expect( - token.connect(contributor).transfer(factory.address, contributionAmount) + (token.connect(contributor) as Contract).transfer( + clrfund.target, + contributionAmount + ) ) .to.emit(token, 'Transfer') - .withArgs(contributor.address, factory.address, contributionAmount) - expect(await token.balanceOf(factory.address)).to.equal(contributionAmount) - }) - - it('sets MACI parameters', async () => { - maciParameters.update({ voteOptionTreeDepth: 3 }) - await expect(factory.setMaciParameters(...maciParameters.values())).to.emit( - maciFactory, - 'MaciParametersChanged' - ) - const treeDepths = await maciFactory.treeDepths() - expect(treeDepths.voteOptionTreeDepth).to.equal(3) - }) - - it('allows only owner to set MACI parameters', async () => { - const coordinatorFactory = factory.connect(coordinator) - await expect( - coordinatorFactory.setMaciParameters(...maciParameters.values()) - ).to.be.revertedWith('Ownable: caller is not the owner') + .withArgs(contributor.address, clrfund.target, contributionAmount) + expect(await token.balanceOf(clrfund.target)).to.equal(contributionAmount) }) describe('deploying funding round', () => { it('deploys funding round', async () => { - await factory.setUserRegistry(userRegistry.address) - await factory.setRecipientRegistry(recipientRegistry.address) - await factory.setToken(token.address) - await factory.setCoordinator(coordinator.address, coordinatorPubKey) - const deployed = factory.deployNewRound() - await expect(deployed).to.emit(factory, 'RoundStarted') + await clrfund.setUserRegistry(userRegistry.target) + await clrfund.setRecipientRegistry(recipientRegistry.target) + await clrfund.setToken(token.target) + await clrfund.setCoordinator(coordinator.address, coordinatorPubKey) + const deployed = clrfund.deployNewRound(roundDuration) + await expect(deployed).to.emit(clrfund, 'RoundStarted') const deployTx = await deployed - expect(await getGasUsage(deployTx)).lessThan(13000000) + // TODO: fix gas usage for deployNewRound() + expect(await getGasUsage(deployTx)).lessThan(20000000) - const fundingRoundAddress = await factory.getCurrentRound() + const fundingRoundAddress = await clrfund.getCurrentRound() expect(fundingRoundAddress).to.properAddress expect(fundingRoundAddress).to.not.equal(ZERO_ADDRESS) @@ -277,252 +299,308 @@ describe('Clr fund deployer', () => { 'FundingRound', fundingRoundAddress ) - expect(await fundingRound.owner()).to.equal(factory.address) - expect(await fundingRound.nativeToken()).to.equal(token.address) + expect(await fundingRound.owner()).to.equal(clrfund.target) + expect(await fundingRound.nativeToken()).to.equal(token.target) const maciAddress = await getEventArg( deployTx, - maciFactory, + maciFactory as BaseContract as Contract, 'MaciDeployed', '_maci' ) + expect(await fundingRound.maci()).to.equal(maciAddress) const maci = await ethers.getContractAt('MACI', maciAddress) - const roundCoordinatorPubKey = await maci.coordinatorPubKey() + const pollAddress = await getEventArg( + deployTx, + maci, + 'DeployPoll', + 'pollAddr' + ) + + const poll = await ethers.getContractAt('Poll', pollAddress.poll) + const roundCoordinatorPubKey = await poll.coordinatorPubKey() expect(roundCoordinatorPubKey.x).to.equal(coordinatorPubKey.x) expect(roundCoordinatorPubKey.y).to.equal(coordinatorPubKey.y) }) it('reverts if user registry is not set', async () => { - await factory.setRecipientRegistry(recipientRegistry.address) - await factory.setToken(token.address) - await factory.setCoordinator(coordinator.address, coordinatorPubKey) - await expect(factory.deployNewRound()).to.be.revertedWith( - 'Factory: User registry is not set' - ) + await clrfund.setRecipientRegistry(recipientRegistry.target) + await clrfund.setToken(token.target) + await clrfund.setCoordinator(coordinator.address, coordinatorPubKey) + + await expect( + clrfund.deployNewRound(roundDuration) + ).to.be.revertedWithCustomError(roundInterface, 'InvalidUserRegistry') }) + // TODO investigate why this fails it('reverts if recipient registry is not set', async () => { - await factory.setUserRegistry(userRegistry.address) - await factory.setToken(token.address) - await factory.setCoordinator(coordinator.address, coordinatorPubKey) - await expect(factory.deployNewRound()).to.be.revertedWith( - 'Factory: Recipient registry is not set' - ) + await clrfund.setUserRegistry(userRegistry.target) + await clrfund.setToken(token.target) + await clrfund.setCoordinator(coordinator.address, coordinatorPubKey) + + await expect( + clrfund.deployNewRound(roundDuration) + ).to.be.revertedWithCustomError(clrfund, 'RecipientRegistryNotSet') }) it('reverts if native token is not set', async () => { - await factory.setUserRegistry(userRegistry.address) - await factory.setRecipientRegistry(recipientRegistry.address) - await factory.setCoordinator(coordinator.address, coordinatorPubKey) - await expect(factory.deployNewRound()).to.be.revertedWith( - 'Factory: Native token is not set' - ) + await clrfund.setUserRegistry(userRegistry.target) + await clrfund.setRecipientRegistry(recipientRegistry.target) + await clrfund.setCoordinator(coordinator.address, coordinatorPubKey) + + await expect( + clrfund.deployNewRound(roundDuration) + ).to.be.revertedWithCustomError(roundInterface, 'InvalidNativeToken') }) it('reverts if coordinator is not set', async () => { - await factory.setUserRegistry(userRegistry.address) - await factory.setRecipientRegistry(recipientRegistry.address) - await factory.setToken(token.address) - await expect(factory.deployNewRound()).to.be.revertedWith( - 'Factory: No coordinator' - ) + await clrfund.setUserRegistry(userRegistry.target) + await clrfund.setRecipientRegistry(recipientRegistry.target) + await clrfund.setToken(token.target) + await expect( + clrfund.deployNewRound(roundDuration) + ).to.be.revertedWithCustomError(roundInterface, 'InvalidCoordinator') }) it('reverts if current round is not finalized', async () => { - await factory.setUserRegistry(userRegistry.address) - await factory.setRecipientRegistry(recipientRegistry.address) - await factory.setToken(token.address) - await factory.setCoordinator(coordinator.address, coordinatorPubKey) - await factory.deployNewRound() - await expect(factory.deployNewRound()).to.be.revertedWith( - 'Factory: Current round is not finalized' - ) + await clrfund.setUserRegistry(userRegistry.target) + await clrfund.setRecipientRegistry(recipientRegistry.target) + await clrfund.setToken(token.target) + await clrfund.setCoordinator(coordinator.address, coordinatorPubKey) + + await clrfund.deployNewRound(roundDuration) + await expect( + clrfund.deployNewRound(roundDuration) + ).to.be.revertedWithCustomError(clrfund, 'NotFinalized') }) it('deploys new funding round after previous round has been finalized', async () => { - await factory.setUserRegistry(userRegistry.address) - await factory.setRecipientRegistry(recipientRegistry.address) - await factory.setToken(token.address) - await factory.setCoordinator(coordinator.address, coordinatorPubKey) - await factory.deployNewRound() - await factory.cancelCurrentRound() - await expect(factory.deployNewRound()).to.emit(factory, 'RoundStarted') + await clrfund.setUserRegistry(userRegistry.target) + await clrfund.setRecipientRegistry(recipientRegistry.target) + await clrfund.setToken(token.target) + await clrfund.setCoordinator(coordinator.address, coordinatorPubKey) + + await clrfund.deployNewRound(roundDuration) + await clrfund.cancelCurrentRound() + await expect(clrfund.deployNewRound(roundDuration)).to.emit( + clrfund, + 'RoundStarted' + ) }) it('only owner can deploy funding round', async () => { - await factory.setUserRegistry(userRegistry.address) - await factory.setRecipientRegistry(recipientRegistry.address) - await factory.setToken(token.address) - await factory.setCoordinator(coordinator.address, coordinatorPubKey) - const factoryAsContributor = factory.connect(contributor) - await expect(factoryAsContributor.deployNewRound()).to.be.revertedWith( - 'Ownable: caller is not the owner' - ) + await clrfund.setUserRegistry(userRegistry.target) + await clrfund.setRecipientRegistry(recipientRegistry.target) + await clrfund.setToken(token.target) + await clrfund.setCoordinator(coordinator.address, coordinatorPubKey) + + const clrfundAsContributor = clrfund.connect(contributor) + await expect( + clrfundAsContributor.deployNewRound(roundDuration) + ).to.be.revertedWith('Ownable: caller is not the owner') }) }) describe('transferring matching funds', () => { - const contributionAmount = UNIT.mul(10) - const totalSpent = UNIT.mul(100) + const contributionAmount = UNIT * 10n + const totalSpent = UNIT * 100n const totalSpentSalt = genRandomSalt().toString() - let roundDuration: number + const resultsCommitment = genRandomSalt().toString() + const perVOVoiceCreditCommitment = genRandomSalt().toString() beforeEach(async () => { - await factory.setUserRegistry(userRegistry.address) - await factory.setRecipientRegistry(recipientRegistry.address) - await factory.setToken(token.address) - await factory.setCoordinator(coordinator.address, coordinatorPubKey) - roundDuration = - maciParameters.signUpDuration + maciParameters.votingDuration + 10 + await clrfund.setUserRegistry(userRegistry.target) + await clrfund.setRecipientRegistry(recipientRegistry.target) + await clrfund.setToken(token.target) + await clrfund.setCoordinator(coordinator.address, coordinatorPubKey) }) it('returns the amount of available matching funding', async () => { - await factory.addFundingSource(deployer.address) - await factory.addFundingSource(contributor.address) + await clrfund.addFundingSource(deployer.address) + await clrfund.addFundingSource(contributor.address) // Allowance is more than available balance - await token.connect(deployer).approve(factory.address, contributionAmount) + await (token.connect(deployer) as Contract).approve( + clrfund.target, + contributionAmount + ) // Allowance is less than available balance - await token - .connect(contributor) - .approve(factory.address, contributionAmount) + const tokenAsContributor = token.connect(contributor) as Contract + await tokenAsContributor.approve(clrfund.target, contributionAmount) // Direct contribution - await token - .connect(contributor) - .transfer(factory.address, contributionAmount) - await factory.deployNewRound() - expect(await factory.getMatchingFunds(token.address)).to.equal( - contributionAmount.mul(2) + await tokenAsContributor.transfer(clrfund.target, contributionAmount) + + await clrfund.deployNewRound(roundDuration) + expect(await clrfund.getMatchingFunds(token.target)).to.equal( + contributionAmount * 2n ) }) it('allows owner to finalize round', async () => { - await token - .connect(contributor) - .transfer(factory.address, contributionAmount) - await factory.deployNewRound() - await provider.send('evm_increaseTime', [roundDuration]) + await (token.connect(contributor) as Contract).transfer( + clrfund.target, + contributionAmount + ) + await clrfund.deployNewRound(roundDuration) + await time.increase(roundDuration) await expect( - factory.transferMatchingFunds(totalSpent, totalSpentSalt) - ).to.be.revertedWith('FundingRound: Votes has not been tallied') + clrfund.transferMatchingFunds( + totalSpent, + totalSpentSalt, + resultsCommitment, + perVOVoiceCreditCommitment + ) + ).to.be.revertedWithCustomError(roundInterface, 'VotesNotTallied') }) it('allows owner to finalize round even without matching funds', async () => { - await factory.deployNewRound() - await provider.send('evm_increaseTime', [roundDuration]) + await clrfund.deployNewRound(roundDuration) + await time.increase(roundDuration) await expect( - factory.transferMatchingFunds(totalSpent, totalSpentSalt) - ).to.be.revertedWith('FundingRound: Votes has not been tallied') + clrfund.transferMatchingFunds( + totalSpent, + totalSpentSalt, + resultsCommitment, + perVOVoiceCreditCommitment + ) + ).to.be.revertedWithCustomError(roundInterface, 'VotesNotTallied') }) it('pulls funds from funding source', async () => { - await factory.addFundingSource(contributor.address) - token.connect(contributor).approve(factory.address, contributionAmount) - await factory.addFundingSource(deployer.address) // Doesn't have tokens - await factory.deployNewRound() - await provider.send('evm_increaseTime', [roundDuration]) + await clrfund.addFundingSource(contributor.address) + await (token.connect(contributor) as Contract).approve( + clrfund.target, + contributionAmount + ) + await clrfund.addFundingSource(deployer.address) // Doesn't have tokens + await clrfund.deployNewRound(roundDuration) + await time.increase(roundDuration) await expect( - factory.transferMatchingFunds(totalSpent, totalSpentSalt) - ).to.be.revertedWith('FundingRound: Votes has not been tallied') + clrfund.transferMatchingFunds( + totalSpent, + totalSpentSalt, + resultsCommitment, + perVOVoiceCreditCommitment + ) + ).to.be.revertedWithCustomError(roundInterface, 'VotesNotTallied') }) it('pulls funds from funding source if allowance is greater than balance', async () => { - await factory.addFundingSource(contributor.address) - token - .connect(contributor) - .approve(factory.address, contributionAmount.mul(2)) - await factory.deployNewRound() - await provider.send('evm_increaseTime', [roundDuration]) + await clrfund.addFundingSource(contributor.address) + await (token.connect(contributor) as Contract).approve( + clrfund.target, + contributionAmount * 2n + ) + await clrfund.deployNewRound(roundDuration) + await time.increase(roundDuration) await expect( - factory.transferMatchingFunds(totalSpent, totalSpentSalt) - ).to.be.revertedWith('FundingRound: Votes has not been tallied') + clrfund.transferMatchingFunds( + totalSpent, + totalSpentSalt, + resultsCommitment, + perVOVoiceCreditCommitment + ) + ).to.be.revertedWithCustomError(roundInterface, 'VotesNotTallied') }) it('allows only owner to finalize round', async () => { - await factory.deployNewRound() - await provider.send('evm_increaseTime', [roundDuration]) + await clrfund.deployNewRound(roundDuration) + await time.increase(roundDuration) await expect( - factory + clrfund .connect(contributor) - .transferMatchingFunds(totalSpent, totalSpentSalt) + .transferMatchingFunds( + totalSpent, + totalSpentSalt, + resultsCommitment, + perVOVoiceCreditCommitment + ) ).to.be.revertedWith('Ownable: caller is not the owner') }) it('reverts if round has not been deployed', async () => { await expect( - factory.transferMatchingFunds(totalSpent, totalSpentSalt) - ).to.be.revertedWith('Factory: Funding round has not been deployed') + clrfund.transferMatchingFunds( + totalSpent, + totalSpentSalt, + resultsCommitment, + perVOVoiceCreditCommitment + ) + ).to.be.revertedWithCustomError(clrfund, 'NoCurrentRound') }) }) describe('cancelling round', () => { beforeEach(async () => { - await factory.setUserRegistry(userRegistry.address) - await factory.setRecipientRegistry(recipientRegistry.address) - await factory.setToken(token.address) - await factory.setCoordinator(coordinator.address, coordinatorPubKey) + await clrfund.setUserRegistry(userRegistry.target) + await clrfund.setRecipientRegistry(recipientRegistry.target) + await clrfund.setToken(token.target) + await clrfund.setCoordinator(coordinator.address, coordinatorPubKey) }) it('allows owner to cancel round', async () => { - await factory.deployNewRound() - const fundingRoundAddress = await factory.getCurrentRound() + await clrfund.deployNewRound(roundDuration) + const fundingRoundAddress = await clrfund.getCurrentRound() const fundingRound = await ethers.getContractAt( 'FundingRound', fundingRoundAddress ) - await expect(factory.cancelCurrentRound()) - .to.emit(factory, 'RoundFinalized') + await expect(clrfund.cancelCurrentRound()) + .to.emit(clrfund, 'RoundFinalized') .withArgs(fundingRoundAddress) expect(await fundingRound.isCancelled()).to.equal(true) }) it('allows only owner to cancel round', async () => { - await factory.deployNewRound() + await clrfund.deployNewRound(roundDuration) await expect( - factory.connect(contributor).cancelCurrentRound() + clrfund.connect(contributor).cancelCurrentRound() ).to.be.revertedWith('Ownable: caller is not the owner') }) it('reverts if round has not been deployed', async () => { - await expect(factory.cancelCurrentRound()).to.be.revertedWith( - 'Factory: Funding round has not been deployed' + await expect(clrfund.cancelCurrentRound()).to.be.revertedWithCustomError( + clrfund, + 'NoCurrentRound' ) }) it('reverts if round is finalized', async () => { - await factory.deployNewRound() - await factory.cancelCurrentRound() - await expect(factory.cancelCurrentRound()).to.be.revertedWith( - 'Factory: Current round is finalized' + await clrfund.deployNewRound(roundDuration) + await clrfund.cancelCurrentRound() + await expect(clrfund.cancelCurrentRound()).to.be.revertedWithCustomError( + clrfund, + 'AlreadyFinalized' ) }) }) it('allows owner to set native token', async () => { - await expect(factory.setToken(token.address)) - .to.emit(factory, 'TokenChanged') - .withArgs(token.address) - expect(await factory.nativeToken()).to.equal(token.address) + await expect(clrfund.setToken(token.target)) + .to.emit(clrfund, 'TokenChanged') + .withArgs(token.target) + expect(await clrfund.nativeToken()).to.equal(token.target) }) it('only owner can set native token', async () => { - const factoryAsContributor = factory.connect(contributor) + const clrfundAsContributor = clrfund.connect(contributor) await expect( - factoryAsContributor.setToken(token.address) + clrfundAsContributor.setToken(token.target) ).to.be.revertedWith('Ownable: caller is not the owner') }) it('allows owner to change coordinator', async () => { - await expect(factory.setCoordinator(coordinator.address, coordinatorPubKey)) - .to.emit(factory, 'CoordinatorChanged') + await expect(clrfund.setCoordinator(coordinator.address, coordinatorPubKey)) + .to.emit(clrfund, 'CoordinatorChanged') .withArgs(coordinator.address) - expect(await factory.coordinator()).to.eq(coordinator.address) + expect(await clrfund.coordinator()).to.eq(coordinator.address) }) it('allows only the owner to set a new coordinator', async () => { - const factoryAsContributor = factory.connect(contributor) + const clrfundAsContributor = clrfund.connect(contributor) await expect( - factoryAsContributor.setCoordinator( + clrfundAsContributor.setCoordinator( coordinator.address, coordinatorPubKey ) @@ -530,36 +608,37 @@ describe('Clr fund deployer', () => { }) it('allows coordinator to call coordinatorQuit and sets coordinator to null', async () => { - await factory.setCoordinator(coordinator.address, coordinatorPubKey) - const factoryAsCoordinator = factory.connect(coordinator) - await expect(factoryAsCoordinator.coordinatorQuit()) - .to.emit(factory, 'CoordinatorChanged') + await clrfund.setCoordinator(coordinator.address, coordinatorPubKey) + const clrfundAsCoordinator = clrfund.connect(coordinator) + await expect(clrfundAsCoordinator.coordinatorQuit()) + .to.emit(clrfund, 'CoordinatorChanged') .withArgs(ZERO_ADDRESS) - expect(await factory.coordinator()).to.equal(ZERO_ADDRESS) + expect(await clrfund.coordinator()).to.equal(ZERO_ADDRESS) }) it('only coordinator can call coordinatorQuit', async () => { - await factory.setCoordinator(coordinator.address, coordinatorPubKey) - await expect(factory.coordinatorQuit()).to.be.revertedWith( - 'Factory: Sender is not the coordinator' + await clrfund.setCoordinator(coordinator.address, coordinatorPubKey) + await expect(clrfund.coordinatorQuit()).to.be.revertedWithCustomError( + clrfund, + 'NotAuthorized' ) }) it('should cancel current round when coordinator quits', async () => { - await factory.setUserRegistry(userRegistry.address) - await factory.setRecipientRegistry(recipientRegistry.address) - await factory.setToken(token.address) - await factory.setCoordinator(coordinator.address, coordinatorPubKey) - await factory.deployNewRound() - const fundingRoundAddress = await factory.getCurrentRound() + await clrfund.setUserRegistry(userRegistry.target) + await clrfund.setRecipientRegistry(recipientRegistry.target) + await clrfund.setToken(token.target) + await clrfund.setCoordinator(coordinator.address, coordinatorPubKey) + await clrfund.deployNewRound(roundDuration) + const fundingRoundAddress = await clrfund.getCurrentRound() const fundingRound = await ethers.getContractAt( 'FundingRound', fundingRoundAddress ) - const factoryAsCoordinator = factory.connect(coordinator) - await expect(factoryAsCoordinator.coordinatorQuit()) - .to.emit(factory, 'RoundFinalized') + const clrfundAsCoordinator = clrfund.connect(coordinator) + await expect(clrfundAsCoordinator.coordinatorQuit()) + .to.emit(clrfund, 'RoundFinalized') .withArgs(fundingRoundAddress) expect(await fundingRound.isCancelled()).to.equal(true) }) diff --git a/contracts/tests/factory.ts b/contracts/tests/factory.ts deleted file mode 100644 index c8a84a0ba..000000000 --- a/contracts/tests/factory.ts +++ /dev/null @@ -1,510 +0,0 @@ -import { ethers, waffle } from 'hardhat' -import { use, expect } from 'chai' -import { solidity } from 'ethereum-waffle' -import { Contract } from 'ethers' -import { genRandomSalt } from 'maci-crypto' -import { Keypair } from '@clrfund/maci-utils' - -import { ZERO_ADDRESS, UNIT } from '../utils/constants' -import { getGasUsage, getEventArg } from '../utils/contracts' -import { deployContract, deployMaciFactory } from '../utils/deployment' -import { MaciParameters } from '../utils/maci' - -use(solidity) - -describe('Funding Round Factory', () => { - const provider = waffle.provider - const [, deployer, coordinator, contributor] = provider.getWallets() - - let maciFactory: Contract - let userRegistry: Contract - let recipientRegistry: Contract - let factory: Contract - let token: Contract - let maciParameters: MaciParameters - const coordinatorPubKey = new Keypair().pubKey.asContractParam() - - beforeEach(async () => { - const circuit = 'prod' - maciFactory = await deployMaciFactory(deployer, circuit) - maciParameters = await MaciParameters.read(maciFactory) - - factory = await deployContract(deployer, 'FundingRoundFactory', [ - maciFactory.address, - ]) - - expect(factory.address).to.properAddress - expect(await getGasUsage(factory.deployTransaction)).lessThan(5400000) - - await maciFactory.transferOwnership(factory.address) - - const SimpleUserRegistry = await ethers.getContractFactory( - 'SimpleUserRegistry', - deployer - ) - userRegistry = await SimpleUserRegistry.deploy() - const SimpleRecipientRegistry = await ethers.getContractFactory( - 'SimpleRecipientRegistry', - deployer - ) - recipientRegistry = await SimpleRecipientRegistry.deploy(factory.address) - - // Deploy token contract and transfer tokens to contributor - const tokenInitialSupply = UNIT.mul(1000) - const Token = await ethers.getContractFactory('AnyOldERC20Token', deployer) - token = await Token.deploy(tokenInitialSupply) - expect(token.address).to.properAddress - await token.transfer(contributor.address, tokenInitialSupply) - }) - - it('initializes factory', async () => { - expect(await factory.coordinator()).to.equal(ZERO_ADDRESS) - expect(await factory.nativeToken()).to.equal(ZERO_ADDRESS) - expect(await factory.maciFactory()).to.equal(maciFactory.address) - expect(await factory.userRegistry()).to.equal(ZERO_ADDRESS) - expect(await factory.recipientRegistry()).to.equal(ZERO_ADDRESS) - }) - - it('transfers ownership to another address', async () => { - await expect(factory.transferOwnership(coordinator.address)) - .to.emit(factory, 'OwnershipTransferred') - .withArgs(deployer.address, coordinator.address) - }) - - describe('changing user registry', () => { - it('allows owner to set user registry', async () => { - await factory.setUserRegistry(userRegistry.address) - expect(await factory.userRegistry()).to.equal(userRegistry.address) - }) - - it('allows only owner to set user registry', async () => { - await expect( - factory.connect(contributor).setUserRegistry(userRegistry.address) - ).to.be.revertedWith('Ownable: caller is not the owner') - }) - - it('allows owner to change recipient registry', async () => { - await factory.setRecipientRegistry(recipientRegistry.address) - const SimpleUserRegistry = await ethers.getContractFactory( - 'SimpleUserRegistry', - deployer - ) - const anotherUserRegistry = await SimpleUserRegistry.deploy() - await factory.setUserRegistry(anotherUserRegistry.address) - expect(await factory.userRegistry()).to.equal(anotherUserRegistry.address) - }) - }) - - describe('changing recipient registry', () => { - it('allows owner to set recipient registry', async () => { - await factory.setRecipientRegistry(recipientRegistry.address) - expect(await factory.recipientRegistry()).to.equal( - recipientRegistry.address - ) - expect(await recipientRegistry.controller()).to.equal(factory.address) - expect(await recipientRegistry.maxRecipients()).to.equal( - 5 ** maciParameters.voteOptionTreeDepth - 1 - ) - }) - - it('allows only owner to set recipient registry', async () => { - await expect( - factory - .connect(contributor) - .setRecipientRegistry(recipientRegistry.address) - ).to.be.revertedWith('Ownable: caller is not the owner') - }) - - it('allows owner to change recipient registry', async () => { - await factory.setRecipientRegistry(recipientRegistry.address) - const SimpleRecipientRegistry = await ethers.getContractFactory( - 'SimpleRecipientRegistry', - deployer - ) - const anotherRecipientRegistry = await SimpleRecipientRegistry.deploy( - factory.address - ) - await factory.setRecipientRegistry(anotherRecipientRegistry.address) - expect(await factory.recipientRegistry()).to.equal( - anotherRecipientRegistry.address - ) - }) - }) - - describe('managing funding sources', () => { - it('allows owner to add funding source', async () => { - await expect(factory.addFundingSource(contributor.address)) - .to.emit(factory, 'FundingSourceAdded') - .withArgs(contributor.address) - }) - - it('allows only owner to add funding source', async () => { - await expect( - factory.connect(contributor).addFundingSource(contributor.address) - ).to.be.revertedWith('Ownable: caller is not the owner') - }) - - it('reverts if funding source is already added', async () => { - await factory.addFundingSource(contributor.address) - await expect( - factory.addFundingSource(contributor.address) - ).to.be.revertedWith('Factory: Funding source already added') - }) - - it('allows owner to remove funding source', async () => { - await factory.addFundingSource(contributor.address) - await expect(factory.removeFundingSource(contributor.address)) - .to.emit(factory, 'FundingSourceRemoved') - .withArgs(contributor.address) - }) - - it('allows only owner to remove funding source', async () => { - await factory.addFundingSource(contributor.address) - await expect( - factory.connect(contributor).removeFundingSource(contributor.address) - ).to.be.revertedWith('Ownable: caller is not the owner') - }) - - it('reverts if funding source is already removed', async () => { - await factory.addFundingSource(contributor.address) - await factory.removeFundingSource(contributor.address) - await expect( - factory.removeFundingSource(contributor.address) - ).to.be.revertedWith('Factory: Funding source not found') - }) - }) - - it('allows direct contributions to the matching pool', async () => { - const contributionAmount = UNIT.mul(10) - await factory.setToken(token.address) - await expect( - token.connect(contributor).transfer(factory.address, contributionAmount) - ) - .to.emit(token, 'Transfer') - .withArgs(contributor.address, factory.address, contributionAmount) - expect(await token.balanceOf(factory.address)).to.equal(contributionAmount) - }) - - it('sets MACI parameters', async () => { - maciParameters.update({ voteOptionTreeDepth: 3 }) - await expect(factory.setMaciParameters(...maciParameters.values())).to.emit( - maciFactory, - 'MaciParametersChanged' - ) - const treeDepths = await maciFactory.treeDepths() - expect(treeDepths.voteOptionTreeDepth).to.equal(3) - }) - - it('allows only owner to set MACI parameters', async () => { - const coordinatorFactory = factory.connect(coordinator) - await expect( - coordinatorFactory.setMaciParameters(...maciParameters.values()) - ).to.be.revertedWith('Ownable: caller is not the owner') - }) - - describe('deploying funding round', () => { - it('deploys funding round', async () => { - await factory.setUserRegistry(userRegistry.address) - await factory.setRecipientRegistry(recipientRegistry.address) - await factory.setToken(token.address) - await factory.setCoordinator(coordinator.address, coordinatorPubKey) - const deployed = factory.deployNewRound() - await expect(deployed).to.emit(factory, 'RoundStarted') - const deployTx = await deployed - expect(await getGasUsage(deployTx)).lessThan(13000000) - - const fundingRoundAddress = await factory.getCurrentRound() - expect(fundingRoundAddress).to.properAddress - expect(fundingRoundAddress).to.not.equal(ZERO_ADDRESS) - - const fundingRound = await ethers.getContractAt( - 'FundingRound', - fundingRoundAddress - ) - expect(await fundingRound.owner()).to.equal(factory.address) - expect(await fundingRound.nativeToken()).to.equal(token.address) - - const maciAddress = await getEventArg( - deployTx, - maciFactory, - 'MaciDeployed', - '_maci' - ) - expect(await fundingRound.maci()).to.equal(maciAddress) - const maci = await ethers.getContractAt('MACI', maciAddress) - const roundCoordinatorPubKey = await maci.coordinatorPubKey() - expect(roundCoordinatorPubKey.x).to.equal(coordinatorPubKey.x) - expect(roundCoordinatorPubKey.y).to.equal(coordinatorPubKey.y) - }) - - it('reverts if user registry is not set', async () => { - await factory.setRecipientRegistry(recipientRegistry.address) - await factory.setToken(token.address) - await factory.setCoordinator(coordinator.address, coordinatorPubKey) - await expect(factory.deployNewRound()).to.be.revertedWith( - 'Factory: User registry is not set' - ) - }) - - it('reverts if recipient registry is not set', async () => { - await factory.setUserRegistry(userRegistry.address) - await factory.setToken(token.address) - await factory.setCoordinator(coordinator.address, coordinatorPubKey) - await expect(factory.deployNewRound()).to.be.revertedWith( - 'Factory: Recipient registry is not set' - ) - }) - - it('reverts if native token is not set', async () => { - await factory.setUserRegistry(userRegistry.address) - await factory.setRecipientRegistry(recipientRegistry.address) - await factory.setCoordinator(coordinator.address, coordinatorPubKey) - await expect(factory.deployNewRound()).to.be.revertedWith( - 'Factory: Native token is not set' - ) - }) - - it('reverts if coordinator is not set', async () => { - await factory.setUserRegistry(userRegistry.address) - await factory.setRecipientRegistry(recipientRegistry.address) - await factory.setToken(token.address) - await expect(factory.deployNewRound()).to.be.revertedWith( - 'Factory: No coordinator' - ) - }) - - it('reverts if current round is not finalized', async () => { - await factory.setUserRegistry(userRegistry.address) - await factory.setRecipientRegistry(recipientRegistry.address) - await factory.setToken(token.address) - await factory.setCoordinator(coordinator.address, coordinatorPubKey) - await factory.deployNewRound() - await expect(factory.deployNewRound()).to.be.revertedWith( - 'Factory: Current round is not finalized' - ) - }) - - it('deploys new funding round after previous round has been finalized', async () => { - await factory.setUserRegistry(userRegistry.address) - await factory.setRecipientRegistry(recipientRegistry.address) - await factory.setToken(token.address) - await factory.setCoordinator(coordinator.address, coordinatorPubKey) - await factory.deployNewRound() - await factory.cancelCurrentRound() - await expect(factory.deployNewRound()).to.emit(factory, 'RoundStarted') - }) - - it('only owner can deploy funding round', async () => { - await factory.setUserRegistry(userRegistry.address) - await factory.setRecipientRegistry(recipientRegistry.address) - await factory.setToken(token.address) - await factory.setCoordinator(coordinator.address, coordinatorPubKey) - const factoryAsContributor = factory.connect(contributor) - await expect(factoryAsContributor.deployNewRound()).to.be.revertedWith( - 'Ownable: caller is not the owner' - ) - }) - }) - - describe('transferring matching funds', () => { - const contributionAmount = UNIT.mul(10) - const totalSpent = UNIT.mul(100) - const totalSpentSalt = genRandomSalt().toString() - let roundDuration: number - - beforeEach(async () => { - await factory.setUserRegistry(userRegistry.address) - await factory.setRecipientRegistry(recipientRegistry.address) - await factory.setToken(token.address) - await factory.setCoordinator(coordinator.address, coordinatorPubKey) - roundDuration = - maciParameters.signUpDuration + maciParameters.votingDuration + 10 - }) - - it('returns the amount of available matching funding', async () => { - await factory.addFundingSource(deployer.address) - await factory.addFundingSource(contributor.address) - // Allowance is more than available balance - await token.connect(deployer).approve(factory.address, contributionAmount) - // Allowance is less than available balance - await token - .connect(contributor) - .approve(factory.address, contributionAmount) - // Direct contribution - await token - .connect(contributor) - .transfer(factory.address, contributionAmount) - await factory.deployNewRound() - expect(await factory.getMatchingFunds(token.address)).to.equal( - contributionAmount.mul(2) - ) - }) - - it('allows owner to finalize round', async () => { - await token - .connect(contributor) - .transfer(factory.address, contributionAmount) - await factory.deployNewRound() - await provider.send('evm_increaseTime', [roundDuration]) - await expect( - factory.transferMatchingFunds(totalSpent, totalSpentSalt) - ).to.be.revertedWith('FundingRound: Votes has not been tallied') - }) - - it('allows owner to finalize round even without matching funds', async () => { - await factory.deployNewRound() - await provider.send('evm_increaseTime', [roundDuration]) - await expect( - factory.transferMatchingFunds(totalSpent, totalSpentSalt) - ).to.be.revertedWith('FundingRound: Votes has not been tallied') - }) - - it('pulls funds from funding source', async () => { - await factory.addFundingSource(contributor.address) - token.connect(contributor).approve(factory.address, contributionAmount) - await factory.addFundingSource(deployer.address) // Doesn't have tokens - await factory.deployNewRound() - await provider.send('evm_increaseTime', [roundDuration]) - await expect( - factory.transferMatchingFunds(totalSpent, totalSpentSalt) - ).to.be.revertedWith('FundingRound: Votes has not been tallied') - }) - - it('pulls funds from funding source if allowance is greater than balance', async () => { - await factory.addFundingSource(contributor.address) - token - .connect(contributor) - .approve(factory.address, contributionAmount.mul(2)) - await factory.deployNewRound() - await provider.send('evm_increaseTime', [roundDuration]) - await expect( - factory.transferMatchingFunds(totalSpent, totalSpentSalt) - ).to.be.revertedWith('FundingRound: Votes has not been tallied') - }) - - it('allows only owner to finalize round', async () => { - await factory.deployNewRound() - await provider.send('evm_increaseTime', [roundDuration]) - await expect( - factory - .connect(contributor) - .transferMatchingFunds(totalSpent, totalSpentSalt) - ).to.be.revertedWith('Ownable: caller is not the owner') - }) - - it('reverts if round has not been deployed', async () => { - await expect( - factory.transferMatchingFunds(totalSpent, totalSpentSalt) - ).to.be.revertedWith('Factory: Funding round has not been deployed') - }) - }) - - describe('cancelling round', () => { - beforeEach(async () => { - await factory.setUserRegistry(userRegistry.address) - await factory.setRecipientRegistry(recipientRegistry.address) - await factory.setToken(token.address) - await factory.setCoordinator(coordinator.address, coordinatorPubKey) - }) - - it('allows owner to cancel round', async () => { - await factory.deployNewRound() - const fundingRoundAddress = await factory.getCurrentRound() - const fundingRound = await ethers.getContractAt( - 'FundingRound', - fundingRoundAddress - ) - await expect(factory.cancelCurrentRound()) - .to.emit(factory, 'RoundFinalized') - .withArgs(fundingRoundAddress) - expect(await fundingRound.isCancelled()).to.equal(true) - }) - - it('allows only owner to cancel round', async () => { - await factory.deployNewRound() - await expect( - factory.connect(contributor).cancelCurrentRound() - ).to.be.revertedWith('Ownable: caller is not the owner') - }) - - it('reverts if round has not been deployed', async () => { - await expect(factory.cancelCurrentRound()).to.be.revertedWith( - 'Factory: Funding round has not been deployed' - ) - }) - - it('reverts if round is finalized', async () => { - await factory.deployNewRound() - await factory.cancelCurrentRound() - await expect(factory.cancelCurrentRound()).to.be.revertedWith( - 'Factory: Current round is finalized' - ) - }) - }) - - it('allows owner to set native token', async () => { - await expect(factory.setToken(token.address)) - .to.emit(factory, 'TokenChanged') - .withArgs(token.address) - expect(await factory.nativeToken()).to.equal(token.address) - }) - - it('only owner can set native token', async () => { - const factoryAsContributor = factory.connect(contributor) - await expect( - factoryAsContributor.setToken(token.address) - ).to.be.revertedWith('Ownable: caller is not the owner') - }) - - it('allows owner to change coordinator', async () => { - await expect(factory.setCoordinator(coordinator.address, coordinatorPubKey)) - .to.emit(factory, 'CoordinatorChanged') - .withArgs(coordinator.address) - expect(await factory.coordinator()).to.eq(coordinator.address) - }) - - it('allows only the owner to set a new coordinator', async () => { - const factoryAsContributor = factory.connect(contributor) - await expect( - factoryAsContributor.setCoordinator( - coordinator.address, - coordinatorPubKey - ) - ).to.be.revertedWith('Ownable: caller is not the owner') - }) - - it('allows coordinator to call coordinatorQuit and sets coordinator to null', async () => { - await factory.setCoordinator(coordinator.address, coordinatorPubKey) - const factoryAsCoordinator = factory.connect(coordinator) - await expect(factoryAsCoordinator.coordinatorQuit()) - .to.emit(factory, 'CoordinatorChanged') - .withArgs(ZERO_ADDRESS) - expect(await factory.coordinator()).to.equal(ZERO_ADDRESS) - }) - - it('only coordinator can call coordinatorQuit', async () => { - await factory.setCoordinator(coordinator.address, coordinatorPubKey) - await expect(factory.coordinatorQuit()).to.be.revertedWith( - 'Factory: Sender is not the coordinator' - ) - }) - - it('should cancel current round when coordinator quits', async () => { - await factory.setUserRegistry(userRegistry.address) - await factory.setRecipientRegistry(recipientRegistry.address) - await factory.setToken(token.address) - await factory.setCoordinator(coordinator.address, coordinatorPubKey) - await factory.deployNewRound() - const fundingRoundAddress = await factory.getCurrentRound() - const fundingRound = await ethers.getContractAt( - 'FundingRound', - fundingRoundAddress - ) - - const factoryAsCoordinator = factory.connect(coordinator) - await expect(factoryAsCoordinator.coordinatorQuit()) - .to.emit(factory, 'RoundFinalized') - .withArgs(fundingRoundAddress) - expect(await fundingRound.isCancelled()).to.equal(true) - }) -}) diff --git a/contracts/tests/maciFactory.ts b/contracts/tests/maciFactory.ts index 9e30a6c47..3f23d58ad 100644 --- a/contracts/tests/maciFactory.ts +++ b/contracts/tests/maciFactory.ts @@ -1,35 +1,54 @@ -import { waffle, artifacts, ethers } from 'hardhat' -import { Contract } from 'ethers' -import { use, expect } from 'chai' -import { solidity } from 'ethereum-waffle' -import { deployMockContract } from '@ethereum-waffle/mock-contract' -import { Keypair } from '@clrfund/maci-utils' +import { artifacts, ethers } from 'hardhat' +import { Contract, TransactionResponse } from 'ethers' +import { expect } from 'chai' +import { deployMockContract, MockContract } from '@clrfund/waffle-mock-contract' import { getEventArg, getGasUsage } from '../utils/contracts' -import { deployMaciFactory } from '../utils/deployment' -import { MaciParameters } from '../utils/maci' - -use(solidity) +import { deployMaciFactory, deployPoseidonLibraries } from '../utils/testutils' +import { MaciParameters } from '../utils/maciParameters' +import { HardhatEthersSigner } from '@nomicfoundation/hardhat-ethers/signers' +import { Keypair } from '@clrfund/common' +import { MACIFactory } from '../typechain-types' describe('MACI factory', () => { - const provider = waffle.provider - const [, deployer, coordinator] = provider.getWallets() - - let maciFactory: Contract - let signUpGatekeeper: Contract - let initialVoiceCreditProxy: Contract + let deployer: HardhatEthersSigner + let coordinator: HardhatEthersSigner + + const duration = 100 + let maciFactory: MACIFactory + let signUpGatekeeper: MockContract + let initialVoiceCreditProxy: MockContract + let topupContract: MockContract let maciParameters: MaciParameters + let poseidonContracts: { [name: string]: string } const coordinatorPubKey = new Keypair().pubKey.asContractParam() - beforeEach(async () => { - const circuit = 'prod' - maciFactory = await deployMaciFactory(deployer, circuit) - expect(await getGasUsage(maciFactory.deployTransaction)).lessThan(5600000) - maciParameters = await MaciParameters.read(maciFactory) + before(async () => { + ;[, deployer, coordinator] = await ethers.getSigners() + }) - const SignUpGatekeeperArtifact = await artifacts.readArtifact( - 'SignUpGatekeeper' + beforeEach(async () => { + if (!poseidonContracts) { + poseidonContracts = await deployPoseidonLibraries({ + ethers, + signer: deployer, + }) + } + maciParameters = MaciParameters.mock() + maciFactory = await deployMaciFactory({ + ethers, + signer: deployer, + libraries: poseidonContracts, + maciParameters, + }) + const transaction = await maciFactory.deploymentTransaction() + expect(transaction).to.be.not.null + expect(await getGasUsage(transaction as TransactionResponse)).lessThan( + 5600000 ) + + const SignUpGatekeeperArtifact = + await artifacts.readArtifact('SignUpGatekeeper') signUpGatekeeper = await deployMockContract( deployer, SignUpGatekeeperArtifact.abi @@ -41,95 +60,96 @@ describe('MACI factory', () => { deployer, InitialVoiceCreditProxyArtifact.abi ) + const Token = await artifacts.readArtifact('AnyOldERC20Token') + topupContract = await deployMockContract(deployer, Token.abi) }) it('sets default MACI parameters', async () => { - const { maxUsers, maxMessages, maxVoteOptions } = - await maciFactory.maxValues() - expect(maxUsers).to.equal(4294967295) - expect(maxMessages).to.equal(4294967295) - expect(maxVoteOptions).to.equal(124) - expect(await maciFactory.signUpDuration()).to.equal(604800) - expect(await maciFactory.votingDuration()).to.equal(604800) + const stateTreeDepth = await maciFactory.stateTreeDepth() + const treeDepths = await maciFactory.treeDepths() + expect(stateTreeDepth).to.be.greaterThan(BigInt(0)) + expect(treeDepths.voteOptionTreeDepth).to.be.greaterThan(BigInt(0)) + expect(treeDepths.messageTreeDepth).to.be.greaterThan(BigInt(0)) }) it('sets MACI parameters', async () => { - maciParameters.update({ - stateTreeDepth: 32, - messageTreeDepth: 32, - voteOptionTreeDepth: 3, - signUpDuration: 86400, - votingDuration: 86400, - }) await expect( - maciFactory.setMaciParameters(...maciParameters.values()) + maciFactory.setMaciParameters(...maciParameters.asContractParam()) ).to.emit(maciFactory, 'MaciParametersChanged') - const { maxUsers, maxMessages, maxVoteOptions } = - await maciFactory.maxValues() - expect(maxUsers).to.equal(2 ** maciParameters.stateTreeDepth - 1) - expect(maxMessages).to.equal(2 ** maciParameters.messageTreeDepth - 1) - expect(maxVoteOptions).to.equal(5 ** maciParameters.voteOptionTreeDepth - 1) - expect(await maciFactory.signUpDuration()).to.equal( - maciParameters.signUpDuration - ) - expect(await maciFactory.votingDuration()).to.equal( - maciParameters.votingDuration - ) - }) - - it('does not allow to decrease the vote option tree depth', async () => { - maciParameters.voteOptionTreeDepth = 1 - await expect( - maciFactory.setMaciParameters(...maciParameters.values()) - ).to.be.revertedWith( - 'MACIFactory: Vote option tree depth can not be decreased' + const { messageTreeDepth } = await maciFactory.treeDepths() + expect(messageTreeDepth).to.equal( + maciParameters.treeDepths.messageTreeDepth ) }) it('allows only owner to set MACI parameters', async () => { const coordinatorMaciFactory = maciFactory.connect(coordinator) await expect( - coordinatorMaciFactory.setMaciParameters(...maciParameters.values()) + coordinatorMaciFactory.setMaciParameters( + ...maciParameters.asContractParam() + ) ).to.be.revertedWith('Ownable: caller is not the owner') }) it('deploys MACI', async () => { + const setParamTx = await maciFactory.setMaciParameters( + ...maciParameters.asContractParam() + ) + await setParamTx.wait() const maciDeployed = maciFactory.deployMaci( - signUpGatekeeper.address, - initialVoiceCreditProxy.address, + signUpGatekeeper.target, + initialVoiceCreditProxy.target, + topupContract.target, + duration, coordinator.address, - coordinatorPubKey + coordinatorPubKey, + deployer.address ) await expect(maciDeployed).to.emit(maciFactory, 'MaciDeployed') const deployTx = await maciDeployed - expect(await getGasUsage(deployTx)).lessThan(9020000) + // TODO: reduce the gas usage + expect(await getGasUsage(deployTx)).lessThan(15094000) }) - it('allows only owner to deploy MACI', async () => { + it('allows anyone to deploy MACI', async () => { + const setParamTx = await maciFactory.setMaciParameters( + ...maciParameters.asContractParam() + ) + await setParamTx.wait() const coordinatorMaciFactory = maciFactory.connect(coordinator) - await expect( - coordinatorMaciFactory.deployMaci( - signUpGatekeeper.address, - initialVoiceCreditProxy.address, - coordinator.address, - coordinatorPubKey - ) - ).to.be.revertedWith('Ownable: caller is not the owner') + + const deployTx = await coordinatorMaciFactory.deployMaci( + signUpGatekeeper.target, + initialVoiceCreditProxy.target, + topupContract.target, + duration, + coordinator.address, + coordinatorPubKey, + coordinator.address + ) + await expect(deployTx).to.emit(maciFactory, 'MaciDeployed') }) it('links with PoseidonT3 correctly', async () => { + const setParamTx = await maciFactory.setMaciParameters( + ...maciParameters.asContractParam() + ) + await setParamTx.wait() const deployTx = await maciFactory.deployMaci( - signUpGatekeeper.address, - initialVoiceCreditProxy.address, + signUpGatekeeper.target, + initialVoiceCreditProxy.target, + topupContract.target, + duration, coordinator.address, - coordinatorPubKey + coordinatorPubKey, + deployer.address ) const maciAddress = await getEventArg( deployTx, - maciFactory, + maciFactory as unknown as Contract, 'MaciDeployed', '_maci' ) @@ -142,15 +162,18 @@ describe('MACI factory', () => { it('links with PoseidonT6 correctly', async () => { const deployTx = await maciFactory.deployMaci( - signUpGatekeeper.address, - initialVoiceCreditProxy.address, + signUpGatekeeper.target, + initialVoiceCreditProxy.target, + topupContract.target, + duration, coordinator.address, - coordinatorPubKey + coordinatorPubKey, + deployer.address ) const maciAddress = await getEventArg( deployTx, - maciFactory, + maciFactory as unknown as Contract, 'MaciDeployed', '_maci' ) diff --git a/contracts/tests/maciParameters.ts b/contracts/tests/maciParameters.ts deleted file mode 100644 index cb4e9dab1..000000000 --- a/contracts/tests/maciParameters.ts +++ /dev/null @@ -1,32 +0,0 @@ -import { expect } from 'chai' -import { MaciParameters } from '../utils/maci' -import { ZERO_ADDRESS } from '../utils/constants' -import { CIRCUITS } from '../utils/deployment' - -describe('Maci Parameters', () => { - it('batch size 4', () => { - const params = CIRCUITS['test'] - const maci = new MaciParameters({ - batchUstVerifier: ZERO_ADDRESS, - qvtVerifier: ZERO_ADDRESS, - ...params.batchSizes, - }) - - const { tallyBatchSize, messageBatchSize } = maci - expect(tallyBatchSize).to.eq(4) - expect(messageBatchSize).to.eq(4) - }) - - it('batch size 64', () => { - const params = CIRCUITS['prod'] - const maci = new MaciParameters({ - batchUstVerifier: ZERO_ADDRESS, - qvtVerifier: ZERO_ADDRESS, - ...params.batchSizes, - }) - - const { tallyBatchSize, messageBatchSize } = params.batchSizes - expect(maci.tallyBatchSize).to.eq(tallyBatchSize) - expect(maci.messageBatchSize).to.eq(messageBatchSize) - }) -}) diff --git a/contracts/tests/recipientRegistry.ts b/contracts/tests/recipientRegistry.ts index 180a8bca6..ea5932993 100644 --- a/contracts/tests/recipientRegistry.ts +++ b/contracts/tests/recipientRegistry.ts @@ -1,21 +1,19 @@ -import { ethers, waffle } from 'hardhat' -import { use, expect } from 'chai' -import { solidity } from 'ethereum-waffle' -import { BigNumber, Contract } from 'ethers' -import { keccak256 } from '@ethersproject/solidity' +import { ethers } from 'hardhat' +import { expect } from 'chai' +import { Contract, solidityPackedKeccak256 } from 'ethers' import { gtcrEncode } from '@kleros/gtcr-encoder' +import { time } from '@nomicfoundation/hardhat-network-helpers' import { UNIT, ZERO_ADDRESS } from '../utils/constants' import { getTxFee, getEventArg } from '../utils/contracts' -import { deployContract } from '../utils/deployment' +import { deployContract } from '../utils/contracts' +import { HardhatEthersSigner } from '@nomicfoundation/hardhat-ethers/signers' +import { EContracts } from '../utils/types' -use(solidity) - -const { provider } = waffle const MAX_RECIPIENTS = 15 async function getCurrentTime(): Promise { - return (await provider.getBlock('latest')).timestamp + return await time.latest() } function getRecipientId( @@ -23,16 +21,22 @@ function getRecipientId( address: string, metadata: string ): string { - return keccak256( + return solidityPackedKeccak256( ['address', 'address', 'string'], [registryAddress, address, metadata] ) } -describe('Simple Recipient Registry', () => { - const [, deployer, controller, recipient] = provider.getWallets() - +describe('Simple Recipient Registry', async () => { let registry: Contract + let registryAddress: string + let deployer: HardhatEthersSigner + let controller: HardhatEthersSigner + let recipient: HardhatEthersSigner + + before(async () => { + ;[, deployer, controller, recipient] = await ethers.getSigners() + }) beforeEach(async () => { const SimpleRecipientRegistry = await ethers.getContractFactory( @@ -40,6 +44,7 @@ describe('Simple Recipient Registry', () => { deployer ) registry = await SimpleRecipientRegistry.deploy(controller.address) + registryAddress = await registry.getAddress() }) describe('initializing and configuring', () => { @@ -49,14 +54,18 @@ describe('Simple Recipient Registry', () => { }) it('sets max number of recipients', async () => { - await registry.connect(controller).setMaxRecipients(MAX_RECIPIENTS) + await (registry.connect(controller) as Contract).setMaxRecipients( + MAX_RECIPIENTS + ) expect(await registry.maxRecipients()).to.equal(MAX_RECIPIENTS) }) it('reverts if given number is less than current limit', async () => { - await registry.connect(controller).setMaxRecipients(MAX_RECIPIENTS) + await (registry.connect(controller) as Contract).setMaxRecipients( + MAX_RECIPIENTS + ) await expect( - registry.connect(controller).setMaxRecipients(1) + (registry.connect(controller) as Contract).setMaxRecipients(1) ).to.be.revertedWith( 'RecipientRegistry: Max number of recipients can not be decreased' ) @@ -81,14 +90,17 @@ describe('Simple Recipient Registry', () => { let recipientId: string beforeEach(async () => { - await registry.connect(controller).setMaxRecipients(MAX_RECIPIENTS) + await (registry.connect(controller) as Contract).setMaxRecipients( + MAX_RECIPIENTS + ) recipientAddress = recipient.address metadata = JSON.stringify({ name: 'Recipient', description: 'Description', imageHash: 'Ipfs imageHash', }) - recipientId = getRecipientId(registry.address, recipientAddress, metadata) + const registryAddress = await registry.getAddress() + recipientId = getRecipientId(registryAddress, recipientAddress, metadata) }) it('allows owner to add recipient', async () => { @@ -117,7 +129,7 @@ describe('Simple Recipient Registry', () => { const anotherRecipientAddress = '0xd8dA6BF26964aF9D7eEd9e03E53415D37aA96045' const anotherRecipientId = getRecipientId( - registry.address, + registryAddress, anotherRecipientAddress, metadata ) @@ -139,7 +151,7 @@ describe('Simple Recipient Registry', () => { }) it('rejects attempts to add recipient from anyone except owner', async () => { - const registryAsRecipient = registry.connect(recipient) + const registryAsRecipient = registry.connect(recipient) as Contract await expect( registryAsRecipient.addRecipient(recipientAddress, metadata) ).to.be.revertedWith('Ownable: caller is not the owner') @@ -203,7 +215,7 @@ describe('Simple Recipient Registry', () => { }) it('rejects attempts to remove recipient from anyone except owner', async () => { - const registryAsRecipient = registry.connect(recipient) + const registryAsRecipient = registry.connect(recipient) as Contract await expect( registryAsRecipient.removeRecipient(recipientId) ).to.be.revertedWith('Ownable: caller is not the owner') @@ -226,7 +238,7 @@ describe('Simple Recipient Registry', () => { it('should not return recipient address for recipient that has been added after the end of round', async () => { const startTime = await getCurrentTime() - await provider.send('evm_increaseTime', [1000]) + await time.increase(1000) const endTime = await getCurrentTime() await registry.addRecipient(recipientAddress, metadata) expect( @@ -238,7 +250,7 @@ describe('Simple Recipient Registry', () => { await registry.addRecipient(recipientAddress, metadata) const startTime = await getCurrentTime() await registry.removeRecipient(recipientId) - await provider.send('evm_increaseTime', [1000]) + await time.increase(1000) const endTime = await getCurrentTime() expect( await registry.getRecipientAddress(recipientIndex, startTime, endTime) @@ -265,13 +277,13 @@ describe('Simple Recipient Registry', () => { // Replace recipients const removedRecipient1 = '0x0000000000000000000000000000000000000001' const removedRecipient1Id = getRecipientId( - registry.address, + registryAddress, removedRecipient1, metadata ) const removedRecipient2 = '0x0000000000000000000000000000000000000002' const removedRecipient2Id = getRecipientId( - registry.address, + registryAddress, removedRecipient2, metadata ) @@ -295,7 +307,7 @@ describe('Simple Recipient Registry', () => { removedRecipient2 ) - await provider.send('evm_increaseTime', [1000]) + await time.increase(1000) const time3 = await getCurrentTime() // Recipients removed before the beginning of the round should be replaced expect(await registry.getRecipientAddress(1, time2, time3)).to.equal( @@ -325,7 +337,13 @@ describe('Simple Recipient Registry', () => { }) describe('Kleros GTCR adapter', () => { - const [, deployer, controller, recipient] = provider.getWallets() + let tcr: Contract + let registry: Contract + let deployer: HardhatEthersSigner + let controller: HardhatEthersSigner + let recipient: HardhatEthersSigner + let tcrAddress: string + const gtcrColumns = [ { label: 'Name', @@ -346,12 +364,13 @@ describe('Kleros GTCR adapter', () => { columns: gtcrColumns, values: { Name: `test-${address}`, Address: address }, }) - const recipientId = keccak256(['bytes'], [recipientData]) + const recipientId = solidityPackedKeccak256(['bytes'], [recipientData]) return [recipientId, recipientData] } - let tcr: Contract - let registry: Contract + before(async () => { + ;[, deployer, controller, recipient] = await ethers.getSigners() + }) beforeEach(async () => { const KlerosGTCRMock = await ethers.getContractFactory( @@ -359,32 +378,40 @@ describe('Kleros GTCR adapter', () => { deployer ) tcr = await KlerosGTCRMock.deploy('/ipfs/0', '/ipfs/1') + tcrAddress = await tcr.getAddress() const KlerosGTCRAdapter = await ethers.getContractFactory( 'KlerosGTCRAdapter', deployer ) - registry = await KlerosGTCRAdapter.deploy(tcr.address, controller.address) + registry = await KlerosGTCRAdapter.deploy(tcrAddress, controller.address) }) it('initializes correctly', async () => { - expect(await registry.tcr()).to.equal(tcr.address) + expect(await registry.tcr()).to.equal(tcrAddress) expect(await registry.controller()).to.equal(controller.address) expect(await registry.maxRecipients()).to.equal(0) }) describe('managing recipients', () => { const recipientIndex = 1 - const [recipientId, recipientData] = encodeRecipient(recipient.address) + let recipientId: string + let recipientData: string + + before(async () => { + ;[recipientId, recipientData] = encodeRecipient(recipient.address) + }) beforeEach(async () => { - await registry.connect(controller).setMaxRecipients(MAX_RECIPIENTS) + await (registry.connect(controller) as Contract).setMaxRecipients( + MAX_RECIPIENTS + ) }) it('allows anyone to add recipient', async () => { await tcr.addItem(recipientData) - const recipientAdded = await registry - .connect(recipient) - .addRecipient(recipientId) + const recipientAdded = await ( + registry.connect(recipient) as Contract + ).addRecipient(recipientId) let currentTime = await getCurrentTime() expect(recipientAdded) .to.emit(registry, 'RecipientAdded') @@ -403,9 +430,9 @@ describe('Kleros GTCR adapter', () => { anotherRecipientAddress ) await tcr.addItem(anotherRecipientData) - const anotherRecipientAdded = await registry - .connect(recipient) - .addRecipient(anotherRecipientId) + const anotherRecipientAdded = await ( + registry.connect(recipient) as Contract + ).addRecipient(anotherRecipientId) currentTime = await getCurrentTime() // Should increase recipient index for every new recipient expect(anotherRecipientAdded) @@ -439,11 +466,11 @@ describe('Kleros GTCR adapter', () => { it('allows anyone to remove recipient', async () => { await tcr.addItem(recipientData) - await registry.connect(recipient).addRecipient(recipientId) + await (registry.connect(recipient) as Contract).addRecipient(recipientId) await tcr.removeItem(recipientId) - const recipientRemoved = await registry - .connect(recipient) - .removeRecipient(recipientId) + const recipientRemoved = await ( + registry.connect(recipient) as Contract + ).removeRecipient(recipientId) const currentTime = await getCurrentTime() expect(recipientRemoved) .to.emit(registry, 'RecipientRemoved') @@ -490,7 +517,9 @@ describe('Kleros GTCR adapter', () => { } beforeEach(async () => { - await registry.connect(controller).setMaxRecipients(MAX_RECIPIENTS) + await (registry.connect(controller) as Contract).setMaxRecipients( + MAX_RECIPIENTS + ) }) it('allows to re-use index of removed recipient', async () => { @@ -525,7 +554,7 @@ describe('Kleros GTCR adapter', () => { removedRecipient2 ) - await provider.send('evm_increaseTime', [1000]) + time.increase(1000) const time3 = await getCurrentTime() // Recipients removed before the beginning of the round should be replaced expect(await registry.getRecipientAddress(1, time2, time3)).to.equal( @@ -539,23 +568,35 @@ describe('Kleros GTCR adapter', () => { }) describe('Optimistic recipient registry', () => { - const [, deployer, controller, recipient, requester] = provider.getWallets() let registry: Contract + let registryAddress: string + + let deployer: HardhatEthersSigner + let controller: HardhatEthersSigner + let recipient: HardhatEthersSigner + let requester: HardhatEthersSigner - const baseDeposit = UNIT.div(10) // 0.1 ETH - const challengePeriodDuration = BigNumber.from(86400) // Seconds + const baseDeposit = UNIT / 10n // 0.1 ETH + const challengePeriodDuration = 86400 // Seconds enum RequestType { Registration = 0, Removal = 1, } + before(async () => { + ;[, deployer, controller, recipient, requester] = await ethers.getSigners() + }) beforeEach(async () => { - registry = await deployContract(deployer, 'OptimisticRecipientRegistry', [ - baseDeposit, - challengePeriodDuration, - controller.address, - ]) + registry = await deployContract( + EContracts.OptimisticRecipientRegistry, + ethers, + { + args: [baseDeposit, challengePeriodDuration, controller.address], + signer: deployer, + } + ) + registryAddress = await registry.getAddress() }) it('initializes correctly', async () => { @@ -568,13 +609,13 @@ describe('Optimistic recipient registry', () => { }) it('changes base deposit', async () => { - const newBaseDeposit = baseDeposit.mul(2) + const newBaseDeposit = baseDeposit * 2n await registry.setBaseDeposit(newBaseDeposit) expect(await registry.baseDeposit()).to.equal(newBaseDeposit) }) it('changes challenge period duration', async () => { - const newChallengePeriodDuration = challengePeriodDuration.mul(2) + const newChallengePeriodDuration = challengePeriodDuration * 2 await registry.setChallengePeriodDuration(newChallengePeriodDuration) expect(await registry.challengePeriodDuration()).to.equal( newChallengePeriodDuration @@ -588,20 +629,22 @@ describe('Optimistic recipient registry', () => { let recipientId: string beforeEach(async () => { - await registry.connect(controller).setMaxRecipients(MAX_RECIPIENTS) + await (registry.connect(controller) as Contract).setMaxRecipients( + MAX_RECIPIENTS + ) recipientAddress = recipient.address metadata = JSON.stringify({ name: 'Recipient', description: 'Description', imageHash: 'Ipfs imageHash', }) - recipientId = getRecipientId(registry.address, recipientAddress, metadata) + recipientId = getRecipientId(registryAddress, recipientAddress, metadata) }) it('allows anyone to submit registration request', async () => { - const requestSubmitted = await registry - .connect(requester) - .addRecipient(recipientAddress, metadata, { value: baseDeposit }) + const requestSubmitted = await ( + registry.connect(requester) as Contract + ).addRecipient(recipientAddress, metadata, { value: baseDeposit }) const currentTime = await getCurrentTime() expect(requestSubmitted) .to.emit(registry, 'RequestSubmitted') @@ -612,7 +655,9 @@ describe('Optimistic recipient registry', () => { metadata, currentTime ) - expect(await provider.getBalance(registry.address)).to.equal(baseDeposit) + expect(await ethers.provider.getBalance(registryAddress)).to.equal( + baseDeposit + ) }) it('should not accept zero-address as recipient address', async () => { @@ -637,7 +682,7 @@ describe('Optimistic recipient registry', () => { await registry.addRecipient(recipientAddress, metadata, { value: baseDeposit, }) - await provider.send('evm_increaseTime', [86400]) + await time.increase(86400) await registry.executeRequest(recipientId) await expect( registry.addRecipient(recipientAddress, metadata, { @@ -660,16 +705,18 @@ describe('Optimistic recipient registry', () => { it('should not accept registration request with incorrect deposit size', async () => { await expect( registry.addRecipient(recipientAddress, metadata, { - value: baseDeposit.div(2), + value: baseDeposit / 2n, }) ).to.be.revertedWith('RecipientRegistry: Incorrect deposit amount') }) it('allows owner to challenge registration request', async () => { - await registry - .connect(requester) - .addRecipient(recipientAddress, metadata, { value: baseDeposit }) - const requesterBalanceBefore = await provider.getBalance( + await (registry.connect(requester) as Contract).addRecipient( + recipientAddress, + metadata, + { value: baseDeposit } + ) + const requesterBalanceBefore = await ethers.provider.getBalance( requester.address ) const requestRejected = await registry.challengeRequest( @@ -680,8 +727,10 @@ describe('Optimistic recipient registry', () => { expect(requestRejected) .to.emit(registry, 'RequestResolved') .withArgs(recipientId, RequestType.Registration, true, 0, currentTime) - const requesterBalanceAfter = await provider.getBalance(requester.address) - expect(requesterBalanceBefore.add(baseDeposit)).to.equal( + const requesterBalanceAfter = await ethers.provider.getBalance( + requester.address + ) + expect(requesterBalanceBefore + baseDeposit).to.equal( requesterBalanceAfter ) }) @@ -690,33 +739,38 @@ describe('Optimistic recipient registry', () => { await registry.addRecipient(recipientAddress, metadata, { value: baseDeposit, }) - const controllerBalanceBefore = await provider.getBalance( + const controllerBalanceBefore = await ethers.provider.getBalance( controller.address ) await registry.challengeRequest(recipientId, controller.address) - const controllerBalanceAfter = await provider.getBalance( + const controllerBalanceAfter = await ethers.provider.getBalance( controller.address ) - expect(controllerBalanceBefore.add(baseDeposit)).to.equal( + expect(controllerBalanceBefore + baseDeposit).to.equal( controllerBalanceAfter ) }) it('allows only owner to challenge requests', async () => { - await registry - .connect(requester) - .addRecipient(recipientAddress, metadata, { value: baseDeposit }) + await (registry.connect(requester) as Contract).addRecipient( + recipientAddress, + metadata, + { value: baseDeposit } + ) await expect( - registry - .connect(requester) - .challengeRequest(recipientId, requester.address) + (registry.connect(requester) as Contract).challengeRequest( + recipientId, + requester.address + ) ).to.be.revertedWith('Ownable: caller is not the owner') }) it('should not allow to challenge resolved request', async () => { - await registry - .connect(requester) - .addRecipient(recipientAddress, metadata, { value: baseDeposit }) + await (registry.connect(requester) as Contract).addRecipient( + recipientAddress, + metadata, + { value: baseDeposit } + ) await registry.challengeRequest(recipientId, requester.address) await expect( registry.challengeRequest(recipientId, requester.address) @@ -724,17 +778,19 @@ describe('Optimistic recipient registry', () => { }) it('allows anyone to execute unchallenged registration request', async () => { - await registry - .connect(requester) - .addRecipient(recipientAddress, metadata, { value: baseDeposit }) - await provider.send('evm_increaseTime', [86400]) + await (registry.connect(requester) as Contract).addRecipient( + recipientAddress, + metadata, + { value: baseDeposit } + ) + await time.increase(86400) - const requesterBalanceBefore = await provider.getBalance( + const requesterBalanceBefore = await ethers.provider.getBalance( requester.address ) - const requestExecuted = await registry - .connect(requester) - .executeRequest(recipientId) + const requestExecuted = await ( + registry.connect(requester) as Contract + ).executeRequest(recipientId) const currentTime = await getCurrentTime() expect(requestExecuted) .to.emit(registry, 'RequestResolved') @@ -746,8 +802,10 @@ describe('Optimistic recipient registry', () => { currentTime ) const txFee = await getTxFee(requestExecuted) - const requesterBalanceAfter = await provider.getBalance(requester.address) - expect(requesterBalanceBefore.sub(txFee).add(baseDeposit)).to.equal( + const requesterBalanceAfter = await ethers.provider.getBalance( + requester.address + ) + expect(requesterBalanceBefore - txFee + baseDeposit).to.equal( requesterBalanceAfter ) @@ -772,7 +830,7 @@ describe('Optimistic recipient registry', () => { }) await expect( - registry.connect(requester).executeRequest(recipientId) + (registry.connect(requester) as Contract).executeRequest(recipientId) ).to.be.revertedWith('RecipientRegistry: Challenge period is not over') }) @@ -782,30 +840,34 @@ describe('Optimistic recipient registry', () => { }) let recipientCount = await registry.getRecipientCount() - expect(recipientCount.toNumber()).to.equal(0) + expect(Number(recipientCount)).to.equal(0) await registry.executeRequest(recipientId) recipientCount = await registry.getRecipientCount() - expect(recipientCount.toNumber()).to.equal(1) + expect(Number(recipientCount)).to.equal(1) }) it('should remember initial deposit amount during registration', async () => { - await registry - .connect(requester) - .addRecipient(recipientAddress, metadata, { value: baseDeposit }) - await registry.setBaseDeposit(baseDeposit.mul(2)) - await provider.send('evm_increaseTime', [86400]) + await (registry.connect(requester) as Contract).addRecipient( + recipientAddress, + metadata, + { value: baseDeposit } + ) + await registry.setBaseDeposit(baseDeposit * 2n) + await time.increase(86400) - const requesterBalanceBefore = await provider.getBalance( + const requesterBalanceBefore = await ethers.provider.getBalance( requester.address ) - const requestExecuted = await registry - .connect(requester) - .executeRequest(recipientId) + const requestExecuted = await ( + registry.connect(requester) as Contract + ).executeRequest(recipientId) const txFee = await getTxFee(requestExecuted) - const requesterBalanceAfter = await provider.getBalance(requester.address) - expect(requesterBalanceBefore.sub(txFee).add(baseDeposit)).to.equal( + const requesterBalanceAfter = await ethers.provider.getBalance( + requester.address + ) + expect(requesterBalanceBefore - txFee + baseDeposit).to.equal( requesterBalanceAfter ) }) @@ -821,7 +883,7 @@ describe('Optimistic recipient registry', () => { }) recipientAddress = `0x000000000000000000000000000000000000${recipientName}` recipientId = getRecipientId( - registry.address, + registryAddress, recipientAddress, metadata ) @@ -829,13 +891,13 @@ describe('Optimistic recipient registry', () => { await registry.addRecipient(recipientAddress, metadata, { value: baseDeposit, }) - await provider.send('evm_increaseTime', [86400]) + await time.increase(86400) await registry.executeRequest(recipientId) } else { await registry.addRecipient(recipientAddress, metadata, { value: baseDeposit, }) - await provider.send('evm_increaseTime', [86400]) + await time.increase(86400) await expect(registry.executeRequest(recipientId)).to.be.revertedWith( 'RecipientRegistry: Recipient limit reached' ) @@ -847,7 +909,7 @@ describe('Optimistic recipient registry', () => { await registry.addRecipient(recipientAddress, metadata, { value: baseDeposit, }) - await provider.send('evm_increaseTime', [86400]) + await time.increase(86400) await registry.executeRequest(recipientId) const requestSubmitted = await registry.removeRecipient(recipientId, { @@ -871,7 +933,7 @@ describe('Optimistic recipient registry', () => { }) await registry.executeRequest(recipientId) - const registryAsRequester = registry.connect(requester) + const registryAsRequester = registry.connect(requester) as Contract await registryAsRequester.removeRecipient(recipientId, { value: baseDeposit, }) @@ -891,12 +953,14 @@ describe('Optimistic recipient registry', () => { await registry.addRecipient(recipientAddress, metadata, { value: baseDeposit, }) - await provider.send('evm_increaseTime', [86400]) + await time.increase(86400) await registry.executeRequest(recipientId) await registry.removeRecipient(recipientId, { value: baseDeposit }) - await provider.send('evm_increaseTime', [86400]) - await registry.connect(requester).executeRequest(recipientId) + await time.increase(86400) + await (registry.connect(requester) as Contract).executeRequest( + recipientId + ) await expect(registry.removeRecipient(recipientId)).to.be.revertedWith( 'RecipientRegistry: Recipient already removed' @@ -907,7 +971,7 @@ describe('Optimistic recipient registry', () => { await registry.addRecipient(recipientAddress, metadata, { value: baseDeposit, }) - await provider.send('evm_increaseTime', [86400]) + await time.increase(86400) await registry.executeRequest(recipientId) await registry.removeRecipient(recipientId, { value: baseDeposit }) @@ -920,7 +984,7 @@ describe('Optimistic recipient registry', () => { await registry.addRecipient(recipientAddress, metadata, { value: baseDeposit, }) - await provider.send('evm_increaseTime', [86400]) + await time.increase(86400) await registry.executeRequest(recipientId) await registry.removeRecipient(recipientId, { value: baseDeposit }) @@ -947,15 +1011,15 @@ describe('Optimistic recipient registry', () => { await registry.addRecipient(recipientAddress, metadata, { value: baseDeposit, }) - await provider.send('evm_increaseTime', [86400]) + await time.increase(86400) await registry.executeRequest(recipientId) await registry.removeRecipient(recipientId, { value: baseDeposit }) - await provider.send('evm_increaseTime', [86400]) + await time.increase(86400) - const requestExecuted = await registry - .connect(requester) - .executeRequest(recipientId) + const requestExecuted = await ( + registry.connect(requester) as Contract + ).executeRequest(recipientId) const currentTime = await getCurrentTime() expect(requestExecuted) .to.emit(registry, 'RequestResolved') @@ -981,10 +1045,12 @@ describe('Optimistic recipient registry', () => { '_recipientId' ) - const anotherRegistry = await deployContract( - deployer, - 'OptimisticRecipientRegistry', - [baseDeposit, challengePeriodDuration, controller.address] + const anotherRegistry = await ethers.deployContract( + EContracts.OptimisticRecipientRegistry, + [baseDeposit, challengePeriodDuration, controller.address], + { + signer: deployer, + } ) const txTwo = await anotherRegistry.addRecipient( recipientAddress, diff --git a/contracts/tests/round.ts b/contracts/tests/round.ts index 40c3c7d92..c0fa4f813 100644 --- a/contracts/tests/round.ts +++ b/contracts/tests/round.ts @@ -1,11 +1,19 @@ -import { ethers, waffle, artifacts } from 'hardhat' -import { use, expect } from 'chai' -import { solidity } from 'ethereum-waffle' -import { deployMockContract } from '@ethereum-waffle/mock-contract' -import { Contract, BigNumber } from 'ethers' -import { defaultAbiCoder } from '@ethersproject/abi' +import { ethers } from 'hardhat' +import { expect } from 'chai' +import { HardhatEthersSigner } from '@nomicfoundation/hardhat-ethers/signers' +import { MockContract } from '@clrfund/waffle-mock-contract' +import { + Contract, + AbiCoder, + parseEther, + sha256, + randomBytes, + hexlify, + toNumber, +} from 'ethers' import { genRandomSalt } from 'maci-crypto' -import { Keypair } from '@clrfund/maci-utils' +import { Keypair } from '@clrfund/common' +import { time } from '@nomicfoundation/hardhat-network-helpers' import { ZERO_ADDRESS, @@ -14,317 +22,275 @@ import { ALPHA_PRECISION, } from '../utils/constants' import { getEventArg, getGasUsage } from '../utils/contracts' -import { deployMaciFactory } from '../utils/deployment' import { bnSqrt, createMessage, addTallyResultsBatch, getRecipientClaimData, - getRecipientTallyResultsBatch, + mergeMaciSubtrees, } from '../utils/maci' -import { sha256 } from 'ethers/lib/utils' - -use(solidity) +import { deployTestFundingRound } from '../utils/testutils' // ethStaker test vectors for Quadratic Funding with alpha import smallTallyTestData from './data/testTallySmall.json' -const totalSpent = BigNumber.from(smallTallyTestData.totalVoiceCredits.spent) -const budget = BigNumber.from(totalSpent).mul(VOICE_CREDIT_FACTOR).mul(2) +import { FundingRound } from '../typechain-types' + +const newResultCommitment = hexlify(randomBytes(32)) +const perVOSpentVoiceCreditsHash = hexlify(randomBytes(32)) +const totalSpent = BigInt(smallTallyTestData.totalSpentVoiceCredits.spent) +const budget = BigInt(totalSpent) * VOICE_CREDIT_FACTOR * 2n const totalQuadraticVotes = smallTallyTestData.results.tally.reduce( (total, tally) => { - return BigNumber.from(tally).pow(2).add(total) + return BigInt(tally) ** 2n + total }, - BigNumber.from(0) + BigInt(0) ) -const matchingPoolSize = budget.sub(totalSpent.mul(VOICE_CREDIT_FACTOR)) - -const expectedAlpha = matchingPoolSize - .mul(ALPHA_PRECISION) - .div(totalQuadraticVotes.sub(totalSpent)) - .div(VOICE_CREDIT_FACTOR) - -function calcAllocationAmount(tally: string, voiceCredit: string): BigNumber { - const quadratic = expectedAlpha - .mul(VOICE_CREDIT_FACTOR) - .mul(BigNumber.from(tally).pow(2)) - const linear = ALPHA_PRECISION.sub(expectedAlpha).mul( - VOICE_CREDIT_FACTOR.mul(voiceCredit) - ) - const allocation = quadratic.add(linear) - return allocation.div(ALPHA_PRECISION) +const matchingPoolSize = budget - totalSpent * VOICE_CREDIT_FACTOR + +const expectedAlpha = + (matchingPoolSize * ALPHA_PRECISION) / + (totalQuadraticVotes - totalSpent) / + VOICE_CREDIT_FACTOR + +const abiCoder = new AbiCoder() + +function calcAllocationAmount(tally: string, voiceCredit: string): bigint { + const quadratic = expectedAlpha * VOICE_CREDIT_FACTOR * BigInt(tally) ** 2n + + const linear = + (ALPHA_PRECISION - expectedAlpha) * + (VOICE_CREDIT_FACTOR * BigInt(voiceCredit)) + + const allocation = quadratic + linear + return allocation / ALPHA_PRECISION } describe('Funding Round', () => { - const provider = waffle.provider - const [, deployer, coordinator, contributor, anotherContributor, recipient] = - provider.getWallets() - const coordinatorPubKey = new Keypair().pubKey - const signUpDuration = 86400 * 7 // Default duration in MACI factory - const votingDuration = 86400 * 7 // Default duration in MACI factory + const roundDuration = 86400 * 7 const userKeypair = new Keypair() - const contributionAmount = UNIT.mul(10) + const userPubKey = userKeypair.pubKey.asContractParam() + const contributionAmount = UNIT * BigInt(10) const tallyHash = 'test' - const tallyTreeDepth = 2 + let tallyTreeDepth: number let token: Contract - let userRegistry: Contract - let recipientRegistry: Contract + let tokenAsContributor: Contract + let userRegistry: MockContract + let recipientRegistry: MockContract + let tally: MockContract let fundingRound: Contract + let fundingRoundAsCoordinator: FundingRound + let fundingRoundAsContributor: FundingRound let maci: Contract - - async function deployMaciMock(): Promise { - const MACIArtifact = await artifacts.readArtifact('MACI') - const maci = await deployMockContract(deployer, MACIArtifact.abi) - const currentTime = (await provider.getBlock('latest')).timestamp - const signUpDeadline = currentTime + signUpDuration - const votingDeadline = signUpDeadline + votingDuration - await maci.mock.signUpTimestamp.returns(currentTime) - await maci.mock.signUpDurationSeconds.returns(signUpDuration) - await maci.mock.votingDurationSeconds.returns(votingDuration) - await maci.mock.calcSignUpDeadline.returns(signUpDeadline) - await maci.mock.calcVotingDeadline.returns(votingDeadline) - await maci.mock.maxUsers.returns(100) - await maci.mock.treeDepths.returns(10, 10, 2) - await maci.mock.signUp.returns() - return maci - } + let maciAddress: string + let poll: Contract + let pollId: bigint + + let deployer: HardhatEthersSigner + let coordinator: HardhatEthersSigner + let contributor: HardhatEthersSigner + let anotherContributor: HardhatEthersSigner + let recipient: HardhatEthersSigner + + before(async () => { + ;[, deployer, coordinator, contributor, anotherContributor, recipient] = + await ethers.getSigners() + }) beforeEach(async () => { - const tokenInitialSupply = UNIT.mul(1000000) - const Token = await ethers.getContractFactory('AnyOldERC20Token', deployer) - token = await Token.deploy(tokenInitialSupply.add(budget)) - await token.transfer(contributor.address, tokenInitialSupply.div(4)) - await token.transfer(anotherContributor.address, tokenInitialSupply.div(4)) - await token.transfer(coordinator.address, tokenInitialSupply.div(4)) - - const IUserRegistryArtifact = await artifacts.readArtifact('IUserRegistry') - userRegistry = await deployMockContract(deployer, IUserRegistryArtifact.abi) - await userRegistry.mock.isVerifiedUser.returns(true) - - const IRecipientRegistryArtifact = await artifacts.readArtifact( - 'IRecipientRegistry' - ) - recipientRegistry = await deployMockContract( - deployer, - IRecipientRegistryArtifact.abi - ) - - const FundingRound = await ethers.getContractFactory('FundingRound', { - signer: deployer, - }) - fundingRound = await FundingRound.deploy( - token.address, - userRegistry.address, - recipientRegistry.address, - coordinator.address - ) - const circuit = 'prod' - const maciFactory = await deployMaciFactory(deployer, circuit) - const maciDeployed = await maciFactory.deployMaci( - fundingRound.address, - fundingRound.address, + const tokenInitialSupply = UNIT * BigInt(1000000) + const deployed = await deployTestFundingRound( + tokenInitialSupply + budget, coordinator.address, - coordinatorPubKey.asContractParam() - ) - const maciAddress = await getEventArg( - maciDeployed, - maciFactory, - 'MaciDeployed', - '_maci' + coordinatorPubKey, + roundDuration, + deployer ) + token = deployed.token + fundingRound = deployed.fundingRound + userRegistry = deployed.mockUserRegistry + recipientRegistry = deployed.mockRecipientRegistry + tally = deployed.mockTally + const mockVerifier = deployed.mockVerifier + + // make the verifier to alwasy returns true + await mockVerifier.mock.verify.returns(true) + await userRegistry.mock.isVerifiedUser.returns(true) + await tally.mock.tallyBatchNum.returns(1) + await tally.mock.verifyTallyResult.returns(true) + await tally.mock.verifySpentVoiceCredits.returns(true) + + tokenAsContributor = token.connect(contributor) as Contract + fundingRoundAsCoordinator = fundingRound.connect( + coordinator + ) as FundingRound + fundingRoundAsContributor = fundingRound.connect( + contributor + ) as FundingRound + + await token.transfer(contributor.address, tokenInitialSupply / 4n) + await token.transfer(anotherContributor.address, tokenInitialSupply / 4n) + await token.transfer(coordinator.address, tokenInitialSupply / 4n) + + maciAddress = await fundingRound.maci() maci = await ethers.getContractAt('MACI', maciAddress) + const pollAddress = await fundingRound.poll() + poll = await ethers.getContractAt('Poll', pollAddress, deployer) + pollId = await fundingRound.pollId() + + const treeDepths = await poll.treeDepths() + tallyTreeDepth = toNumber(treeDepths.voteOptionTreeDepth) }) it('initializes funding round correctly', async () => { expect(await fundingRound.owner()).to.equal(deployer.address) - expect(await fundingRound.nativeToken()).to.equal(token.address) + expect(await fundingRound.nativeToken()).to.equal(token.target) expect(await fundingRound.voiceCreditFactor()).to.equal(VOICE_CREDIT_FACTOR) expect(await fundingRound.matchingPoolSize()).to.equal(0) expect(await fundingRound.totalSpent()).to.equal(0) - expect(await fundingRound.totalVotes()).to.equal(0) - expect(await fundingRound.userRegistry()).to.equal(userRegistry.address) + expect(await fundingRound.userRegistry()).to.equal(userRegistry.target) expect(await fundingRound.recipientRegistry()).to.equal( - recipientRegistry.address + recipientRegistry.target ) expect(await fundingRound.isFinalized()).to.equal(false) expect(await fundingRound.isCancelled()).to.equal(false) expect(await fundingRound.coordinator()).to.equal(coordinator.address) - expect(await fundingRound.maci()).to.equal(ZERO_ADDRESS) - }) - - it('allows owner to set MACI address', async () => { - await fundingRound.setMaci(maci.address) - expect(await fundingRound.maci()).to.equal(maci.address) - }) - - it('allows to set MACI address only once', async () => { - await fundingRound.setMaci(maci.address) - await expect(fundingRound.setMaci(maci.address)).to.be.revertedWith( - 'FundingRound: Already linked to MACI instance' - ) - }) - - it('allows only owner to set MACI address', async () => { - const fundingRoundAsCoordinator = fundingRound.connect(coordinator) - await expect( - fundingRoundAsCoordinator.setMaci(maci.address) - ).to.be.revertedWith('Ownable: caller is not the owner') + expect(await fundingRound.maci()).to.be.properAddress }) describe('accepting contributions', () => { - const userPubKey = userKeypair.pubKey.asContractParam() - const encodedContributorAddress = defaultAbiCoder.encode( - ['address'], - [contributor.address] - ) - let tokenAsContributor: Contract + let encodedContributorAddress: string + let fundingRoundAsContributor: Contract beforeEach(async () => { - tokenAsContributor = token.connect(contributor) - fundingRoundAsContributor = fundingRound.connect(contributor) + tokenAsContributor = token.connect(contributor) as Contract + fundingRoundAsContributor = fundingRound.connect(contributor) as Contract + encodedContributorAddress = abiCoder.encode( + ['address'], + [contributor.address] + ) }) it('accepts contributions from everyone', async () => { - await fundingRound.setMaci(maci.address) - await tokenAsContributor.approve(fundingRound.address, contributionAmount) - const expectedVoiceCredits = contributionAmount.div(VOICE_CREDIT_FACTOR) + await tokenAsContributor.approve(fundingRound.target, contributionAmount) + const expectedVoiceCredits = contributionAmount / VOICE_CREDIT_FACTOR await expect( fundingRoundAsContributor.contribute(userPubKey, contributionAmount) ) .to.emit(fundingRound, 'Contribution') .withArgs(contributor.address, contributionAmount) .to.emit(maci, 'SignUp') - // We use [] to skip argument matching, otherwise it will fail - // Possibly related: https://github.com/EthWorks/Waffle/issues/245 - .withArgs([], 1, expectedVoiceCredits) - expect(await token.balanceOf(fundingRound.address)).to.equal( + // We use [] to skip argument matching, otherwise it will fail + // Possibly related: https://github.com/EthWorks/Waffle/issues/245 + //.withArgs([], 1, expectedVoiceCredits) + + expect(await token.balanceOf(fundingRound.target)).to.equal( contributionAmount ) expect(await fundingRound.contributorCount()).to.equal(1) expect( await fundingRound.getVoiceCredits( - fundingRound.address, + fundingRound.target, encodedContributorAddress ) ).to.equal(expectedVoiceCredits) }) - it('rejects contributions if MACI has not been linked to a round', async () => { - await tokenAsContributor.approve(fundingRound.address, contributionAmount) - await expect( - fundingRoundAsContributor.contribute(userPubKey, contributionAmount) - ).to.be.revertedWith('FundingRound: MACI not deployed') - }) - it('limits the number of contributors', async () => { // TODO: add test later }) it('rejects contributions if funding round has been finalized', async () => { - await fundingRound.setMaci(maci.address) await fundingRound.cancel() - await tokenAsContributor.approve(fundingRound.address, contributionAmount) + await tokenAsContributor.approve(fundingRound.target, contributionAmount) await expect( fundingRoundAsContributor.contribute(userPubKey, contributionAmount) - ).to.be.revertedWith('FundingRound: Round finalized') + ).to.be.revertedWithCustomError(fundingRound, 'RoundAlreadyFinalized') }) it('rejects contributions with zero amount', async () => { - await fundingRound.setMaci(maci.address) - await tokenAsContributor.approve(fundingRound.address, contributionAmount) + await tokenAsContributor.approve(fundingRound.target, contributionAmount) await expect( fundingRoundAsContributor.contribute(userPubKey, 0) - ).to.be.revertedWith( - 'FundingRound: Contribution amount must be greater than zero' - ) + ).to.be.revertedWithCustomError(fundingRound, 'ContributionAmountIsZero') }) it('rejects contributions that are too large', async () => { - await fundingRound.setMaci(maci.address) - const contributionAmount = UNIT.mul(10001) - await tokenAsContributor.approve(fundingRound.address, contributionAmount) + const contributionAmount = UNIT * BigInt(10001) + await tokenAsContributor.approve(fundingRound.target, contributionAmount) await expect( fundingRoundAsContributor.contribute(userPubKey, contributionAmount) - ).to.be.revertedWith('FundingRound: Contribution amount is too large') + ).to.be.revertedWithCustomError( + fundingRound, + 'ContributionAmountTooLarge' + ) }) it('allows to contribute only once per round', async () => { - await fundingRound.setMaci(maci.address) await tokenAsContributor.approve( - fundingRound.address, - contributionAmount.mul(2) + fundingRound.target, + contributionAmount * BigInt(2) ) await fundingRoundAsContributor.contribute(userPubKey, contributionAmount) await expect( fundingRoundAsContributor.contribute(userPubKey, contributionAmount) - ).to.be.revertedWith('FundingRound: Already contributed') + ).to.be.revertedWithCustomError(fundingRound, 'AlreadyContributed') }) it('requires approval', async () => { - await fundingRound.setMaci(maci.address) await expect( fundingRoundAsContributor.contribute(userPubKey, contributionAmount) - ).to.be.revertedWith('ERC20: transfer amount exceeds allowance') + ).to.be.revertedWith('ERC20: insufficient allowance') }) it('rejects contributions from unverified users', async () => { - await fundingRound.setMaci(maci.address) - await tokenAsContributor.approve(fundingRound.address, contributionAmount) + await tokenAsContributor.approve(fundingRound.target, contributionAmount) await userRegistry.mock.isVerifiedUser.returns(false) await expect( fundingRoundAsContributor.contribute(userPubKey, contributionAmount) - ).to.be.revertedWith('FundingRound: User has not been verified') + ).to.be.revertedWithCustomError(fundingRound, 'UserNotVerified') }) it('should not allow users who have not contributed to sign up directly in MACI', async () => { - await fundingRound.setMaci(maci.address) - const signUpData = defaultAbiCoder.encode( - ['address'], - [contributor.address] - ) + const signUpData = abiCoder.encode(['address'], [contributor.address]) await expect( maci.signUp(userPubKey, signUpData, encodedContributorAddress) - ).to.be.revertedWith('FundingRound: User has not contributed') + ).to.be.revertedWithCustomError(fundingRound, 'UserHasNotContributed') }) it('should not allow users who have already signed up to sign up directly in MACI', async () => { - await fundingRound.setMaci(maci.address) - await tokenAsContributor.approve(fundingRound.address, contributionAmount) + await tokenAsContributor.approve(fundingRound.target, contributionAmount) await fundingRoundAsContributor.contribute(userPubKey, contributionAmount) - const signUpData = defaultAbiCoder.encode( - ['address'], - [contributor.address] - ) + const signUpData = abiCoder.encode(['address'], [contributor.address]) await expect( maci.signUp(userPubKey, signUpData, encodedContributorAddress) - ).to.be.revertedWith('FundingRound: User already registered') + ).to.be.revertedWithCustomError(fundingRound, 'UserAlreadyRegistered') }) it('should not return the amount of voice credits for user who has not contributed', async () => { await expect( fundingRound.getVoiceCredits( - fundingRound.address, + fundingRound.target, encodedContributorAddress ) - ).to.be.revertedWith('FundingRound: User does not have any voice credits') + ).to.be.revertedWithCustomError(fundingRound, 'NoVoiceCredits') }) }) describe('voting', () => { - const singleVote = UNIT.mul(4) + const singleVote = UNIT * BigInt(4) let fundingRoundAsContributor: Contract let userStateIndex: number let recipientIndex = 1 let nonce = 1 beforeEach(async () => { - await fundingRound.setMaci(maci.address) - const tokenAsContributor = token.connect(contributor) - await tokenAsContributor.approve(fundingRound.address, contributionAmount) - fundingRoundAsContributor = fundingRound.connect(contributor) + const tokenAsContributor = token.connect(contributor) as Contract + await tokenAsContributor.approve(fundingRound.target, contributionAmount) + fundingRoundAsContributor = fundingRound.connect(contributor) as Contract const contributionTx = await fundingRoundAsContributor.contribute( userKeypair.pubKey.asContractParam(), contributionAmount @@ -335,7 +301,6 @@ describe('Funding Round', () => { 'SignUp', '_stateIndex' ) - await provider.send('evm_increaseTime', [signUpDuration]) }) it('submits a vote', async () => { @@ -346,13 +311,14 @@ describe('Funding Round', () => { coordinatorPubKey, recipientIndex, singleVote, - nonce + nonce, + pollId ) - const messagePublished = maci.publishMessage( + const messagePublished = poll.publishMessage( message.asContractParam(), encPubKey.asContractParam() ) - await expect(messagePublished).to.emit(maci, 'PublishMessage') + await expect(messagePublished).to.emit(poll, 'PublishMessage') const publishTx = await messagePublished expect(await getGasUsage(publishTx)).lessThan(2135000) }) @@ -366,9 +332,10 @@ describe('Funding Round', () => { coordinatorPubKey, null, null, - nonce + nonce, + pollId ) - await maci.publishMessage( + await poll.publishMessage( message.asContractParam(), encPubKey.asContractParam() ) @@ -385,9 +352,10 @@ describe('Funding Round', () => { coordinatorPubKey, null, null, - nonce + nonce, + pollId ) - await maci.publishMessage( + await poll.publishMessage( message.asContractParam(), encPubKey.asContractParam() ) @@ -402,9 +370,10 @@ describe('Funding Round', () => { coordinatorPubKey, null, null, - nonce + nonce, + pollId ) - await maci.publishMessage( + await poll.publishMessage( message1.asContractParam(), encPubKey1.asContractParam() ) @@ -415,9 +384,10 @@ describe('Funding Round', () => { coordinatorPubKey, recipientIndex, singleVote, - nonce + 1 + nonce + 1, + pollId ) - await maci.publishMessage( + await poll.publishMessage( message2.asContractParam(), encPubKey2.asContractParam() ) @@ -432,9 +402,10 @@ describe('Funding Round', () => { coordinatorPubKey, recipientIndex, singleVote, - nonce + nonce, + pollId ) - await maci.publishMessage( + await poll.publishMessage( message.asContractParam(), encPubKey.asContractParam() ) @@ -457,12 +428,13 @@ describe('Funding Round', () => { coordinatorPubKey, recipientIndex, singleVote, - nonce + nonce, + pollId ) messages.push(message.asContractParam()) encPubKeys.push(encPubKey.asContractParam()) } - const messageBatchSubmitted = await fundingRound.submitMessageBatch( + const messageBatchSubmitted = await poll.publishMessageBatch( messages, encPubKeys ) @@ -472,251 +444,306 @@ describe('Funding Round', () => { describe('publishing tally hash', () => { it('allows coordinator to publish vote tally hash', async () => { - await expect( - fundingRound.connect(coordinator).publishTallyHash(tallyHash) - ) + await expect(fundingRoundAsCoordinator.publishTallyHash(tallyHash)) .to.emit(fundingRound, 'TallyPublished') .withArgs(tallyHash) expect(await fundingRound.tallyHash()).to.equal(tallyHash) // Should be possible to re-publish - await expect( - fundingRound.connect(coordinator).publishTallyHash('fixed') - ).to.emit(fundingRound, 'TallyPublished') + await expect(fundingRoundAsCoordinator.publishTallyHash('fixed')).to.emit( + fundingRound, + 'TallyPublished' + ) }) it('allows only coordinator to publish tally hash', async () => { - await expect(fundingRound.publishTallyHash(tallyHash)).to.be.revertedWith( - 'FundingRound: Sender is not the coordinator' - ) + await expect( + fundingRound.publishTallyHash(tallyHash) + ).to.be.revertedWithCustomError(fundingRound, 'NotCoordinator') }) it('reverts if round has been finalized', async () => { await fundingRound.cancel() await expect( - fundingRound.connect(coordinator).publishTallyHash(tallyHash) - ).to.be.revertedWith('FundingRound: Round finalized') + fundingRoundAsCoordinator.publishTallyHash(tallyHash) + ).to.be.revertedWithCustomError(fundingRound, 'RoundAlreadyFinalized') }) it('rejects empty string', async () => { await expect( - fundingRound.connect(coordinator).publishTallyHash('') - ).to.be.revertedWith('FundingRound: Tally hash is empty string') + fundingRoundAsCoordinator.publishTallyHash('') + ).to.be.revertedWithCustomError(fundingRound, 'EmptyTallyHash') }) }) describe('finalizing round', () => { - const matchingPoolSize = UNIT.mul(10000) - const totalContributions = UNIT.mul(1000) - const totalSpent = totalContributions.div(VOICE_CREDIT_FACTOR) + const matchingPoolSize = UNIT * BigInt(10000) + const totalContributions = UNIT * BigInt(1000) + const totalSpent = totalContributions / VOICE_CREDIT_FACTOR const totalSpentSalt = genRandomSalt().toString() const totalVotes = bnSqrt(totalSpent) - const tallyTreeDepth = 2 - expect(totalVotes.toNumber()).to.equal(10000) + expect(totalVotes).to.equal(BigInt(10000)) beforeEach(async () => { - maci = await deployMaciMock() - await maci.mock.hasUntalliedStateLeaves.returns(false) - await maci.mock.totalVotes.returns(totalVotes) - await maci.mock.verifySpentVoiceCredits.returns(true) - await maci.mock.verifyTallyResult.returns(true) - await maci.mock.treeDepths.returns(10, 10, tallyTreeDepth) - await maci.mock.verifyPerVOSpentVoiceCredits.returns(true) - - await token - .connect(contributor) - .approve(fundingRound.address, totalContributions) + await (token.connect(contributor) as Contract).approve( + fundingRound.target, + totalContributions + ) }) it('allows owner to finalize round', async () => { - await fundingRound.setMaci(maci.address) - await fundingRound - .connect(contributor) - .contribute(userKeypair.pubKey.asContractParam(), totalContributions) - await provider.send('evm_increaseTime', [signUpDuration + votingDuration]) - await fundingRound.connect(coordinator).publishTallyHash(tallyHash) - await token.transfer(fundingRound.address, matchingPoolSize) + await (fundingRound.connect(contributor) as Contract).contribute( + userKeypair.pubKey.asContractParam(), + totalContributions + ) + await time.increase(roundDuration) + + await mergeMaciSubtrees({ maciAddress, pollId, signer: deployer }) + await fundingRoundAsCoordinator.publishTallyHash(tallyHash) + await token.transfer(fundingRound.target, matchingPoolSize) await addTallyResultsBatch( - fundingRound.connect(coordinator), + fundingRoundAsCoordinator, tallyTreeDepth, smallTallyTestData, 5 ) - await fundingRound.finalize(totalSpent, totalSpentSalt) + await fundingRound.finalize( + totalSpent, + totalSpentSalt, + newResultCommitment, + perVOSpentVoiceCreditsHash + ) expect(await fundingRound.isFinalized()).to.equal(true) expect(await fundingRound.isCancelled()).to.equal(false) expect(await fundingRound.totalSpent()).to.equal(totalSpent) - expect(await fundingRound.totalVotes()).to.equal(totalVotes) expect(await fundingRound.matchingPoolSize()).to.equal(matchingPoolSize) }) it('allows owner to finalize round when matching pool is empty', async () => { - await fundingRound.setMaci(maci.address) - await fundingRound - .connect(contributor) - .contribute(userKeypair.pubKey.asContractParam(), totalContributions) - await provider.send('evm_increaseTime', [signUpDuration + votingDuration]) - await fundingRound.connect(coordinator).publishTallyHash(tallyHash) + await (fundingRound.connect(contributor) as Contract).contribute( + userKeypair.pubKey.asContractParam(), + totalContributions + ) + await time.increase(roundDuration) + await mergeMaciSubtrees({ maciAddress, pollId, signer: deployer }) + await fundingRoundAsCoordinator.publishTallyHash(tallyHash) await addTallyResultsBatch( - fundingRound.connect(coordinator), + fundingRoundAsCoordinator, tallyTreeDepth, smallTallyTestData, 5 ) - await fundingRound.finalize(totalSpent, totalSpentSalt) + await fundingRound.finalize( + totalSpent, + totalSpentSalt, + newResultCommitment, + perVOSpentVoiceCreditsHash + ) expect(await fundingRound.totalSpent()).to.equal(totalSpent) - expect(await fundingRound.totalVotes()).to.equal(totalVotes) expect(await fundingRound.matchingPoolSize()).to.equal(0) }) it('counts direct token transfers to funding round as matching pool contributions', async () => { - await fundingRound.setMaci(maci.address) - await fundingRound - .connect(contributor) - .contribute(userKeypair.pubKey.asContractParam(), totalContributions) - await provider.send('evm_increaseTime', [signUpDuration + votingDuration]) - await fundingRound.connect(coordinator).publishTallyHash(tallyHash) - await token.transfer(fundingRound.address, matchingPoolSize) - await token - .connect(contributor) - .transfer(fundingRound.address, contributionAmount) + await (fundingRound.connect(contributor) as Contract).contribute( + userKeypair.pubKey.asContractParam(), + totalContributions + ) + await time.increase(roundDuration) + await mergeMaciSubtrees({ maciAddress, pollId, signer: deployer }) + await fundingRoundAsCoordinator.publishTallyHash(tallyHash) + await token.transfer(fundingRound.target, matchingPoolSize) + await (token.connect(contributor) as Contract).transfer( + fundingRound.target, + contributionAmount + ) await addTallyResultsBatch( - fundingRound.connect(coordinator), + fundingRoundAsCoordinator, tallyTreeDepth, smallTallyTestData, 5 ) - await fundingRound.finalize(totalSpent, totalSpentSalt) + await fundingRound.finalize( + totalSpent, + totalSpentSalt, + newResultCommitment, + perVOSpentVoiceCreditsHash + ) expect(await fundingRound.matchingPoolSize()).to.equal( - matchingPoolSize.add(contributionAmount) + matchingPoolSize + contributionAmount ) }) it('reverts if round has been finalized already', async () => { - await fundingRound.setMaci(maci.address) - await fundingRound - .connect(contributor) - .contribute(userKeypair.pubKey.asContractParam(), totalContributions) - await provider.send('evm_increaseTime', [signUpDuration + votingDuration]) - await fundingRound.connect(coordinator).publishTallyHash(tallyHash) - await token.transfer(fundingRound.address, matchingPoolSize) + await (fundingRound.connect(contributor) as Contract).contribute( + userKeypair.pubKey.asContractParam(), + totalContributions + ) + await time.increase(roundDuration) + + await mergeMaciSubtrees({ maciAddress, pollId, signer: deployer }) + await fundingRoundAsCoordinator.publishTallyHash(tallyHash) + await token.transfer(fundingRound.target, matchingPoolSize) await addTallyResultsBatch( - fundingRound.connect(coordinator), + fundingRoundAsCoordinator, tallyTreeDepth, smallTallyTestData, 5 ) - await fundingRound.finalize(totalSpent, totalSpentSalt) - await expect( - fundingRound.finalize(totalSpent, totalSpentSalt) - ).to.be.revertedWith('FundingRound: Already finalized') - }) - - it('reverts MACI has not been deployed', async () => { - await provider.send('evm_increaseTime', [signUpDuration + votingDuration]) + await fundingRound.finalize( + totalSpent, + totalSpentSalt, + newResultCommitment, + perVOSpentVoiceCreditsHash + ) await expect( - fundingRound.finalize(totalSpent, totalSpentSalt) - ).to.be.revertedWith('FundingRound: MACI not deployed') + fundingRound.finalize( + totalSpent, + totalSpentSalt, + newResultCommitment, + perVOSpentVoiceCreditsHash + ) + ).to.be.revertedWithCustomError(fundingRound, 'RoundAlreadyFinalized') }) it('reverts if voting is still in progress', async () => { - await fundingRound.setMaci(maci.address) - await fundingRound - .connect(contributor) - .contribute(userKeypair.pubKey.asContractParam(), totalContributions) - await provider.send('evm_increaseTime', [signUpDuration]) + await (fundingRound.connect(contributor) as Contract).contribute( + userKeypair.pubKey.asContractParam(), + totalContributions + ) + await time.increase(roundDuration / 2) await expect( - fundingRound.finalize(totalSpent, totalSpentSalt) - ).to.be.revertedWith('FundingRound: Voting has not been finished') + fundingRound.finalize( + totalSpent, + totalSpentSalt, + newResultCommitment, + perVOSpentVoiceCreditsHash + ) + ).to.be.revertedWithCustomError(fundingRound, 'VotingPeriodNotPassed') }) it('reverts if votes has not been tallied', async () => { - await fundingRound.setMaci(maci.address) - await fundingRound - .connect(contributor) - .contribute(userKeypair.pubKey.asContractParam(), totalContributions) - await provider.send('evm_increaseTime', [signUpDuration + votingDuration]) - await maci.mock.hasUntalliedStateLeaves.returns(true) + await (fundingRound.connect(contributor) as Contract).contribute( + userKeypair.pubKey.asContractParam(), + totalContributions + ) + await time.increase(roundDuration) + await mergeMaciSubtrees({ maciAddress, pollId, signer: deployer }) + await tally.mock.tallyBatchNum.returns(0) await expect( - fundingRound.finalize(totalSpent, totalSpentSalt) - ).to.be.revertedWith('FundingRound: Votes has not been tallied') + fundingRound.finalize( + totalSpent, + totalSpentSalt, + newResultCommitment, + perVOSpentVoiceCreditsHash + ) + ).to.be.revertedWithCustomError(fundingRound, 'VotesNotTallied') }) it('reverts if tally hash has not been published', async () => { - await fundingRound.setMaci(maci.address) - await fundingRound - .connect(contributor) - .contribute(userKeypair.pubKey.asContractParam(), totalContributions) - await provider.send('evm_increaseTime', [signUpDuration + votingDuration]) + await (fundingRound.connect(contributor) as Contract).contribute( + userKeypair.pubKey.asContractParam(), + totalContributions + ) + await time.increase(roundDuration) + await mergeMaciSubtrees({ maciAddress, pollId, signer: deployer }) await expect( - fundingRound.finalize(totalSpent, totalSpentSalt) - ).to.be.revertedWith('FundingRound: Tally hash has not been published') + fundingRound.finalize( + totalSpent, + totalSpentSalt, + newResultCommitment, + perVOSpentVoiceCreditsHash + ) + ).to.be.revertedWithCustomError(fundingRound, 'TallyHashNotPublished') }) - it('reverts if total votes is zero', async () => { - await fundingRound.setMaci(maci.address) - await fundingRound - .connect(contributor) - .contribute(userKeypair.pubKey.asContractParam(), totalContributions) - await provider.send('evm_increaseTime', [signUpDuration + votingDuration]) - await fundingRound.connect(coordinator).publishTallyHash(tallyHash) - await token.transfer(fundingRound.address, matchingPoolSize) - await maci.mock.totalVotes.returns(0) + it('reverts if total votes (== totalSpent) is zero', async () => { + await (fundingRound.connect(contributor) as Contract).contribute( + userKeypair.pubKey.asContractParam(), + totalContributions + ) + await time.increase(roundDuration) + await mergeMaciSubtrees({ maciAddress, pollId, signer: deployer }) + await fundingRoundAsCoordinator.publishTallyHash(tallyHash) + await token.transfer(fundingRound.target, matchingPoolSize) await addTallyResultsBatch( - fundingRound.connect(coordinator), + fundingRoundAsCoordinator, tallyTreeDepth, smallTallyTestData, 5 ) await expect( - fundingRound.finalize(totalSpent, totalSpentSalt) - ).to.be.revertedWith('FundingRound: No votes') + fundingRound.finalize( + 0, // totalSpent + totalSpentSalt, + newResultCommitment, + perVOSpentVoiceCreditsHash + ) + ).to.be.revertedWithCustomError(fundingRound, 'NoVotes') }) it('reverts if total amount of spent voice credits is incorrect', async () => { - await fundingRound.setMaci(maci.address) - await fundingRound - .connect(contributor) - .contribute(userKeypair.pubKey.asContractParam(), totalContributions) - await provider.send('evm_increaseTime', [signUpDuration + votingDuration]) - await fundingRound.connect(coordinator).publishTallyHash(tallyHash) - await token.transfer(fundingRound.address, matchingPoolSize) - await maci.mock.verifySpentVoiceCredits.returns(false) + await (fundingRound.connect(contributor) as Contract).contribute( + userKeypair.pubKey.asContractParam(), + totalContributions + ) + + await time.increase(roundDuration) + + await mergeMaciSubtrees({ maciAddress, pollId, signer: deployer }) + await fundingRoundAsCoordinator.publishTallyHash(tallyHash) + await token.transfer(fundingRound.target, matchingPoolSize) await addTallyResultsBatch( - fundingRound.connect(coordinator), + fundingRoundAsCoordinator, tallyTreeDepth, smallTallyTestData, 5 ) + await tally.mock.verifySpentVoiceCredits.returns(false) await expect( - fundingRound.finalize(totalSpent, totalSpentSalt) - ).to.be.revertedWith( - 'FundingRound: Incorrect total amount of spent voice credits' + fundingRound.finalize( + totalSpent, + totalSpentSalt, + newResultCommitment, + perVOSpentVoiceCreditsHash + ) + ).to.be.revertedWithCustomError( + fundingRound, + 'IncorrectSpentVoiceCredits' ) }) it('allows only owner to finalize round', async () => { - await fundingRound.setMaci(maci.address) - await fundingRound - .connect(contributor) - .contribute(userKeypair.pubKey.asContractParam(), totalContributions) - await provider.send('evm_increaseTime', [signUpDuration + votingDuration]) - await fundingRound.connect(coordinator).publishTallyHash(tallyHash) - await token.transfer(fundingRound.address, matchingPoolSize) - - const fundingRoundAsCoordinator = fundingRound.connect(coordinator) + await (fundingRound.connect(contributor) as Contract).contribute( + userKeypair.pubKey.asContractParam(), + totalContributions + ) + await time.increase(roundDuration) + + const fundingRoundAsCoordinator = fundingRound.connect( + coordinator + ) as Contract + + await mergeMaciSubtrees({ maciAddress, pollId, signer: deployer }) + await fundingRoundAsCoordinator.publishTallyHash(tallyHash) + await token.transfer(fundingRound.target, matchingPoolSize) + await expect( - fundingRoundAsCoordinator.finalize(totalSpent, totalSpentSalt) + fundingRoundAsCoordinator.finalize( + totalSpent, + totalSpentSalt, + newResultCommitment, + perVOSpentVoiceCreditsHash + ) ).to.be.revertedWith('Ownable: caller is not the owner') }) }) @@ -729,50 +756,55 @@ describe('Funding Round', () => { }) it('reverts if round has been finalized already', async () => { - const matchingPoolSize = UNIT.mul(10000) - const totalContributions = UNIT.mul(1000) - const totalSpent = totalContributions.div(VOICE_CREDIT_FACTOR) + const matchingPoolSize = UNIT * BigInt(10000) + const totalContributions = UNIT * BigInt(1000) + const totalSpent = totalContributions / VOICE_CREDIT_FACTOR const totalSpentSalt = genRandomSalt().toString() - maci = await deployMaciMock() - await fundingRound.setMaci(maci.address) - await token - .connect(contributor) - .approve(fundingRound.address, totalContributions) - await fundingRound - .connect(contributor) - .contribute(userKeypair.pubKey.asContractParam(), totalContributions) - await provider.send('evm_increaseTime', [signUpDuration + votingDuration]) - await maci.mock.hasUntalliedStateLeaves.returns(false) - await maci.mock.totalVotes.returns(bnSqrt(totalSpent)) - await maci.mock.verifySpentVoiceCredits.returns(true) - await maci.mock.treeDepths.returns(10, 10, tallyTreeDepth) - await maci.mock.verifySpentVoiceCredits.returns(true) - await maci.mock.verifyPerVOSpentVoiceCredits.returns(true) - await maci.mock.verifyTallyResult.returns(true) - await fundingRound.connect(coordinator).publishTallyHash(tallyHash) - await token.transfer(fundingRound.address, matchingPoolSize) + + await (token.connect(contributor) as Contract).approve( + fundingRound.target, + totalContributions + ) + await (fundingRound.connect(contributor) as Contract).contribute( + userKeypair.pubKey.asContractParam(), + totalContributions + ) + await time.increase(roundDuration) + + await mergeMaciSubtrees({ maciAddress, pollId, signer: deployer }) + await fundingRoundAsCoordinator.publishTallyHash(tallyHash) + await token.transfer(fundingRound.target, matchingPoolSize) await addTallyResultsBatch( - fundingRound.connect(coordinator), + fundingRoundAsCoordinator, tallyTreeDepth, smallTallyTestData, 3 ) - await fundingRound.finalize(totalSpent, totalSpentSalt) + await fundingRound.finalize( + totalSpent, + totalSpentSalt, + newResultCommitment, + perVOSpentVoiceCreditsHash + ) - await expect(fundingRound.cancel()).to.be.revertedWith( - 'FundingRound: Already finalized' + await expect(fundingRound.cancel()).to.be.revertedWithCustomError( + fundingRound, + 'RoundAlreadyFinalized' ) }) it('reverts if round has been cancelled already', async () => { await fundingRound.cancel() - await expect(fundingRound.cancel()).to.be.revertedWith( - 'FundingRound: Already finalized' + await expect(fundingRound.cancel()).to.be.revertedWithCustomError( + fundingRound, + 'RoundAlreadyFinalized' ) }) it('allows only owner to cancel round', async () => { - const fundingRoundAsCoordinator = fundingRound.connect(coordinator) + const fundingRoundAsCoordinator = fundingRound.connect( + coordinator + ) as Contract await expect(fundingRoundAsCoordinator.cancel()).to.be.revertedWith( 'Ownable: caller is not the owner' ) @@ -782,152 +814,154 @@ describe('Funding Round', () => { describe('withdrawing funds', () => { const userPubKey = userKeypair.pubKey.asContractParam() const anotherUserPubKey = userKeypair.pubKey.asContractParam() - const contributionAmount = UNIT.mul(10) + const contributionAmount = UNIT * BigInt(10) let fundingRoundAsContributor: Contract beforeEach(async () => { - fundingRoundAsContributor = fundingRound.connect(contributor) - await fundingRound.setMaci(maci.address) - await token - .connect(contributor) - .approve(fundingRound.address, contributionAmount) - await token - .connect(anotherContributor) - .approve(fundingRound.address, contributionAmount) + fundingRoundAsContributor = fundingRound.connect(contributor) as Contract + await (token.connect(contributor) as Contract).approve( + fundingRound.target, + contributionAmount + ) + await (token.connect(anotherContributor) as Contract).approve( + fundingRound.target, + contributionAmount + ) }) it('allows contributors to withdraw funds', async () => { await fundingRoundAsContributor.contribute(userPubKey, contributionAmount) - await fundingRound - .connect(anotherContributor) - .contribute(anotherUserPubKey, contributionAmount) + await (fundingRound.connect(anotherContributor) as Contract).contribute( + anotherUserPubKey, + contributionAmount + ) await fundingRound.cancel() await expect(fundingRoundAsContributor.withdrawContribution()) .to.emit(fundingRound, 'ContributionWithdrawn') .withArgs(contributor.address) - await fundingRound.connect(anotherContributor).withdrawContribution() - expect(await token.balanceOf(fundingRound.address)).to.equal(0) + await ( + fundingRound.connect(anotherContributor) as Contract + ).withdrawContribution() + expect(await token.balanceOf(fundingRound.target)).to.equal(0) }) it('disallows withdrawal if round is not cancelled', async () => { await fundingRoundAsContributor.contribute(userPubKey, contributionAmount) await expect( fundingRoundAsContributor.withdrawContribution() - ).to.be.revertedWith('FundingRound: Round not cancelled') + ).to.be.revertedWithCustomError(fundingRound, 'RoundNotCancelled') }) it('reverts if user did not contribute to the round', async () => { await fundingRound.cancel() await expect( fundingRoundAsContributor.withdrawContribution() - ).to.be.revertedWith('FundingRound: Nothing to withdraw') + ).to.be.revertedWithCustomError(fundingRound, 'NothingToWithdraw') }) it('reverts if funds are already withdrawn', async () => { - await fundingRound - .connect(contributor) - .contribute(userPubKey, contributionAmount) - await fundingRound - .connect(anotherContributor) - .contribute(anotherUserPubKey, contributionAmount) + const fundingRoundAsContributor = fundingRound.connect( + contributor + ) as Contract + await fundingRoundAsContributor.contribute(userPubKey, contributionAmount) + await (fundingRound.connect(anotherContributor) as Contract).contribute( + anotherUserPubKey, + contributionAmount + ) await fundingRound.cancel() - await fundingRound.connect(contributor).withdrawContribution() + await fundingRoundAsContributor.withdrawContribution() await expect( - fundingRound.connect(contributor).withdrawContribution() - ).to.be.revertedWith('FundingRound: Nothing to withdraw') + fundingRoundAsContributor.withdrawContribution() + ).to.be.revertedWithCustomError(fundingRound, 'NothingToWithdraw') }) it('allows anyone to withdraw multiple contributions', async () => { - await fundingRound - .connect(contributor) - .contribute(userPubKey, contributionAmount) - await fundingRound - .connect(anotherContributor) - .contribute(anotherUserPubKey, contributionAmount) + await (fundingRound.connect(contributor) as Contract).contribute( + userPubKey, + contributionAmount + ) + await (fundingRound.connect(anotherContributor) as Contract).contribute( + anotherUserPubKey, + contributionAmount + ) await fundingRound.cancel() - const tx = await fundingRound - .connect(coordinator) - .withdrawContributions([ - contributor.address, - anotherContributor.address, - ]) + const tx = await ( + fundingRound.connect(coordinator) as Contract + ).withdrawContributions([contributor.address, anotherContributor.address]) await tx.wait() - expect(await token.balanceOf(fundingRound.address)).to.equal(0) + expect(await token.balanceOf(fundingRound.target)).to.equal(0) }) it('allows transaction to complete even if some contributions fail to withdraw', async () => { - await fundingRound - .connect(contributor) - .contribute(userPubKey, contributionAmount) + await (fundingRound.connect(contributor) as Contract).contribute( + userPubKey, + contributionAmount + ) await fundingRound.cancel() - const tx = await fundingRound - .connect(coordinator) - .withdrawContributions([ - contributor.address, - anotherContributor.address, - ]) + const tx = await ( + fundingRound.connect(coordinator) as Contract + ).withdrawContributions([contributor.address, anotherContributor.address]) await tx.wait() - expect(await token.balanceOf(fundingRound.address)).to.equal(0) + expect(await token.balanceOf(fundingRound.target)).to.equal(0) }) }) describe('claiming funds', () => { - const totalVotes = totalQuadraticVotes const recipientIndex = 3 const { spent: totalSpent, salt: totalSpentSalt } = - smallTallyTestData.totalVoiceCredits + smallTallyTestData.totalSpentVoiceCredits const contributions = - smallTallyTestData.totalVoiceCreditsPerVoteOption.tally[recipientIndex] + smallTallyTestData.perVOSpentVoiceCredits.tally[recipientIndex] const expectedAllocatedAmount = calcAllocationAmount( smallTallyTestData.results.tally[recipientIndex], - smallTallyTestData.totalVoiceCreditsPerVoteOption.tally[recipientIndex] - ).toString() + smallTallyTestData.perVOSpentVoiceCredits.tally[recipientIndex] + ) let fundingRoundAsRecipient: Contract let fundingRoundAsContributor: Contract beforeEach(async () => { - maci = await deployMaciMock() - await maci.mock.hasUntalliedStateLeaves.returns(false) - await maci.mock.totalVotes.returns(totalVotes) - await maci.mock.verifySpentVoiceCredits.returns(true) - await maci.mock.verifyTallyResult.returns(true) - await maci.mock.verifyPerVOSpentVoiceCredits.returns(true) - await maci.mock.treeDepths.returns(10, 10, tallyTreeDepth) - await recipientRegistry.mock.getRecipientAddress.returns( recipient.address ) - await fundingRound.setMaci(maci.address) - const tokenAsContributor = token.connect(contributor) - await tokenAsContributor.approve(fundingRound.address, contributions) - fundingRoundAsContributor = fundingRound.connect(contributor) + const tokenAsContributor = token.connect(contributor) as Contract + await tokenAsContributor.approve(fundingRound.target, contributions) + fundingRoundAsContributor = fundingRound.connect(contributor) as Contract - await provider.send('evm_increaseTime', [signUpDuration + votingDuration]) - await fundingRound.connect(coordinator).publishTallyHash(tallyHash) - fundingRoundAsRecipient = fundingRound.connect(recipient) + await time.increase(roundDuration) + await mergeMaciSubtrees({ maciAddress, pollId, signer: deployer }) + await (fundingRound.connect(coordinator) as Contract).publishTallyHash( + tallyHash + ) + fundingRoundAsRecipient = fundingRound.connect(recipient) as Contract + await tally.mock.verifyPerVOSpentVoiceCredits.returns(true) }) it('allows recipient to claim allocated funds', async () => { - await token.transfer(fundingRound.address, budget) + await token.transfer(fundingRound.target, budget) await addTallyResultsBatch( - fundingRound.connect(coordinator), + fundingRoundAsCoordinator, tallyTreeDepth, smallTallyTestData, 3 ) - await fundingRound.finalize(totalSpent, totalSpentSalt) + await fundingRound.finalize( + totalSpent, + totalSpentSalt, + newResultCommitment, + perVOSpentVoiceCreditsHash + ) - const { results, totalVoiceCreditsPerVoteOption } = smallTallyTestData + const { results, perVOSpentVoiceCredits } = smallTallyTestData expect( await fundingRound.getAllocatedAmount( results.tally[recipientIndex], - totalVoiceCreditsPerVoteOption.tally[recipientIndex] + perVOSpentVoiceCredits.tally[recipientIndex] ) ).to.equal(expectedAllocatedAmount, 'mismatch allocated amount') @@ -946,14 +980,19 @@ describe('Funding Round', () => { }) it('allows address different than recipient to claim allocated funds', async () => { - await token.transfer(fundingRound.address, budget) + await token.transfer(fundingRound.target, budget) await addTallyResultsBatch( - fundingRound.connect(coordinator), + fundingRoundAsCoordinator, tallyTreeDepth, smallTallyTestData, 3 ) - await fundingRound.finalize(totalSpent, totalSpentSalt) + await fundingRound.finalize( + totalSpent, + totalSpentSalt, + newResultCommitment, + perVOSpentVoiceCreditsHash + ) const claimData = getRecipientClaimData( recipientIndex, @@ -970,14 +1009,19 @@ describe('Funding Round', () => { }) it('allows recipient to claim zero amount', async () => { - await token.transfer(fundingRound.address, budget) + await token.transfer(fundingRound.target, budget) await addTallyResultsBatch( - fundingRound.connect(coordinator), + fundingRoundAsCoordinator, tallyTreeDepth, smallTallyTestData, 3 ) - await fundingRound.finalize(totalSpent, totalSpentSalt) + await fundingRound.finalize( + totalSpent, + totalSpentSalt, + newResultCommitment, + perVOSpentVoiceCreditsHash + ) const recipientWithZeroFunds = 2 const claimData = getRecipientClaimData( @@ -992,20 +1036,23 @@ describe('Funding Round', () => { }) it('allows recipient to claim if the matching pool is empty', async () => { - const totalContributions = - ethers.BigNumber.from(totalSpent).mul(VOICE_CREDIT_FACTOR) - await token.transfer(fundingRound.address, totalContributions) + const totalContributions = BigInt(totalSpent) * VOICE_CREDIT_FACTOR + await token.transfer(fundingRound.target, totalContributions) await addTallyResultsBatch( - fundingRound.connect(coordinator), + fundingRoundAsCoordinator, tallyTreeDepth, smallTallyTestData, 3 ) - await fundingRound.finalize(totalSpent, totalSpentSalt) + await fundingRound.finalize( + totalSpent, + totalSpentSalt, + newResultCommitment, + perVOSpentVoiceCreditsHash + ) - const expectedWithoutMatching = ethers.BigNumber.from(contributions) - .mul(VOICE_CREDIT_FACTOR) - .toString() + const expectedWithoutMatching = + BigInt(contributions) * VOICE_CREDIT_FACTOR const claimData = getRecipientClaimData( recipientIndex, @@ -1018,7 +1065,7 @@ describe('Funding Round', () => { }) it('should not allow recipient to claim funds if round has not been finalized', async () => { - await token.transfer(fundingRound.address, budget) + await token.transfer(fundingRound.target, budget) const claimData = getRecipientClaimData( recipientIndex, @@ -1027,11 +1074,11 @@ describe('Funding Round', () => { ) await expect( fundingRoundAsRecipient.claimFunds(...claimData) - ).to.be.revertedWith('FundingRound: Round not finalized') + ).to.be.revertedWithCustomError(fundingRound, 'RoundNotFinalized') }) it('should not allow recipient to claim funds if round has been cancelled', async () => { - await token.transfer(fundingRound.address, budget) + await token.transfer(fundingRound.target, budget) await fundingRound.cancel() const claimData = getRecipientClaimData( @@ -1041,18 +1088,23 @@ describe('Funding Round', () => { ) await expect( fundingRoundAsRecipient.claimFunds(...claimData) - ).to.be.revertedWith('FundingRound: Round has been cancelled') + ).to.be.revertedWithCustomError(fundingRound, 'RoundCancelled') }) it('sends funds allocated to unverified recipients back to matching pool', async () => { - await token.transfer(fundingRound.address, budget) + await token.transfer(fundingRound.target, budget) await addTallyResultsBatch( - fundingRound.connect(coordinator), + fundingRoundAsCoordinator, tallyTreeDepth, smallTallyTestData, 3 ) - await fundingRound.finalize(totalSpent, totalSpentSalt) + await fundingRound.finalize( + totalSpent, + totalSpentSalt, + newResultCommitment, + perVOSpentVoiceCreditsHash + ) await recipientRegistry.mock.getRecipientAddress.returns(ZERO_ADDRESS) const claimData = getRecipientClaimData( @@ -1065,19 +1117,24 @@ describe('Funding Round', () => { .to.emit(fundingRound, 'FundsClaimed') .withArgs(recipientIndex, deployer.address, expectedAllocatedAmount) expect(await token.balanceOf(deployer.address)).to.equal( - initialDeployerBalance.add(expectedAllocatedAmount) + BigInt(initialDeployerBalance) + expectedAllocatedAmount ) }) it('allows recipient to claim allocated funds only once', async () => { - await token.transfer(fundingRound.address, budget) + await token.transfer(fundingRound.target, budget) await addTallyResultsBatch( - fundingRound.connect(coordinator), + fundingRoundAsCoordinator, tallyTreeDepth, smallTallyTestData, 3 ) - await fundingRound.finalize(totalSpent, totalSpentSalt) + await fundingRound.finalize( + totalSpent, + totalSpentSalt, + newResultCommitment, + perVOSpentVoiceCreditsHash + ) const claimData = getRecipientClaimData( recipientIndex, @@ -1087,44 +1144,50 @@ describe('Funding Round', () => { await fundingRoundAsRecipient.claimFunds(...claimData) await expect( fundingRoundAsRecipient.claimFunds(...claimData) - ).to.be.revertedWith('FundingRound: Funds already claimed') + ).to.be.revertedWithCustomError(fundingRound, 'FundsAlreadyClaimed') }) it('should verify that tally result is correct', async () => { - await token.transfer(fundingRound.address, budget) - - await maci.mock.verifyTallyResult.returns(false) + await token.transfer(fundingRound.target, budget) + await tally.mock.verifyTallyResult.returns(false) await expect( addTallyResultsBatch( - fundingRound.connect(coordinator), + fundingRoundAsCoordinator, tallyTreeDepth, smallTallyTestData, 3 ) - ).to.be.revertedWith('FundingRound: Incorrect tally result') + ).to.be.revertedWithCustomError(fundingRound, 'IncorrectTallyResult') }) it('should verify that amount of spent voice credits is correct', async () => { - await token.transfer(fundingRound.address, budget) - await maci.mock.verifyPerVOSpentVoiceCredits.returns(false) + await token.transfer(fundingRound.target, budget) await addTallyResultsBatch( - fundingRound.connect(coordinator), + fundingRoundAsCoordinator, tallyTreeDepth, smallTallyTestData, 3 ) - await fundingRound.finalize(totalSpent, totalSpentSalt) + await fundingRound.finalize( + totalSpent, + totalSpentSalt, + newResultCommitment, + perVOSpentVoiceCreditsHash + ) const claimData = getRecipientClaimData( recipientIndex, tallyTreeDepth, smallTallyTestData ) + + await tally.mock.verifyPerVOSpentVoiceCredits.returns(false) await expect( fundingRoundAsRecipient.claimFunds(...claimData) - ).to.be.revertedWith( - 'FundingRound: Incorrect amount of spent voice credits' + ).to.be.revertedWithCustomError( + fundingRound, + 'IncorrectPerVOSpentVoiceCredits' ) }) }) @@ -1132,41 +1195,33 @@ describe('Funding Round', () => { describe('finalizing with alpha', function () { this.timeout(2 * 60 * 1000) const treeDepth = 2 - const totalVotes = 11382064 beforeEach(async () => { - maci = await deployMaciMock() - await maci.mock.hasUntalliedStateLeaves.returns(false) - await maci.mock.totalVotes.returns(totalVotes) - await maci.mock.verifySpentVoiceCredits.returns(true) - await maci.mock.verifyTallyResult.returns(true) - await maci.mock.verifyPerVOSpentVoiceCredits.returns(true) - await maci.mock.treeDepths.returns(10, 10, treeDepth) - await recipientRegistry.mock.getRecipientAddress.returns( recipient.address ) - await token.transfer(fundingRound.address, budget) - - await fundingRound.setMaci(maci.address) + await token.transfer(fundingRound.target, budget) - const fundingRoundAsCoordinator = fundingRound.connect(coordinator) + const fundingRoundAsCoordinator = fundingRound.connect( + coordinator + ) as Contract await fundingRoundAsCoordinator.publishTallyHash(tallyHash) - await provider.send('evm_increaseTime', [signUpDuration + votingDuration]) + await time.increase(roundDuration) + await mergeMaciSubtrees({ maciAddress, pollId, signer: deployer }) }) it('adds and verifies tally results', async function () { this.timeout(2 * 60 * 1000) await addTallyResultsBatch( - fundingRound.connect(coordinator), + fundingRoundAsCoordinator, treeDepth, smallTallyTestData, 5 ) const totalResults = await fundingRound.totalTallyResults() - expect(totalResults.toNumber()).to.eq(25, 'total verified mismatch') + expect(toNumber(totalResults)).to.eq(25, 'total verified mismatch') const totalSquares = await fundingRound.totalVotesSquares() expect(totalSquares.toString()).to.eq( @@ -1178,14 +1233,14 @@ describe('Funding Round', () => { it('calculates alpha correctly', async function () { this.timeout(2 * 60 * 1000) await addTallyResultsBatch( - fundingRound.connect(coordinator), + fundingRoundAsCoordinator, treeDepth, smallTallyTestData, 5 ) const totalVotes = await fundingRound.totalVotesSquares() - const { spent: totalSpent } = smallTallyTestData.totalVoiceCredits + const { spent: totalSpent } = smallTallyTestData.totalSpentVoiceCredits const calculatedAlpha = await fundingRound.calcAlpha( budget, totalVotes, @@ -1196,13 +1251,18 @@ describe('Funding Round', () => { it('finalizes successfully', async function () { await addTallyResultsBatch( - fundingRound.connect(coordinator), + fundingRoundAsCoordinator, treeDepth, smallTallyTestData, 3 ) - const { spent, salt } = smallTallyTestData.totalVoiceCredits - await fundingRound.finalize(spent, salt) + const { spent, salt } = smallTallyTestData.totalSpentVoiceCredits + await fundingRound.finalize( + spent, + salt, + newResultCommitment, + perVOSpentVoiceCreditsHash + ) const alpha = await fundingRound.alpha() expect(alpha.toString()).to.eq( @@ -1212,57 +1272,99 @@ describe('Funding Round', () => { }) it('fails to finalize if all projects only have 1 contributor', async function () { - const tallyTreeDepth = 1 - await maci.mock.treeDepths.returns(10, 10, tallyTreeDepth) const tallyWith1Contributor = { + newTallyCommitment: + '0xae3fc926f8347c17f9787eded70bc60e32a175cb46c58c03ffe2f4372cd736', results: { commitment: '0x2f44c97ce649078012fd686eaf996fc6b8d817e11ab574f0d0a0d750ee1ec101', - tally: [0, 200, 200, 0, 0], + tally: [ + 0, 200, 200, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, + ], salt: '0xa1f71f9e48a5f2ec55020051a190f079ca43d66457879972554c3c2e8a07ea0', }, - totalVoiceCredits: { + totalSpentVoiceCredits: { spent: '80000', commitment: '0x18b52cbe2a91777772d10c80d1b883cdc98e0f19475bcd907c693fddd6c675b8', salt: '0x2013aa4e350542684f78adbf3e716c3bcf96e12c64b8e8ef3d962e3568132778', }, - totalVoiceCreditsPerVoteOption: { + perVOSpentVoiceCredits: { commitment: '0x26e6ae35c82006eff6408b713d477307b2da16c7a1ff15fb46c0762ee308e88a', - tally: ['0', '40000', '40000', '0', '0'], + tally: [ + '0', + '40000', + '40000', + '0', + '0', + '0', + '0', + '0', + '0', + '0', + '0', + '0', + '0', + '0', + '0', + '0', + '0', + '0', + '0', + '0', + '0', + '0', + '0', + '0', + '0', + ], + salt: '0x63c80f2b0319790c19b3b17ecd7b00fc1dc7398198601d0dfb30253306ecb34', }, - salt: '0x63c80f2b0319790c19b3b17ecd7b00fc1dc7398198601d0dfb30253306ecb34', } const batchSize = 3 await addTallyResultsBatch( - fundingRound.connect(coordinator), + fundingRoundAsCoordinator, tallyTreeDepth, tallyWith1Contributor, batchSize ) - const { spent, salt } = smallTallyTestData.totalVoiceCredits - await expect(fundingRound.finalize(spent, salt)).to.be.revertedWith( - 'FundingRound: Total quadratic votes must be greater than total spent voice credits' + const { spent, salt } = smallTallyTestData.totalSpentVoiceCredits + await expect( + fundingRound.finalize( + spent, + salt, + newResultCommitment, + perVOSpentVoiceCreditsHash + ) + ).to.be.revertedWithCustomError( + fundingRound, + 'NoProjectHasMoreThanOneVote' ) }) it('calculates claim funds correctly', async function () { await addTallyResultsBatch( - fundingRound.connect(coordinator), + fundingRoundAsCoordinator, treeDepth, smallTallyTestData, 20 ) - const { spent, salt } = smallTallyTestData.totalVoiceCredits - await fundingRound.finalize(spent, salt) + const { spent, salt } = smallTallyTestData.totalSpentVoiceCredits + await fundingRound.finalize( + spent, + salt, + newResultCommitment, + perVOSpentVoiceCreditsHash + ) + await tally.mock.verifyPerVOSpentVoiceCredits.returns(true) - const { tally } = smallTallyTestData.results - const { tally: spents } = - smallTallyTestData.totalVoiceCreditsPerVoteOption + const { tally: tallyResults } = smallTallyTestData.results + const { tally: spents } = smallTallyTestData.perVOSpentVoiceCredits - for (let i = 0; i < tally.length; i++) { - const tallyResult = tally[i] + for (let i = 0; i < tallyResults.length; i++) { + const tallyResult = tallyResults[i] if (tallyResult !== '0') { const amount = await fundingRound.getAllocatedAmount( tallyResult, @@ -1288,14 +1390,18 @@ describe('Funding Round', () => { }) it('prevents finalize if tally results not completely received', async function () { - const { spent, salt } = smallTallyTestData.totalVoiceCredits - await expect(fundingRound.finalize(spent, salt)).to.be.revertedWith( - 'FundingRound: Incomplete tally results' - ) + const { spent, salt } = smallTallyTestData.totalSpentVoiceCredits + await expect( + fundingRound.finalize( + spent, + salt, + newResultCommitment, + perVOSpentVoiceCreditsHash + ) + ).to.be.revertedWithCustomError(fundingRound, 'IncompleteTallyResults') }) it('allows only coordinator to add tally results', async function () { - const fundingRoundAsContributor = fundingRound.connect(contributor) await expect( addTallyResultsBatch( fundingRoundAsContributor, @@ -1303,11 +1409,10 @@ describe('Funding Round', () => { smallTallyTestData, 5 ) - ).to.be.revertedWith('FundingRound: Sender is not the coordinator') + ).to.be.revertedWithCustomError(fundingRound, 'NotCoordinator') }) it('allows only coordinator to add tally results in batches', async function () { - const fundingRoundAsContributor = fundingRound.connect(contributor) await expect( addTallyResultsBatch( fundingRoundAsContributor, @@ -1315,72 +1420,73 @@ describe('Funding Round', () => { smallTallyTestData, 5 ) - ).to.be.revertedWith('FundingRound: Sender is not the coordinator') + ).to.be.revertedWithCustomError(fundingRound, 'NotCoordinator') }) it('prevents adding tally results if maci has not completed tallying', async function () { - await maci.mock.hasUntalliedStateLeaves.returns(true) - + await tally.mock.tallyBatchNum.returns(0) await expect( addTallyResultsBatch( - fundingRound.connect(coordinator), + fundingRoundAsCoordinator, tallyTreeDepth, smallTallyTestData, 5 ) - ).to.be.revertedWith('FundingRound: Votes have not been tallied') + ).to.be.revertedWithCustomError(fundingRound, 'VotesNotTallied') }) it('prevents adding batches of tally results if maci has not completed tallying', async function () { - await maci.mock.hasUntalliedStateLeaves.returns(true) - + await tally.mock.tallyBatchNum.returns(0) await expect( addTallyResultsBatch( - fundingRound.connect(coordinator), + fundingRoundAsCoordinator, tallyTreeDepth, smallTallyTestData, 5 ) - ).to.be.revertedWith('FundingRound: Votes have not been tallied') + ).to.be.revertedWithCustomError(fundingRound, 'VotesNotTallied') }) it('prevent adding more tally results if already finalized', async () => { - await maci.mock.treeDepths.returns(10, 10, tallyTreeDepth) - await addTallyResultsBatch( - fundingRound.connect(coordinator), + fundingRoundAsCoordinator, tallyTreeDepth, smallTallyTestData, 5 ) - const { spent, salt } = smallTallyTestData.totalVoiceCredits - await fundingRound.finalize(spent, salt) + const { spent, salt } = smallTallyTestData.totalSpentVoiceCredits + await fundingRound.finalize( + spent, + salt, + newResultCommitment, + perVOSpentVoiceCreditsHash + ) await expect( addTallyResultsBatch( - fundingRound.connect(coordinator), + fundingRoundAsCoordinator, tallyTreeDepth, smallTallyTestData, 5 ) - ).to.be.revertedWith('FundingRound: Already finalized') + ).to.be.revertedWithCustomError(fundingRound, 'RoundAlreadyFinalized') }) it('prevents adding tally results that were already verified', async function () { await addTallyResultsBatch( - fundingRound.connect(coordinator), + fundingRoundAsCoordinator, tallyTreeDepth, smallTallyTestData, 5 ) await expect( addTallyResultsBatch( - fundingRound.connect(coordinator), + fundingRoundAsCoordinator, tallyTreeDepth, smallTallyTestData, 5 ) - ).to.revertedWith('FundingRound: Vote results already verified') + ).to.revertedWithCustomError(fundingRound, 'VoteResultsAlreadyVerified') }) it('returns correct proccessed count in the callback for processing tally results', async () => { @@ -1390,7 +1496,7 @@ describe('Funding Round', () => { const total = smallTallyTestData.results.tally.length const lastBatch = Math.ceil(total / batchSize) await addTallyResultsBatch( - fundingRound.connect(coordinator), + fundingRoundAsCoordinator, tallyTreeDepth, smallTallyTestData, batchSize, @@ -1410,45 +1516,6 @@ describe('Funding Round', () => { }) }) - describe('getRecipientTallyResultsBatch', () => { - const treeDepth = 5 - const batchSize = 5 - const total = smallTallyTestData.results.tally.length - for (const startIndex of [0, Math.floor(total / 2)]) { - it(`should pass with startIndex ${startIndex}`, () => { - const data = getRecipientTallyResultsBatch( - startIndex, - treeDepth, - smallTallyTestData, - batchSize - ) - expect(data).to.have.lengthOf(5) - expect(data[1]).to.have.lengthOf(5) - }) - } - it(`should pass with startIndex ${total - 1}`, () => { - const data = getRecipientTallyResultsBatch( - total - 1, - treeDepth, - smallTallyTestData, - batchSize - ) - expect(data).to.have.lengthOf(5) - expect(data[1]).to.have.lengthOf(1) - }) - it(`should fail with startIndex ${total}`, () => { - const startIndex = total - expect(() => { - getRecipientTallyResultsBatch( - startIndex, - treeDepth, - smallTallyTestData, - batchSize - ) - }).to.throw('Recipient index out of bound') - }) - }) - describe('Alpha calculation', () => { it('fails alpha calculation if budget less than contributions', async function () { const totalBudget = 99 @@ -1456,17 +1523,18 @@ describe('Funding Round', () => { const totalSpent = 100 await expect( fundingRound.calcAlpha(totalBudget, totalVotesSquares, totalSpent) - ).to.be.revertedWith('FundingRound: Invalid budget') + ).to.be.revertedWithCustomError(fundingRound, 'InvalidBudget') }) it('fails alpha calculation if total votes square less than total spent', async function () { - const totalBudget = ethers.utils.parseEther('200') + const totalBudget = parseEther('200') const totalVotesSquares = 88 const totalSpent = 100 await expect( fundingRound.calcAlpha(totalBudget, totalVotesSquares, totalSpent) - ).to.be.revertedWith( - 'FundingRound: Total quadratic votes must be greater than total spent voice credits' + ).to.be.revertedWithCustomError( + fundingRound, + 'NoProjectHasMoreThanOneVote' ) }) }) diff --git a/contracts/tests/userRegistry.ts b/contracts/tests/userRegistry.ts index 7721bb744..63d05e76f 100644 --- a/contracts/tests/userRegistry.ts +++ b/contracts/tests/userRegistry.ts @@ -1,19 +1,18 @@ -import { ethers, waffle } from 'hardhat' -import { use, expect } from 'chai' -import { solidity } from 'ethereum-waffle' +import { ethers } from 'hardhat' +import { expect } from 'chai' import { Contract } from 'ethers' import { ZERO_ADDRESS } from '../utils/constants' - -use(solidity) +import { HardhatEthersSigner } from '@nomicfoundation/hardhat-ethers/signers' describe('Simple User Registry', () => { - const provider = waffle.provider - const [, deployer, user] = provider.getWallets() - let registry: Contract + let user: HardhatEthersSigner beforeEach(async () => { + let deployer: HardhatEthersSigner + ;[, deployer, user] = await ethers.getSigners() + const SimpleUserRegistry = await ethers.getContractFactory( 'SimpleUserRegistry', deployer @@ -44,7 +43,7 @@ describe('Simple User Registry', () => { }) it('allows only owner to add users', async () => { - const registryAsUser = registry.connect(user) + const registryAsUser = registry.connect(user) as Contract await expect(registryAsUser.addUser(user.address)).to.be.revertedWith( 'Ownable: caller is not the owner' ) @@ -66,7 +65,7 @@ describe('Simple User Registry', () => { it('allows only owner to remove users', async () => { await registry.addUser(user.address) - const registryAsUser = registry.connect(user) + const registryAsUser = registry.connect(user) as Contract await expect(registryAsUser.removeUser(user.address)).to.be.revertedWith( 'Ownable: caller is not the owner' ) diff --git a/contracts/tests/userRegistryBrightId.ts b/contracts/tests/userRegistryBrightId.ts index d92ed49fb..687d0a47f 100644 --- a/contracts/tests/userRegistryBrightId.ts +++ b/contracts/tests/userRegistryBrightId.ts @@ -1,15 +1,18 @@ -import { ethers, waffle } from 'hardhat' -import { use, expect } from 'chai' -import { solidity } from 'ethereum-waffle' -import { Contract, providers, utils } from 'ethers' +import { ethers } from 'hardhat' +import { expect } from 'chai' +import { + Wallet, + Contract, + SigningKey, + encodeBytes32String, + solidityPackedKeccak256, +} from 'ethers' import { ZERO_ADDRESS } from '../utils/constants' +import { time } from '@nomicfoundation/hardhat-network-helpers' +import { HardhatEthersSigner } from '@nomicfoundation/hardhat-ethers/signers' -use(solidity) - -const verifier = ethers.Wallet.createRandom() -const signingKey = new utils.SigningKey(verifier.privateKey) - -const context = utils.formatBytes32String('clrfund-goerli') +const verifier = Wallet.createRandom() +const context = encodeBytes32String('clrfund-goerli') const verificationHash = '0xc99d46ae8baaa7ed2766cbf34e566de43decc2ff7d8e3da5cb80e72f3b5e20de' @@ -24,26 +27,18 @@ type Verification = { verificationHash: string } -async function getBlockTimestamp( - provider: providers.Provider -): Promise { - const blockNumber = await provider.getBlockNumber() - const block = await provider.getBlock(blockNumber) - return block.timestamp -} - -function generateVerification( +async function generateVerification( appUserId: string, timestamp: number, - anotherSigner?: utils.SigningKey -): Verification { - const message = utils.solidityKeccak256( + anotherSigner?: SigningKey +): Promise { + const message = solidityPackedKeccak256( ['bytes32', 'address', 'bytes32', 'uint256'], [context, appUserId, verificationHash, timestamp] ) - const sig = anotherSigner - ? anotherSigner.signDigest(message) - : signingKey.signDigest(message) + + const signer = anotherSigner ?? verifier.signingKey + const sig = await signer.sign(message) return { appUserId, @@ -65,19 +60,24 @@ function register(registry: Contract, verification: Verification) { ) } -describe('BrightId User Registry', () => { - const provider = waffle.provider - const [, deployer, user] = provider.getWallets() - +describe('BrightId User Registry', async () => { let registry: Contract let sponsor: Contract + let user: HardhatEthersSigner + let sponsorAddress: string + + before(async () => { + ;[, , user] = await ethers.getSigners() + }) beforeEach(async () => { + const [, deployer] = await ethers.getSigners() const BrightIdSponsor = await ethers.getContractFactory( 'BrightIdSponsor', deployer ) sponsor = await BrightIdSponsor.deploy() + sponsorAddress = await sponsor.getAddress() const BrightIdUserRegistry = await ethers.getContractFactory( 'BrightIdUserRegistry', @@ -86,7 +86,7 @@ describe('BrightId User Registry', () => { registry = await BrightIdUserRegistry.deploy( context, verifier.address, - sponsor.address + sponsorAddress ) }) @@ -108,19 +108,22 @@ describe('BrightId User Registry', () => { }) it('allows valid sponsor', async () => { - await expect(registry.setSponsor(sponsor.address)) + await expect(registry.setSponsor(sponsorAddress)) .to.emit(registry, 'SponsorChanged') - .withArgs(sponsor.address) + .withArgs(sponsorAddress) }) describe('registration', () => { let blockTimestamp: number beforeEach(async () => { - blockTimestamp = await getBlockTimestamp(provider) + blockTimestamp = await time.latest() }) it('allows valid verified user to register', async () => { - const verification = generateVerification(user.address, blockTimestamp) + const verification = await generateVerification( + user.address, + blockTimestamp + ) expect(await registry.isVerifiedUser(user.address)).to.equal(false) await expect(register(registry, verification)) .to.emit(registry, 'Registered') @@ -130,7 +133,7 @@ describe('BrightId User Registry', () => { }) it('rejects verifications with 0 timestamp', async () => { - const verification = generateVerification(user.address, 0) + const verification = await generateVerification(user.address, 0) await expect(register(registry, verification)).to.be.revertedWith( 'NEWER VERIFICATION REGISTERED BEFORE' ) @@ -140,8 +143,8 @@ describe('BrightId User Registry', () => { expect(await registry.isVerifiedUser(user.address)).to.equal(false) const oldTime = blockTimestamp const newTime = blockTimestamp + 1 - const oldVerification = generateVerification(user.address, oldTime) - const newVerification = generateVerification(user.address, newTime) + const oldVerification = await generateVerification(user.address, oldTime) + const newVerification = await generateVerification(user.address, newTime) await expect(register(registry, newVerification)) .to.emit(registry, 'Registered') .withArgs(user.address, newVerification.timestamp) @@ -155,17 +158,25 @@ describe('BrightId User Registry', () => { it('rejects invalid verifications', async () => { const timestamp = blockTimestamp - const signer = new utils.SigningKey(user.privateKey) - const verification = generateVerification(user.address, timestamp, signer) + const anotherSigner = Wallet.createRandom() + + const verification = await generateVerification( + user.address, + timestamp, + anotherSigner.signingKey + ) await expect(register(registry, verification)).to.be.revertedWith( 'NOT AUTHORIZED' ) }) it('rejects invalid context', async () => { - const verification = generateVerification(user.address, blockTimestamp) + const verification = await generateVerification( + user.address, + blockTimestamp + ) const tx = await registry.setSettings( - utils.formatBytes32String('invalid'), + encodeBytes32String('invalid'), verifier.address ) await tx.wait() diff --git a/contracts/tests/userRegistryMerkle.ts b/contracts/tests/userRegistryMerkle.ts index 5ee1467eb..87c021a55 100644 --- a/contracts/tests/userRegistryMerkle.ts +++ b/contracts/tests/userRegistryMerkle.ts @@ -1,50 +1,53 @@ -import { ethers, waffle } from 'hardhat' -import { use, expect } from 'chai' -import { solidity } from 'ethereum-waffle' -import { Contract, utils, Wallet } from 'ethers' +import { ethers } from 'hardhat' +import { expect } from 'chai' +import { Contract, Wallet, zeroPadBytes, randomBytes } from 'ethers' import { loadUserMerkleTree, getUserMerkleProof } from '@clrfund/common' - -use(solidity) +import { HardhatEthersSigner } from '@nomicfoundation/hardhat-ethers/signers' describe('Merkle User Registry', () => { - const provider = waffle.provider - const [, deployer, user1, user2] = provider.getWallets() - - const signers = { [user1.address]: user1, [user2.address]: user2 } - const authorizedUsers = [user1.address, user2.address] let registry: Contract let tree: any + let user1: HardhatEthersSigner + let user2: HardhatEthersSigner + const signers: Record = {} + + before(async () => { + ;[, , user1, user2] = await ethers.getSigners() + signers[user1.address] = user1 + signers[user2.address] = user2 + }) beforeEach(async () => { + const [, deployer] = await ethers.getSigners() const MerkleUserRegistry = await ethers.getContractFactory( 'MerkleUserRegistry', deployer ) registry = await MerkleUserRegistry.deploy() - tree = loadUserMerkleTree(authorizedUsers) + tree = loadUserMerkleTree(Object.keys(signers)) const tx = await registry.setMerkleRoot(tree.root, 'test') await tx.wait() }) it('rejects zero merkle root', async () => { await expect( - registry.setMerkleRoot(utils.hexZeroPad('0x0', 32), 'testzero') + registry.setMerkleRoot(zeroPadBytes('0x00', 32), 'testzero') ).to.be.revertedWith('MerkleUserRegistry: Merkle root is zero') }) it('should not allow non-owner to set the merkle root', async () => { - const registryAsUser = registry.connect(signers[user1.address]) + const registryAsUser = registry.connect(signers[user1.address]) as Contract await expect( - registryAsUser.setMerkleRoot(utils.hexZeroPad('0x1', 32), 'non owner') + registryAsUser.setMerkleRoot(randomBytes(32), 'non owner') ).to.be.revertedWith('Ownable: caller is not the owner') }) describe('registration', () => { it('allows valid verified user to register', async () => { - for (const user of authorizedUsers) { + for (const user of Object.keys(signers)) { const proof = getUserMerkleProof(user, tree) - const registryAsUser = registry.connect(signers[user]) + const registryAsUser = registry.connect(signers[user]) as Contract await expect(registryAsUser.addUser(user, proof)) .to.emit(registryAsUser, 'UserAdded') .withArgs(user, tree.root) @@ -55,7 +58,9 @@ describe('Merkle User Registry', () => { it('rejects unauthorized user', async () => { const user = ethers.Wallet.createRandom() const proof = tree.getProof(0) - const registryAsUser = registry.connect(signers[user1.address]) + const registryAsUser = registry.connect( + signers[user1.address] + ) as Contract await expect( registryAsUser.addUser(user.address, proof) ).to.be.revertedWith('MerkleUserRegistry: User is not authorized') @@ -65,16 +70,16 @@ describe('Merkle User Registry', () => { it('should be able load 10k users', async function () { this.timeout(200000) - const allAuthorizedUsers = Array.from(authorizedUsers) + const allAuthorizedUsers = Object.keys(signers) for (let i = 0; i < 10000; i++) { - const randomWallet = new Wallet(utils.randomBytes(32)) + const randomWallet = Wallet.createRandom() allAuthorizedUsers.push(randomWallet.address) } tree = loadUserMerkleTree(allAuthorizedUsers) const tx = await registry.setMerkleRoot(tree.root, 'test') await tx.wait() - const registryAsUser = registry.connect(user1) + const registryAsUser = registry.connect(user1) as Contract const proof = getUserMerkleProof(user1.address, tree) await expect(registryAsUser.addUser(user1.address, proof)) .to.emit(registryAsUser, 'UserAdded') diff --git a/contracts/tests/userRegistrySemaphore.ts b/contracts/tests/userRegistrySemaphore.ts new file mode 100644 index 000000000..95a71c4ef --- /dev/null +++ b/contracts/tests/userRegistrySemaphore.ts @@ -0,0 +1,110 @@ +import { ethers } from 'hardhat' +import { expect } from 'chai' +import { Contract, Wallet } from 'ethers' + +import { ZERO_ADDRESS } from '../utils/constants' +import { HardhatEthersSigner } from '@nomicfoundation/hardhat-ethers/signers' + +describe('Semaphore User Registry', () => { + let registry: Contract + let user: HardhatEthersSigner + + beforeEach(async () => { + let deployer: HardhatEthersSigner + ;[, deployer, user] = await ethers.getSigners() + + const SemaphoreUserRegistry = await ethers.getContractFactory( + 'SemaphoreUserRegistry', + deployer + ) + registry = await SemaphoreUserRegistry.deploy() + }) + + describe('managing verified users', () => { + it('allows owner to add user to the registry', async () => { + const semaphoreId = 1 + expect(await registry.isVerifiedUser(user.address)).to.equal(false) + await expect(registry.addUser(user.address, semaphoreId)) + .to.emit(registry, 'UserAdded') + .withArgs(user.address, semaphoreId) + expect(await registry.isVerifiedUser(user.address)).to.equal(true) + }) + + it('rejects zero-address', async () => { + const semaphoreId = 1 + await expect( + registry.addUser(ZERO_ADDRESS, semaphoreId) + ).to.be.revertedWith('UserRegistry: User address is zero') + }) + + it('rejects zero semphoreId', async () => { + const semaphoreId = 0 + await expect( + registry.addUser(user.address, semaphoreId) + ).to.be.revertedWith('UserRegistry: Semaphore Id is zero') + }) + + it('rejects user who is already in the registry', async () => { + const semaphoreId = 1 + await registry.addUser(user.address, semaphoreId) + await expect( + registry.addUser(user.address, semaphoreId) + ).to.be.revertedWith('UserRegistry: User already verified') + }) + + it('rejects semphoreId that is already in the registry', async () => { + const semaphoreId = 1 + const anotherUser = Wallet.createRandom() + await registry.addUser(user.address, semaphoreId) + await expect( + registry.addUser(anotherUser.address, semaphoreId) + ).to.be.revertedWith('UserRegistry: Semaphore Id already registered') + }) + + it('allows only owner to add users', async () => { + const semaphoreId = 1 + const registryAsUser = registry.connect(user) as Contract + await expect( + registryAsUser.addUser(user.address, semaphoreId) + ).to.be.revertedWith('Ownable: caller is not the owner') + }) + + it('allows owner to remove user', async () => { + const semaphoreId = 1 + await registry.addUser(user.address, semaphoreId) + await expect(registry.removeUser(user.address)) + .to.emit(registry, 'UserRemoved') + .withArgs(user.address) + expect(await registry.isVerifiedUser(user.address)).to.equal(false) + }) + + it('reverts when trying to remove user who is not in the registry', async () => { + await expect(registry.removeUser(user.address)).to.be.revertedWith( + 'UserRegistry: User is not in the registry' + ) + }) + + it('allows only owner to remove users', async () => { + const semaphoreId = 1 + await registry.addUser(user.address, semaphoreId) + const registryAsUser = registry.connect(user) as Contract + await expect(registryAsUser.removeUser(user.address)).to.be.revertedWith( + 'Ownable: caller is not the owner' + ) + }) + + it('checks valid semaphoreId', async () => { + const semaphoreId = 1 + await registry.addUser(user.address, semaphoreId) + const isVerified = await registry.isVerifiedSemaphoreId(semaphoreId) + expect(isVerified).to.be.true + }) + + it('checks invalid semaphoreId', async () => { + const semaphoreId = 1 + await registry.addUser(user.address, semaphoreId) + const isVerified = await registry.isVerifiedSemaphoreId(3) + expect(isVerified).to.be.false + }) + }) +}) diff --git a/contracts/tests/userRegistrySnapshot.ts b/contracts/tests/userRegistrySnapshot.ts index 97a4422e2..7b5b37d14 100644 --- a/contracts/tests/userRegistrySnapshot.ts +++ b/contracts/tests/userRegistrySnapshot.ts @@ -1,12 +1,11 @@ import { ethers } from 'hardhat' -import { use, expect } from 'chai' -import { solidity } from 'ethereum-waffle' +import { expect } from 'chai' import { Contract, ContractTransaction, - providers, - constants, - utils, + JsonRpcProvider, + ZeroAddress, + ZeroHash, } from 'ethers' import { Block, @@ -16,39 +15,25 @@ import { rlpEncodeProof, } from '@clrfund/common' -use(solidity) - -// Accounts from arbitrum-goerli to call eth_getProof as hardhat network +// use optimism-sepolia as hardhat network // does not support eth_getProof -const provider = new providers.InfuraProvider('arbitrum-goerli') +const provider = new JsonRpcProvider('https://sepolia.optimism.io') const tokens = [ { address: '0x65bc8dd04808d99cf8aa6749f128d55c2051edde', - type: 'ERC20', // get proof with this block number - snapshotBlock: 35904051, - // storage slot for balances in the token (0x65bc8dd04808d99cf8aa6749f128d55c2051edde) on arbitrum goerli + snapshotBlock: 8388839, + // storage slot for balances in the token (0x65bc8dd04808d99cf8aa6749f128d55c2051edde) storageSlot: 2, + type: 'ERC20', holders: { - currentAndSnapshotHolder: '0x0B0Fe9D858F7e3751A3dcC7ffd0B9236be5E4bf5', - snapshotHolder: '0xBa8aC318F2dd829AF3D0D93882b4F1a9F3307bFD', + currentAndSnapshotHolder: '0xb5BdAa442BB34F27e793861C456CD5bDC527Ac8C', + snapshotHolder: '0xf8C6704E6b595B4B72085fACdf83b7FaDF767Ae3', currentHolderOnly: '0x5Fd5b076F6Ba8E8195cffb38A028afe5694b3d27', zeroBalance: '0xfb96F12fDD64D674631DB7B40bC35cFE74E98aF7', }, }, - { - address: '0x7E8206276F8FE511bfa44c9135B222DEe75e58f4', - type: 'ERC721', - snapshotBlock: 35904824, - storageSlot: 3, - holders: { - currentAndSnapshotHolder: '0x980825655805509f47EbDE41515966aeD5Df883D', - snapshotHolder: '0x326850D078c34cBF6996756523b00f0f1731dF12', - currentHolderOnly: '0x8D4EFdF0891DC38AC3DA2C3C5E683C982D3F7426', - zeroBalance: '0x99c68BFfF94d70f736491E9824caeDd19307167B', - }, - }, ] /** @@ -80,7 +65,9 @@ async function addUser( return userRegistry.addUser(userAccount, proofRlpBytes) } -describe('SnapshotUserRegistry', function () { +// TODO: find a better way to test snapshot. Currently this test fails +// because snapshot too old, it becomes unable +describe.skip('SnapshotUserRegistry', function () { let userRegistry: Contract let block: Block @@ -107,7 +94,7 @@ describe('SnapshotUserRegistry', function () { it('Should throw if token address is 0', async function () { await expect( userRegistry.setStorageRoot( - constants.AddressZero, + ZeroAddress, block.hash, block.stateRoot, token.storageSlot, @@ -120,7 +107,7 @@ describe('SnapshotUserRegistry', function () { await expect( userRegistry.setStorageRoot( token.address, - utils.hexZeroPad('0x00', 32), + ZeroHash, block.stateRoot, token.storageSlot, accountProofRlpBytes @@ -133,7 +120,7 @@ describe('SnapshotUserRegistry', function () { userRegistry.setStorageRoot( token.address, block.hash, - utils.hexZeroPad('0x00', 32), + ZeroHash, token.storageSlot, accountProofRlpBytes ) @@ -154,6 +141,7 @@ describe('SnapshotUserRegistry', function () { provider ) const accountProofRlpBytes = rlpEncodeProof(proof.accountProof) + const tx = await userRegistry.setStorageRoot( token.address, block.hash, diff --git a/contracts/tsconfig.json b/contracts/tsconfig.json index f5597e526..4565eb4ff 100644 --- a/contracts/tsconfig.json +++ b/contracts/tsconfig.json @@ -1,16 +1,13 @@ { "compilerOptions": { - "target": "es2018", + "target": "es2020", "module": "commonjs", "strict": true, "esModuleInterop": true, - "outDir": "dist", + "forceConsistentCasingInFileNames": true, + "skipLibCheck": true, "resolveJsonModule": true }, - "include": ["./scripts", "./tests"], - "files": [ - "./hardhat.config.ts", - "./node_modules/@nomiclabs/hardhat-ethers/src/type-extensions.d.ts", - "./node_modules/@nomiclabs/hardhat-waffle/src/type-extensions.d.ts" - ] + "include": ["./scripts", "./tests", "./cli", "./e2e", "./utils"], + "files": ["./hardhat.config.ts"] } diff --git a/contracts/utils/JSONFile.ts b/contracts/utils/JSONFile.ts new file mode 100644 index 000000000..e1d6e4c86 --- /dev/null +++ b/contracts/utils/JSONFile.ts @@ -0,0 +1,50 @@ +import fs from 'fs' + +/** + * Used by JSON.stringify to convert bigint to string + * @param _key: key of the JSON entry to process + * @param value: value of the JSON entry to process + * @returns formated value + */ +function replacer(_key: string, value: any) { + if (typeof value === 'bigint') { + return value.toString() + } + return value +} + +export class JSONFile { + /** + * Read the content of the JSON file + * @param path The path of the JSON file + * @returns + */ + static read(path: string) { + return JSON.parse(fs.readFileSync(path).toString()) + } + + /** + * Update the JSON file with the data + * @param path The path of the file + * @param data The new data to add to the JSON content + */ + static update(path: string, data: any) { + let state: any + try { + state = JSONFile.read(path) + } catch { + state = {} + } + fs.writeFileSync(path, JSON.stringify({ ...state, ...data }, null, 2)) + } + + /** + * Write the data to the JSON file + * @param path The path of the file + * @param data The data to write + */ + static write(path: string, data: any) { + const outputString = JSON.stringify(data, replacer, 2) + fs.writeFileSync(path, outputString + '\n') + } +} diff --git a/contracts/utils/RecipientRegistryLogProcessor.ts b/contracts/utils/RecipientRegistryLogProcessor.ts index be07d3a14..6d74a4334 100644 --- a/contracts/utils/RecipientRegistryLogProcessor.ts +++ b/contracts/utils/RecipientRegistryLogProcessor.ts @@ -1,4 +1,4 @@ -import { Contract, EventFilter, providers, constants, utils } from 'ethers' +import { Contract, EventFilter, Interface, ZeroAddress } from 'ethers' import { ProviderFactory } from './providers/ProviderFactory' import { Project } from './types' import { RecipientState } from './constants' @@ -6,11 +6,16 @@ import { ParserFactory } from './parsers/ParserFactory' import { Log } from './providers/BaseProvider' import { toDate } from './date' import { EVENT_ABIS } from './abi' - -function getFilter(address: string, abi: string): EventFilter { - const eventInterface = new utils.Interface([abi]) - const events = Object.values(eventInterface.events) - const topic0 = eventInterface.getEventTopic(events[0].name) +import { AbiInfo } from './types' +import { HardhatConfig } from 'hardhat/types' + +function getFilter(address: string, abiInfo: AbiInfo): EventFilter { + const eventInterface = new Interface([abiInfo.abi]) + const event = eventInterface.getEvent(abiInfo.name) + if (!event) { + throw new Error(`Event ${abiInfo.name} not found`) + } + const topic0 = event.topicHash return { address, topics: [topic0] } } @@ -37,36 +42,37 @@ export class RecipientRegistryLogProcessor { endBlock, startBlock, blocksPerBatch, - etherscanApiKey, + config, network, }: { recipientRegistry: Contract startBlock: number endBlock: number blocksPerBatch: number - etherscanApiKey: string + config: HardhatConfig network: string }): Promise { // fetch event logs containing project information const lastBlock = endBlock ? endBlock - : await this.registry.provider.getBlockNumber() + : await this.registry.runner?.provider?.getBlockNumber() + const registryAddress = await this.registry.getAddress() console.log( `Fetching event logs from the recipient registry`, - this.registry.address + registryAddress ) const logProvider = ProviderFactory.createProvider({ network, - etherscanApiKey, + config, }) let logs: Log[] = [] for (let i = 0; i < EVENT_ABIS.length; i++) { const { add, remove } = EVENT_ABIS[i] - const filter = getFilter(this.registry.address, add.abi) + const filter = getFilter(registryAddress, add) const addLogs = await logProvider.fetchLogs({ filter, startBlock, @@ -75,7 +81,7 @@ export class RecipientRegistryLogProcessor { }) if (addLogs.length > 0) { - const filter = getFilter(this.registry.address, remove.abi) + const filter = getFilter(registryAddress, remove) const removeLogs = await logProvider.fetchLogs({ filter, startBlock, @@ -99,7 +105,7 @@ export class RecipientRegistryLogProcessor { return logs } - async parseLogs(logs: providers.Log[]): Promise> { + async parseLogs(logs: Log[]): Promise> { const recipients: Record = {} for (let i = 0; i < logs.length; i++) { @@ -112,16 +118,18 @@ export class RecipientRegistryLogProcessor { } catch (err) { console.log('failed to parse', (err as Error).message) } - const address = parsed.recipientAddress || constants.AddressZero + const address = parsed.recipientAddress || ZeroAddress const id = parsed.id || '0' const [block, transaction] = await Promise.all([ - this.registry.provider.getBlock(log.blockNumber), - this.registry.provider.getTransactionReceipt(log.transactionHash), + this.registry.runner?.provider?.getBlock(log.blockNumber), + this.registry.runner?.provider?.getTransactionReceipt( + log.transactionHash + ), ]) - const blockTimestamp = toDate(block.timestamp) + const blockTimestamp = toDate(block?.timestamp || 0) const createdAt = parsed.createdAt || blockTimestamp - const requester = transaction.from + const requester = transaction?.from if (!recipients[id]) { recipients[id] = { diff --git a/contracts/utils/abi.ts b/contracts/utils/abi.ts index 7e2f0368c..dc3c0c004 100644 --- a/contracts/utils/abi.ts +++ b/contracts/utils/abi.ts @@ -1,4 +1,4 @@ -import { utils } from 'ethers' +import { Interface } from 'ethers' import { AbiInfo } from './types' type EventAbiEntry = { @@ -6,6 +6,17 @@ type EventAbiEntry = { remove: AbiInfo } +/** + * MACI v0 ABI used in exportRound.ts + */ +export const MaciV0Abi = [ + 'function signUpTimestamp() view returns (uint256)', + 'function signUpDurationSeconds() view returns (uint256)', + 'function votingDurationSeconds() view returns (uint256)', + `function treeDepths() view returns ((uint8 stateTreeDepth, uint8 messageTreeDepth, uint8 voteOptionTreeDepth))`, + 'function numMessages() view returns (uint256)', +] + export const getRecipientAddressAbi = [ `function getRecipientAddress(uint256 _index, uint256 _startTime, uint256 _endTime)` + ` external view returns (address)`, @@ -16,52 +27,64 @@ export const EVENT_ABIS: EventAbiEntry[] = [ { add: { type: 'RequestSubmitted', + name: 'RequestSubmitted', abi: `event RequestSubmitted(bytes32 indexed _recipientId, uint8 indexed _type, address _recipient, string _metadata, uint256 _timestamp)`, }, remove: { type: 'RequestResolved', + name: 'RequestResolved', abi: `event RequestResolved(bytes32 indexed _recipientId, uint8 indexed _type, bool indexed _rejected, uint256 _recipientIndex, uint256 _timestamp)`, }, }, { add: { type: 'RecipientAdded', + name: 'RecipientAdded', abi: 'event RecipientAdded(bytes32 indexed _recipientId, address _recipient, string _metadata, uint256 _index, uint256 _timestamp)', }, remove: { type: 'RecipientRemoved', + name: 'RecipientRemoved', abi: 'event RecipientRemoved(bytes32 indexed _recipientId, uint256 _timestamp)', }, }, { add: { type: 'RecipientAddedV1', + name: 'RecipientAdded', abi: 'event RecipientAdded(address indexed _recipient, string _metadata, uint256 _index)', }, remove: { type: 'RecipientRemovedV1', + name: 'RecipientRemoved', abi: 'event RecipientRemoved(address indexed _recipient)', }, }, { add: { type: 'KlerosRecipientAdded', + name: 'RecipientAdded', abi: `event RecipientAdded(bytes32 indexed _recipientId, bytes _metadata, uint256 _index)`, }, remove: { type: 'KlerosRecipientRemoved', + name: 'RecipientRemoved', abi: `event RecipientRemoved(bytes32 indexed _recipientId)`, }, }, ] +/** + * Event topic abi + */ export const TOPIC_ABIS: Record = EVENT_ABIS.reduce( (records: Record, addAndRemoveGroup) => { - Object.values(addAndRemoveGroup).forEach(({ type, abi }) => { - const addInterface = new utils.Interface([abi]) - const events = Object.values(addInterface.events) - const topic0 = addInterface.getEventTopic(events[0].name) - records[topic0] = { type, abi } + Object.values(addAndRemoveGroup).forEach(({ type, name, abi }) => { + const addInterface = new Interface([abi]) + const event = addInterface.getEvent(name) + if (event) { + records[event.topicHash] = { type, name, abi } + } }) return records diff --git a/contracts/utils/circuits.ts b/contracts/utils/circuits.ts new file mode 100644 index 000000000..f7cba55e6 --- /dev/null +++ b/contracts/utils/circuits.ts @@ -0,0 +1,107 @@ +// custom configuration for MACI parameters +// See https://github.com/privacy-scaling-explorations/maci/wiki/Precompiled-v1.1.1 for parameter definition +// NOTE: currently the version of MACI used in clrfund only supports circuit 6-9-2-3 because +// the EmptyBallotRoots.sol published in MACI npm package is hardcoded for stateTreeDepth = 6 + +import path from 'path' + +// This should match MACI.TREE_ARITY in the contract +const TREE_ARITY = 5 + +export const DEFAULT_CIRCUIT = 'micro' + +/** + * Information about the circuit + */ +export type CircuitInfo = { + processMessagesZkey: string + processWitness: string + processWasm: string + processDatFile: string + tallyVotesZkey: string + tallyWitness: string + tallyWasm: string + tallyDatFile: string + stateTreeDepth: number + treeDepths: { + messageTreeDepth: number + messageTreeSubDepth: number + voteOptionTreeDepth: number + intStateTreeDepth: number + } + maxValues: { + maxMessages: bigint + maxVoteOptions: bigint + } + messageBatchSize: bigint +} + +export const CIRCUITS: { [name: string]: CircuitInfo } = { + micro: { + processMessagesZkey: 'ProcessMessages_6-9-2-3/processMessages_6-9-2-3.zkey', + processWitness: + 'ProcessMessages_6-9-2-3/ProcessMessages_6-9-2-3_cpp/ProcessMessages_6-9-2-3', + processWasm: + 'ProcessMessages_6-9-2-3/ProcessMessages_6-9-2-3_js/ProcessMessages_6-9-2-3.wasm', + processDatFile: + 'ProcessMessages_6-9-2-3/ProcessMessages_6-9-2-3_cpp/ProcessMessages_6-9-2-3.dat', + tallyVotesZkey: 'TallyVotes_6-2-3/tallyVotes_6-2-3.zkey', + tallyWitness: 'TallyVotes_6-2-3/TallyVotes_6-2-3_cpp/TallyVotes_6-2-3', + tallyWasm: 'TallyVotes_6-2-3/TallyVotes_6-2-3_js/TallyVotes_6-2-3.wasm', + tallyDatFile: 'TallyVotes_6-2-3/TallyVotes_6-2-3_cpp/TallyVotes_6-2-3.dat', + // 1st param in processmessages_6-9-2-3 + stateTreeDepth: 6, + treeDepths: { + // 2nd param in processmessages_6-9-2-3 + messageTreeDepth: 9, + // 3rd param in processmessages_6-9-2-3 + messageTreeSubDepth: 2, + // last param of processMessages_6-9-2-3 and tallyvotes_6-2-3 + voteOptionTreeDepth: 3, + // 2nd param in tallyvotes_6-2-3 + intStateTreeDepth: 2, + }, + maxValues: { + // maxMessages and maxVoteOptions are calculated using treeArity = 5 as seen in the following code: + // https://github.com/privacy-scaling-explorations/maci/blob/master/contracts/contracts/Poll.sol#L115 + // treeArity ** messageTreeDepth + maxMessages: BigInt(TREE_ARITY ** 9), + // treeArity ** voteOptionTreeDepth + maxVoteOptions: BigInt(TREE_ARITY ** 3), + }, + messageBatchSize: BigInt(TREE_ARITY ** 2), + }, +} + +/** + * List of all the circuit files used by MACI commands + */ +export interface ZkFiles { + processZkFile: string + processWitness: string + processWasm: string + processDatFile: string + tallyZkFile: string + tallyWitness: string + tallyWasm: string + tallyDatFile: string +} + +/** + * Get the zkey file path + * @param name zkey file name + * @returns zkey file path + */ +export function getCircuitFiles(circuit: string, directory: string): ZkFiles { + const params = CIRCUITS[circuit] + return { + processZkFile: path.join(directory, params.processMessagesZkey), + processWitness: path.join(directory, params.processWitness), + processWasm: path.join(directory, params.processWasm), + processDatFile: path.join(directory, params.processDatFile), + tallyZkFile: path.join(directory, params.tallyVotesZkey), + tallyWitness: path.join(directory, params.tallyWitness), + tallyWasm: path.join(directory, params.tallyWasm), + tallyDatFile: path.join(directory, params.tallyDatFile), + } +} diff --git a/contracts/utils/constants.ts b/contracts/utils/constants.ts index c7777989e..dfdbcd011 100644 --- a/contracts/utils/constants.ts +++ b/contracts/utils/constants.ts @@ -1,10 +1,19 @@ -import { BigNumber } from 'ethers' - export const DEFAULT_IPFS_GATEWAY = 'https://ipfs.io' export const ZERO_ADDRESS = '0x0000000000000000000000000000000000000000' -export const UNIT = BigNumber.from(10).pow(BigNumber.from(18)) -export const VOICE_CREDIT_FACTOR = BigNumber.from(10).pow(4 + 18 - 9) -export const ALPHA_PRECISION = BigNumber.from(10).pow(18) +export const UNIT = 10n ** 18n +export const VOICE_CREDIT_FACTOR = 10n ** BigInt(4 + 18 - 9) +export const ALPHA_PRECISION = 10n ** 18n +export const DEFAULT_SR_QUEUE_OPS = '4' +export const DEFAULT_GET_LOG_BATCH_SIZE = 20000 +export const TREE_ARITY = 5 + +// brightid.clr.fund node uses this to sign messages +// see the ethSigningAddress in https://brightid.clr.fund +export const BRIGHTID_VERIFIER_ADDR = + '0xdbf0b2ee9887fe11934789644096028ed3febe9c' + +// This is brightid node signer address +// export const BRIGHTID_VERIFIER_ADDR = '0xb1d71F62bEe34E9Fc349234C201090c33BCdF6DB' export enum RecipientState { Registered = 'Registered', diff --git a/contracts/utils/contracts.ts b/contracts/utils/contracts.ts index 9fa12808d..45250e3fb 100644 --- a/contracts/utils/contracts.ts +++ b/contracts/utils/contracts.ts @@ -1,37 +1,119 @@ -import { BigNumber, Contract, utils } from 'ethers' -import { TransactionResponse } from '@ethersproject/abstract-provider' +import { + BaseContract, + ContractTransactionResponse, + TransactionResponse, + Signer, +} from 'ethers' +import { getEventArg } from '@clrfund/common' +import { EContracts } from './types' +import { + DeployContractOptions, + HardhatEthersHelpers, +} from '@nomicfoundation/hardhat-ethers/types' +import { VkRegistry, FundingRound } from '../typechain-types' +import { MaciParameters } from './maciParameters' +import { IVerifyingKeyStruct } from 'maci-contracts' +/** + * Deploy a contract + * @param name Name of the contract + * @param ethers hardhat ethers handle + * @param options options with signer, libraries or contract constructor args + * @returns contract + */ +export async function deployContract( + name: EContracts, + ethers: HardhatEthersHelpers, + options?: DeployContractOptions & { args?: unknown[]; quiet?: boolean } +): Promise { + const args = options?.args || [] + const contractName = String(name).includes('Poseidon') ? ':' + name : name + const contract = await ethers.deployContract(contractName, args, options) + await contract.waitForDeployment() + + if (options?.quiet === false) { + console.log(`Deployed ${name} at ${contract.target}`) + } + return contract as BaseContract as T +} + +/** + * Set Verifying key + * @param vkRegistry VKRegistry contract + * @param maciParameters MACI tree depths and verifying key information + * @returns transaction response + */ +export async function setVerifyingKeys( + vkRegistry: VkRegistry, + params: MaciParameters +): Promise { + const messageBatchSize = params.getMessageBatchSize() + const tx = await vkRegistry.setVerifyingKeys( + params.stateTreeDepth, + params.treeDepths.intStateTreeDepth, + params.treeDepths.messageTreeDepth, + params.treeDepths.voteOptionTreeDepth, + messageBatchSize, + params.processVk.asContractParam() as IVerifyingKeyStruct, + params.tallyVk.asContractParam() as IVerifyingKeyStruct + ) + + const receipt = await tx.wait() + if (receipt?.status !== 1) { + throw new Error('Failed to set verifying key; transaction receipt status 1') + } + return tx +} + +/** + * Get the gas usage + * @param transaction The transaction handle + * @returns Gas used + */ export async function getGasUsage( transaction: TransactionResponse ): Promise { const receipt = await transaction.wait() - return receipt.gasUsed.toNumber() + return receipt ? Number(receipt.gasUsed) : 0 } +/** + * Get the transaction fee + * @param transaction The transaction handle + * @returns Gas fee + */ export async function getTxFee( transaction: TransactionResponse -): Promise { +): Promise { const receipt = await transaction.wait() // effectiveGasPrice was introduced by EIP1559 - return receipt.gasUsed.mul(receipt.effectiveGasPrice) + return receipt ? BigInt(receipt.gasUsed) * BigInt(receipt.gasPrice) : 0n } -export async function getEventArg( - transaction: TransactionResponse, - contract: Contract, - eventName: string, - argumentName: string -): Promise { - // eslint-disable-line @typescript-eslint/no-explicit-any - const receipt = await transaction.wait() - for (const log of receipt.logs || []) { - if (log.address != contract.address) { - continue - } - const event = contract.interface.parseLog(log) - if (event && event.name === eventName) { - return event.args[argumentName] - } - } - throw new Error('Event not found') +/** + * Return the current funding round contract handle + * @param clrfund ClrFund contract address + * @param signer Signer who will interact with the funding round contract + * @param hre Hardhat runtime environment + */ +export async function getCurrentFundingRoundContract( + clrfund: string, + signer: Signer, + ethers: HardhatEthersHelpers +): Promise { + const clrfundContract = await ethers.getContractAt( + EContracts.ClrFund, + clrfund, + signer + ) + + const fundingRound = await clrfundContract.getCurrentRound() + const fundingRoundContract = await ethers.getContractAt( + EContracts.FundingRound, + fundingRound, + signer + ) + + return fundingRoundContract as BaseContract as FundingRound } +export { getEventArg } diff --git a/contracts/utils/date.ts b/contracts/utils/date.ts index 201fd9297..3e506ff13 100644 --- a/contracts/utils/date.ts +++ b/contracts/utils/date.ts @@ -1,5 +1,8 @@ -import { BigNumber, BigNumberish } from 'ethers' - -export function toDate(val: BigNumberish) { - return new Date(BigNumber.from(val).mul(1000).toNumber()) +/** + * Convert the unix timestamp in seconds to javascript date object + * @param unixTime unix timestamp in seconds + * @returns javascript date object + */ +export function toDate(unixTime: any) { + return new Date(Number(unixTime) * 1000) } diff --git a/contracts/utils/deployment.ts b/contracts/utils/deployment.ts deleted file mode 100644 index 342de8d81..000000000 --- a/contracts/utils/deployment.ts +++ /dev/null @@ -1,274 +0,0 @@ -import { ethers, config } from 'hardhat' -import { Libraries } from 'hardhat/types/runtime' -import { Signer, Contract, utils } from 'ethers' -import { link } from 'ethereum-waffle' -import path from 'path' - -import { MaciParameters } from './maci' -import { readFileSync } from 'fs' - -const userRegistryNames: Record = { - simple: 'SimpleUserRegistry', - brightid: 'BrightIdUserRegistry', - snapshot: 'SnapshotUserRegistry', - merkle: 'MerkleUserRegistry', -} - -export interface BrightIdParams { - context: string - verifierAddress: string - sponsor: string -} - -/** - * Return the brightid user registry contructor parameter values - * @param userRegistryType user registry type - * @returns BrightIdParams or null - */ -export function getBrightIdParams( - userRegistryType: string -): BrightIdParams | null { - if (userRegistryType === 'brightid') { - const verifierAddress = process.env.BRIGHTID_VERIFIER_ADDR - const sponsor = process.env.BRIGHTID_SPONSOR - if (!verifierAddress) { - throw new Error('Missing environment variable BRIGHTID_VERIFIER_ADDR') - } - if (!sponsor) { - throw new Error('Missing environment variable BRIGHTID_SPONSOR') - } - - return { - context: process.env.BRIGHTID_CONTEXT || 'clr.fund', - verifierAddress, - sponsor, - } - } else { - return null - } -} - -export function linkBytecode( - bytecode: string, - libraries: { [name: string]: string } -): string { - // Workarounds for https://github.com/nomiclabs/buidler/issues/611 - const linkable = { evm: { bytecode: { object: bytecode } } } - for (const [libraryName, libraryAddress] of Object.entries(libraries)) { - link(linkable, libraryName, libraryAddress.toLowerCase()) - } - return linkable.evm.bytecode.object -} - -// custom configuration for MACI parameters. -export const CIRCUITS: { [name: string]: any } = { - test: { - batchUstVerifier: 'BatchUpdateStateTreeVerifier', - qvtVerifier: 'QuadVoteTallyVerifier', - treeDepths: { - stateTreeDepth: 4, - messageTreeDepth: 4, - voteOptionTreeDepth: 2, - }, - batchSizes: { - tallyBatchSize: 4, - messageBatchSize: 4, - }, - }, - small: { - batchUstVerifier: 'BatchUpdateStateTreeVerifierSmall', - qvtVerifier: 'QuadVoteTallyVerifierSmall', - treeDepths: { - stateTreeDepth: 8, - messageTreeDepth: 11, - voteOptionTreeDepth: 3, - }, - batchSizes: { - tallyBatchSize: 4, - messageBatchSize: 4, - }, - }, - medium: { - batchUstVerifier: 'BatchUpdateStateTreeVerifierMedium', - qvtVerifier: 'QuadVoteTallyVerifierMedium', - treeDepths: { - stateTreeDepth: 9, - messageTreeDepth: 13, - voteOptionTreeDepth: 3, - }, - batchSizes: { - tallyBatchSize: 4, - messageBatchSize: 4, - }, - }, - x32: { - batchUstVerifier: 'BatchUpdateStateTreeVerifier32', - qvtVerifier: 'QuadVoteTallyVerifier32', - treeDepths: { - stateTreeDepth: 32, - messageTreeDepth: 32, - voteOptionTreeDepth: 3, - }, - batchSizes: { - tallyBatchSize: 8, - messageBatchSize: 8, - }, - }, - prod: { - batchUstVerifier: 'BatchUpdateStateTreeVerifierBatch64', - qvtVerifier: 'QuadVoteTallyVerifierBatch64', - treeDepths: { - stateTreeDepth: 32, - messageTreeDepth: 32, - voteOptionTreeDepth: 3, - }, - batchSizes: { - tallyBatchSize: 64, - messageBatchSize: 64, - }, - }, -} - -type PoseidonName = 'PoseidonT3' | 'PoseidonT6' - -/** - * Deploy the PoseidonT3 or PoseidonT6 contracts. These 2 contracts - * have a custom artifact location that the hardhat library cannot - * retrieve using the standard getContractFactory() function, so, we manually - * read the artifact content and pass to the getContractFactory function - * - * NOTE: there are 2 copies of the Poseidon artifacts, the one in the build/contracts - * folder has the actual contract bytecode, the other one in the build/contracts/maci-contracts - * only has the library interface. If the wrong bytecode is used to deploy the contract, - * the hash functions will always return 0. - * - * @param account the account that deploys the contract - * @param contractName PoseidonT3 or PoseidonT6 - * @returns contract object - */ -export async function deployPoseidon( - account: Signer, - contractName: PoseidonName -): Promise { - const artifact = JSON.parse( - readFileSync( - path.join(config.paths.artifacts, `${contractName}.json`) - ).toString() - ) - - const Poseidon = await ethers.getContractFactory( - artifact.abi, - artifact.bytecode, - account - ) - - return Poseidon.deploy() -} - -export async function deployContract( - account: Signer, - contractName: string, - contractArgs: any[] = [] -): Promise { - const contractFactory = await ethers.getContractFactory(contractName, account) - const contract = await contractFactory.deploy(...contractArgs) - return await contract.deployed() -} - -interface MaciFactoryDependencies { - poseidonT3?: Contract - poseidonT6?: Contract - batchUstVerifier?: Contract - qvtVerifier?: Contract -} - -export async function deployMaciFactory( - account: Signer, - circuit = 'x32', - { - poseidonT3, - poseidonT6, - batchUstVerifier, - qvtVerifier, - }: MaciFactoryDependencies = {} -): Promise { - if (!poseidonT3) { - poseidonT3 = await deployPoseidon(account, 'PoseidonT3') - } - if (!poseidonT6) { - poseidonT6 = await deployPoseidon(account, 'PoseidonT6') - } - if (!batchUstVerifier) { - const BatchUstVerifier = await ethers.getContractFactory( - CIRCUITS[circuit].batchUstVerifier, - account - ) - batchUstVerifier = await BatchUstVerifier.deploy() - } - if (!qvtVerifier) { - const QvtVerifier = await ethers.getContractFactory( - CIRCUITS[circuit].qvtVerifier, - account - ) - qvtVerifier = await QvtVerifier.deploy() - } - - const maciLibraries: Libraries = { - 'maci-contracts/sol/Poseidon.sol:PoseidonT3': poseidonT3.address, - 'maci-contracts/sol/Poseidon.sol:PoseidonT6': poseidonT6.address, - } - - const MACIFactory = await ethers.getContractFactory('MACIFactory', { - signer: account, - libraries: maciLibraries, - }) - const maciParameters = new MaciParameters({ - batchUstVerifier: batchUstVerifier.address, - qvtVerifier: qvtVerifier.address, - ...CIRCUITS[circuit].treeDepths, - ...CIRCUITS[circuit].batchSizes, - }) - - const maciFactory = await MACIFactory.deploy(...maciParameters.values()) - await maciFactory.deployTransaction.wait() - - return maciFactory -} - -export async function deployUserRegistry( - userRegistryType: string, - deployer: Signer, - brightid: BrightIdParams | null -): Promise { - let userRegistry: Contract - if (userRegistryType === 'brightid') { - if (!brightid) { - throw new Error('Missing BrightId parameter') - } - - const BrightIdUserRegistry = await ethers.getContractFactory( - 'BrightIdUserRegistry', - deployer - ) - - userRegistry = await BrightIdUserRegistry.deploy( - utils.formatBytes32String(brightid.context), - brightid.verifierAddress, - brightid.sponsor - ) - } else { - const userRegistryName = userRegistryNames[userRegistryType] - if (!userRegistryName) { - throw new Error('unsupported user registry type: ' + userRegistryType) - } - - const UserRegistry = await ethers.getContractFactory( - userRegistryName, - deployer - ) - userRegistry = await UserRegistry.deploy() - } - - await userRegistry.deployTransaction.wait() - return userRegistry -} diff --git a/contracts/utils/file.ts b/contracts/utils/file.ts deleted file mode 100644 index df83d0f7d..000000000 --- a/contracts/utils/file.ts +++ /dev/null @@ -1,7 +0,0 @@ -import fs from 'fs' - -export function writeToFile(filePath: string, data: any) { - const outputString = JSON.stringify(data, null, 2) - fs.writeFileSync(filePath, outputString + '\n') - console.log('Successfully written to ', filePath) -} diff --git a/contracts/utils/ipfs.ts b/contracts/utils/ipfs.ts index e2157a093..092d9a876 100644 --- a/contracts/utils/ipfs.ts +++ b/contracts/utils/ipfs.ts @@ -1,17 +1,55 @@ // eslint-disable-next-line @typescript-eslint/no-var-requires const Hash = require('ipfs-only-hash') -import { utils } from 'ethers' +import { FetchRequest } from 'ethers' import { DEFAULT_IPFS_GATEWAY } from './constants' - +import fs from 'fs' +import path from 'path' +import pinataSDK from '@pinata/sdk' +/** + * Get the ipfs hash for the input object + * @param object a json object to get the ipfs hash for + * @returns the ipfs hash + */ export async function getIpfsHash(object: any): Promise { const data = Buffer.from(JSON.stringify(object, null, 4)) return await Hash.of(data) } export class Ipfs { + /** + * Get the content of the ipfs hash + * @param hash ipfs hash + * @param gatewayUrl ipfs gateway url + * @returns the content + */ static async fetchJson(hash: string, gatewayUrl?: string): Promise { const url = `${gatewayUrl || DEFAULT_IPFS_GATEWAY}/ipfs/${hash}` - const result = utils.fetchJson(url) - return result + const req = new FetchRequest(url) + const resp = await req.send() + return resp.bodyJson + } + + /** + * Pin a file to IPFS + * @param file The file path to be uploaded to IPFS + * @param apiKey Pinata api key + * @param secretApiKey Pinata secret api key + * @returns IPFS hash + */ + static async pinFile( + file: string, + apiKey: string, + secretApiKey: string + ): Promise { + const pinata = new pinataSDK(apiKey, secretApiKey) + const data = fs.createReadStream(file) + const name = path.basename(file) + const options = { + pinataMetadata: { + name, + }, + } + const res = await pinata.pinFileToIPFS(data, options) + return res.IpfsHash } } diff --git a/contracts/utils/maci.ts b/contracts/utils/maci.ts index eae858e70..bb3e3bb0b 100644 --- a/contracts/utils/maci.ts +++ b/contracts/utils/maci.ts @@ -1,79 +1,52 @@ -import { Contract, BigNumber, ContractReceipt } from 'ethers' +import { ContractTransactionReceipt, Signer } from 'ethers' import { bnSqrt, createMessage, getRecipientClaimData, IncrementalQuinTree, hash5, + hash3, + hashLeftRight, LEAVES_PER_NODE, -} from '@clrfund/maci-utils' - -export class MaciParameters { - stateTreeDepth = 32 - messageTreeDepth = 32 - voteOptionTreeDepth = 3 - tallyBatchSize = 8 - messageBatchSize = 8 - batchUstVerifier!: string - qvtVerifier!: string - signUpDuration = 7 * 86400 - votingDuration = 7 * 86400 - - constructor(parameters: { [name: string]: any } = {}) { - this.update(parameters) - } - - update(parameters: { [name: string]: any }) { - for (const [name, value] of Object.entries(parameters)) { - ;(this as any)[name] = value - } - } + genTallyResultCommitment, + Keypair, + Tally as TallyData, +} from '@clrfund/common' +import * as os from 'os' +import { + mergeMessages, + mergeSignups, + genProofs, + proveOnChain, + GenProofsArgs, + genLocalState, + verify, +} from 'maci-cli' - values(): any[] { - // To be passed to setMaciParameters() - return [ - this.stateTreeDepth, - this.messageTreeDepth, - this.voteOptionTreeDepth, - this.tallyBatchSize, - this.messageBatchSize, - this.batchUstVerifier, - this.qvtVerifier, - this.signUpDuration, - this.votingDuration, - ] - } +import { getTalyFilePath, isPathExist } from './misc' +import { getCircuitFiles } from './circuits' +import { FundingRound } from '../typechain-types' - static async read(maciFactory: Contract): Promise { - const { stateTreeDepth, messageTreeDepth, voteOptionTreeDepth } = - await maciFactory.treeDepths() - const { tallyBatchSize, messageBatchSize } = await maciFactory.batchSizes() - const batchUstVerifier = await maciFactory.batchUstVerifier() - const qvtVerifier = await maciFactory.qvtVerifier() - const signUpDuration = (await maciFactory.signUpDuration()).toNumber() - const votingDuration = (await maciFactory.votingDuration()).toNumber() - return new MaciParameters({ - stateTreeDepth, - messageTreeDepth, - voteOptionTreeDepth, - tallyBatchSize, - messageBatchSize, - batchUstVerifier, - qvtVerifier, - signUpDuration, - votingDuration, - }) - } +interface TallyResultProof { + recipientIndex: number + result: string + proof: bigint[][] } -export function getRecipientTallyResult( +export const isOsArm = os.arch().includes('arm') + +export function getTallyResultProof( recipientIndex: number, recipientTreeDepth: number, - tally: any -): any[] { + tally: TallyData +): TallyResultProof { // Create proof for tally result const result = tally.results.tally[recipientIndex] - const resultSalt = tally.results.salt + if (result == null) { + // result is null or undefined + throw Error(`Missing tally result for index ${recipientIndex}`) + } + const resultTree = new IncrementalQuinTree( recipientTreeDepth, BigInt(0), @@ -81,79 +54,288 @@ export function getRecipientTallyResult( hash5 ) for (const leaf of tally.results.tally) { - resultTree.insert(leaf) + resultTree.insert(BigInt(leaf)) } - const resultProof = resultTree.genMerklePath(recipientIndex) - - return [ - recipientTreeDepth, + const resultProof = resultTree.genProof(recipientIndex) + return { recipientIndex, result, - resultProof.pathElements.map((x) => x.map((y) => y.toString())), - resultSalt, - ] + proof: resultProof.pathElements, + } } -export function getRecipientTallyResultsBatch( +export function getTallyResultProofBatch( recipientStartIndex: number, recipientTreeDepth: number, tally: any, batchSize: number -): any[] { +): TallyResultProof[] { const tallyCount = tally.results.tally.length if (recipientStartIndex >= tallyCount) { throw new Error('Recipient index out of bound') } - const tallyData = [] + const proofs: TallyResultProof[] = [] const lastIndex = recipientStartIndex + batchSize > tallyCount ? tallyCount : recipientStartIndex + batchSize + for (let i = recipientStartIndex; i < lastIndex; i++) { - tallyData.push(getRecipientTallyResult(i, recipientTreeDepth, tally)) + proofs.push(getTallyResultProof(i, recipientTreeDepth, tally)) } - // the salt is the same for all tally results - const resultSalt = tallyData[0][4] - return [ - recipientTreeDepth, - tallyData.map((item) => item[1]), - tallyData.map((item) => item[2]), - tallyData.map((item) => item[3]), - resultSalt, - ] + return proofs } export async function addTallyResultsBatch( - fundingRound: Contract, + fundingRound: FundingRound, recipientTreeDepth: number, tallyData: any, batchSize: number, startIndex = 0, - callback?: (processed: number, receipt: ContractReceipt) => void -): Promise { - let totalGasUsed = BigNumber.from(0) + callback?: (processed: number, receipt: ContractTransactionReceipt) => void +): Promise { + let totalGasUsed = 0 const { tally } = tallyData.results + + const spentVoiceCreditsHash = hashLeftRight( + BigInt(tallyData.totalSpentVoiceCredits.spent), + BigInt(tallyData.totalSpentVoiceCredits.salt) + ) + + const perVOSpentVoiceCreditsHash = genTallyResultCommitment( + tallyData.perVOSpentVoiceCredits.tally.map((x: string) => BigInt(x)), + BigInt(tallyData.perVOSpentVoiceCredits.salt), + recipientTreeDepth + ) + + const newResultCommitment = genTallyResultCommitment( + tally.map((x: string) => BigInt(x)), + BigInt(tallyData.results.salt), + recipientTreeDepth + ) + + const newTallyCommitment = hash3([ + newResultCommitment, + spentVoiceCreditsHash, + perVOSpentVoiceCreditsHash, + ]) + + if ('0x' + newTallyCommitment.toString(16) !== tallyData.newTallyCommitment) { + console.error( + 'Error: the newTallyCommitment is invalid.', + '0x' + newTallyCommitment.toString(16), + tallyData.newTallyCommitment + ) + } + for (let i = startIndex; i < tally.length; i = i + batchSize) { - const data = getRecipientTallyResultsBatch( + const proofs = getTallyResultProofBatch( i, recipientTreeDepth, tallyData, batchSize ) - const tx = await fundingRound.addTallyResultsBatch(...data) + const tx = await fundingRound.addTallyResultsBatch( + proofs.map((i) => i.recipientIndex), + proofs.map((i) => i.result), + proofs.map((i) => i.proof), + BigInt(tallyData.results.salt), + spentVoiceCreditsHash, + BigInt(perVOSpentVoiceCreditsHash) + ) const receipt = await tx.wait() + if (receipt?.status !== 1) { + throw new Error('Failed to add tally results on chain') + } + if (callback) { // the 2nd element in the data array has the array of // recipients to be processed for the batch - const totalProcessed = i + data[1].length + const totalProcessed = i + proofs.length callback(totalProcessed, receipt) } - totalGasUsed = totalGasUsed.add(receipt.gasUsed) + totalGasUsed = totalGasUsed + Number(receipt.gasUsed) } return totalGasUsed } -export { createMessage, getRecipientClaimData, bnSqrt } +/* Input to getGenProofArgs() */ +type getGenProofArgsInput = { + maciAddress: string + pollId: bigint + // coordinator's MACI serialized secret key + coordinatorMacisk: string + // the transaction hash of the creation of the MACI contract + maciTxHash?: string + // the key get zkeys file mapping, see utils/circuits.ts + circuitType: string + circuitDirectory: string + rapidsnark?: string + // where the proof will be produced + outputDir: string + // number of blocks of logs to fetch per batch + blocksPerBatch: number + // fetch logs from MACI from these start and end blocks + startBlock?: number + endBlock?: number + // MACI state file + maciStateFile?: string + // Tally output file + tallyFile: string + // transaction signer + signer: Signer + // flag to turn on verbose logging in MACI cli + quiet?: boolean +} + +/* + * Get the arguments to pass to the genProof function + */ +export function getGenProofArgs(args: getGenProofArgsInput): GenProofsArgs { + const { + maciAddress, + pollId, + coordinatorMacisk, + maciTxHash, + circuitType, + circuitDirectory, + rapidsnark, + outputDir, + blocksPerBatch, + startBlock, + endBlock, + maciStateFile, + tallyFile, + signer, + quiet, + } = args + + const { + processZkFile, + tallyZkFile, + processWitness, + processWasm, + processDatFile, + tallyWitness, + tallyWasm, + tallyDatFile, + } = getCircuitFiles(circuitType, circuitDirectory) + + if (isOsArm) { + return { + outputDir, + tallyFile, + tallyZkey: tallyZkFile, + processZkey: processZkFile, + pollId, + coordinatorPrivKey: coordinatorMacisk, + maciAddress, + transactionHash: maciTxHash, + processWasm, + tallyWasm, + useWasm: true, + blocksPerBatch, + startBlock, + endBlock, + stateFile: maciStateFile, + signer, + quiet, + } + } else { + if (!rapidsnark) { + throw new Error('Please specify the path to the rapidsnark binary') + } + + if (!isPathExist(rapidsnark)) { + throw new Error(`Path ${rapidsnark} does not exist`) + } + + return { + outputDir, + tallyFile, + tallyZkey: tallyZkFile, + processZkey: processZkFile, + pollId, + processWitgen: processWitness, + processDatFile, + tallyWitgen: tallyWitness, + tallyDatFile, + coordinatorPrivKey: coordinatorMacisk, + maciAddress, + transactionHash: maciTxHash, + rapidsnark, + useWasm: false, + blocksPerBatch, + startBlock, + endBlock, + stateFile: maciStateFile, + signer, + quiet, + } + } +} + +/** + * Merge MACI message and signups subtrees + * Must merge the subtrees before calling genProofs + * @param maciAddress MACI contract address + * @param pollId Poll id + * @param numQueueOps Number of operations to perform for the merge + * @param quiet Whether to log output + */ +export async function mergeMaciSubtrees({ + maciAddress, + pollId, + numQueueOps, + signer, + quiet, +}: { + maciAddress: string + pollId: bigint + signer: Signer + numQueueOps?: string + quiet?: boolean +}) { + if (!maciAddress) throw new Error('Missing MACI address') + + await mergeMessages({ + pollId, + maciContractAddress: maciAddress, + numQueueOps, + signer, + quiet, + }) + + await mergeSignups({ + pollId, + maciContractAddress: maciAddress, + numQueueOps, + signer, + quiet, + }) +} + +/** + * Create a random MACI private key + * + * @returns MACI serialized private key + */ +export function newMaciPrivateKey(): string { + const keypair = new Keypair() + const secretKey = keypair.privKey.serialize() + return secretKey +} + +export { + createMessage, + getRecipientClaimData, + bnSqrt, + genProofs, + proveOnChain, + verify, + genLocalState, + TallyData, +} diff --git a/contracts/utils/maciParameters.ts b/contracts/utils/maciParameters.ts new file mode 100644 index 000000000..e498a15e9 --- /dev/null +++ b/contracts/utils/maciParameters.ts @@ -0,0 +1,135 @@ +import { Contract, BigNumberish } from 'ethers' + +import { VerifyingKey } from 'maci-domainobjs' +import { extractVk } from 'maci-circuits' +import { CIRCUITS, getCircuitFiles } from './circuits' +import { TREE_ARITY } from './constants' +import { Params } from '../typechain-types/contracts/MACIFactory' + +type TreeDepths = { + intStateTreeDepth: number + messageTreeSubDepth: number + messageTreeDepth: number + voteOptionTreeDepth: number +} + +export class MaciParameters { + stateTreeDepth: number + processVk: VerifyingKey + tallyVk: VerifyingKey + treeDepths: TreeDepths + + constructor(parameters: { [name: string]: any } = {}) { + this.stateTreeDepth = parameters.stateTreeDepth + this.processVk = parameters.processVk + this.tallyVk = parameters.tallyVk + this.treeDepths = { + intStateTreeDepth: parameters.intStateTreeDepth, + messageTreeSubDepth: parameters.messageTreeSubDepth, + messageTreeDepth: parameters.messageTreeDepth, + voteOptionTreeDepth: parameters.voteOptionTreeDepth, + } + } + + /** + * Calculate the message batch size + * @returns message batch size + */ + getMessageBatchSize(): number { + return TREE_ARITY ** this.treeDepths.messageTreeSubDepth + } + + asContractParam(): [ + _stateTreeDepth: BigNumberish, + _treeDepths: Params.TreeDepthsStruct, + ] { + return [ + this.stateTreeDepth, + { + intStateTreeDepth: this.treeDepths.intStateTreeDepth, + messageTreeSubDepth: this.treeDepths.messageTreeSubDepth, + messageTreeDepth: this.treeDepths.messageTreeDepth, + voteOptionTreeDepth: this.treeDepths.voteOptionTreeDepth, + }, + ] + } + + static async fromConfig( + circuit: string, + directory: string + ): Promise { + const params = CIRCUITS[circuit] + const { processZkFile, tallyZkFile } = getCircuitFiles(circuit, directory) + const processVk: VerifyingKey = VerifyingKey.fromObj( + await extractVk(processZkFile) + ) + const tallyVk: VerifyingKey = VerifyingKey.fromObj( + await extractVk(tallyZkFile) + ) + + return new MaciParameters({ + stateTreeDepth: params.stateTreeDepth, + ...params.treeDepths, + processVk, + tallyVk, + }) + } + + static async fromContract(maciFactory: Contract): Promise { + const stateTreeDepth = await maciFactory.stateTreeDepth() + const { + intStateTreeDepth, + messageTreeSubDepth, + messageTreeDepth, + voteOptionTreeDepth, + } = await maciFactory.treeDepths() + + return new MaciParameters({ + stateTreeDepth, + intStateTreeDepth, + messageTreeSubDepth, + messageTreeDepth, + voteOptionTreeDepth, + }) + } + + static mock(): MaciParameters { + const processVk = VerifyingKey.fromObj({ + protocol: 1, + curve: 1, + nPublic: 1, + vk_alpha_1: [1, 2], + vk_beta_2: [ + [1, 2], + [1, 2], + ], + vk_gamma_2: [ + [1, 2], + [1, 2], + ], + vk_delta_2: [ + [1, 2], + [1, 2], + ], + vk_alphabeta_12: [[[1, 2, 3]]], + IC: [[1, 2]], + }) + + // use smaller voteOptionTreeDepth for testing + const params = { + treeDepths: { + intStateTreeDepth: 2, + messageTreeSubDepth: 2, + messageTreeDepth: 8, + voteOptionTreeDepth: 2, + }, + } + + return new MaciParameters({ + stateTreeDepth: 6, + ...params.treeDepths, + processVk, + tallyVk: processVk.copy(), + }) + } +} diff --git a/contracts/utils/misc.ts b/contracts/utils/misc.ts new file mode 100644 index 000000000..9f7a34297 --- /dev/null +++ b/contracts/utils/misc.ts @@ -0,0 +1,60 @@ +import path from 'path' +import fs from 'fs' + +/** + * Get the tally file path + * @param outputDir The output directory + * @returns The tally file path + */ +export function getTalyFilePath(outputDir: string) { + return path.join(outputDir, 'tally.json') +} + +/** + * Get the MACI state file path + * @param directory The directory containing the MACI state file + * @returns The path of the MACI state file + */ +export function getMaciStateFilePath(directory: string) { + return path.join(directory, 'maci-state.json') +} + +/** + * Return the proof output directory + * @param directory The root directory + * @param network The network + * @param roundAddress The funding round contract address + * @returns The proofs output directory + */ +export function getProofDirForRound( + directory: string, + network: string, + roundAddress: string +) { + try { + return path.join( + directory, + network.toLowerCase(), + roundAddress.toLowerCase() + ) + } catch { + return directory + } +} + +/** + * Check if the path exist + * @param path The path to check for existence + * @returns true if the path exists + */ +export function isPathExist(path: string): boolean { + return fs.existsSync(path) +} + +/** + * Create a directory + * @param directory The directory to create + */ +export function makeDirectory(directory: string): void { + fs.mkdirSync(directory, { recursive: true }) +} diff --git a/contracts/utils/parsers/BaseParser.ts b/contracts/utils/parsers/BaseParser.ts index 3ca0547a3..50507ae5e 100644 --- a/contracts/utils/parsers/BaseParser.ts +++ b/contracts/utils/parsers/BaseParser.ts @@ -1,11 +1,27 @@ -import { Log } from '@ethersproject/abstract-provider' +import { Log, Interface } from 'ethers' import { Project } from '../types' +import { TOPIC_ABIS } from '../abi' export abstract class BaseParser { topic0: string + private parser: Interface constructor(topic0: string) { this.topic0 = topic0 + + const abiInfo = TOPIC_ABIS[this.topic0] + if (!abiInfo) { + throw new Error(`topic ${this.topic0} not found`) + } + this.parser = new Interface([abiInfo.abi]) + } + + protected getEventArgs(log: Log): any { + const parsedLog = this.parser.parseLog({ + data: log.data, + topics: [...log.topics], + }) + return parsedLog?.args || {} } abstract parse(log: Log): Partial diff --git a/contracts/utils/parsers/KlerosRecipientAddedParser.ts b/contracts/utils/parsers/KlerosRecipientAddedParser.ts index a44aee9da..ebd4c42dd 100644 --- a/contracts/utils/parsers/KlerosRecipientAddedParser.ts +++ b/contracts/utils/parsers/KlerosRecipientAddedParser.ts @@ -1,13 +1,12 @@ import { Log } from '../providers/BaseProvider' import { Project } from '../types' -import { utils, BigNumber, constants } from 'ethers' -import { TOPIC_ABIS } from '../abi' -import { RecipientState } from '../constants' +import { toUtf8String as tryToUtf8String, decodeRlp } from 'ethers' +import { RecipientState, ZERO_ADDRESS } from '../constants' import { BaseParser } from './BaseParser' function toUtf8String(hex: string): string | undefined { try { - return utils.toUtf8String(hex) + return tryToUtf8String(hex) } catch { return undefined } @@ -25,16 +24,25 @@ function sanitizeImageHash(url: string | undefined): string | undefined { function decodeMetadata(rawMetadata: string): any { // best effort to parse the rlp encoded metadata try { - const decoded = utils.RLP.decode(rawMetadata) - const utf8s = decoded.map(toUtf8String) + const decoded = decodeRlp(rawMetadata) + + if (!Array.isArray(decoded)) { + throw new Error('Unexpected metadata format, expecting array') + } + + const utf8s = decoded.map((val) => { + if (typeof val !== 'string') { + throw new Error('Unexpected decoded format, expecting string') + } + return typeof val === 'string' ? toUtf8String(val) : val + }) const name = utf8s[0] const recipientAddress = decoded[1] - const imageHash = sanitizeImageHash(utf8s[2]) + const imageHash = sanitizeImageHash(utf8s[2] as string) const description = utf8s[3] const websiteUrl = utf8s[4] const twitterUrl = utf8s[5] - return { name, recipientAddress, @@ -55,19 +63,13 @@ export class KlerosRecipientAddedParser extends BaseParser { } parse(log: Log): Partial { - const abiInfo = TOPIC_ABIS[this.topic0] - if (!abiInfo) { - throw new Error(`topic ${this.topic0} not found`) - } - - const parser = new utils.Interface([abiInfo.abi]) - const { args } = parser.parseLog(log) + const args = this.getEventArgs(log) const id = args._recipientId - const recipientIndex = BigNumber.from(args._index).toNumber() + const recipientIndex = Number(args._index) const state = RecipientState.Accepted const rawMetadata = args._metadata const metadata = decodeMetadata(args._metadata) - const recipientAddress = metadata?.recipientAddress || constants.AddressZero + const recipientAddress = metadata?.recipientAddress || ZERO_ADDRESS const name = metadata?.name || '?' return { diff --git a/contracts/utils/parsers/KlerosRecipientRemovedParser.ts b/contracts/utils/parsers/KlerosRecipientRemovedParser.ts index 468237a49..fa23898da 100644 --- a/contracts/utils/parsers/KlerosRecipientRemovedParser.ts +++ b/contracts/utils/parsers/KlerosRecipientRemovedParser.ts @@ -1,7 +1,5 @@ import { Log } from '../providers/BaseProvider' import { Project } from '../types' -import { utils } from 'ethers' -import { TOPIC_ABIS } from '../abi' import { RecipientState } from '../constants' import { BaseParser } from './BaseParser' @@ -11,13 +9,7 @@ export class KlerosRecipientRemovedParser extends BaseParser { } parse(log: Log): Partial { - const abiInfo = TOPIC_ABIS[this.topic0] - if (!abiInfo) { - throw new Error(`topic ${this.topic0} not found`) - } - - const parser = new utils.Interface([abiInfo.abi]) - const { args } = parser.parseLog(log) + const args = this.getEventArgs(log) const id = args._recipientId const state = RecipientState.Removed diff --git a/contracts/utils/parsers/RecipientAddedParser.ts b/contracts/utils/parsers/RecipientAddedParser.ts index bcbe47fd1..b3525c182 100644 --- a/contracts/utils/parsers/RecipientAddedParser.ts +++ b/contracts/utils/parsers/RecipientAddedParser.ts @@ -1,7 +1,5 @@ import { Log } from '../providers/BaseProvider' import { Project } from '../types' -import { BigNumber, utils } from 'ethers' -import { TOPIC_ABIS } from '../abi' import { RecipientState } from '../constants' import { BaseParser } from './BaseParser' import { toDate } from '../date' @@ -12,14 +10,9 @@ export class RecipientAddedParser extends BaseParser { } parse(log: Log): Project { - const abiInfo = TOPIC_ABIS[this.topic0] - if (!abiInfo) { - throw new Error(`topic ${this.topic0} not found`) - } - const parser = new utils.Interface([abiInfo.abi]) - const { args } = parser.parseLog(log) + const args = this.getEventArgs(log) const id = args._recipientId - const recipientIndex = BigNumber.from(args._index).toNumber() + const recipientIndex = Number(args._index) const recipientAddress = args._recipient const addedAt = args._timestamp let metadata: any diff --git a/contracts/utils/parsers/RecipientAddedV1Parser.ts b/contracts/utils/parsers/RecipientAddedV1Parser.ts index 5334f2038..30331891c 100644 --- a/contracts/utils/parsers/RecipientAddedV1Parser.ts +++ b/contracts/utils/parsers/RecipientAddedV1Parser.ts @@ -1,7 +1,5 @@ import { Log } from '../providers/BaseProvider' import { Project } from '../types' -import { BigNumber, utils } from 'ethers' -import { TOPIC_ABIS } from '../abi' import { RecipientState } from '../constants' import { BaseParser } from './BaseParser' @@ -11,14 +9,9 @@ export class RecipientAddedV1Parser extends BaseParser { } parse(log: Log): Project { - const abiInfo = TOPIC_ABIS[this.topic0] - if (!abiInfo) { - throw new Error(`topic ${this.topic0} not found`) - } - const parser = new utils.Interface([abiInfo.abi]) - const { args } = parser.parseLog(log) + const args = this.getEventArgs(log) const id = args._recipient - const recipientIndex = BigNumber.from(args._index).toNumber() + const recipientIndex = Number(args._index) const recipientAddress = args._recipient let metadata: any let name: string diff --git a/contracts/utils/parsers/RecipientRemovedParser.ts b/contracts/utils/parsers/RecipientRemovedParser.ts index b7f557de4..f179d11e3 100644 --- a/contracts/utils/parsers/RecipientRemovedParser.ts +++ b/contracts/utils/parsers/RecipientRemovedParser.ts @@ -1,7 +1,5 @@ import { Log } from '../providers/BaseProvider' import { Project } from '../types' -import { utils } from 'ethers' -import { TOPIC_ABIS } from '../abi' import { RecipientState } from '../constants' import { BaseParser } from './BaseParser' import { toDate } from '../date' @@ -12,13 +10,7 @@ export class RecipientRemovedParser extends BaseParser { } parse(log: Log): Partial { - const abiInfo = TOPIC_ABIS[this.topic0] - if (!abiInfo) { - throw new Error(`topic ${this.topic0} not found`) - } - - const parser = new utils.Interface([abiInfo.abi]) - const { args } = parser.parseLog(log) + const args = this.getEventArgs(log) const id = args._recipientId const state = RecipientState.Removed const removedAt = toDate(args._timestamp) diff --git a/contracts/utils/parsers/RecipientRemovedV1Parser.ts b/contracts/utils/parsers/RecipientRemovedV1Parser.ts index bbc80215a..7cb37c201 100644 --- a/contracts/utils/parsers/RecipientRemovedV1Parser.ts +++ b/contracts/utils/parsers/RecipientRemovedV1Parser.ts @@ -1,7 +1,5 @@ import { Log } from '../providers/BaseProvider' import { Project } from '../types' -import { utils } from 'ethers' -import { TOPIC_ABIS } from '../abi' import { RecipientState } from '../constants' import { BaseParser } from './BaseParser' @@ -11,13 +9,7 @@ export class RecipientRemovedV1Parser extends BaseParser { } parse(log: Log): Partial { - const abiInfo = TOPIC_ABIS[this.topic0] - if (!abiInfo) { - throw new Error(`topic ${this.topic0} not found`) - } - - const parser = new utils.Interface([abiInfo.abi]) - const { args } = parser.parseLog(log) + const args = this.getEventArgs(log) const id = args._recipient const state = RecipientState.Removed diff --git a/contracts/utils/parsers/RequestResolvedParser.ts b/contracts/utils/parsers/RequestResolvedParser.ts index fbf739d67..7b55c97a4 100644 --- a/contracts/utils/parsers/RequestResolvedParser.ts +++ b/contracts/utils/parsers/RequestResolvedParser.ts @@ -1,7 +1,5 @@ import { Log } from '../providers/BaseProvider' import { Project } from '../types' -import { utils, BigNumber } from 'ethers' -import { TOPIC_ABIS } from '../abi' import { RecipientState } from '../constants' import { BaseParser } from './BaseParser' import { toDate } from '../date' @@ -12,18 +10,12 @@ export class RequestResolvedParser extends BaseParser { } parse(log: Log): Partial { - const abiInfo = TOPIC_ABIS[this.topic0] - if (!abiInfo) { - throw new Error(`topic ${this.topic0} not found`) - } - - const parser = new utils.Interface([abiInfo.abi]) - const { args } = parser.parseLog(log) + const args = this.getEventArgs(log) const id = args._recipientId const timestamp = toDate(args._timestamp) let state = - args._type === 1 ? RecipientState.Removed : RecipientState.Accepted + args._type === 1n ? RecipientState.Removed : RecipientState.Accepted if (args._rejected) { state = RecipientState.Rejected @@ -31,7 +23,7 @@ export class RequestResolvedParser extends BaseParser { const recipientIndex = state === RecipientState.Accepted - ? BigNumber.from(args._recipientIndex).toNumber() + ? Number(args._recipientIndex) : undefined const createdAt = state === RecipientState.Accepted ? timestamp : undefined const removedAt = state === RecipientState.Accepted ? undefined : timestamp diff --git a/contracts/utils/parsers/RequestSubmittedParser.ts b/contracts/utils/parsers/RequestSubmittedParser.ts index 9bd363c77..777b38fbb 100644 --- a/contracts/utils/parsers/RequestSubmittedParser.ts +++ b/contracts/utils/parsers/RequestSubmittedParser.ts @@ -1,7 +1,5 @@ import { Log } from '../providers/BaseProvider' import { Project } from '../types' -import { utils } from 'ethers' -import { TOPIC_ABIS } from '../abi' import { RecipientState } from '../constants' import { BaseParser } from './BaseParser' import { toDate } from '../date' @@ -12,17 +10,14 @@ export class RequestSubmittedParser extends BaseParser { } parse(log: Log): Partial { - const abiInfo = TOPIC_ABIS[this.topic0] - if (!abiInfo) { - throw new Error(`topic ${this.topic0} not found`) - } - const parser = new utils.Interface([abiInfo.abi]) - const { args } = parser.parseLog(log) + const args = this.getEventArgs(log) const id = args._recipientId const recipientIndex = args._index const state = - args._type === 0 ? RecipientState.Registered : RecipientState.Removed + BigInt(args._type) === BigInt(0) + ? RecipientState.Registered + : RecipientState.Removed const timestamp = toDate(args._timestamp) const createdAt = diff --git a/contracts/utils/providers/BaseProvider.ts b/contracts/utils/providers/BaseProvider.ts index 707fdc56b..3eb57d4cb 100644 --- a/contracts/utils/providers/BaseProvider.ts +++ b/contracts/utils/providers/BaseProvider.ts @@ -1,9 +1,9 @@ -import { EventFilter, Log } from '@ethersproject/abstract-provider' +import { EventFilter, Log } from 'ethers' export interface FetchLogArgs { filter: EventFilter startBlock: number - lastBlock: number + lastBlock?: number blocksPerBatch: number } diff --git a/contracts/utils/providers/EtherscanProvider.ts b/contracts/utils/providers/EtherscanProvider.ts index 9d8383532..8534156ae 100644 --- a/contracts/utils/providers/EtherscanProvider.ts +++ b/contracts/utils/providers/EtherscanProvider.ts @@ -1,20 +1,67 @@ import { BaseProvider, FetchLogArgs, Log } from './BaseProvider' -import { utils, BigNumber } from 'ethers' +import { FetchRequest } from 'ethers' +import { HardhatConfig } from 'hardhat/types' const EtherscanApiUrl: Record = { xdai: 'https://api.gnosisscan.io', arbitrum: 'https://api.arbiscan.io', 'arbitrum-goerli': 'https://api-goerli.arbiscan.io', + 'arbitrum-sepolia': 'https://api-sepolia.arbiscan.io', + optimism: 'https://api-optimistic.etherscan.io', + 'optimism-sepolia': 'https://api-sepolia-optimistic.etherscan.io', +} + +/** + * Mapping of the hardhat network name to the Etherscan network name in the hardhat.config + */ +const EtherscanNetworks: Record = { + arbitrum: 'arbitrumOne', + optimism: 'optimisticEthereum', +} + +/** + * The the Etherscan API key from the hardhat.config file + * @param config The Hardhat config object + * @param network The Hardhat network name + * @returns The Etherscan API key + */ +function getEtherscanApiKey(config: HardhatConfig, network: string): string { + let etherscanApiKey = '' + if (config.etherscan?.apiKey) { + if (typeof config.etherscan.apiKey === 'string') { + etherscanApiKey = config.etherscan.apiKey + } else { + const etherscanNetwork = EtherscanNetworks[network] ?? network + etherscanApiKey = config.etherscan.apiKey[etherscanNetwork] + } + } + + return etherscanApiKey } export class EtherscanProvider extends BaseProvider { apiKey: string network: string + baseUrl: string - constructor(apiKey: string, network: string) { + constructor(config: HardhatConfig, network: string) { super() - this.apiKey = apiKey + + const etherscanApiKey = getEtherscanApiKey(config, network) + if (!etherscanApiKey) { + throw new Error(`Etherscan API key is not found for ${network}`) + } + + const etherscanBaseUrl = EtherscanApiUrl[network] + if (!etherscanBaseUrl) { + throw new Error( + `Network ${network} is not supported in etherscan fetch log api` + ) + } + this.network = network + this.apiKey = etherscanApiKey + this.baseUrl = etherscanBaseUrl } async fetchLogs({ @@ -22,19 +69,15 @@ export class EtherscanProvider extends BaseProvider { startBlock, lastBlock, }: FetchLogArgs): Promise { - const baseUrl = EtherscanApiUrl[this.network] - if (!baseUrl) { - throw new Error( - `Network ${this.network} is not supported in etherscan fetch log api` - ) - } - const topic0 = filter.topics?.[0] || '' + const toBlockQuery = lastBlock ? `&toBlock=${lastBlock}` : '' const url = - `${baseUrl}/api?module=logs&action=getLogs&address=${filter.address}` + - `&topic0=${topic0}&fromBlock=${startBlock}&&toBlock=${lastBlock}&apikey=${this.apiKey}` + `${this.baseUrl}/api?module=logs&action=getLogs&address=${filter.address}` + + `&topic0=${topic0}&fromBlock=${startBlock}${toBlockQuery}&apikey=${this.apiKey}` - const result = await utils.fetchJson(url) + const req = new FetchRequest(url) + const resp = await req.send() + const result = resp.bodyJson if (result.status === '0' && result.message === 'No records found') { return [] @@ -45,7 +88,7 @@ export class EtherscanProvider extends BaseProvider { } return result.result.map((res: any) => ({ - blockNumber: BigNumber.from(res.blockNumber).toNumber(), + blockNumber: Number(res.blockNumber), blockHash: res.blockHash, transactionIndex: res.transactionIndex, removed: false, diff --git a/contracts/utils/providers/ProviderFactory.ts b/contracts/utils/providers/ProviderFactory.ts index 6a79ad0ec..b7c5474d2 100644 --- a/contracts/utils/providers/ProviderFactory.ts +++ b/contracts/utils/providers/ProviderFactory.ts @@ -1,17 +1,15 @@ +import { HardhatConfig } from 'hardhat/types' import { BaseProvider } from './BaseProvider' import { EtherscanProvider } from './EtherscanProvider' export type CreateProviderArgs = { network: string - etherscanApiKey: string + config: HardhatConfig } export class ProviderFactory { - static createProvider({ - network, - etherscanApiKey, - }: CreateProviderArgs): BaseProvider { + static createProvider({ network, config }: CreateProviderArgs): BaseProvider { // use etherscan provider only as JsonRpcProvider is not reliable - return new EtherscanProvider(etherscanApiKey, network) + return new EtherscanProvider(config, network) } } diff --git a/contracts/utils/testutils.ts b/contracts/utils/testutils.ts new file mode 100644 index 000000000..e5ace7da7 --- /dev/null +++ b/contracts/utils/testutils.ts @@ -0,0 +1,285 @@ +import { Signer, Contract } from 'ethers' +import { MockContract, deployMockContract } from '@clrfund/waffle-mock-contract' +import { artifacts, ethers } from 'hardhat' +import { MaciParameters } from './maciParameters' +import { PubKey } from '@clrfund/common' +import { deployContract, getEventArg, setVerifyingKeys } from './contracts' +import { HardhatEthersHelpers } from '@nomicfoundation/hardhat-ethers/types' +import { EContracts } from './types' +import { Libraries } from 'hardhat/types' +import { MACIFactory, VkRegistry } from '../typechain-types' +import { ZERO_ADDRESS } from './constants' + +/** + * Deploy a mock contract with the given contract name + * @param signer signer of the mock contract deployment + * @param name name of the contract to mock + * @returns a mock contract + */ +export async function deployMockContractByName( + name: string, + signer: Signer +): Promise { + const ContractArtifacts = await artifacts.readArtifact(name) + return deployMockContract(signer, ContractArtifacts.abi) +} + +/** + * Deploy all the poseidon contracts + * + * @param signer The signer for the deployment transaction + * @param ethers Hardhat ethers handle + * @returns the deployed poseidon contracts + */ +export async function deployPoseidonLibraries({ + signer, + ethers, +}: { + signer?: Signer + ethers: HardhatEthersHelpers +}): Promise<{ [name: string]: string }> { + const PoseidonT3Contract = await deployContract( + EContracts.PoseidonT3, + ethers, + { signer } + ) + + const PoseidonT4Contract = await deployContract( + EContracts.PoseidonT4, + ethers, + { signer } + ) + + const PoseidonT5Contract = await deployContract( + EContracts.PoseidonT5, + ethers, + { signer } + ) + + const PoseidonT6Contract = await deployContract( + EContracts.PoseidonT6, + ethers, + { + signer, + } + ) + + const libraries = { + PoseidonT3: await PoseidonT3Contract.getAddress(), + PoseidonT4: await PoseidonT4Contract.getAddress(), + PoseidonT5: await PoseidonT5Contract.getAddress(), + PoseidonT6: await PoseidonT6Contract.getAddress(), + } + return libraries +} + +/** + * Deploy an instance of MACI factory + * libraries - poseidon contracts + * ethers - hardhat ethers handle + * signer - if signer is not provided, use default signer in ethers + * @returns MACI factory contract + */ +export async function deployMaciFactory({ + libraries, + ethers, + signer, + maciParameters, + quiet, +}: { + libraries: Libraries + ethers: HardhatEthersHelpers + signer?: Signer + maciParameters: MaciParameters + quiet?: boolean +}): Promise { + const vkRegistry = await deployContract( + EContracts.VkRegistry, + ethers, + { signer, quiet } + ) + await setVerifyingKeys(vkRegistry, maciParameters) + + const verifier = await deployContract(EContracts.Verifier, ethers, { + signer, + quiet, + }) + + const pollFactory = await deployContract( + EContracts.PollFactory, + ethers, + { libraries, signer, quiet } + ) + + const tallyFactory = await deployContract( + EContracts.TallyFactory, + ethers, + { libraries, signer, quiet } + ) + + const messageProcessorFactory = await deployContract( + EContracts.MessageProcessorFactory, + ethers, + { libraries, signer, quiet } + ) + + // all the factories to deploy MACI contracts + const factories = { + pollFactory: pollFactory.target, + tallyFactory: tallyFactory.target, + // subsidy is not currently used + subsidyFactory: ZERO_ADDRESS, + messageProcessorFactory: messageProcessorFactory.target, + } + + const maciFactory = await deployContract( + EContracts.MACIFactory, + ethers, + { + args: [vkRegistry.target, factories, verifier.target], + libraries, + signer, + quiet, + } + ) + + const setTx = await maciFactory.setMaciParameters( + ...maciParameters.asContractParam() + ) + await setTx.wait() + + return maciFactory +} + +/** + * Output from the deployTestFundingRound() function + */ +export type DeployTestFundingRoundOutput = { + token: Contract + fundingRound: Contract + mockUserRegistry: MockContract + mockRecipientRegistry: MockContract + mockVerifier: MockContract + mockTally: MockContract +} + +/** + * Deploy an instance of funding round contract for testing + * @param tokenSupply initial supply for the native token + * @param coordinatorAddress the coordinator wallet address + * @param deployer singer for the contract deployment + * @returns all the deployed objects in DeployTestFundingRoundOutput + */ +export async function deployTestFundingRound( + tokenSupply: bigint, + coordinatorAddress: string, + coordinatorPubKey: PubKey, + roundDuration: number, + deployer: Signer +): Promise { + const token = await ethers.deployContract( + EContracts.AnyOldERC20Token, + [tokenSupply], + deployer + ) + + const mockUserRegistry = await deployMockContractByName( + EContracts.IUserRegistry, + deployer + ) + const mockRecipientRegistry = await deployMockContractByName( + EContracts.IRecipientRegistry, + deployer + ) + + const fundingRound = await ethers.deployContract( + EContracts.FundingRound, + [ + token.target, + mockUserRegistry.target, + mockRecipientRegistry.target, + coordinatorAddress, + ], + deployer + ) + + const libraries = await deployPoseidonLibraries({ + signer: deployer, + ethers, + }) + + const maciParameters = MaciParameters.mock() + const maciFactory = await deployMaciFactory({ + libraries, + ethers, + signer: deployer, + maciParameters, + }) + const factories = await maciFactory.factories() + const topupToken = await ethers.deployContract( + EContracts.TopupToken, + deployer + ) + const vkRegistry = await ethers.deployContract( + EContracts.VkRegistry, + deployer + ) + const mockVerifier = await deployMockContractByName( + EContracts.Verifier, + deployer + ) + const mockTally = await deployMockContractByName(EContracts.Tally, deployer) + + const maciInstance = await ethers.deployContract( + EContracts.MACI, + [ + factories.pollFactory, + factories.messageProcessorFactory, + factories.tallyFactory, + factories.subsidyFactory, + fundingRound.target, + fundingRound.target, + topupToken.target, + maciParameters.stateTreeDepth, + ], + { + signer: deployer, + libraries, + } + ) + + const deployPollTx = await maciInstance.deployPoll( + roundDuration, + maciParameters.treeDepths, + coordinatorPubKey.asContractParam(), + mockVerifier.target, + vkRegistry.target, + // pass false to not deploy the subsidy contract + false + ) + const pollAddr = await getEventArg( + deployPollTx, + maciInstance, + 'DeployPoll', + 'pollAddr' + ) + + // swap out the tally contract with with a mock for testing + const pollContracts = { + tally: await mockTally.getAddress(), + poll: pollAddr.poll, + messageProcessor: pollAddr.messageProcessor, + subsidy: pollAddr.subsidy, + } + + await fundingRound.setMaci(maciInstance.target, pollContracts) + + return { + token, + fundingRound, + mockRecipientRegistry, + mockUserRegistry, + mockVerifier, + mockTally, + } +} diff --git a/contracts/utils/types.ts b/contracts/utils/types.ts index 221063da9..a389bec65 100644 --- a/contracts/utils/types.ts +++ b/contracts/utils/types.ts @@ -1,7 +1,40 @@ -export enum recipientRegistryType { - simple = 0, - kleros = 1, - optimistic = 2, +/** + * ClrFund contracts + */ +export enum EContracts { + ClrFund = 'ClrFund', + FundingRoundFactory = 'FundingRoundFactory', + FundingRound = 'FundingRound', + MACIFactory = 'MACIFactory', + MACI = 'MACI', + Verifier = 'Verifier', + VkRegistry = 'VkRegistry', + TopupCredit = 'TopupCredit', + PollFactory = 'PollFactory', + Poll = 'Poll', + MessageProcessorFactory = 'MessageProcessorFactory', + MessageProcessor = 'MessageProcessor', + TallyFactory = 'TallyFactory', + Tally = 'Tally', + PoseidonT3 = 'PoseidonT3', + PoseidonT4 = 'PoseidonT4', + PoseidonT5 = 'PoseidonT5', + PoseidonT6 = 'PoseidonT6', + IRecipientRegistry = 'IRecipientRegistry', + SimpleRecipientRegistry = 'SimpleRecipientRegistry', + OptimisticRecipientRegistry = 'OptimisticRecipientRegistry', + KlerosGTCRAdapter = 'KlerosGTCRAdapter', + IUserRegistry = 'IUserRegistry', + SimpleUserRegistry = 'SimpleUserRegistry', + SemaphoreUserRegistry = 'SemaphoreUserRegistry', + SnapshotUserRegistry = 'SnapshotUserRegistry', + MerkleUserRegistry = 'MerkleUserRegistry', + BrightIdUserRegistry = 'BrightIdUserRegistry', + AnyOldERC20Token = 'AnyOldERC20Token', + BrightIdSponsor = 'BrightIdSponsor', + ClrFundDeployer = 'ClrFundDeployer', + ERC20 = 'ERC20', + TopupToken = 'TopupToken', } export interface Project { @@ -39,6 +72,8 @@ export interface Round { recipientRegistryAddress: string recipientDepositAmount?: string maciAddress: string + pollAddress?: string + pollId?: bigint contributorCount: number totalSpent: string matchingPoolSize: string @@ -51,6 +86,11 @@ export interface Round { nativeTokenDecimals: number startTime: number endTime: number + signUpDuration: number + votingDuration: number + messages: bigint + maxMessages: bigint + maxRecipients: bigint blogUrl?: string } @@ -66,6 +106,7 @@ export type EventType = export type AbiInfo = { type: EventType + name: string abi: string } @@ -74,12 +115,3 @@ export type RoundFileContent = { projects: Project[] tally: any } - -export type Tally = { - results: { - tally: string[] - } - totalVoiceCreditsPerVoteOption: { - tally: string[] - } -} diff --git a/docs/brightid.md b/docs/brightid.md index a942a511f..efd01636d 100644 --- a/docs/brightid.md +++ b/docs/brightid.md @@ -22,6 +22,7 @@ Available envs: | ----------- | ------- | ---------------- | | arbitrum | clrfund-arbitrum |0x669A55Dd17a2f9F4dacC37C7eeB5Ed3e13f474f9| | arbitrum rinkeby | clrfund-arbitrum-rinkeby | 0xC7c81634Dac2de4E7f2Ba407B638ff003ce4534C | +| arbitrum sepolia | clrfund-arbitrum-goerli | 0xF1ef516dEa7e6Dd334996726D58029Ee9bAD081D | | goerli | clrfund-goerli | 0xF045234A776C87060DEEc5689056455A24a59c08 | | xdai | clrfund-gnosischain |0x669A55Dd17a2f9F4dacC37C7eeB5Ed3e13f474f9| @@ -36,6 +37,7 @@ BRIGHTID_CONTEXT={CONTEXT} Note: the BrightID context is specific to the BrightID network - it's independent from the Ethereum network you choose to run the app on. It refers to the BrightID app context where you want to burn sponsorship tokens. The `Sponsor Contract` is the contract set up in the BrightID node to track the sponsorship event. +The BrightID context can be found here: https://apps.brightid.org/#nodes [Learn more about context in the BrightID docs](https://dev.brightid.org/docs/guides/ZG9jOjQxNTE1NDU-basic-integration). @@ -82,6 +84,9 @@ See the [deployment guide](./deploymnet.md) for special setup to use the sponsor ``` 4. check for sponsorship token balance - for clrfund-arbitrum context: https://brightid.clr.fund/brightid/v6/apps/clrfund-arbitrum +### Signature is not valid +1. Check that the verifier address is correct, it is the `ethSigningAddress` from https://brightid.clr.fund +2. You can update the verifier address using `sponsorContract.setSettings()` ## Resources diff --git a/docs/deploy-clrFundDeployer.md b/docs/deploy-clrFundDeployer.md new file mode 100644 index 000000000..6d34df2dd --- /dev/null +++ b/docs/deploy-clrFundDeployer.md @@ -0,0 +1,18 @@ +# Deploy the ClrFundDeployer contract + +The ClrFundDeployer contract is used to deploy `ClrFund` instances from the [ClrFund Admin](https://github.com/clrfund/clrfund-admin). + +1. Follow the steps in the [deployment guide](./deployment.md) to install the dependencies, download the zkeys, setup BrightId (if applicable), and configure the `.env` and `deploy-config.json` files in the `contracts` folder + +2. Run the deployment script + +Run the following command in the contracts folder. Make sure you backup the `deployed-contracts.json` file (if exists) as the following command will overwrite the file. + +```sh +yarn hardhat new-deployer --verify --network {network} +``` + +Use the `--verify` flag to verify the newly deployed contracts. Make sure the `etherscan` API key is setup in the hardhat.config file +Use the `--incremental` flag to resume a deployment if it was interrupted due to error. +Use the `--manage-nonce` flag to let the script manually set the nonce (as opposed to getting the nonce from the node). This is useful if using testnet public node like `optimism-sepolia` where the node may occasionally give `nonce too low` error. + diff --git a/docs/deployment.md b/docs/deployment.md index e82ec0680..5dd55a9a4 100644 --- a/docs/deployment.md +++ b/docs/deployment.md @@ -1,5 +1,18 @@ # Deploy to a network +## Install MACI dependencies + +### Install rapidsnark (if on an intel chip) + +Check the MACI doc, https://maci.pse.dev/docs/installation#install-rapidsnark-if-on-an-intel-chip, on how to install the rapidsnark. + + +### Install C++ dependencies (if on intel chip) + +``` +sudo apt-get install libgmp-dev nlohmann-json3-dev nasm g++ +``` + ## Setup BrightID If using BrightID as the user registry type: @@ -20,47 +33,73 @@ Once the app is registered, you will get an appId which will be set to `BRIGHTID ## Deploy Contracts -### Deploy the BrightID sponsor contract (if using BrightID) +Goto the `contracts` folder. -1. Run `yarn hardhat --network {network} deploy-sponsor` -2. Verify the contract by running `yarn hardhat --network arbitrum-goerli verify {contract address}` -3. Set `BRIGHTID_SPONSOR` to the contract address in the next step +### Generate the coordinator MACI private key -### Edit the `/contracts/.env` file +``` +yarn hardhat new-maci-key +``` + +Make a note of MACI private key to setup the `contracts/.env` file. + +### Edit the `contracts/.env` file E.g. ``` -RECIPIENT_REGISTRY_TYPE=simple -USER_REGISTRY_TYPE=simple JSONRPC_HTTP_URL=https://NETWORK.alchemyapi.io/v2/ADD_API_KEY WALLET_PRIVATE_KEY= -NATIVE_TOKEN_ADDRESS= -BRIGHTID_CONTEXT= -BRIGHTID_SPONSOR= +COORDINATOR_MACISK=The coordinator's private key from previous step which starts with `macisk.` +# API keys for verifying contracts, update hardhat.config for additional keys if needed +ARBISCAN_API_KEY= +``` + +### Download MACI circuit files + +The following script will download the files in the params folder under the current folder where the script is run + +``` +monorepo/.github/scripts/download-6-9-2-3.sh +``` + + +### Edit the `contracts/deploy-config.json` file + +``` +cp deploy-config-example.json deploy-config.json ``` -### Run the deploy script +Update the `VkRegistry.paramsDirectory` with the circuit parameter folder. If you ran the `monorepo/.github/scripts/download-6-9-2-3.sh` in the `contracts` folder, it should be `./params`. + + +### Run the deployment scripts +Use `yarn hardhat help` to print the command line help menu for all available commands. Note that the following steps are for deploying a standalone ClrFund instance. To deploy an instance of the ClrFundDeployer contract, please refer to the [ClrFundDeployer Deployment Guide](./deploy-clrFundDeployer.md) -1. Adjust the `/contracts/scripts/deploy.ts` as you wish. -2. Run `yarn hardhat run --network {network} scripts/deploy.ts` or use one of the `yarn deploy:{network}` available in `/contracts/package.json`. -3. Make sure to save in a safe place the serializedCoordinatorPrivKey, you are going to need it for tallying the votes in future steps. -4. To deploy a new funding round, update the .env file: +1. Deploy an instance of ClrFund ``` -# .env -# The funding round factory address -FACTORY_ADDRESS= -# The coordinator MACI private key (serializedCoordinatorPrivKey saved in step 3) -COORDINATOR_PK= -# The coordinator wallet private key -COORDINATOR_ETH_PK= +yarn hardhat new-clrfund --network ``` -5. If using a snapshot user registry, run the `set-storage-root` task to set the storage root for the block snapshot for user account verification +Notice that the file `deployed-contracts.json` is created or updated (if already exists). Make a copy of this file now in case you run the `new-clrfund` command without the --incremental flag, this file will be overwritten. You'll need this file for the `new-round` and `verify-all` commands. +2. deploy new funding round ``` -yarn hardhat --network {network} set-storage-root --registry 0x7113b39Eb26A6F0a4a5872E7F6b865c57EDB53E0 --slot 2 --token 0x65bc8dd04808d99cf8aa6749f128d55c2051edde --block 34677758 --network arbitrum-goerli +yarn hardhat new-round --network +``` + +4. To load a list of users into the simple user registry, + +``` +yarn hardhat load-simple-users --file-path addresses.txt --user-registry
--network +``` + + +If using a snapshot user registry, run the `set-storage-root` task to set the storage root for the block snapshot for user account verification + +``` +yarn hardhat set-storage-root --registry {user-registry-address} --slot 2 --token {token-address} --block 34677758 --network {network} ``` Note: to get the storage slot '--slot' value, run the `find-storage-slot` task. @@ -75,16 +114,11 @@ yarn hardhat load-merkle-users --address-file ./addresses.txt --user-registry 0x Note: Make sure to upload generated merkle tree file to IPFS. -6. Run the `newRound.ts` script to deploy a new funding round: +8. Verify all deployed contracts: +Make sure the `deployed-contracts.json` file is present as it stores contract constructor arguments used by the verify-all script. ``` -yarn hardhat run --network {network} scripts/newRound.ts -``` - -5. Verify all deployed contracts: - -``` -yarn hardhat verify-all {funding-round-factory-address} --network {network} +yarn hardhat verify-all --network {network} ``` ### Deploy the subgraph @@ -93,14 +127,19 @@ Currently, we are using the [Hosted Service](https://thegraph.com/docs/en/hosted Inside `/subgraph`: -1. Prepare the `subgraph.yaml` with the correct network data - - Update or create a new JSON file which you want to use, under `/config` - - Run `yarn prepare:{network}` -2. Build: +1. Prepare the config file + - Under the `/config` folder, create a new JSON file or update an existing one + - If you deployed a standalone ClrFund contract, use the `xdai.json` as a template to create your config file + - If you deployed a ClrFundDeployer contract, use the `deployer-arbitrum-sepolia.json` as a template +2. Prepare the `schema.graphql` file + - Run `npx mustache schema.template.graphql > schema.graphql` +2. Prepare the `subgraph.yaml` file + - Run `npx mustache subgraph.template.yaml > subgraph.yaml` +3. Build: - `yarn codegen` - `yarn build` -3. Authenticate with `yarn graph auth --product hosted-service ` -4. Deploy it by running `yarn graph deploy --product hosted-service USERNAME/SUBGRAPH` +4. Authenticate with `yarn graph auth --product hosted-service ` +5. Deploy it by running `yarn graph deploy --product hosted-service USERNAME/SUBGRAPH` ### Deploy the user interface @@ -119,7 +158,7 @@ VITE_INFURA_ID= VITE_IPFS_API_KEY= VITE_IPFS_SECRET_API_KEY= VITE_SUBGRAPH_URL= -VITE_CLRFUND_FACTORY_ADDRESS= +VITE_CLRFUND_ADDRESS= VITE_USER_REGISTRY_TYPE= VITE_BRIGHTID_CONTEXT= VITE_BRIGHTID_SPONSOR_KEY= @@ -132,6 +171,8 @@ VITE_GOOGLE_SPREADSHEET_ID= ``` +Note: if VITE_SUBGRAPH_URL is not set, the app will try to get the round information from the vue-app/src/rounds.json file which can be generated using the `hardhat export-round` command. + ##### Setup the netlify functions 1. Set the `functions directory` to `vue-app/dist/lambda`. diff --git a/docs/funding-source.md b/docs/funding-source.md index 7c0c6a8b6..f84afceed 100644 --- a/docs/funding-source.md +++ b/docs/funding-source.md @@ -2,4 +2,4 @@ The funding source is an ethereum address from which clr.fund can receive matching funding using the [allowance mechanism](https://docs.openzeppelin.com/contracts/3.x/api/token/erc20#IERC20-allowance-address-address-). It could be an externally owned account or a contract (such as DAO). -To become a funding source the address should be added to the list of funding sources by the clr.fund administrator (the owner of the FundingRoundFactory). At the end of each funding round clr.fund checks token allowance for the `FundingRoundFactory` contract address and transfers allowed amount of tokens to the matching pool. +To become a funding source the address should be added to the list of funding sources by the clr.fund administrator (the owner of the ClrFund). At the end of each funding round clr.fund checks token allowance for the `ClrFund` contract address and transfers allowed amount of tokens to the matching pool. diff --git a/docs/google-sheets.md b/docs/google-sheets.md index e16a8de5d..393963ecc 100644 --- a/docs/google-sheets.md +++ b/docs/google-sheets.md @@ -14,14 +14,15 @@ Two new env variables must be added: - create google service account (https://cloud.google.com/iam/docs/service-accounts-create) - create service account key - download the account credential file with the json string + - enable the google sheets api (https://console.cloud.google.com/apis/library/sheets.googleapis.com) - `VITE_GOOGLE_SPREADSHEET_ID`: the spreadsheet id that is going to be used - the spreadsheet id is auto-generated when you create a google spreadsheet - make sure to grant edit access to the service account - make sure the spreadsheet has a header with the following fields - |projectname |projecttagline |projectdescription |projectcategory |projectproblemSpace|fundaddressName |projectcategory |projectproblemSpace|fundaddressName |fundresolvedAddress |fundplans |teamname |teamdescription |teamemail |linksgithub |linksradicle |linkswebsite |linkstwitter |linksdiscord |imagebannerHash |imagethumbnailHash | - | ------------- | ------------- |------------- | ------------- | ------------- |------------- | ------------- | ------------- |------------- | ------------- | ------------- |------------- |------------- | ------------- |------------- | ------------- | ------------- |------------- | ------------- | ------------- |------------- | + |projectname |projecttagline |projectdescription |projectcategory |projectproblemSpace|fundaddressName |fundresolvedAddress |fundplans |teamname |teamdescription |teamemail |linksgithub |linksradicle |linkswebsite |linkstwitter |linksdiscord |imagebannerHash |imagethumbnailHash | + | ---------- | ------------- |------------- | ------------- | ------------- |------------- | ------------- | ------------- |------------- | ------------- | ------------- |------------- |------------- | ------------- |------------- | ------------- | ------------- |------------- | -- `GOOGLE_SHEET_NAME`: the sheet name, default to Raw if not defined +- `GOOGLE_SHEET_NAME`: the google sheet name, default to Sheet1 if not defined [Learn more about setting up Google authentication credentials](https://cloud.google.com/docs/authentication/getting-started). @@ -44,10 +45,10 @@ With that, you will have the lambda functions in `/.netlify/functions/{function} # Testing using curl -For example, if the netlify function is deployed on `https://clrfund-vue3.netlify.app`, +For example, if the netlify function is deployed on `https://clrfund-testnet.netlify.app`, ``` curl -H "Content-Type: application/json" \ -d '{"project": { "name": "testtest", "tagline": "blah blah"}}' \ - https://clrfund-vue3.netlify.app/.netlify/functions/recipient + https://clrfund-testnet.netlify.app/.netlify/functions/recipient ``` diff --git a/docs/howto-use-app.md b/docs/howto-use-app.md index a48935190..04c4f4e93 100644 --- a/docs/howto-use-app.md +++ b/docs/howto-use-app.md @@ -4,12 +4,12 @@ 1. ETH > For testing, - - Get Goerli ETH from [Unitap](https://unitap.app/gas-tap) - - Use the [bridge](https://bridge.arbitrum.io/?l2ChainId=421613) to convert to Arbitrum Goerli ETH + - Get Sepolia ETH from [Unitap](https://unitap.app/gas-tap) + - Use the [bridge](https://bridge.arbitrum.io/?l2ChainId=421613) to convert to Arbitrum Sepolia ETH 2. Contribution tokens - > For testing, mint the DAI tokens using the `mint()` function from the [etherscan contract page](https://goerli.arbiscan.io//address/0x65bc8dd04808d99cf8aa6749f128d55c2051edde#writeContract) with the follow inputs: + > For testing, mint the DAI tokens using the `mint()` function from the [etherscan contract page](https://sepolia.arbiscan.io//address/0x65bc8dd04808d99cf8aa6749f128d55c2051edde#writeContract) with the follow inputs: - usr (address): Your wallet address - wad (uint256): How many DAI tokens to mint, e.g. 20000000000000000000 is 20 DAI diff --git a/docs/tally-verify.md b/docs/tally-verify.md index 2ac34b7e2..9ce6bc7dd 100644 --- a/docs/tally-verify.md +++ b/docs/tally-verify.md @@ -1,247 +1,65 @@ # How to tally votes -A funding round coordinator can tally votes using the MACI CLI, Docker or clrfund scripts. +Only a funding round coordinator can tally votes. -## Using MACI CLI - -### Clone the [MACI repo](https://github.com/privacy-scaling-explorations/maci) and switch to version v0.10.1: - -``` -git clone https://github.com/privacy-scaling-explorations/maci.git -cd maci/ -git checkout v0.10.1 -``` - -Follow instructions in README.md to install necessary dependencies. - -### Download circuits parameters - -Download the [zkSNARK parameters](https://gateway.pinata.cloud/ipfs/QmbVzVWqNTjEv5S3Vvyq7NkLVkpqWuA9DGMRibZYJXKJqy) for 'batch 64' circuits into the `circuits/params/` directory. - -Change the permission of the c binaries to be executable: -``` -cd circuits/params -chmod u+x qvt32 batchUst32 -``` - -Or, run the script monorepo/.github/scripts/download-batch64-params.sh to download the parameter files. - - -The contract deployment scripts, `deploy*.ts` in the [clrfund repository](https://github.com/clrfund/monorepo/tree/develop/contracts/scripts) currently use the `batch 64` circuits, if you want to use a smaller size circuits, you can find them [here](../contracts/contracts/snarkVerifiers/README.md). You will need to update the deploy script to call `deployMaciFactory()` with your circuit and redeploy the contracts. - -``` - // e.g. to use the x32 circuits - const circuit = 'x32' // defined in contracts/utils/deployment.ts - const maciFactory = await deployMaciFactory(deployer, circuit) -``` - -### Recompile the contracts: -Compile the contracts to generate the ABI that the MACI command lines use in the next step. - -``` -cd ../contracts -npm run compileSol -``` - -### Generate coordinator key -Generate the coordinator key used to encrypt messages. The key will be used when deploying new round. - -``` -cd ../cli -node build/index.js genMaciKeypair -``` - -A single key can be used to coordinate multiple rounds. ### Tally votes -Download the logs to be fed to the `proveOnChain` step. This step is useful -especially to avoid hitting rating limiting from the node. Make sure to run this -step againts a node that has archiving enabled, e.g. could use the alchemy node: - -``` -cd ../cli -node build/index.js fetchLogs \ - --eth-provider \ - --contract \ - --start-block \ - --num-blocks-per-request \ - --output logs -``` - -Decrypt messages, tally the votes and generate proofs: - -``` -node build/index.js genProofs \ - --eth-provider \ - --contract \ - --privkey \ - --tally-file tally.json \ - --logs-file logs \ - --macistate macistate \ - --output proofs.json -``` - -The coordinator private key (`COORDINATOR_PRIVKEY`) must be in the MACI key format (starts with `macisk`). It is used to decrypt messages. - -The `genProofs` command will create two files: `proofs.json` and `tally.json`. The `proofs.json` file will be needed to run the next command, `proveOnChain`, which submits proofs to the MACI contract: - -``` -node build/index.js proveOnChain \ - --eth-provider \ - --contract \ - --eth-privkey \ - --proof-file proofs.json -``` - -The Ethereum private key (`eth-private-key`) can be any private key that controls the necessary amount of ETH to pay for gas. - -The process may take several hours. Results can be found in `tally.json` file, which must then be published via IPFS. +Install MACI dependencies (see the github action, `.github/workflows/test-scripts.yml` for all the dependencies to install) -Finally, the [CID](https://docs.ipfs.tech/concepts/content-addressing/) of tally file must be submitted to `FundingRound` contract: +Run the script monorepo/.github/scripts/download-6-9-2-3.sh to download the parameter files. -``` -await fundingRound.publishTallyHash('') -``` - -## Using Docker - -In case you are in a different OS than Linux, you can run all the previous MACI CLI commands by running the Docker image located in the MACI repo. - -**Note:** the batch 64 zkSNARK parameters have been tested using Ubuntu 22.04 + Node v16.13.2 - -### Use the docker image - -First, install [docker](https://docs.docker.com/engine/install/) and [docker-compose](https://docs.docker.com/compose/install/) - -Inside the maci repo, run: - -``` -docker-compose up -``` - -Once the container is built, in a different terminal, grab the container id: - -``` -docker container ls -``` - -Get inside the container and execute the scripts you want: - -``` -docker exec -it {CONTAINER_ID} bash - -# inside the container -cd cli/ -node build/index.js genProofs ... -``` - -## Using clrfund scripts - -### Generate coordinator key - -``` -cd contracts/ -yarn ts-node scripts/generate-key.ts -``` - -A single key can be used to coordinate multiple rounds. - -### Tally votes - -Install [zkutil](https://github.com/poma/zkutil) (see instructions in [MACI readme](https://github.com/appliedzkp/maci#get-started)). - -Switch to `contracts` directory: - -``` -cd contracts/ -``` - -Download [zkSNARK parameters](https://gateway.pinata.cloud/ipfs/QmbVzVWqNTjEv5S3Vvyq7NkLVkpqWuA9DGMRibZYJXKJqy) for 'batch 64' circuits to `snark-params` directory. Example: - -``` -ipfs get --output snark-params QmbVzVWqNTjEv5S3Vvyq7NkLVkpqWuA9DGMRibZYJXKJqy -``` - -Change the permission of the c binaries to be executable: -``` -cd snark-params -chmod u+x qvt32 batchUst32 -``` - -Or, run the script monorepo/.github/scripts/download-batch64-params.sh to download the parameter files. - - - -Set the path to downloaded parameter files and also the path to `zkutil` binary (if needed): - -``` -export NODE_CONFIG='{"snarkParamsPath": "path-to/snark-params/", "zkutil_bin": "/usr/bin/zkutil"}' -``` - -Set the following env vars in `.env`: +Set the following env vars in `/contracts/.env`: ``` # private key for decrypting messages -COORDINATOR_PK= +COORDINATOR_MACISK= # private key for interacting with contracts -COORDINATOR_ETH_PK= +WALLET_MNEMONIC= +WALLET_PRIVATE_KEY + +# credential to upload tally result to IPFS +PINATA_API_KEY= +PINATA_SECRET_API_KEY= ``` -Decrypt messages and tally the votes: +Decrypt messages, tally the votes: ``` -yarn hardhat tally --network {network} --round-address {funding-round-address} --start-block {maci-contract-start-block} +yarn hardhat tally --clrfund {CLRFUND_CONTRACT_ADDRESS} --maci-tx-hash {MACI_CREATION_TRANSACTION_HASH} --proof-dir {OUTPUT_DIR} --rapidsnark {RAPID_SNARK} --network {network} ``` -If there's error and the tally task was stopped prematurely, it can be resumed by passing 2 additional parameters, '--maci-logs' and/or '--maci-state-file', if the files were generated. - -Result will be saved to `tally.json` file, which must then be published via IPFS. - -**Using [command line](https://docs.ipfs.tech/reference/kubo/cli/#ipfs)** - +You only need to provide `--rapidsnark` if you are running the `tally` command on an intel chip. +If the `tally` script failed, you can rerun the command with the same parameters. ``` -# start ipfs daemon in one terminal -ipfs daemon -# in a diff terminal, go to `/contracts` (or where you have the file) and publish the file -ipfs add tally.json -``` +Result will be saved to `{OUTPUT_DIR}/{network}-{fundingRoundAddress}/tally.json` file, which is also available on IPFS at `https://{ipfs-gateway-host}/ipfs/{tally-hash}`. ### Finalize round Make sure you have the following env vars in `.env`. Ignore this if you are running a local test round in `localhost`, the script will know these values itself. ``` -FACTORY_ADDRESS= -COORDINATOR_ETH_PK= +# private key of the owner of the clrfund contract for interacting with the contract +WALLET_MNEMONIC= +WALLET_PRIVATE_KEY= ``` Once you have the `tally.json` from the tally script, run: ``` -yarn hardhat run --network {network} scripts/finalize.ts +yarn hardhat finalize --clrfund {CLRFUND_CONTRACT_ADDRESS} --proof-dir {OUTPUT_DIR} --network {network} ``` # How to verify the tally results -Anyone can verify the tally results using the MACI cli or clrfund scripts. - -### Using MACI CLI - -Follow the steps in tallying votes to get the MACI cli, circuit parameters, and tally file, and verify using the following command: - -``` -node build/index.js verify -t tally.json -``` - -### Using clrfund scripts +Anyone can verify the tally results in the tally.json. From the clrfund contracts folder, run the following command to verify the result: ``` -yarn ts-node scripts/verify.ts tally.json +yarn hardhat verify-tally-file --tally-file {tally.json} --network {network} ``` # How to enable the leaderboard view @@ -254,7 +72,7 @@ After finalizing the round, enable the leaderboard view in the vue-app by export ```sh cd contracts -yarn hardhat export-round --output-dir ../vue-app/src/rounds --network --round-address --operator --start-block --ipfs +yarn hardhat export-round --output-dir ../vue-app/src/rounds --network {network} --round-address {round_address} --operator {operator} --start-block {recipient-registry-start-block} --ipfs {ipfs-gateway-url} ``` 3) Build and deploy the app @@ -263,3 +81,12 @@ yarn hardhat export-round --output-dir ../vue-app/src/rounds --network ## Troubleshooting If you encountered `core dumped` while running the genProofs script as seen in this [issue](https://github.com/clrfund/monorepo/issues/383), make sure the files are not corrupted due to disk space issue, e.g. check file sizes, checksum, and missing files. + +Also, lack of memory can also cause `core dump`, try to work around it by setting `max-old-space-size` before rrunning the tally script. +``` +export NODE_OPTIONS=--max-old-space-size=4096 +``` + +If you notice `Error at message index 0 - failed decryption due to either wrong encryption public key or corrupted ciphertext` while running the tally script, don't worry, it's just a warning. This issue is tracked [here](https://github.com/privacy-scaling-explorations/maci/issues/1134) + +`Error at message index n - invalid nonce` is also a warning, not an error. This error occurs when users reallocated their contribution. diff --git a/docs/trusted-setup.md b/docs/trusted-setup.md deleted file mode 100644 index 3c3be55f8..000000000 --- a/docs/trusted-setup.md +++ /dev/null @@ -1,107 +0,0 @@ -# Trusted Setup - -## How to verify the correctness of execution? - -### Verify using MACI CLI - -Clone the [MACI repo](https://github.com/appliedzkp/maci/) and switch to version v0.10.1: - -``` -git clone https://github.com/appliedzkp/maci.git -cd maci/ -git checkout v0.10.1 -``` - -Follow instructions in README.md to install necessary dependencies. - -### x32 Circuits - -Download [zkSNARK parameters](https://gateway.pinata.cloud/ipfs/QmWSxPBNYDtsK23KwYdMtcDaJg3gWS3LBsqMnENrVG6nmc) for 'x32' circuits into `circuits/params/` directory and rebuild the keys: - -``` -cd circuits -./scripts/buildSnarks32.sh -``` - -To recompile all the params (with Linux): - -``` -# install deps -sudo apt-get install build-essential libgmp-dev libsodium-dev nasm git - -# remove everything from the /params folder -rm -r circuits/params/* - -# recompile binaries (takes time: ~5min to ~10min) -cd circuits -./scripts/buildSnarks32.sh -``` - -Recompile the contracts: - -``` -cd ../contracts -npm run compileSol -``` - -Download the logs: - -``` -cd cli -node build/index.js fetchLogs \ - --eth-provider \ - --contract \ - --start-block \ - --num-blocks-per-request \ - --output logs -``` - -Generate proofs: - -``` -node build/index.js genProofs \ - --eth-provider \ - --contract \ - --privkey \ - --output proofs.json \ - --tally-file tally.json -``` - -Download the tally file and verify it: - -``` -cd ../cli -node build/index.js verify -t tally.json -``` - -### Verify using clrfund scripts - -Switch to `contracts` directory: - -``` -cd contracts/ -``` - -Download [zkSNARK parameters](https://gateway.pinata.cloud/ipfs/QmRzp3vkFPNHPpXiu7iKpPqVnZB97wq7gyih2mp6pa5bmD) for 'medium' circuits to `snark-params` directory. Example: - -``` -ipfs get --output snark-params QmRzp3vkFPNHPpXiu7iKpPqVnZB97wq7gyih2mp6pa5bmD -``` - -Or download [zkSNARK parameters](https://gateway.pinata.cloud/ipfs/QmWSxPBNYDtsK23KwYdMtcDaJg3gWS3LBsqMnENrVG6nmc) for 'x32' circuits to `snark-params` directory. Example: - -``` -ipfs get --output snark-params QmWSxPBNYDtsK23KwYdMtcDaJg3gWS3LBsqMnENrVG6nmc -``` - -Set the path to downloaded parameter files: - -``` -export NODE_CONFIG='{"snarkParamsPath": "../../../contracts/snark-params/"}' -``` - -Verify: - -``` -yarn ts-node scripts/verify.ts tally.json -``` diff --git a/maci-utils/.gitignore b/maci-utils/.gitignore deleted file mode 100644 index e3fbd9833..000000000 --- a/maci-utils/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -build -node_modules diff --git a/maci-utils/README.md b/maci-utils/README.md deleted file mode 100644 index 86a2f4b0f..000000000 --- a/maci-utils/README.md +++ /dev/null @@ -1 +0,0 @@ -# clr.fund utility functions that interact with MACI diff --git a/maci-utils/package.json b/maci-utils/package.json deleted file mode 100644 index db7200c70..000000000 --- a/maci-utils/package.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "name": "@clrfund/maci-utils", - "version": "0.0.1", - "description": "Utility functions to interact with the MACI library", - "main": "src/index", - "scripts": { - "build": "tsc", - "lint": "eslint 'src/**/*.ts'", - "clean": "rm -rf build" - }, - "keywords": [ - "MACI" - ], - "license": "GPL-3.0", - "dependencies": { - "maci-crypto": "npm:@clrfund/maci-crypto@0.10.2", - "maci-domainobjs": "npm:@clrfund/maci-domainobjs@0.10.2" - }, - "devDependencies": { - "eslint": "^8.31.0", - "typescript": "^4.9.3" - } -} diff --git a/maci-utils/src/index.ts b/maci-utils/src/index.ts deleted file mode 100644 index 5363e7832..000000000 --- a/maci-utils/src/index.ts +++ /dev/null @@ -1,3 +0,0 @@ -export * from './tally' -export * from './utils' -export * from './keypair' diff --git a/maci-utils/src/utils.ts b/maci-utils/src/utils.ts deleted file mode 100644 index e80745dce..000000000 --- a/maci-utils/src/utils.ts +++ /dev/null @@ -1,111 +0,0 @@ -import { BigNumber } from 'ethers' -import { genRandomSalt, IncrementalQuinTree, hash5 } from 'maci-crypto' -import { PubKey, Command, Message } from 'maci-domainobjs' -import { Keypair } from './keypair' -import { utils } from 'ethers' -import { Tally } from './tally' - -const LEAVES_PER_NODE = 5 - -declare type PathElements = bigint[][] -declare type Indices = number[] -declare type Leaf = bigint - -interface MerkleProof { - pathElements: PathElements - indices: Indices - depth: number - /* eslint-disable-next-line @typescript-eslint/ban-types */ - root: BigInt - leaf: Leaf -} - -export function bnSqrt(a: BigNumber): BigNumber { - // Take square root from a big number - // https://stackoverflow.com/a/52468569/1868395 - if (a.isZero()) { - return a - } - let x - let x1 = a.div(2) - do { - x = x1 - x1 = x.add(a.div(x)).div(2) - } while (!x.eq(x1)) - return x -} - -export function createMessage( - userStateIndex: number, - userKeypair: Keypair, - newUserKeypair: Keypair | null, - coordinatorPubKey: PubKey, - voteOptionIndex: number | null, - voiceCredits: BigNumber | null, - nonce: number, - salt?: bigint -): [Message, PubKey] { - const encKeypair = newUserKeypair ? newUserKeypair : userKeypair - if (!salt) { - salt = genRandomSalt() as bigint - } - - const quadraticVoteWeight = voiceCredits - ? bnSqrt(voiceCredits) - : BigNumber.from(0) - - const command = new Command( - BigInt(userStateIndex), - encKeypair.pubKey, - BigInt(voteOptionIndex || 0), - BigInt(quadraticVoteWeight.toString()), - BigInt(nonce), - salt - ) - const signature = command.sign(userKeypair.privKey) - const message = command.encrypt( - signature, - Keypair.genEcdhSharedKey(encKeypair.privKey, coordinatorPubKey) - ) - return [message, encKeypair.pubKey] -} - -export function getRecipientClaimData( - recipientIndex: number, - recipientTreeDepth: number, - tally: Tally -): any[] { - // Create proof for total amount of spent voice credits - const spent = tally.totalVoiceCreditsPerVoteOption.tally[recipientIndex] - const spentSalt = tally.totalVoiceCreditsPerVoteOption.salt - const spentTree = new IncrementalQuinTree( - recipientTreeDepth, - BigInt(0), - LEAVES_PER_NODE, - hash5 - ) - for (const leaf of tally.totalVoiceCreditsPerVoteOption.tally) { - spentTree.insert(BigInt(leaf)) - } - const spentProof: MerkleProof = spentTree.genMerklePath(recipientIndex) - - return [ - recipientIndex, - spent, - spentProof.pathElements.map((x) => x.map((y) => y.toString())), - spentSalt, - ] -} - -/** - * get the id of the subgraph public key entity from the pubKey value - * @param pubKey MACI public key - * @returns the id for the subgraph public key entity - */ -export function getPubKeyId(pubKey: PubKey): string { - const pubKeyPair = pubKey.asContractParam() - const id = utils.id(pubKeyPair.x + '.' + pubKeyPair.y) - return id -} - -export { Message, Command, IncrementalQuinTree, hash5, LEAVES_PER_NODE } diff --git a/maci-utils/tsconfig.json b/maci-utils/tsconfig.json deleted file mode 100644 index 957cdc1a2..000000000 --- a/maci-utils/tsconfig.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "compilerOptions": { - "skipLibCheck": true, - "experimentalDecorators": true, - "alwaysStrict": true, - "noImplicitAny": false, - "forceConsistentCasingInFileNames": true, - "noUnusedLocals": false, - "noUnusedParameters": false, - "noImplicitReturns": true, - "noFallthroughCasesInSwitch": true, - "sourceMap": true, - "strict": true, - "outDir": "./build", - "target": "es2018", - "esModuleInterop": true, - "module": "commonjs", - "declaration": true - }, - "exclude": ["node_modules/**"], - "include": ["./src"] -} diff --git a/package.json b/package.json index 1f9757ac3..072d15e02 100644 --- a/package.json +++ b/package.json @@ -7,12 +7,21 @@ "packages": [ "common", "contracts", - "maci-utils", "vue-app", "subgraph" ], "nohoist": [ - "**/@nomiclabs/**" + "**/@nomiclabs/**", + "**/snarkjs/**", + "**/snarkjs", + "**/maci-core/**", + "**/maci-core", + "**/maci-circuits/**", + "**/maci-circuits", + "**/maci-cli/**", + "**/maci-cli", + "**/maci-contracts/**", + "**/maci-contracts" ] }, "lint-staged": { @@ -26,7 +35,6 @@ "build:web": "yarn workspace @clrfund/vue-app run build", "build:subgraph": "yarn workspace @clrfund/subgraph run codegen && yarn workspace @clrfund/subgraph run build", "start:dev": "yarn deploy:local && yarn start:subgraph && yarn start:web", - "start:registry": "yarn deploy:local-registry && yarn start:subgraph && yarn start:web", "start:node": "yarn workspace @clrfund/contracts run node", "start:web": "yarn workspace @clrfund/vue-app run serve", "start:subgraph": "yarn workspace @clrfund/subgraph run prepare:hardhat && yarn build:subgraph && yarn deploy:local-subgraph", @@ -37,11 +45,8 @@ "test:format": "yarn prettier --check", "test:lint-i18n": "echo yarn workspace @clrfund/vue-app run test:lint-i18n --ci", "deploy:subgraph": "yarn workspace @clrfund/subgraph run deploy", - "deploy:local": "yarn deploy:local-registry && yarn deploy:local-round", - "deploy:local-registry": "yarn workspace @clrfund/contracts run deploy:local", - "deploy:local-round": "yarn workspace @clrfund/contracts run deployTestRound:local", + "deploy:local": "yarn workspace @clrfund/contracts run deploy:local", "deploy:local-subgraph": "yarn workspace @clrfund/subgraph run create-local && yarn workspace @clrfund/subgraph run deploy-local", - "upgrade:local": "yarn workspace @clrfund/contracts run upgrade:local", "lint": "yarn workspaces run lint", "lint:contracts": "yarn workspace @clrfund/contracts run lint", "lint:web": "yarn workspace @clrfund/vue-app run lint", @@ -53,7 +58,7 @@ "devDependencies": { "husky": "^6.0.0", "lint-staged": "^11.0.0", - "prettier": "^2.8.0", + "prettier": "3.0.3", "typechain": "^3.0.0" } } diff --git a/subgraph/abis/FundingRoundFactory.json b/subgraph/abis/ClrFund.json similarity index 51% rename from subgraph/abis/FundingRoundFactory.json rename to subgraph/abis/ClrFund.json index b56cf93eb..30e4badb0 100644 --- a/subgraph/abis/FundingRoundFactory.json +++ b/subgraph/abis/ClrFund.json @@ -1,14 +1,76 @@ [ { + "inputs": [], + "name": "AlreadyFinalized", + "type": "error" + }, + { + "inputs": [], + "name": "FundingSourceAlreadyAdded", + "type": "error" + }, + { + "inputs": [], + "name": "FundingSourceNotFound", + "type": "error" + }, + { + "inputs": [], + "name": "InvalidFundingRoundFactory", + "type": "error" + }, + { + "inputs": [], + "name": "InvalidMaciFactory", + "type": "error" + }, + { + "inputs": [], + "name": "NoCurrentRound", + "type": "error" + }, + { + "inputs": [], + "name": "NotAuthorized", + "type": "error" + }, + { + "inputs": [], + "name": "NotFinalized", + "type": "error" + }, + { + "inputs": [], + "name": "NotInitialized", + "type": "error" + }, + { + "inputs": [], + "name": "NotOwnerOfMaciFactory", + "type": "error" + }, + { + "inputs": [], + "name": "RecipientRegistryNotSet", + "type": "error" + }, + { + "inputs": [], + "name": "VoteOptionTreeDepthNotSet", + "type": "error" + }, + { + "anonymous": false, "inputs": [ { - "internalType": "contract MACIFactory", - "name": "_maciFactory", + "indexed": false, + "internalType": "address", + "name": "_coordinator", "type": "address" } ], - "stateMutability": "nonpayable", - "type": "constructor" + "name": "CoordinatorChanged", + "type": "event" }, { "anonymous": false, @@ -16,11 +78,24 @@ { "indexed": false, "internalType": "address", - "name": "_coordinator", + "name": "_roundFactory", "type": "address" } ], - "name": "CoordinatorChanged", + "name": "FundingRoundFactoryChanged", + "type": "event" + }, + { + "anonymous": false, + "inputs": [ + { + "indexed": false, + "internalType": "address", + "name": "_template", + "type": "address" + } + ], + "name": "FundingRoundTemplateChanged", "type": "event" }, { @@ -49,6 +124,25 @@ "name": "FundingSourceRemoved", "type": "event" }, + { + "anonymous": false, + "inputs": [], + "name": "Initialized", + "type": "event" + }, + { + "anonymous": false, + "inputs": [ + { + "indexed": false, + "internalType": "address", + "name": "_maciFactory", + "type": "address" + } + ], + "name": "MaciFactoryChanged", + "type": "event" + }, { "anonymous": false, "inputs": [ @@ -68,6 +162,19 @@ "name": "OwnershipTransferred", "type": "event" }, + { + "anonymous": false, + "inputs": [ + { + "indexed": false, + "internalType": "address", + "name": "_recipientRegistry", + "type": "address" + } + ], + "name": "RecipientRegistryChanged", + "type": "event" + }, { "anonymous": false, "inputs": [ @@ -107,9 +214,39 @@ "name": "TokenChanged", "type": "event" }, + { + "anonymous": false, + "inputs": [ + { + "indexed": false, + "internalType": "address", + "name": "_userRegistry", + "type": "address" + } + ], + "name": "UserRegistryChanged", + "type": "event" + }, + { + "inputs": [], + "name": "MESSAGE_DATA_LENGTH", + "outputs": [ + { + "internalType": "uint8", + "name": "", + "type": "uint8" + } + ], + "stateMutability": "view", + "type": "function" + }, { "inputs": [ - { "internalType": "address", "name": "_source", "type": "address" } + { + "internalType": "address", + "name": "_source", + "type": "address" + } ], "name": "addFundingSource", "outputs": [], @@ -126,7 +263,13 @@ { "inputs": [], "name": "coordinator", - "outputs": [{ "internalType": "address", "name": "", "type": "address" }], + "outputs": [ + { + "internalType": "address", + "name": "", + "type": "address" + } + ], "stateMutability": "view", "type": "function" }, @@ -134,8 +277,16 @@ "inputs": [], "name": "coordinatorPubKey", "outputs": [ - { "internalType": "uint256", "name": "x", "type": "uint256" }, - { "internalType": "uint256", "name": "y", "type": "uint256" } + { + "internalType": "uint256", + "name": "x", + "type": "uint256" + }, + { + "internalType": "uint256", + "name": "y", + "type": "uint256" + } ], "stateMutability": "view", "type": "function" @@ -148,7 +299,13 @@ "type": "function" }, { - "inputs": [], + "inputs": [ + { + "internalType": "uint256", + "name": "duration", + "type": "uint256" + } + ], "name": "deployNewRound", "outputs": [], "stateMutability": "nonpayable", @@ -159,7 +316,7 @@ "name": "getCurrentRound", "outputs": [ { - "internalType": "contract FundingRound", + "internalType": "contract IFundingRound", "name": "_currentRound", "type": "address" } @@ -169,18 +326,63 @@ }, { "inputs": [ - { "internalType": "contract ERC20", "name": "token", "type": "address" } + { + "internalType": "contract ERC20", + "name": "token", + "type": "address" + } ], "name": "getMatchingFunds", - "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], + "outputs": [ + { + "internalType": "uint256", + "name": "", + "type": "uint256" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [], + "name": "getMaxRecipients", + "outputs": [ + { + "internalType": "uint256", + "name": "_maxRecipients", + "type": "uint256" + } + ], "stateMutability": "view", "type": "function" }, + { + "inputs": [ + { + "internalType": "address", + "name": "_maciFactory", + "type": "address" + }, + { + "internalType": "address", + "name": "_roundFactory", + "type": "address" + } + ], + "name": "init", + "outputs": [], + "stateMutability": "nonpayable", + "type": "function" + }, { "inputs": [], "name": "maciFactory", "outputs": [ - { "internalType": "contract MACIFactory", "name": "", "type": "address" } + { + "internalType": "contract IMACIFactory", + "name": "", + "type": "address" + } ], "stateMutability": "view", "type": "function" @@ -189,7 +391,11 @@ "inputs": [], "name": "nativeToken", "outputs": [ - { "internalType": "contract ERC20", "name": "", "type": "address" } + { + "internalType": "contract ERC20", + "name": "", + "type": "address" + } ], "stateMutability": "view", "type": "function" @@ -197,7 +403,13 @@ { "inputs": [], "name": "owner", - "outputs": [{ "internalType": "address", "name": "", "type": "address" }], + "outputs": [ + { + "internalType": "address", + "name": "", + "type": "address" + } + ], "stateMutability": "view", "type": "function" }, @@ -216,7 +428,11 @@ }, { "inputs": [ - { "internalType": "address", "name": "_source", "type": "address" } + { + "internalType": "address", + "name": "_source", + "type": "address" + } ], "name": "removeFundingSource", "outputs": [], @@ -230,15 +446,40 @@ "stateMutability": "nonpayable", "type": "function" }, + { + "inputs": [], + "name": "roundFactory", + "outputs": [ + { + "internalType": "contract IFundingRoundFactory", + "name": "", + "type": "address" + } + ], + "stateMutability": "view", + "type": "function" + }, { "inputs": [ - { "internalType": "address", "name": "_coordinator", "type": "address" }, + { + "internalType": "address", + "name": "_coordinator", + "type": "address" + }, { "components": [ - { "internalType": "uint256", "name": "x", "type": "uint256" }, - { "internalType": "uint256", "name": "y", "type": "uint256" } + { + "internalType": "uint256", + "name": "x", + "type": "uint256" + }, + { + "internalType": "uint256", + "name": "y", + "type": "uint256" + } ], - "internalType": "struct MACISharedObjs.PubKey", + "internalType": "struct DomainObjs.PubKey", "name": "_coordinatorPubKey", "type": "tuple" } @@ -250,37 +491,26 @@ }, { "inputs": [ - { "internalType": "uint8", "name": "_stateTreeDepth", "type": "uint8" }, - { "internalType": "uint8", "name": "_messageTreeDepth", "type": "uint8" }, - { - "internalType": "uint8", - "name": "_voteOptionTreeDepth", - "type": "uint8" - }, - { "internalType": "uint8", "name": "_tallyBatchSize", "type": "uint8" }, - { "internalType": "uint8", "name": "_messageBatchSize", "type": "uint8" }, { - "internalType": "contract SnarkVerifier", - "name": "_batchUstVerifier", + "internalType": "address", + "name": "_roundFactory", "type": "address" - }, + } + ], + "name": "setFundingRoundFactory", + "outputs": [], + "stateMutability": "nonpayable", + "type": "function" + }, + { + "inputs": [ { - "internalType": "contract SnarkVerifier", - "name": "_qvtVerifier", + "internalType": "address", + "name": "_maciFactory", "type": "address" - }, - { - "internalType": "uint256", - "name": "_signUpDuration", - "type": "uint256" - }, - { - "internalType": "uint256", - "name": "_votingDuration", - "type": "uint256" } ], - "name": "setMaciParameters", + "name": "setMaciFactory", "outputs": [], "stateMutability": "nonpayable", "type": "function" @@ -300,7 +530,11 @@ }, { "inputs": [ - { "internalType": "address", "name": "_token", "type": "address" } + { + "internalType": "address", + "name": "_token", + "type": "address" + } ], "name": "setToken", "outputs": [], @@ -322,11 +556,25 @@ }, { "inputs": [ - { "internalType": "uint256", "name": "_totalSpent", "type": "uint256" }, + { + "internalType": "uint256", + "name": "_totalSpent", + "type": "uint256" + }, { "internalType": "uint256", "name": "_totalSpentSalt", "type": "uint256" + }, + { + "internalType": "uint256", + "name": "_newResultCommitment", + "type": "uint256" + }, + { + "internalType": "uint256", + "name": "_perVOSpentVoiceCreditsHash", + "type": "uint256" } ], "name": "transferMatchingFunds", @@ -336,7 +584,11 @@ }, { "inputs": [ - { "internalType": "address", "name": "newOwner", "type": "address" } + { + "internalType": "address", + "name": "newOwner", + "type": "address" + } ], "name": "transferOwnership", "outputs": [], diff --git a/subgraph/abis/ClrFundDeployer.json b/subgraph/abis/ClrFundDeployer.json new file mode 100644 index 000000000..68b32d168 --- /dev/null +++ b/subgraph/abis/ClrFundDeployer.json @@ -0,0 +1,237 @@ +[ + { + "inputs": [ + { + "internalType": "address", + "name": "_clrfundTemplate", + "type": "address" + }, + { + "internalType": "address", + "name": "_maciFactory", + "type": "address" + }, + { + "internalType": "address", + "name": "_roundFactory", + "type": "address" + } + ], + "stateMutability": "nonpayable", + "type": "constructor" + }, + { + "inputs": [], + "name": "ClrFundAlreadyRegistered", + "type": "error" + }, + { + "inputs": [], + "name": "InvalidClrFundTemplate", + "type": "error" + }, + { + "inputs": [], + "name": "InvalidFundingRoundFactory", + "type": "error" + }, + { + "inputs": [], + "name": "InvalidMaciFactory", + "type": "error" + }, + { + "anonymous": false, + "inputs": [ + { + "indexed": false, + "internalType": "address", + "name": "newTemplate", + "type": "address" + } + ], + "name": "NewClrfundTemplate", + "type": "event" + }, + { + "anonymous": false, + "inputs": [ + { + "indexed": false, + "internalType": "address", + "name": "newTemplate", + "type": "address" + } + ], + "name": "NewFundingRoundTemplate", + "type": "event" + }, + { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "internalType": "address", + "name": "clrfund", + "type": "address" + } + ], + "name": "NewInstance", + "type": "event" + }, + { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "internalType": "address", + "name": "previousOwner", + "type": "address" + }, + { + "indexed": true, + "internalType": "address", + "name": "newOwner", + "type": "address" + } + ], + "name": "OwnershipTransferred", + "type": "event" + }, + { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "internalType": "address", + "name": "clrfund", + "type": "address" + }, + { + "indexed": false, + "internalType": "string", + "name": "metadata", + "type": "string" + } + ], + "name": "Register", + "type": "event" + }, + { + "inputs": [], + "name": "clrfundTemplate", + "outputs": [ + { + "internalType": "address", + "name": "", + "type": "address" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [ + { + "internalType": "address", + "name": "", + "type": "address" + } + ], + "name": "clrfunds", + "outputs": [ + { + "internalType": "bool", + "name": "", + "type": "bool" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [], + "name": "deployClrFund", + "outputs": [ + { + "internalType": "address", + "name": "", + "type": "address" + } + ], + "stateMutability": "nonpayable", + "type": "function" + }, + { + "inputs": [], + "name": "maciFactory", + "outputs": [ + { + "internalType": "address", + "name": "", + "type": "address" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [], + "name": "owner", + "outputs": [ + { + "internalType": "address", + "name": "", + "type": "address" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [], + "name": "renounceOwnership", + "outputs": [], + "stateMutability": "nonpayable", + "type": "function" + }, + { + "inputs": [], + "name": "roundFactory", + "outputs": [ + { + "internalType": "address", + "name": "", + "type": "address" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [ + { + "internalType": "address", + "name": "_clrfundTemplate", + "type": "address" + } + ], + "name": "setClrFundTemplate", + "outputs": [], + "stateMutability": "nonpayable", + "type": "function" + }, + { + "inputs": [ + { + "internalType": "address", + "name": "newOwner", + "type": "address" + } + ], + "name": "transferOwnership", + "outputs": [], + "stateMutability": "nonpayable", + "type": "function" + } +] diff --git a/subgraph/abis/FundingRound.json b/subgraph/abis/FundingRound.json index 9f603757e..7bfd15417 100644 --- a/subgraph/abis/FundingRound.json +++ b/subgraph/abis/FundingRound.json @@ -25,6 +25,223 @@ "stateMutability": "nonpayable", "type": "constructor" }, + { + "inputs": [], + "name": "AlreadyContributed", + "type": "error" + }, + { + "inputs": [], + "name": "ContributionAmountIsZero", + "type": "error" + }, + { + "inputs": [], + "name": "ContributionAmountTooLarge", + "type": "error" + }, + { + "inputs": [], + "name": "EmptyTallyHash", + "type": "error" + }, + { + "inputs": [], + "name": "FundsAlreadyClaimed", + "type": "error" + }, + { + "inputs": [ + { + "internalType": "uint256", + "name": "total", + "type": "uint256" + }, + { + "internalType": "uint256", + "name": "actual", + "type": "uint256" + } + ], + "name": "IncompleteTallyResults", + "type": "error" + }, + { + "inputs": [], + "name": "IncorrectPerVOSpentVoiceCredits", + "type": "error" + }, + { + "inputs": [], + "name": "IncorrectSpentVoiceCredits", + "type": "error" + }, + { + "inputs": [], + "name": "IncorrectTallyResult", + "type": "error" + }, + { + "inputs": [], + "name": "InvalidBudget", + "type": "error" + }, + { + "inputs": [], + "name": "InvalidCoordinator", + "type": "error" + }, + { + "inputs": [], + "name": "InvalidMaci", + "type": "error" + }, + { + "inputs": [], + "name": "InvalidMessageProcessor", + "type": "error" + }, + { + "inputs": [], + "name": "InvalidNativeToken", + "type": "error" + }, + { + "inputs": [], + "name": "InvalidPoll", + "type": "error" + }, + { + "inputs": [], + "name": "InvalidRecipientRegistry", + "type": "error" + }, + { + "inputs": [], + "name": "InvalidTally", + "type": "error" + }, + { + "inputs": [], + "name": "InvalidUserRegistry", + "type": "error" + }, + { + "inputs": [], + "name": "MaciAlreadySet", + "type": "error" + }, + { + "inputs": [], + "name": "MaciNotSet", + "type": "error" + }, + { + "inputs": [], + "name": "NoProjectHasMoreThanOneVote", + "type": "error" + }, + { + "inputs": [], + "name": "NoVoiceCredits", + "type": "error" + }, + { + "inputs": [], + "name": "NoVotes", + "type": "error" + }, + { + "inputs": [], + "name": "NotCoordinator", + "type": "error" + }, + { + "inputs": [], + "name": "NothingToWithdraw", + "type": "error" + }, + { + "inputs": [], + "name": "OnlyMaciCanRegisterVoters", + "type": "error" + }, + { + "inputs": [], + "name": "PollNotSet", + "type": "error" + }, + { + "inputs": [], + "name": "RoundAlreadyFinalized", + "type": "error" + }, + { + "inputs": [], + "name": "RoundCancelled", + "type": "error" + }, + { + "inputs": [], + "name": "RoundNotCancelled", + "type": "error" + }, + { + "inputs": [], + "name": "RoundNotFinalized", + "type": "error" + }, + { + "inputs": [], + "name": "TallyHashNotPublished", + "type": "error" + }, + { + "inputs": [ + { + "internalType": "address", + "name": "expected", + "type": "address" + }, + { + "internalType": "address", + "name": "actual", + "type": "address" + } + ], + "name": "UnexpectedPollAddress", + "type": "error" + }, + { + "inputs": [], + "name": "UserAlreadyRegistered", + "type": "error" + }, + { + "inputs": [], + "name": "UserHasNotContributed", + "type": "error" + }, + { + "inputs": [], + "name": "UserNotVerified", + "type": "error" + }, + { + "inputs": [], + "name": "VoteResultsAlreadyVerified", + "type": "error" + }, + { + "inputs": [], + "name": "VotesNotTallied", + "type": "error" + }, + { + "inputs": [], + "name": "VotingPeriodNotPassed", + "type": "error" + }, { "anonymous": false, "inputs": [ @@ -101,6 +318,19 @@ "name": "OwnershipTransferred", "type": "event" }, + { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "internalType": "address", + "name": "_poll", + "type": "address" + } + ], + "name": "PollSet", + "type": "event" + }, { "anonymous": false, "inputs": [ @@ -114,6 +344,38 @@ "name": "TallyPublished", "type": "event" }, + { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "internalType": "uint256", + "name": "_voteOptionIndex", + "type": "uint256" + }, + { + "indexed": false, + "internalType": "uint256", + "name": "_tally", + "type": "uint256" + } + ], + "name": "TallyResultsAdded", + "type": "event" + }, + { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "internalType": "address", + "name": "_tally", + "type": "address" + } + ], + "name": "TallySet", + "type": "event" + }, { "anonymous": false, "inputs": [ @@ -127,6 +389,74 @@ "name": "Voted", "type": "event" }, + { + "inputs": [], + "name": "MESSAGE_DATA_LENGTH", + "outputs": [ + { + "internalType": "uint8", + "name": "", + "type": "uint8" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [], + "name": "TREE_ARITY", + "outputs": [ + { + "internalType": "uint256", + "name": "", + "type": "uint256" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [], + "name": "alpha", + "outputs": [ + { + "internalType": "uint256", + "name": "", + "type": "uint256" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [ + { + "internalType": "uint256", + "name": "_budget", + "type": "uint256" + }, + { + "internalType": "uint256", + "name": "_totalVotesSquares", + "type": "uint256" + }, + { + "internalType": "uint256", + "name": "_totalSpent", + "type": "uint256" + } + ], + "name": "calcAlpha", + "outputs": [ + { + "internalType": "uint256", + "name": "_alpha", + "type": "uint256" + } + ], + "stateMutability": "view", + "type": "function" + }, { "inputs": [], "name": "cancel", @@ -134,6 +464,44 @@ "stateMutability": "nonpayable", "type": "function" }, + { + "inputs": [ + { + "internalType": "uint256", + "name": "_voteOptionIndex", + "type": "uint256" + }, + { + "internalType": "uint256", + "name": "_spent", + "type": "uint256" + }, + { + "internalType": "uint256[][]", + "name": "_spentProof", + "type": "uint256[][]" + }, + { + "internalType": "uint256", + "name": "_spentSalt", + "type": "uint256" + }, + { + "internalType": "uint256", + "name": "_resultsCommitment", + "type": "uint256" + }, + { + "internalType": "uint256", + "name": "_spentVoiceCreditsCommitment", + "type": "uint256" + } + ], + "name": "claimFunds", + "outputs": [], + "stateMutability": "nonpayable", + "type": "function" + }, { "inputs": [ { @@ -149,7 +517,7 @@ "type": "uint256" } ], - "internalType": "struct MACISharedObjs.PubKey", + "internalType": "struct DomainObjs.PubKey", "name": "pubKey", "type": "tuple" }, @@ -177,6 +545,30 @@ "stateMutability": "view", "type": "function" }, + { + "inputs": [ + { + "internalType": "address", + "name": "", + "type": "address" + } + ], + "name": "contributors", + "outputs": [ + { + "internalType": "uint256", + "name": "voiceCredits", + "type": "uint256" + }, + { + "internalType": "bool", + "name": "isRegistered", + "type": "bool" + } + ], + "stateMutability": "view", + "type": "function" + }, { "inputs": [], "name": "coordinator", @@ -201,6 +593,16 @@ "internalType": "uint256", "name": "_totalSpentSalt", "type": "uint256" + }, + { + "internalType": "uint256", + "name": "_newResultCommitment", + "type": "uint256" + }, + { + "internalType": "uint256", + "name": "_perVOSpentVoiceCreditsHash", + "type": "uint256" } ], "name": "finalize", @@ -256,6 +658,25 @@ "stateMutability": "view", "type": "function" }, + { + "inputs": [ + { + "internalType": "address", + "name": "addressValue", + "type": "address" + } + ], + "name": "isAddressZero", + "outputs": [ + { + "internalType": "bool", + "name": "", + "type": "bool" + } + ], + "stateMutability": "pure", + "type": "function" + }, { "inputs": [], "name": "isCancelled", @@ -334,6 +755,32 @@ "stateMutability": "view", "type": "function" }, + { + "inputs": [], + "name": "poll", + "outputs": [ + { + "internalType": "contract Poll", + "name": "", + "type": "address" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [], + "name": "pollId", + "outputs": [ + { + "internalType": "uint256", + "name": "", + "type": "uint256" + } + ], + "stateMutability": "view", + "type": "function" + }, { "inputs": [ { @@ -360,6 +807,35 @@ "stateMutability": "view", "type": "function" }, + { + "inputs": [ + { + "internalType": "uint256", + "name": "", + "type": "uint256" + } + ], + "name": "recipients", + "outputs": [ + { + "internalType": "bool", + "name": "fundsClaimed", + "type": "bool" + }, + { + "internalType": "bool", + "name": "tallyVerified", + "type": "bool" + }, + { + "internalType": "uint256", + "name": "tallyResult", + "type": "uint256" + } + ], + "stateMutability": "view", + "type": "function" + }, { "inputs": [ { @@ -386,60 +862,78 @@ "type": "function" }, { - "inputs": [ - { - "internalType": "contract MACI", - "name": "_maci", - "type": "address" - } - ], - "name": "setMaci", + "inputs": [], + "name": "resetTally", "outputs": [], "stateMutability": "nonpayable", "type": "function" }, { "inputs": [ + { + "internalType": "contract MACI", + "name": "_maci", + "type": "address" + }, { "components": [ { - "internalType": "uint256", - "name": "iv", - "type": "uint256" + "internalType": "address", + "name": "poll", + "type": "address" }, { - "internalType": "uint256[10]", - "name": "data", - "type": "uint256[10]" - } - ], - "internalType": "struct MACISharedObjs.Message[]", - "name": "_messages", - "type": "tuple[]" - }, - { - "components": [ + "internalType": "address", + "name": "messageProcessor", + "type": "address" + }, { - "internalType": "uint256", - "name": "x", - "type": "uint256" + "internalType": "address", + "name": "tally", + "type": "address" }, { - "internalType": "uint256", - "name": "y", - "type": "uint256" + "internalType": "address", + "name": "subsidy", + "type": "address" } ], - "internalType": "struct MACISharedObjs.PubKey[]", - "name": "_encPubKeys", - "type": "tuple[]" + "internalType": "struct MACI.PollContracts", + "name": "_pollContracts", + "type": "tuple" + } + ], + "name": "setMaci", + "outputs": [], + "stateMutability": "nonpayable", + "type": "function" + }, + { + "inputs": [ + { + "internalType": "address", + "name": "_maci", + "type": "address" } ], - "name": "submitMessageBatch", + "name": "setMaciInstance", "outputs": [], "stateMutability": "nonpayable", "type": "function" }, + { + "inputs": [], + "name": "tally", + "outputs": [ + { + "internalType": "contract Tally", + "name": "", + "type": "address" + } + ], + "stateMutability": "view", + "type": "function" + }, { "inputs": [], "name": "tallyHash", @@ -453,6 +947,19 @@ "stateMutability": "view", "type": "function" }, + { + "inputs": [], + "name": "topupToken", + "outputs": [ + { + "internalType": "contract TopupToken", + "name": "", + "type": "address" + } + ], + "stateMutability": "view", + "type": "function" + }, { "inputs": [], "name": "totalSpent", @@ -466,6 +973,19 @@ "stateMutability": "view", "type": "function" }, + { + "inputs": [], + "name": "totalTallyResults", + "outputs": [ + { + "internalType": "uint256", + "name": "", + "type": "uint256" + } + ], + "stateMutability": "view", + "type": "function" + }, { "inputs": [], "name": "totalVotes", @@ -479,6 +999,19 @@ "stateMutability": "view", "type": "function" }, + { + "inputs": [], + "name": "totalVotesSquares", + "outputs": [ + { + "internalType": "uint256", + "name": "", + "type": "uint256" + } + ], + "stateMutability": "view", + "type": "function" + }, { "inputs": [ { @@ -518,6 +1051,13 @@ "stateMutability": "view", "type": "function" }, + { + "inputs": [], + "name": "withdrawContribution", + "outputs": [], + "stateMutability": "nonpayable", + "type": "function" + }, { "inputs": [ { @@ -526,8 +1066,14 @@ "type": "address[]" } ], - "name": "withdrawContribution", - "outputs": [], + "name": "withdrawContributions", + "outputs": [ + { + "internalType": "bool[]", + "name": "result", + "type": "bool[]" + } + ], "stateMutability": "nonpayable", "type": "function" } diff --git a/subgraph/abis/MACI.json b/subgraph/abis/MACI.json index 9bd23ef87..4a09120f9 100644 --- a/subgraph/abis/MACI.json +++ b/subgraph/abis/MACI.json @@ -2,90 +2,29 @@ { "inputs": [ { - "components": [ - { - "internalType": "uint8", - "name": "stateTreeDepth", - "type": "uint8" - }, - { - "internalType": "uint8", - "name": "messageTreeDepth", - "type": "uint8" - }, - { - "internalType": "uint8", - "name": "voteOptionTreeDepth", - "type": "uint8" - } - ], - "internalType": "struct MACIParameters.TreeDepths", - "name": "_treeDepths", - "type": "tuple" - }, - { - "components": [ - { - "internalType": "uint8", - "name": "tallyBatchSize", - "type": "uint8" - }, - { - "internalType": "uint8", - "name": "messageBatchSize", - "type": "uint8" - } - ], - "internalType": "struct MACIParameters.BatchSizes", - "name": "_batchSizes", - "type": "tuple" - }, - { - "components": [ - { - "internalType": "uint256", - "name": "maxUsers", - "type": "uint256" - }, - { - "internalType": "uint256", - "name": "maxMessages", - "type": "uint256" - }, - { - "internalType": "uint256", - "name": "maxVoteOptions", - "type": "uint256" - } - ], - "internalType": "struct MACIParameters.MaxValues", - "name": "_maxValues", - "type": "tuple" - }, - { - "internalType": "contract SignUpGatekeeper", - "name": "_signUpGatekeeper", + "internalType": "contract IPollFactory", + "name": "_pollFactory", "type": "address" }, { - "internalType": "contract SnarkVerifier", - "name": "_batchUstVerifier", + "internalType": "contract IMessageProcessorFactory", + "name": "_messageProcessorFactory", "type": "address" }, { - "internalType": "contract SnarkVerifier", - "name": "_qvtVerifier", + "internalType": "contract ITallySubsidyFactory", + "name": "_tallyFactory", "type": "address" }, { - "internalType": "uint256", - "name": "_signUpDurationSeconds", - "type": "uint256" + "internalType": "contract ITallySubsidyFactory", + "name": "_subsidyFactory", + "type": "address" }, { - "internalType": "uint256", - "name": "_votingDurationSeconds", - "type": "uint256" + "internalType": "contract SignUpGatekeeper", + "name": "_signUpGatekeeper", + "type": "address" }, { "internalType": "contract InitialVoiceCreditProxy", @@ -93,351 +32,194 @@ "type": "address" }, { - "components": [ - { - "internalType": "uint256", - "name": "x", - "type": "uint256" - }, - { - "internalType": "uint256", - "name": "y", - "type": "uint256" - } - ], - "internalType": "struct MACISharedObjs.PubKey", - "name": "_coordinatorPubKey", - "type": "tuple" + "internalType": "contract TopupCredit", + "name": "_topupCredit", + "type": "address" }, { - "internalType": "address", - "name": "_coordinatorAddress", - "type": "address" + "internalType": "uint8", + "name": "_stateTreeDepth", + "type": "uint8" } ], - "stateMutability": "nonpayable", + "stateMutability": "payable", "type": "constructor" }, { - "anonymous": false, "inputs": [ { - "components": [ - { - "internalType": "uint256", - "name": "iv", - "type": "uint256" - }, - { - "internalType": "uint256[10]", - "name": "data", - "type": "uint256[10]" - } - ], - "indexed": false, - "internalType": "struct MACISharedObjs.Message", - "name": "_message", - "type": "tuple" - }, - { - "components": [ - { - "internalType": "uint256", - "name": "x", - "type": "uint256" - }, - { - "internalType": "uint256", - "name": "y", - "type": "uint256" - } - ], - "indexed": false, - "internalType": "struct MACISharedObjs.PubKey", - "name": "_encPubKey", - "type": "tuple" + "internalType": "address", + "name": "_caller", + "type": "address" } ], - "name": "PublishMessage", - "type": "event" + "name": "CallerMustBePoll", + "type": "error" }, { - "anonymous": false, - "inputs": [ - { - "components": [ - { - "internalType": "uint256", - "name": "x", - "type": "uint256" - }, - { - "internalType": "uint256", - "name": "y", - "type": "uint256" - } - ], - "indexed": false, - "internalType": "struct MACISharedObjs.PubKey", - "name": "_userPubKey", - "type": "tuple" - }, - { - "indexed": false, - "internalType": "uint256", - "name": "_stateIndex", - "type": "uint256" - }, - { - "indexed": false, - "internalType": "uint256", - "name": "_voiceCreditBalance", - "type": "uint256" - } - ], - "name": "SignUp", - "type": "event" + "inputs": [], + "name": "InvalidMessage", + "type": "error" + }, + { + "inputs": [], + "name": "MaciPubKeyLargerThanSnarkFieldSize", + "type": "error" }, { "inputs": [ { "internalType": "uint256", - "name": "_newStateRoot", + "name": "pollId", "type": "uint256" - }, - { - "components": [ - { - "internalType": "uint256", - "name": "x", - "type": "uint256" - }, - { - "internalType": "uint256", - "name": "y", - "type": "uint256" - } - ], - "internalType": "struct MACISharedObjs.PubKey[]", - "name": "_ecdhPubKeys", - "type": "tuple[]" - }, - { - "internalType": "uint256[8]", - "name": "_proof", - "type": "uint256[8]" } ], - "name": "batchProcessMessage", - "outputs": [], - "stateMutability": "nonpayable", - "type": "function" + "name": "PollDoesNotExist", + "type": "error" + }, + { + "inputs": [], + "name": "PoseidonHashLibrariesNotLinked", + "type": "error" }, { "inputs": [ - { - "internalType": "uint8", - "name": "_levels", - "type": "uint8" - } - ], - "name": "calcEmptyVoteOptionTreeRoot", - "outputs": [ { "internalType": "uint256", - "name": "", + "name": "pollId", "type": "uint256" } ], - "stateMutability": "pure", - "type": "function" + "name": "PreviousPollNotCompleted", + "type": "error" }, { "inputs": [], - "name": "calcSignUpDeadline", - "outputs": [ - { - "internalType": "uint256", - "name": "", - "type": "uint256" - } - ], - "stateMutability": "view", - "type": "function" + "name": "SignupTemporaryBlocked", + "type": "error" }, { "inputs": [], - "name": "calcVotingDeadline", - "outputs": [ - { - "internalType": "uint256", - "name": "", - "type": "uint256" - } - ], - "stateMutability": "view", - "type": "function" + "name": "TooManySignups", + "type": "error" }, { + "anonymous": false, "inputs": [ { - "internalType": "uint8", - "name": "_treeLevels", - "type": "uint8" - }, - { + "indexed": false, "internalType": "uint256", - "name": "_zeroValue", + "name": "_pollId", "type": "uint256" - } - ], - "name": "computeEmptyQuinRoot", - "outputs": [ + }, { + "indexed": true, "internalType": "uint256", - "name": "", + "name": "_coordinatorPubKeyX", "type": "uint256" - } - ], - "stateMutability": "pure", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "uint8", - "name": "_treeLevels", - "type": "uint8" }, { + "indexed": true, "internalType": "uint256", - "name": "_zeroValue", + "name": "_coordinatorPubKeyY", "type": "uint256" - } - ], - "name": "computeEmptyRoot", - "outputs": [ + }, { - "internalType": "uint256", - "name": "", - "type": "uint256" + "components": [ + { + "internalType": "address", + "name": "poll", + "type": "address" + }, + { + "internalType": "address", + "name": "messageProcessor", + "type": "address" + }, + { + "internalType": "address", + "name": "tally", + "type": "address" + }, + { + "internalType": "address", + "name": "subsidy", + "type": "address" + } + ], + "indexed": false, + "internalType": "struct MACI.PollContracts", + "name": "pollAddr", + "type": "tuple" } ], - "stateMutability": "pure", - "type": "function" + "name": "DeployPoll", + "type": "event" }, - { - "inputs": [], - "name": "coordinatorAddress", - "outputs": [ + "anonymous": false, + "inputs": [ { + "indexed": true, "internalType": "address", - "name": "", + "name": "previousOwner", "type": "address" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [], - "name": "coordinatorPubKey", - "outputs": [ - { - "internalType": "uint256", - "name": "x", - "type": "uint256" }, { - "internalType": "uint256", - "name": "y", - "type": "uint256" + "indexed": true, + "internalType": "address", + "name": "newOwner", + "type": "address" } ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [], - "name": "coordinatorReset", - "outputs": [], - "stateMutability": "nonpayable", - "type": "function" + "name": "OwnershipTransferred", + "type": "event" }, { - "inputs": [], - "name": "currentMessageBatchIndex", - "outputs": [ + "anonymous": false, + "inputs": [ { + "indexed": false, "internalType": "uint256", - "name": "", + "name": "_stateIndex", "type": "uint256" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [], - "name": "currentPerVOSpentVoiceCreditsCommitment", - "outputs": [ + }, { + "indexed": true, "internalType": "uint256", - "name": "", + "name": "_userPubKeyX", "type": "uint256" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [], - "name": "currentQvtBatchNum", - "outputs": [ + }, { + "indexed": true, "internalType": "uint256", - "name": "", + "name": "_userPubKeyY", "type": "uint256" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [], - "name": "currentResultsCommitment", - "outputs": [ + }, { + "indexed": false, "internalType": "uint256", - "name": "", + "name": "_voiceCreditBalance", "type": "uint256" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [], - "name": "currentSpentVoiceCreditsCommitment", - "outputs": [ + }, { + "indexed": false, "internalType": "uint256", - "name": "", + "name": "_timestamp", "type": "uint256" } ], - "stateMutability": "view", - "type": "function" + "name": "SignUp", + "type": "event" }, { "inputs": [], - "name": "emptyVoteOptionTreeRoot", + "name": "MESSAGE_DATA_LENGTH", "outputs": [ { - "internalType": "uint256", + "internalType": "uint8", "name": "", - "type": "uint256" + "type": "uint8" } ], "stateMutability": "view", @@ -447,9 +229,36 @@ "inputs": [ { "internalType": "uint256", - "name": "_newStateRoot", + "name": "_duration", "type": "uint256" }, + { + "components": [ + { + "internalType": "uint8", + "name": "intStateTreeDepth", + "type": "uint8" + }, + { + "internalType": "uint8", + "name": "messageTreeSubDepth", + "type": "uint8" + }, + { + "internalType": "uint8", + "name": "messageTreeDepth", + "type": "uint8" + }, + { + "internalType": "uint8", + "name": "voteOptionTreeDepth", + "type": "uint8" + } + ], + "internalType": "struct Params.TreeDepths", + "name": "_treeDepths", + "type": "tuple" + }, { "components": [ { @@ -463,56 +272,73 @@ "type": "uint256" } ], - "internalType": "struct MACISharedObjs.PubKey[]", - "name": "_ecdhPubKeys", - "type": "tuple[]" + "internalType": "struct DomainObjs.PubKey", + "name": "_coordinatorPubKey", + "type": "tuple" + }, + { + "internalType": "address", + "name": "_verifier", + "type": "address" + }, + { + "internalType": "address", + "name": "_vkRegistry", + "type": "address" + }, + { + "internalType": "bool", + "name": "useSubsidy", + "type": "bool" } ], - "name": "genBatchUstPublicSignals", + "name": "deployPoll", "outputs": [ { - "internalType": "uint256[]", - "name": "", - "type": "uint256[]" + "components": [ + { + "internalType": "address", + "name": "poll", + "type": "address" + }, + { + "internalType": "address", + "name": "messageProcessor", + "type": "address" + }, + { + "internalType": "address", + "name": "tally", + "type": "address" + }, + { + "internalType": "address", + "name": "subsidy", + "type": "address" + } + ], + "internalType": "struct MACI.PollContracts", + "name": "pollAddr", + "type": "tuple" } ], - "stateMutability": "view", + "stateMutability": "nonpayable", "type": "function" }, { "inputs": [ { "internalType": "uint256", - "name": "_intermediateStateRoot", - "type": "uint256" - }, - { - "internalType": "uint256", - "name": "_newResultsCommitment", - "type": "uint256" - }, - { - "internalType": "uint256", - "name": "_newSpentVoiceCreditsCommitment", - "type": "uint256" - }, - { - "internalType": "uint256", - "name": "_newPerVOSpentVoiceCreditsCommitment", - "type": "uint256" - }, - { - "internalType": "uint256", - "name": "_totalVotes", + "name": "_pollId", "type": "uint256" } ], - "name": "genQvtPublicSignals", + "name": "getPoll", "outputs": [ { - "internalType": "uint256[]", - "name": "", - "type": "uint256[]" + "internalType": "address", + "name": "poll", + "type": "address" } ], "stateMutability": "view", @@ -520,11 +346,11 @@ }, { "inputs": [], - "name": "getMessageTreeRoot", + "name": "getStateAqRoot", "outputs": [ { "internalType": "uint256", - "name": "", + "name": "root", "type": "uint256" } ], @@ -532,57 +358,56 @@ "type": "function" }, { - "inputs": [], - "name": "getStateTreeRoot", + "inputs": [ + { + "internalType": "uint256[2]", + "name": "array", + "type": "uint256[2]" + } + ], + "name": "hash2", "outputs": [ { "internalType": "uint256", - "name": "", + "name": "result", "type": "uint256" } ], - "stateMutability": "view", + "stateMutability": "pure", "type": "function" }, { - "inputs": [], - "name": "hasUnprocessedMessages", - "outputs": [ + "inputs": [ { - "internalType": "bool", - "name": "", - "type": "bool" + "internalType": "uint256[3]", + "name": "array", + "type": "uint256[3]" } ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [], - "name": "hasUntalliedStateLeaves", + "name": "hash3", "outputs": [ { - "internalType": "bool", - "name": "", - "type": "bool" + "internalType": "uint256", + "name": "result", + "type": "uint256" } ], - "stateMutability": "view", + "stateMutability": "pure", "type": "function" }, { "inputs": [ { - "internalType": "uint256[]", + "internalType": "uint256[4]", "name": "array", - "type": "uint256[]" + "type": "uint256[4]" } ], - "name": "hash11", + "name": "hash4", "outputs": [ { "internalType": "uint256", - "name": "", + "name": "result", "type": "uint256" } ], @@ -601,7 +426,7 @@ "outputs": [ { "internalType": "uint256", - "name": "", + "name": "result", "type": "uint256" } ], @@ -612,12 +437,12 @@ "inputs": [ { "internalType": "uint256", - "name": "_left", + "name": "left", "type": "uint256" }, { "internalType": "uint256", - "name": "_right", + "name": "right", "type": "uint256" } ], @@ -625,7 +450,7 @@ "outputs": [ { "internalType": "uint256", - "name": "", + "name": "result", "type": "uint256" } ], @@ -638,25 +463,42 @@ "components": [ { "internalType": "uint256", - "name": "iv", + "name": "msgType", + "type": "uint256" + }, + { + "internalType": "uint256[10]", + "name": "data", + "type": "uint256[10]" + } + ], + "internalType": "struct DomainObjs.Message", + "name": "_message", + "type": "tuple" + }, + { + "components": [ + { + "internalType": "uint256", + "name": "x", "type": "uint256" }, { - "internalType": "uint256[10]", - "name": "data", - "type": "uint256[10]" + "internalType": "uint256", + "name": "y", + "type": "uint256" } ], - "internalType": "struct MACISharedObjs.Message", - "name": "_message", + "internalType": "struct DomainObjs.PubKey", + "name": "_encPubKey", "type": "tuple" } ], - "name": "hashMessage", + "name": "hashMessageAndEncPubKey", "outputs": [ { "internalType": "uint256", - "name": "", + "name": "msgHash", "type": "uint256" } ], @@ -680,15 +522,10 @@ "type": "uint256" } ], - "internalType": "struct MACISharedObjs.PubKey", + "internalType": "struct DomainObjs.PubKey", "name": "pubKey", "type": "tuple" }, - { - "internalType": "uint256", - "name": "voteOptionTreeRoot", - "type": "uint256" - }, { "internalType": "uint256", "name": "voiceCreditBalance", @@ -696,7 +533,7 @@ }, { "internalType": "uint256", - "name": "nonce", + "name": "timestamp", "type": "uint256" } ], @@ -709,26 +546,13 @@ "outputs": [ { "internalType": "uint256", - "name": "", + "name": "ciphertext", "type": "uint256" } ], "stateMutability": "pure", "type": "function" }, - { - "inputs": [], - "name": "hashedBlankStateLeaf", - "outputs": [ - { - "internalType": "uint256", - "name": "", - "type": "uint256" - } - ], - "stateMutability": "view", - "type": "function" - }, { "inputs": [], "name": "initialVoiceCreditProxy", @@ -743,78 +567,50 @@ "type": "function" }, { - "inputs": [], - "name": "maxMessages", - "outputs": [ + "inputs": [ { "internalType": "uint256", - "name": "", + "name": "_pollId", "type": "uint256" } ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [], - "name": "maxUsers", + "name": "mergeStateAq", "outputs": [ { "internalType": "uint256", - "name": "", + "name": "root", "type": "uint256" } ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [], - "name": "messageBatchSize", - "outputs": [ - { - "internalType": "uint8", - "name": "", - "type": "uint8" - } - ], - "stateMutability": "view", + "stateMutability": "nonpayable", "type": "function" }, { - "inputs": [], - "name": "messageTree", - "outputs": [ + "inputs": [ { - "internalType": "contract IncrementalMerkleTree", - "name": "", - "type": "address" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [], - "name": "messageTreeMaxLeafIndex", - "outputs": [ + "internalType": "uint256", + "name": "_numSrQueueOps", + "type": "uint256" + }, { "internalType": "uint256", - "name": "", + "name": "_pollId", "type": "uint256" } ], - "stateMutability": "view", + "name": "mergeStateAqSubRoots", + "outputs": [], + "stateMutability": "nonpayable", "type": "function" }, { "inputs": [], - "name": "numMessages", + "name": "messageProcessorFactory", "outputs": [ { - "internalType": "uint256", + "internalType": "contract IMessageProcessorFactory", "name": "", - "type": "uint256" + "type": "address" } ], "stateMutability": "view", @@ -822,7 +618,7 @@ }, { "inputs": [], - "name": "numSignUps", + "name": "nextPollId", "outputs": [ { "internalType": "uint256", @@ -835,7 +631,7 @@ }, { "inputs": [], - "name": "originalCurrentResultsCommitment", + "name": "numSignUps", "outputs": [ { "internalType": "uint256", @@ -848,12 +644,12 @@ }, { "inputs": [], - "name": "originalSpentVoiceCreditsCommitment", + "name": "owner", "outputs": [ { - "internalType": "uint256", + "internalType": "address", "name": "", - "type": "uint256" + "type": "address" } ], "stateMutability": "view", @@ -862,48 +658,23 @@ { "inputs": [ { - "internalType": "uint256", - "name": "_intermediateStateRoot", - "type": "uint256" - }, - { - "internalType": "uint256", - "name": "_newResultsCommitment", - "type": "uint256" - }, - { - "internalType": "uint256", - "name": "_newSpentVoiceCreditsCommitment", - "type": "uint256" - }, - { - "internalType": "uint256", - "name": "_newPerVOSpentVoiceCreditsCommitment", - "type": "uint256" + "internalType": "uint256[2]", + "name": "dataToPad", + "type": "uint256[2]" }, { "internalType": "uint256", - "name": "_totalVotes", + "name": "msgType", "type": "uint256" - }, - { - "internalType": "uint256[8]", - "name": "_proof", - "type": "uint256[8]" } ], - "name": "proveVoteTallyBatch", - "outputs": [], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [ + "name": "padAndHashMessage", + "outputs": [ { "components": [ { "internalType": "uint256", - "name": "iv", + "name": "msgType", "type": "uint256" }, { @@ -912,8 +683,8 @@ "type": "uint256[10]" } ], - "internalType": "struct MACISharedObjs.Message", - "name": "_message", + "internalType": "struct DomainObjs.Message", + "name": "message", "type": "tuple" }, { @@ -929,70 +700,44 @@ "type": "uint256" } ], - "internalType": "struct MACISharedObjs.PubKey", - "name": "_encPubKey", - "type": "tuple" - } - ], - "name": "publishMessage", - "outputs": [], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [ - { - "components": [ - { - "internalType": "uint256", - "name": "x", - "type": "uint256" - }, - { - "internalType": "uint256", - "name": "y", - "type": "uint256" - } - ], - "internalType": "struct MACISharedObjs.PubKey", - "name": "_userPubKey", + "internalType": "struct DomainObjs.PubKey", + "name": "padKey", "type": "tuple" }, { - "internalType": "bytes", - "name": "_signUpGatekeeperData", - "type": "bytes" - }, - { - "internalType": "bytes", - "name": "_initialVoiceCreditProxyData", - "type": "bytes" + "internalType": "uint256", + "name": "msgHash", + "type": "uint256" } ], - "name": "signUp", - "outputs": [], - "stateMutability": "nonpayable", + "stateMutability": "pure", "type": "function" }, { "inputs": [], - "name": "signUpDurationSeconds", + "name": "pollFactory", "outputs": [ { - "internalType": "uint256", + "internalType": "contract IPollFactory", "name": "", - "type": "uint256" + "type": "address" } ], "stateMutability": "view", "type": "function" }, { - "inputs": [], - "name": "signUpGatekeeper", + "inputs": [ + { + "internalType": "uint256", + "name": "", + "type": "uint256" + } + ], + "name": "polls", "outputs": [ { - "internalType": "contract SignUpGatekeeper", + "internalType": "address", "name": "", "type": "address" } @@ -1002,38 +747,73 @@ }, { "inputs": [], - "name": "signUpTimestamp", + "name": "renounceOwnership", + "outputs": [], + "stateMutability": "nonpayable", + "type": "function" + }, + { + "inputs": [ + { + "internalType": "uint256[]", + "name": "array", + "type": "uint256[]" + } + ], + "name": "sha256Hash", "outputs": [ { "internalType": "uint256", - "name": "", + "name": "result", "type": "uint256" } ], - "stateMutability": "view", + "stateMutability": "pure", "type": "function" }, { - "inputs": [], - "name": "stateRoot", - "outputs": [ + "inputs": [ { - "internalType": "uint256", - "name": "", - "type": "uint256" + "components": [ + { + "internalType": "uint256", + "name": "x", + "type": "uint256" + }, + { + "internalType": "uint256", + "name": "y", + "type": "uint256" + } + ], + "internalType": "struct DomainObjs.PubKey", + "name": "_pubKey", + "type": "tuple" + }, + { + "internalType": "bytes", + "name": "_signUpGatekeeperData", + "type": "bytes" + }, + { + "internalType": "bytes", + "name": "_initialVoiceCreditProxyData", + "type": "bytes" } ], - "stateMutability": "view", + "name": "signUp", + "outputs": [], + "stateMutability": "nonpayable", "type": "function" }, { "inputs": [], - "name": "stateRootBeforeProcessing", + "name": "signUpGatekeeper", "outputs": [ { - "internalType": "uint256", + "internalType": "contract SignUpGatekeeper", "name": "", - "type": "uint256" + "type": "address" } ], "stateMutability": "view", @@ -1041,10 +821,10 @@ }, { "inputs": [], - "name": "stateTree", + "name": "stateAq", "outputs": [ { - "internalType": "contract IncrementalMerkleTree", + "internalType": "contract AccQueue", "name": "", "type": "address" } @@ -1054,7 +834,7 @@ }, { "inputs": [], - "name": "tallyBatchSize", + "name": "stateTreeDepth", "outputs": [ { "internalType": "uint8", @@ -1067,12 +847,12 @@ }, { "inputs": [], - "name": "totalVotes", + "name": "subsidyFactory", "outputs": [ { - "internalType": "uint256", + "internalType": "contract ITallySubsidyFactory", "name": "", - "type": "uint256" + "type": "address" } ], "stateMutability": "view", @@ -1080,46 +860,25 @@ }, { "inputs": [], - "name": "treeDepths", + "name": "subtreesMerged", "outputs": [ { - "internalType": "uint8", - "name": "stateTreeDepth", - "type": "uint8" - }, - { - "internalType": "uint8", - "name": "messageTreeDepth", - "type": "uint8" - }, - { - "internalType": "uint8", - "name": "voteOptionTreeDepth", - "type": "uint8" + "internalType": "bool", + "name": "", + "type": "bool" } ], "stateMutability": "view", "type": "function" }, { - "inputs": [ - { - "internalType": "uint256", - "name": "_spent", - "type": "uint256" - }, - { - "internalType": "uint256", - "name": "_salt", - "type": "uint256" - } - ], - "name": "verifySpentVoiceCredits", + "inputs": [], + "name": "tallyFactory", "outputs": [ { - "internalType": "bool", + "internalType": "contract ITallySubsidyFactory", "name": "", - "type": "bool" + "type": "address" } ], "stateMutability": "view", @@ -1127,28 +886,28 @@ }, { "inputs": [], - "name": "voteOptionsMaxLeafIndex", + "name": "topupCredit", "outputs": [ { - "internalType": "uint256", + "internalType": "contract TopupCredit", "name": "", - "type": "uint256" + "type": "address" } ], "stateMutability": "view", "type": "function" }, { - "inputs": [], - "name": "votingDurationSeconds", - "outputs": [ + "inputs": [ { - "internalType": "uint256", - "name": "", - "type": "uint256" + "internalType": "address", + "name": "newOwner", + "type": "address" } ], - "stateMutability": "view", + "name": "transferOwnership", + "outputs": [], + "stateMutability": "nonpayable", "type": "function" } ] diff --git a/subgraph/abis/MACIFactory.json b/subgraph/abis/MACIFactory.json index 0a8b91ad4..c8ab362b8 100644 --- a/subgraph/abis/MACIFactory.json +++ b/subgraph/abis/MACIFactory.json @@ -2,54 +2,91 @@ { "inputs": [ { - "internalType": "uint8", - "name": "_stateTreeDepth", - "type": "uint8" - }, - { - "internalType": "uint8", - "name": "_messageTreeDepth", - "type": "uint8" - }, - { - "internalType": "uint8", - "name": "_voteOptionTreeDepth", - "type": "uint8" - }, - { - "internalType": "uint8", - "name": "_tallyBatchSize", - "type": "uint8" - }, - { - "internalType": "uint8", - "name": "_messageBatchSize", - "type": "uint8" - }, - { - "internalType": "contract SnarkVerifier", - "name": "_batchUstVerifier", - "type": "address" - }, - { - "internalType": "contract SnarkVerifier", - "name": "_qvtVerifier", + "internalType": "address", + "name": "_vkRegistry", "type": "address" }, { - "internalType": "uint256", - "name": "_signUpDuration", - "type": "uint256" + "components": [ + { + "internalType": "address", + "name": "pollFactory", + "type": "address" + }, + { + "internalType": "address", + "name": "tallyFactory", + "type": "address" + }, + { + "internalType": "address", + "name": "subsidyFactory", + "type": "address" + }, + { + "internalType": "address", + "name": "messageProcessorFactory", + "type": "address" + } + ], + "internalType": "struct MACICommon.Factories", + "name": "_factories", + "type": "tuple" }, { - "internalType": "uint256", - "name": "_votingDuration", - "type": "uint256" + "internalType": "address", + "name": "_verifier", + "type": "address" } ], "stateMutability": "nonpayable", "type": "constructor" }, + { + "inputs": [], + "name": "InvalidMessageProcessorFactory", + "type": "error" + }, + { + "inputs": [], + "name": "InvalidPollFactory", + "type": "error" + }, + { + "inputs": [], + "name": "InvalidSubsidyFactory", + "type": "error" + }, + { + "inputs": [], + "name": "InvalidTallyFactory", + "type": "error" + }, + { + "inputs": [], + "name": "InvalidVerifier", + "type": "error" + }, + { + "inputs": [], + "name": "InvalidVkRegistry", + "type": "error" + }, + { + "inputs": [], + "name": "NotInitialized", + "type": "error" + }, + { + "inputs": [], + "name": "ProcessVkNotSet", + "type": "error" + }, + { + "inputs": [], + "name": "TallyVkNotSet", + "type": "error" + }, { "anonymous": false, "inputs": [ @@ -90,16 +127,11 @@ }, { "inputs": [], - "name": "batchSizes", + "name": "MESSAGE_DATA_LENGTH", "outputs": [ { "internalType": "uint8", - "name": "tallyBatchSize", - "type": "uint8" - }, - { - "internalType": "uint8", - "name": "messageBatchSize", + "name": "", "type": "uint8" } ], @@ -108,12 +140,12 @@ }, { "inputs": [], - "name": "batchUstVerifier", + "name": "TREE_ARITY", "outputs": [ { - "internalType": "contract SnarkVerifier", + "internalType": "uint256", "name": "", - "type": "address" + "type": "uint256" } ], "stateMutability": "view", @@ -123,17 +155,27 @@ "inputs": [ { "internalType": "contract SignUpGatekeeper", - "name": "_signUpGatekeeper", + "name": "signUpGatekeeper", "type": "address" }, { "internalType": "contract InitialVoiceCreditProxy", - "name": "_initialVoiceCreditProxy", + "name": "initialVoiceCreditProxy", "type": "address" }, { "internalType": "address", - "name": "_coordinator", + "name": "topupCredit", + "type": "address" + }, + { + "internalType": "uint256", + "name": "duration", + "type": "uint256" + }, + { + "internalType": "address", + "name": "coordinator", "type": "address" }, { @@ -149,9 +191,14 @@ "type": "uint256" } ], - "internalType": "struct MACISharedObjs.PubKey", - "name": "_coordinatorPubKey", + "internalType": "struct DomainObjs.PubKey", + "name": "coordinatorPubKey", "type": "tuple" + }, + { + "internalType": "address", + "name": "maciOwner", + "type": "address" } ], "name": "deployMaci", @@ -160,6 +207,33 @@ "internalType": "contract MACI", "name": "_maci", "type": "address" + }, + { + "components": [ + { + "internalType": "address", + "name": "poll", + "type": "address" + }, + { + "internalType": "address", + "name": "messageProcessor", + "type": "address" + }, + { + "internalType": "address", + "name": "tally", + "type": "address" + }, + { + "internalType": "address", + "name": "subsidy", + "type": "address" + } + ], + "internalType": "struct MACI.PollContracts", + "name": "_pollContracts", + "type": "tuple" } ], "stateMutability": "nonpayable", @@ -167,46 +241,57 @@ }, { "inputs": [], - "name": "maxValues", + "name": "factories", "outputs": [ { - "internalType": "uint256", - "name": "maxUsers", - "type": "uint256" + "internalType": "address", + "name": "pollFactory", + "type": "address" }, { - "internalType": "uint256", - "name": "maxMessages", - "type": "uint256" + "internalType": "address", + "name": "tallyFactory", + "type": "address" }, { - "internalType": "uint256", - "name": "maxVoteOptions", - "type": "uint256" + "internalType": "address", + "name": "subsidyFactory", + "type": "address" + }, + { + "internalType": "address", + "name": "messageProcessorFactory", + "type": "address" } ], "stateMutability": "view", "type": "function" }, { - "inputs": [], - "name": "owner", + "inputs": [ + { + "internalType": "uint8", + "name": "messageTreeSubDepth", + "type": "uint8" + } + ], + "name": "getMessageBatchSize", "outputs": [ { - "internalType": "address", - "name": "", - "type": "address" + "internalType": "uint256", + "name": "_messageBatchSize", + "type": "uint256" } ], - "stateMutability": "view", + "stateMutability": "pure", "type": "function" }, { "inputs": [], - "name": "qvtVerifier", + "name": "owner", "outputs": [ { - "internalType": "contract SnarkVerifier", + "internalType": "address", "name": "", "type": "address" } @@ -229,59 +314,111 @@ "type": "uint8" }, { - "internalType": "uint8", - "name": "_messageTreeDepth", - "type": "uint8" - }, - { - "internalType": "uint8", - "name": "_voteOptionTreeDepth", - "type": "uint8" - }, - { - "internalType": "uint8", - "name": "_tallyBatchSize", - "type": "uint8" - }, + "components": [ + { + "internalType": "uint8", + "name": "intStateTreeDepth", + "type": "uint8" + }, + { + "internalType": "uint8", + "name": "messageTreeSubDepth", + "type": "uint8" + }, + { + "internalType": "uint8", + "name": "messageTreeDepth", + "type": "uint8" + }, + { + "internalType": "uint8", + "name": "voteOptionTreeDepth", + "type": "uint8" + } + ], + "internalType": "struct Params.TreeDepths", + "name": "_treeDepths", + "type": "tuple" + } + ], + "name": "setMaciParameters", + "outputs": [], + "stateMutability": "nonpayable", + "type": "function" + }, + { + "inputs": [ { - "internalType": "uint8", - "name": "_messageBatchSize", - "type": "uint8" - }, + "internalType": "address", + "name": "_messageProcessorFactory", + "type": "address" + } + ], + "name": "setMessageProcessorFactory", + "outputs": [], + "stateMutability": "nonpayable", + "type": "function" + }, + { + "inputs": [ { - "internalType": "contract SnarkVerifier", - "name": "_batchUstVerifier", + "internalType": "address", + "name": "_pollFactory", "type": "address" - }, + } + ], + "name": "setPollFactory", + "outputs": [], + "stateMutability": "nonpayable", + "type": "function" + }, + { + "inputs": [ { - "internalType": "contract SnarkVerifier", - "name": "_qvtVerifier", + "internalType": "address", + "name": "_tallyFactory", "type": "address" - }, + } + ], + "name": "setTallyFactory", + "outputs": [], + "stateMutability": "nonpayable", + "type": "function" + }, + { + "inputs": [ { - "internalType": "uint256", - "name": "_signUpDuration", - "type": "uint256" - }, + "internalType": "address", + "name": "_verifier", + "type": "address" + } + ], + "name": "setVerifier", + "outputs": [], + "stateMutability": "nonpayable", + "type": "function" + }, + { + "inputs": [ { - "internalType": "uint256", - "name": "_votingDuration", - "type": "uint256" + "internalType": "address", + "name": "_vkRegistry", + "type": "address" } ], - "name": "setMaciParameters", + "name": "setVkRegistry", "outputs": [], "stateMutability": "nonpayable", "type": "function" }, { "inputs": [], - "name": "signUpDuration", + "name": "stateTreeDepth", "outputs": [ { - "internalType": "uint256", + "internalType": "uint8", "name": "", - "type": "uint256" + "type": "uint8" } ], "stateMutability": "view", @@ -306,7 +443,12 @@ "outputs": [ { "internalType": "uint8", - "name": "stateTreeDepth", + "name": "intStateTreeDepth", + "type": "uint8" + }, + { + "internalType": "uint8", + "name": "messageTreeSubDepth", "type": "uint8" }, { @@ -325,12 +467,25 @@ }, { "inputs": [], - "name": "votingDuration", + "name": "verifier", "outputs": [ { - "internalType": "uint256", + "internalType": "contract Verifier", "name": "", - "type": "uint256" + "type": "address" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [], + "name": "vkRegistry", + "outputs": [ + { + "internalType": "contract VkRegistry", + "name": "", + "type": "address" } ], "stateMutability": "view", diff --git a/subgraph/abis/OptimisticRecipientRegistry.json b/subgraph/abis/OptimisticRecipientRegistry.json index cf953b474..ab62d0daf 100644 --- a/subgraph/abis/OptimisticRecipientRegistry.json +++ b/subgraph/abis/OptimisticRecipientRegistry.json @@ -1,13 +1,21 @@ [ { "inputs": [ - { "internalType": "uint256", "name": "_baseDeposit", "type": "uint256" }, + { + "internalType": "uint256", + "name": "_baseDeposit", + "type": "uint256" + }, { "internalType": "uint256", "name": "_challengePeriodDuration", "type": "uint256" }, - { "internalType": "address", "name": "_controller", "type": "address" } + { + "internalType": "address", + "name": "_controller", + "type": "address" + } ], "stateMutability": "nonpayable", "type": "constructor" @@ -107,8 +115,16 @@ }, { "inputs": [ - { "internalType": "address", "name": "_recipient", "type": "address" }, - { "internalType": "string", "name": "_metadata", "type": "string" } + { + "internalType": "address", + "name": "_recipient", + "type": "address" + }, + { + "internalType": "string", + "name": "_metadata", + "type": "string" + } ], "name": "addRecipient", "outputs": [], @@ -118,20 +134,36 @@ { "inputs": [], "name": "baseDeposit", - "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], + "outputs": [ + { + "internalType": "uint256", + "name": "", + "type": "uint256" + } + ], "stateMutability": "view", "type": "function" }, { "inputs": [], "name": "challengePeriodDuration", - "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], + "outputs": [ + { + "internalType": "uint256", + "name": "", + "type": "uint256" + } + ], "stateMutability": "view", "type": "function" }, { "inputs": [ - { "internalType": "bytes32", "name": "_recipientId", "type": "bytes32" }, + { + "internalType": "bytes32", + "name": "_recipientId", + "type": "bytes32" + }, { "internalType": "address payable", "name": "_beneficiary", @@ -139,54 +171,123 @@ } ], "name": "challengeRequest", - "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }], + "outputs": [ + { + "internalType": "bool", + "name": "", + "type": "bool" + } + ], "stateMutability": "nonpayable", "type": "function" }, { "inputs": [], "name": "controller", - "outputs": [{ "internalType": "address", "name": "", "type": "address" }], + "outputs": [ + { + "internalType": "address", + "name": "", + "type": "address" + } + ], "stateMutability": "view", "type": "function" }, { "inputs": [ - { "internalType": "bytes32", "name": "_recipientId", "type": "bytes32" } + { + "internalType": "bytes32", + "name": "_recipientId", + "type": "bytes32" + } ], "name": "executeRequest", - "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }], + "outputs": [ + { + "internalType": "bool", + "name": "", + "type": "bool" + } + ], "stateMutability": "nonpayable", "type": "function" }, { "inputs": [ - { "internalType": "uint256", "name": "_index", "type": "uint256" }, - { "internalType": "uint256", "name": "_startTime", "type": "uint256" }, - { "internalType": "uint256", "name": "_endTime", "type": "uint256" } + { + "internalType": "uint256", + "name": "_index", + "type": "uint256" + }, + { + "internalType": "uint256", + "name": "_startTime", + "type": "uint256" + }, + { + "internalType": "uint256", + "name": "_endTime", + "type": "uint256" + } ], "name": "getRecipientAddress", - "outputs": [{ "internalType": "address", "name": "", "type": "address" }], + "outputs": [ + { + "internalType": "address", + "name": "", + "type": "address" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [], + "name": "getRecipientCount", + "outputs": [ + { + "internalType": "uint256", + "name": "", + "type": "uint256" + } + ], "stateMutability": "view", "type": "function" }, { "inputs": [], "name": "maxRecipients", - "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], + "outputs": [ + { + "internalType": "uint256", + "name": "", + "type": "uint256" + } + ], "stateMutability": "view", "type": "function" }, { "inputs": [], "name": "owner", - "outputs": [{ "internalType": "address", "name": "", "type": "address" }], + "outputs": [ + { + "internalType": "address", + "name": "", + "type": "address" + } + ], "stateMutability": "view", "type": "function" }, { "inputs": [ - { "internalType": "bytes32", "name": "_recipientId", "type": "bytes32" } + { + "internalType": "bytes32", + "name": "_recipientId", + "type": "bytes32" + } ], "name": "removeRecipient", "outputs": [], @@ -202,7 +303,11 @@ }, { "inputs": [ - { "internalType": "uint256", "name": "_baseDeposit", "type": "uint256" } + { + "internalType": "uint256", + "name": "_baseDeposit", + "type": "uint256" + } ], "name": "setBaseDeposit", "outputs": [], @@ -224,16 +329,30 @@ }, { "inputs": [ - { "internalType": "uint256", "name": "_maxRecipients", "type": "uint256" } + { + "internalType": "uint256", + "name": "_maxRecipients", + "type": "uint256" + } ], "name": "setMaxRecipients", - "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }], + "outputs": [ + { + "internalType": "bool", + "name": "", + "type": "bool" + } + ], "stateMutability": "nonpayable", "type": "function" }, { "inputs": [ - { "internalType": "address", "name": "newOwner", "type": "address" } + { + "internalType": "address", + "name": "newOwner", + "type": "address" + } ], "name": "transferOwnership", "outputs": [], diff --git a/subgraph/abis/Poll.json b/subgraph/abis/Poll.json new file mode 100644 index 000000000..671177ba2 --- /dev/null +++ b/subgraph/abis/Poll.json @@ -0,0 +1,966 @@ +[ + { + "inputs": [ + { + "internalType": "uint256", + "name": "_duration", + "type": "uint256" + }, + { + "components": [ + { + "internalType": "uint256", + "name": "maxMessages", + "type": "uint256" + }, + { + "internalType": "uint256", + "name": "maxVoteOptions", + "type": "uint256" + } + ], + "internalType": "struct Params.MaxValues", + "name": "_maxValues", + "type": "tuple" + }, + { + "components": [ + { + "internalType": "uint8", + "name": "intStateTreeDepth", + "type": "uint8" + }, + { + "internalType": "uint8", + "name": "messageTreeSubDepth", + "type": "uint8" + }, + { + "internalType": "uint8", + "name": "messageTreeDepth", + "type": "uint8" + }, + { + "internalType": "uint8", + "name": "voteOptionTreeDepth", + "type": "uint8" + } + ], + "internalType": "struct Params.TreeDepths", + "name": "_treeDepths", + "type": "tuple" + }, + { + "components": [ + { + "internalType": "uint256", + "name": "x", + "type": "uint256" + }, + { + "internalType": "uint256", + "name": "y", + "type": "uint256" + } + ], + "internalType": "struct DomainObjs.PubKey", + "name": "_coordinatorPubKey", + "type": "tuple" + }, + { + "components": [ + { + "internalType": "contract IMACI", + "name": "maci", + "type": "address" + }, + { + "internalType": "contract AccQueue", + "name": "messageAq", + "type": "address" + }, + { + "internalType": "contract TopupCredit", + "name": "topupCredit", + "type": "address" + } + ], + "internalType": "struct Params.ExtContracts", + "name": "_extContracts", + "type": "tuple" + } + ], + "stateMutability": "payable", + "type": "constructor" + }, + { + "inputs": [], + "name": "InvalidBatchLength", + "type": "error" + }, + { + "inputs": [], + "name": "InvalidMessage", + "type": "error" + }, + { + "inputs": [], + "name": "MaciPubKeyLargerThanSnarkFieldSize", + "type": "error" + }, + { + "inputs": [], + "name": "PollAlreadyInit", + "type": "error" + }, + { + "inputs": [], + "name": "StateAqAlreadyMerged", + "type": "error" + }, + { + "inputs": [], + "name": "StateAqSubtreesNeedMerge", + "type": "error" + }, + { + "inputs": [], + "name": "TooManyMessages", + "type": "error" + }, + { + "inputs": [], + "name": "VotingPeriodNotOver", + "type": "error" + }, + { + "inputs": [], + "name": "VotingPeriodOver", + "type": "error" + }, + { + "anonymous": false, + "inputs": [ + { + "indexed": false, + "internalType": "uint256", + "name": "_stateRoot", + "type": "uint256" + }, + { + "indexed": false, + "internalType": "uint256", + "name": "_numSignups", + "type": "uint256" + } + ], + "name": "MergeMaciStateAq", + "type": "event" + }, + { + "anonymous": false, + "inputs": [ + { + "indexed": false, + "internalType": "uint256", + "name": "_numSrQueueOps", + "type": "uint256" + } + ], + "name": "MergeMaciStateAqSubRoots", + "type": "event" + }, + { + "anonymous": false, + "inputs": [ + { + "indexed": false, + "internalType": "uint256", + "name": "_messageRoot", + "type": "uint256" + } + ], + "name": "MergeMessageAq", + "type": "event" + }, + { + "anonymous": false, + "inputs": [ + { + "indexed": false, + "internalType": "uint256", + "name": "_numSrQueueOps", + "type": "uint256" + } + ], + "name": "MergeMessageAqSubRoots", + "type": "event" + }, + { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "internalType": "address", + "name": "previousOwner", + "type": "address" + }, + { + "indexed": true, + "internalType": "address", + "name": "newOwner", + "type": "address" + } + ], + "name": "OwnershipTransferred", + "type": "event" + }, + { + "anonymous": false, + "inputs": [ + { + "components": [ + { + "internalType": "uint256", + "name": "msgType", + "type": "uint256" + }, + { + "internalType": "uint256[10]", + "name": "data", + "type": "uint256[10]" + } + ], + "indexed": false, + "internalType": "struct DomainObjs.Message", + "name": "_message", + "type": "tuple" + }, + { + "components": [ + { + "internalType": "uint256", + "name": "x", + "type": "uint256" + }, + { + "internalType": "uint256", + "name": "y", + "type": "uint256" + } + ], + "indexed": false, + "internalType": "struct DomainObjs.PubKey", + "name": "_encPubKey", + "type": "tuple" + } + ], + "name": "PublishMessage", + "type": "event" + }, + { + "anonymous": false, + "inputs": [ + { + "components": [ + { + "internalType": "uint256", + "name": "msgType", + "type": "uint256" + }, + { + "internalType": "uint256[10]", + "name": "data", + "type": "uint256[10]" + } + ], + "indexed": false, + "internalType": "struct DomainObjs.Message", + "name": "_message", + "type": "tuple" + } + ], + "name": "TopupMessage", + "type": "event" + }, + { + "inputs": [], + "name": "MESSAGE_DATA_LENGTH", + "outputs": [ + { + "internalType": "uint8", + "name": "", + "type": "uint8" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [], + "name": "coordinatorPubKey", + "outputs": [ + { + "internalType": "uint256", + "name": "x", + "type": "uint256" + }, + { + "internalType": "uint256", + "name": "y", + "type": "uint256" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [], + "name": "coordinatorPubKeyHash", + "outputs": [ + { + "internalType": "uint256", + "name": "", + "type": "uint256" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [], + "name": "currentSbCommitment", + "outputs": [ + { + "internalType": "uint256", + "name": "", + "type": "uint256" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [], + "name": "extContracts", + "outputs": [ + { + "internalType": "contract IMACI", + "name": "maci", + "type": "address" + }, + { + "internalType": "contract AccQueue", + "name": "messageAq", + "type": "address" + }, + { + "internalType": "contract TopupCredit", + "name": "topupCredit", + "type": "address" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [], + "name": "getDeployTimeAndDuration", + "outputs": [ + { + "internalType": "uint256", + "name": "pollDeployTime", + "type": "uint256" + }, + { + "internalType": "uint256", + "name": "pollDuration", + "type": "uint256" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [ + { + "internalType": "uint256[2]", + "name": "array", + "type": "uint256[2]" + } + ], + "name": "hash2", + "outputs": [ + { + "internalType": "uint256", + "name": "result", + "type": "uint256" + } + ], + "stateMutability": "pure", + "type": "function" + }, + { + "inputs": [ + { + "internalType": "uint256[3]", + "name": "array", + "type": "uint256[3]" + } + ], + "name": "hash3", + "outputs": [ + { + "internalType": "uint256", + "name": "result", + "type": "uint256" + } + ], + "stateMutability": "pure", + "type": "function" + }, + { + "inputs": [ + { + "internalType": "uint256[4]", + "name": "array", + "type": "uint256[4]" + } + ], + "name": "hash4", + "outputs": [ + { + "internalType": "uint256", + "name": "result", + "type": "uint256" + } + ], + "stateMutability": "pure", + "type": "function" + }, + { + "inputs": [ + { + "internalType": "uint256[5]", + "name": "array", + "type": "uint256[5]" + } + ], + "name": "hash5", + "outputs": [ + { + "internalType": "uint256", + "name": "result", + "type": "uint256" + } + ], + "stateMutability": "pure", + "type": "function" + }, + { + "inputs": [ + { + "internalType": "uint256", + "name": "left", + "type": "uint256" + }, + { + "internalType": "uint256", + "name": "right", + "type": "uint256" + } + ], + "name": "hashLeftRight", + "outputs": [ + { + "internalType": "uint256", + "name": "result", + "type": "uint256" + } + ], + "stateMutability": "pure", + "type": "function" + }, + { + "inputs": [ + { + "components": [ + { + "internalType": "uint256", + "name": "msgType", + "type": "uint256" + }, + { + "internalType": "uint256[10]", + "name": "data", + "type": "uint256[10]" + } + ], + "internalType": "struct DomainObjs.Message", + "name": "_message", + "type": "tuple" + }, + { + "components": [ + { + "internalType": "uint256", + "name": "x", + "type": "uint256" + }, + { + "internalType": "uint256", + "name": "y", + "type": "uint256" + } + ], + "internalType": "struct DomainObjs.PubKey", + "name": "_encPubKey", + "type": "tuple" + } + ], + "name": "hashMessageAndEncPubKey", + "outputs": [ + { + "internalType": "uint256", + "name": "msgHash", + "type": "uint256" + } + ], + "stateMutability": "pure", + "type": "function" + }, + { + "inputs": [ + { + "components": [ + { + "components": [ + { + "internalType": "uint256", + "name": "x", + "type": "uint256" + }, + { + "internalType": "uint256", + "name": "y", + "type": "uint256" + } + ], + "internalType": "struct DomainObjs.PubKey", + "name": "pubKey", + "type": "tuple" + }, + { + "internalType": "uint256", + "name": "voiceCreditBalance", + "type": "uint256" + }, + { + "internalType": "uint256", + "name": "timestamp", + "type": "uint256" + } + ], + "internalType": "struct DomainObjs.StateLeaf", + "name": "_stateLeaf", + "type": "tuple" + } + ], + "name": "hashStateLeaf", + "outputs": [ + { + "internalType": "uint256", + "name": "ciphertext", + "type": "uint256" + } + ], + "stateMutability": "pure", + "type": "function" + }, + { + "inputs": [], + "name": "init", + "outputs": [], + "stateMutability": "nonpayable", + "type": "function" + }, + { + "inputs": [], + "name": "maxValues", + "outputs": [ + { + "internalType": "uint256", + "name": "maxMessages", + "type": "uint256" + }, + { + "internalType": "uint256", + "name": "maxVoteOptions", + "type": "uint256" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [ + { + "internalType": "uint256", + "name": "_pollId", + "type": "uint256" + } + ], + "name": "mergeMaciStateAq", + "outputs": [], + "stateMutability": "nonpayable", + "type": "function" + }, + { + "inputs": [ + { + "internalType": "uint256", + "name": "_numSrQueueOps", + "type": "uint256" + }, + { + "internalType": "uint256", + "name": "_pollId", + "type": "uint256" + } + ], + "name": "mergeMaciStateAqSubRoots", + "outputs": [], + "stateMutability": "nonpayable", + "type": "function" + }, + { + "inputs": [], + "name": "mergeMessageAq", + "outputs": [], + "stateMutability": "nonpayable", + "type": "function" + }, + { + "inputs": [ + { + "internalType": "uint256", + "name": "_numSrQueueOps", + "type": "uint256" + } + ], + "name": "mergeMessageAqSubRoots", + "outputs": [], + "stateMutability": "nonpayable", + "type": "function" + }, + { + "inputs": [], + "name": "mergedStateRoot", + "outputs": [ + { + "internalType": "uint256", + "name": "", + "type": "uint256" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [], + "name": "numMessages", + "outputs": [ + { + "internalType": "uint256", + "name": "", + "type": "uint256" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [], + "name": "numSignUpsAndMessages", + "outputs": [ + { + "internalType": "uint256", + "name": "numSUps", + "type": "uint256" + }, + { + "internalType": "uint256", + "name": "numMsgs", + "type": "uint256" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [], + "name": "numSignups", + "outputs": [ + { + "internalType": "uint256", + "name": "", + "type": "uint256" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [], + "name": "owner", + "outputs": [ + { + "internalType": "address", + "name": "", + "type": "address" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [ + { + "internalType": "uint256[2]", + "name": "dataToPad", + "type": "uint256[2]" + }, + { + "internalType": "uint256", + "name": "msgType", + "type": "uint256" + } + ], + "name": "padAndHashMessage", + "outputs": [ + { + "components": [ + { + "internalType": "uint256", + "name": "msgType", + "type": "uint256" + }, + { + "internalType": "uint256[10]", + "name": "data", + "type": "uint256[10]" + } + ], + "internalType": "struct DomainObjs.Message", + "name": "message", + "type": "tuple" + }, + { + "components": [ + { + "internalType": "uint256", + "name": "x", + "type": "uint256" + }, + { + "internalType": "uint256", + "name": "y", + "type": "uint256" + } + ], + "internalType": "struct DomainObjs.PubKey", + "name": "padKey", + "type": "tuple" + }, + { + "internalType": "uint256", + "name": "msgHash", + "type": "uint256" + } + ], + "stateMutability": "pure", + "type": "function" + }, + { + "inputs": [ + { + "components": [ + { + "internalType": "uint256", + "name": "msgType", + "type": "uint256" + }, + { + "internalType": "uint256[10]", + "name": "data", + "type": "uint256[10]" + } + ], + "internalType": "struct DomainObjs.Message", + "name": "_message", + "type": "tuple" + }, + { + "components": [ + { + "internalType": "uint256", + "name": "x", + "type": "uint256" + }, + { + "internalType": "uint256", + "name": "y", + "type": "uint256" + } + ], + "internalType": "struct DomainObjs.PubKey", + "name": "_encPubKey", + "type": "tuple" + } + ], + "name": "publishMessage", + "outputs": [], + "stateMutability": "nonpayable", + "type": "function" + }, + { + "inputs": [ + { + "components": [ + { + "internalType": "uint256", + "name": "msgType", + "type": "uint256" + }, + { + "internalType": "uint256[10]", + "name": "data", + "type": "uint256[10]" + } + ], + "internalType": "struct DomainObjs.Message[]", + "name": "_messages", + "type": "tuple[]" + }, + { + "components": [ + { + "internalType": "uint256", + "name": "x", + "type": "uint256" + }, + { + "internalType": "uint256", + "name": "y", + "type": "uint256" + } + ], + "internalType": "struct DomainObjs.PubKey[]", + "name": "_encPubKeys", + "type": "tuple[]" + } + ], + "name": "publishMessageBatch", + "outputs": [], + "stateMutability": "nonpayable", + "type": "function" + }, + { + "inputs": [], + "name": "renounceOwnership", + "outputs": [], + "stateMutability": "nonpayable", + "type": "function" + }, + { + "inputs": [ + { + "internalType": "uint256[]", + "name": "array", + "type": "uint256[]" + } + ], + "name": "sha256Hash", + "outputs": [ + { + "internalType": "uint256", + "name": "result", + "type": "uint256" + } + ], + "stateMutability": "pure", + "type": "function" + }, + { + "inputs": [], + "name": "stateAqMerged", + "outputs": [ + { + "internalType": "bool", + "name": "", + "type": "bool" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [ + { + "internalType": "uint256", + "name": "stateIndex", + "type": "uint256" + }, + { + "internalType": "uint256", + "name": "amount", + "type": "uint256" + } + ], + "name": "topup", + "outputs": [], + "stateMutability": "nonpayable", + "type": "function" + }, + { + "inputs": [ + { + "internalType": "address", + "name": "newOwner", + "type": "address" + } + ], + "name": "transferOwnership", + "outputs": [], + "stateMutability": "nonpayable", + "type": "function" + }, + { + "inputs": [], + "name": "treeDepths", + "outputs": [ + { + "internalType": "uint8", + "name": "intStateTreeDepth", + "type": "uint8" + }, + { + "internalType": "uint8", + "name": "messageTreeSubDepth", + "type": "uint8" + }, + { + "internalType": "uint8", + "name": "messageTreeDepth", + "type": "uint8" + }, + { + "internalType": "uint8", + "name": "voteOptionTreeDepth", + "type": "uint8" + } + ], + "stateMutability": "view", + "type": "function" + } +] diff --git a/subgraph/config/arbitrum-goerli.json b/subgraph/config/arbitrum-goerli.json deleted file mode 100644 index 2126aa6b6..000000000 --- a/subgraph/config/arbitrum-goerli.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "network": "arbitrum-goerli", - "address": "0x0a12CE1B7a95f2067AB930f0b2316FF21Cd5A430", - "factoryStartBlock": 325577, - "recipientRegistryStartBlock": 325577 -} diff --git a/subgraph/config/arbitrum-rinkeby.json b/subgraph/config/arbitrum-rinkeby.json deleted file mode 100644 index c8850d0b0..000000000 --- a/subgraph/config/arbitrum-rinkeby.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "network": "arbitrum-rinkeby", - "address": "0xC032e80a413Be959d9a9B6e5CadE53c870074d37", - "factoryStartBlock": 4806990, - "recipientRegistryStartBlock": 4806990 -} diff --git a/subgraph/config/arbitrum-sepolia.json b/subgraph/config/arbitrum-sepolia.json new file mode 100644 index 000000000..37bdfe64a --- /dev/null +++ b/subgraph/config/arbitrum-sepolia.json @@ -0,0 +1,6 @@ +{ + "network": "arbitrum-sepolia", + "clrFundAddress": "0xEd7dD059294dE1B053B2B50Fb6A73a559219F678", + "clrFundStartBlock": 22697290, + "recipientRegistryStartBlock": 22697290 +} diff --git a/subgraph/config/arbitrum.json b/subgraph/config/arbitrum.json index 8f72d1d1f..9b0bf753b 100644 --- a/subgraph/config/arbitrum.json +++ b/subgraph/config/arbitrum.json @@ -1,6 +1,6 @@ { "network": "arbitrum-one", - "address": "0x2e89494a8fE02891511a43f7877b726787E0C160", - "factoryStartBlock": 3461582, + "clrFundAddress": "0x2e89494a8fE02891511a43f7877b726787E0C160", + "clrFundStartBlock": 3461582, "recipientRegistryStartBlock": 3461582 } diff --git a/subgraph/config/deployer-arbitrum-sepolia.json b/subgraph/config/deployer-arbitrum-sepolia.json new file mode 100644 index 000000000..858db0f32 --- /dev/null +++ b/subgraph/config/deployer-arbitrum-sepolia.json @@ -0,0 +1,6 @@ +{ + "network": "arbitrum-sepolia", + "clrFundDeployerAddress": "0xC0F9054083D42b61C9bbA8EB3533fF3f0208C1fb", + "clrFundDeployerStartBlock": 24627080, + "recipientRegistryStartBlock": 24627080 +} diff --git a/subgraph/config/goerli.json b/subgraph/config/goerli.json deleted file mode 100644 index c413e317f..000000000 --- a/subgraph/config/goerli.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "network": "goerli", - "address": "0xb1709e5dbB787E82A7feA30da5322e77F3c7D00F", - "factoryStartBlock": 7109979, - "recipientRegistryStartBlock": 7109979 -} diff --git a/subgraph/config/hardhat.json b/subgraph/config/hardhat.json index 308788d1d..47a121d11 100644 --- a/subgraph/config/hardhat.json +++ b/subgraph/config/hardhat.json @@ -1,6 +1,6 @@ { "network": "hardhat", - "address": "0x5FC8d32690cc91D4c39d9d3abcBD16989F875707", - "factoryStartBlock": 0, + "clrFundAddress": "0x0DCd1Bf9A1b36cE34237eEaFef220932846BCD82", + "clrFundStartBlock": 0, "recipientRegistryStartBlock": 0 } diff --git a/subgraph/config/optimism-sepolia.json b/subgraph/config/optimism-sepolia.json new file mode 100644 index 000000000..d052bf9af --- /dev/null +++ b/subgraph/config/optimism-sepolia.json @@ -0,0 +1,6 @@ +{ + "network": "optimism-sepolia", + "clrFundAddress": "0x9deB2f0A56FeCEe7ECE9B742Ab4f5Bc21A634F83", + "clrFundStartBlock": 8973710, + "recipientRegistryStartBlock": 8973710 +} diff --git a/subgraph/config/xdai.json b/subgraph/config/xdai.json index b026df2a1..b92df0999 100644 --- a/subgraph/config/xdai.json +++ b/subgraph/config/xdai.json @@ -1,6 +1,6 @@ { "network": "xdai", - "address": "0x4ede8f30d9c2dc96a9d6787e9c4a478424fb960a", - "factoryStartBlock": 15217676, + "clrFundAddress": "0x4ede8f30d9c2dc96a9d6787e9c4a478424fb960a", + "clrFundStartBlock": 15217676, "recipientRegistryStartBlock": 15217676 } diff --git a/subgraph/generated/FundingRoundFactory/BrightIdUserRegistry.ts b/subgraph/generated/ClrFund/BrightIdUserRegistry.ts similarity index 97% rename from subgraph/generated/FundingRoundFactory/BrightIdUserRegistry.ts rename to subgraph/generated/ClrFund/BrightIdUserRegistry.ts index 7d1e77f55..1209bacdb 100644 --- a/subgraph/generated/FundingRoundFactory/BrightIdUserRegistry.ts +++ b/subgraph/generated/ClrFund/BrightIdUserRegistry.ts @@ -7,7 +7,7 @@ import { Entity, Bytes, Address, - BigInt + BigInt, } from "@graphprotocol/graph-ts"; export class OwnershipTransferred extends ethereum.Event { @@ -103,7 +103,7 @@ export class BrightIdUserRegistry extends ethereum.SmartContract { let result = super.call( "brightIdSponsor", "brightIdSponsor():(address)", - [] + [], ); return result[0].toAddress(); @@ -113,7 +113,7 @@ export class BrightIdUserRegistry extends ethereum.SmartContract { let result = super.tryCall( "brightIdSponsor", "brightIdSponsor():(address)", - [] + [], ); if (result.reverted) { return new ethereum.CallResult(); @@ -141,7 +141,7 @@ export class BrightIdUserRegistry extends ethereum.SmartContract { let result = super.call( "isVerifiedUser", "isVerifiedUser(address):(bool)", - [ethereum.Value.fromAddress(_user)] + [ethereum.Value.fromAddress(_user)], ); return result[0].toBoolean(); @@ -151,7 +151,7 @@ export class BrightIdUserRegistry extends ethereum.SmartContract { let result = super.tryCall( "isVerifiedUser", "isVerifiedUser(address):(bool)", - [ethereum.Value.fromAddress(_user)] + [ethereum.Value.fromAddress(_user)], ); if (result.reverted) { return new ethereum.CallResult(); @@ -179,7 +179,7 @@ export class BrightIdUserRegistry extends ethereum.SmartContract { let result = super.call( "verifications", "verifications(address):(uint256)", - [ethereum.Value.fromAddress(param0)] + [ethereum.Value.fromAddress(param0)], ); return result[0].toBigInt(); @@ -189,7 +189,7 @@ export class BrightIdUserRegistry extends ethereum.SmartContract { let result = super.tryCall( "verifications", "verifications(address):(uint256)", - [ethereum.Value.fromAddress(param0)] + [ethereum.Value.fromAddress(param0)], ); if (result.reverted) { return new ethereum.CallResult(); diff --git a/subgraph/generated/FundingRoundFactory/FundingRoundFactory.ts b/subgraph/generated/ClrFund/ClrFund.ts similarity index 70% rename from subgraph/generated/FundingRoundFactory/FundingRoundFactory.ts rename to subgraph/generated/ClrFund/ClrFund.ts index f2c5e52e3..3446a9e7b 100644 --- a/subgraph/generated/FundingRoundFactory/FundingRoundFactory.ts +++ b/subgraph/generated/ClrFund/ClrFund.ts @@ -7,7 +7,7 @@ import { Entity, Bytes, Address, - BigInt + BigInt, } from "@graphprotocol/graph-ts"; export class CoordinatorChanged extends ethereum.Event { @@ -28,6 +28,42 @@ export class CoordinatorChanged__Params { } } +export class FundingRoundFactoryChanged extends ethereum.Event { + get params(): FundingRoundFactoryChanged__Params { + return new FundingRoundFactoryChanged__Params(this); + } +} + +export class FundingRoundFactoryChanged__Params { + _event: FundingRoundFactoryChanged; + + constructor(event: FundingRoundFactoryChanged) { + this._event = event; + } + + get _roundFactory(): Address { + return this._event.parameters[0].value.toAddress(); + } +} + +export class FundingRoundTemplateChanged extends ethereum.Event { + get params(): FundingRoundTemplateChanged__Params { + return new FundingRoundTemplateChanged__Params(this); + } +} + +export class FundingRoundTemplateChanged__Params { + _event: FundingRoundTemplateChanged; + + constructor(event: FundingRoundTemplateChanged) { + this._event = event; + } + + get _template(): Address { + return this._event.parameters[0].value.toAddress(); + } +} + export class FundingSourceAdded extends ethereum.Event { get params(): FundingSourceAdded__Params { return new FundingSourceAdded__Params(this); @@ -64,6 +100,38 @@ export class FundingSourceRemoved__Params { } } +export class Initialized extends ethereum.Event { + get params(): Initialized__Params { + return new Initialized__Params(this); + } +} + +export class Initialized__Params { + _event: Initialized; + + constructor(event: Initialized) { + this._event = event; + } +} + +export class MaciFactoryChanged extends ethereum.Event { + get params(): MaciFactoryChanged__Params { + return new MaciFactoryChanged__Params(this); + } +} + +export class MaciFactoryChanged__Params { + _event: MaciFactoryChanged; + + constructor(event: MaciFactoryChanged) { + this._event = event; + } + + get _maciFactory(): Address { + return this._event.parameters[0].value.toAddress(); + } +} + export class OwnershipTransferred extends ethereum.Event { get params(): OwnershipTransferred__Params { return new OwnershipTransferred__Params(this); @@ -86,6 +154,24 @@ export class OwnershipTransferred__Params { } } +export class RecipientRegistryChanged extends ethereum.Event { + get params(): RecipientRegistryChanged__Params { + return new RecipientRegistryChanged__Params(this); + } +} + +export class RecipientRegistryChanged__Params { + _event: RecipientRegistryChanged; + + constructor(event: RecipientRegistryChanged) { + this._event = event; + } + + get _recipientRegistry(): Address { + return this._event.parameters[0].value.toAddress(); + } +} + export class RoundFinalized extends ethereum.Event { get params(): RoundFinalized__Params { return new RoundFinalized__Params(this); @@ -140,7 +226,25 @@ export class TokenChanged__Params { } } -export class FundingRoundFactory__coordinatorPubKeyResult { +export class UserRegistryChanged extends ethereum.Event { + get params(): UserRegistryChanged__Params { + return new UserRegistryChanged__Params(this); + } +} + +export class UserRegistryChanged__Params { + _event: UserRegistryChanged; + + constructor(event: UserRegistryChanged) { + this._event = event; + } + + get _userRegistry(): Address { + return this._event.parameters[0].value.toAddress(); + } +} + +export class ClrFund__coordinatorPubKeyResult { value0: BigInt; value1: BigInt; @@ -165,9 +269,32 @@ export class FundingRoundFactory__coordinatorPubKeyResult { } } -export class FundingRoundFactory extends ethereum.SmartContract { - static bind(address: Address): FundingRoundFactory { - return new FundingRoundFactory("FundingRoundFactory", address); +export class ClrFund extends ethereum.SmartContract { + static bind(address: Address): ClrFund { + return new ClrFund("ClrFund", address); + } + + MESSAGE_DATA_LENGTH(): i32 { + let result = super.call( + "MESSAGE_DATA_LENGTH", + "MESSAGE_DATA_LENGTH():(uint8)", + [], + ); + + return result[0].toI32(); + } + + try_MESSAGE_DATA_LENGTH(): ethereum.CallResult { + let result = super.tryCall( + "MESSAGE_DATA_LENGTH", + "MESSAGE_DATA_LENGTH():(uint8)", + [], + ); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toI32()); } coordinator(): Address { @@ -185,36 +312,34 @@ export class FundingRoundFactory extends ethereum.SmartContract { return ethereum.CallResult.fromValue(value[0].toAddress()); } - coordinatorPubKey(): FundingRoundFactory__coordinatorPubKeyResult { + coordinatorPubKey(): ClrFund__coordinatorPubKeyResult { let result = super.call( "coordinatorPubKey", "coordinatorPubKey():(uint256,uint256)", - [] + [], ); - return new FundingRoundFactory__coordinatorPubKeyResult( + return new ClrFund__coordinatorPubKeyResult( result[0].toBigInt(), - result[1].toBigInt() + result[1].toBigInt(), ); } - try_coordinatorPubKey(): ethereum.CallResult< - FundingRoundFactory__coordinatorPubKeyResult - > { + try_coordinatorPubKey(): ethereum.CallResult { let result = super.tryCall( "coordinatorPubKey", "coordinatorPubKey():(uint256,uint256)", - [] + [], ); if (result.reverted) { return new ethereum.CallResult(); } let value = result.value; return ethereum.CallResult.fromValue( - new FundingRoundFactory__coordinatorPubKeyResult( + new ClrFund__coordinatorPubKeyResult( value[0].toBigInt(), - value[1].toBigInt() - ) + value[1].toBigInt(), + ), ); } @@ -222,7 +347,7 @@ export class FundingRoundFactory extends ethereum.SmartContract { let result = super.call( "getCurrentRound", "getCurrentRound():(address)", - [] + [], ); return result[0].toAddress(); @@ -232,7 +357,7 @@ export class FundingRoundFactory extends ethereum.SmartContract { let result = super.tryCall( "getCurrentRound", "getCurrentRound():(address)", - [] + [], ); if (result.reverted) { return new ethereum.CallResult(); @@ -245,7 +370,7 @@ export class FundingRoundFactory extends ethereum.SmartContract { let result = super.call( "getMatchingFunds", "getMatchingFunds(address):(uint256)", - [ethereum.Value.fromAddress(token)] + [ethereum.Value.fromAddress(token)], ); return result[0].toBigInt(); @@ -255,7 +380,30 @@ export class FundingRoundFactory extends ethereum.SmartContract { let result = super.tryCall( "getMatchingFunds", "getMatchingFunds(address):(uint256)", - [ethereum.Value.fromAddress(token)] + [ethereum.Value.fromAddress(token)], + ); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toBigInt()); + } + + getMaxRecipients(): BigInt { + let result = super.call( + "getMaxRecipients", + "getMaxRecipients():(uint256)", + [], + ); + + return result[0].toBigInt(); + } + + try_getMaxRecipients(): ethereum.CallResult { + let result = super.tryCall( + "getMaxRecipients", + "getMaxRecipients():(uint256)", + [], ); if (result.reverted) { return new ethereum.CallResult(); @@ -313,7 +461,7 @@ export class FundingRoundFactory extends ethereum.SmartContract { let result = super.call( "recipientRegistry", "recipientRegistry():(address)", - [] + [], ); return result[0].toAddress(); @@ -323,7 +471,7 @@ export class FundingRoundFactory extends ethereum.SmartContract { let result = super.tryCall( "recipientRegistry", "recipientRegistry():(address)", - [] + [], ); if (result.reverted) { return new ethereum.CallResult(); @@ -332,49 +480,34 @@ export class FundingRoundFactory extends ethereum.SmartContract { return ethereum.CallResult.fromValue(value[0].toAddress()); } - userRegistry(): Address { - let result = super.call("userRegistry", "userRegistry():(address)", []); + roundFactory(): Address { + let result = super.call("roundFactory", "roundFactory():(address)", []); return result[0].toAddress(); } - try_userRegistry(): ethereum.CallResult
{ - let result = super.tryCall("userRegistry", "userRegistry():(address)", []); + try_roundFactory(): ethereum.CallResult
{ + let result = super.tryCall("roundFactory", "roundFactory():(address)", []); if (result.reverted) { return new ethereum.CallResult(); } let value = result.value; return ethereum.CallResult.fromValue(value[0].toAddress()); } -} -export class ConstructorCall extends ethereum.Call { - get inputs(): ConstructorCall__Inputs { - return new ConstructorCall__Inputs(this); - } - - get outputs(): ConstructorCall__Outputs { - return new ConstructorCall__Outputs(this); - } -} - -export class ConstructorCall__Inputs { - _call: ConstructorCall; - - constructor(call: ConstructorCall) { - this._call = call; - } + userRegistry(): Address { + let result = super.call("userRegistry", "userRegistry():(address)", []); - get _maciFactory(): Address { - return this._call.inputValues[0].value.toAddress(); + return result[0].toAddress(); } -} - -export class ConstructorCall__Outputs { - _call: ConstructorCall; - constructor(call: ConstructorCall) { - this._call = call; + try_userRegistry(): ethereum.CallResult
{ + let result = super.tryCall("userRegistry", "userRegistry():(address)", []); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toAddress()); } } @@ -476,6 +609,10 @@ export class DeployNewRoundCall__Inputs { constructor(call: DeployNewRoundCall) { this._call = call; } + + get duration(): BigInt { + return this._call.inputValues[0].value.toBigInt(); + } } export class DeployNewRoundCall__Outputs { @@ -486,6 +623,40 @@ export class DeployNewRoundCall__Outputs { } } +export class InitCall extends ethereum.Call { + get inputs(): InitCall__Inputs { + return new InitCall__Inputs(this); + } + + get outputs(): InitCall__Outputs { + return new InitCall__Outputs(this); + } +} + +export class InitCall__Inputs { + _call: InitCall; + + constructor(call: InitCall) { + this._call = call; + } + + get _maciFactory(): Address { + return this._call.inputValues[0].value.toAddress(); + } + + get _roundFactory(): Address { + return this._call.inputValues[1].value.toAddress(); + } +} + +export class InitCall__Outputs { + _call: InitCall; + + constructor(call: InitCall) { + this._call = call; + } +} + export class RemoveFundingSourceCall extends ethereum.Call { get inputs(): RemoveFundingSourceCall__Inputs { return new RemoveFundingSourceCall__Inputs(this); @@ -565,7 +736,7 @@ export class SetCoordinatorCall__Inputs { get _coordinatorPubKey(): SetCoordinatorCall_coordinatorPubKeyStruct { return changetype( - this._call.inputValues[1].value.toTuple() + this._call.inputValues[1].value.toTuple(), ); } } @@ -588,64 +759,62 @@ export class SetCoordinatorCall_coordinatorPubKeyStruct extends ethereum.Tuple { } } -export class SetMaciParametersCall extends ethereum.Call { - get inputs(): SetMaciParametersCall__Inputs { - return new SetMaciParametersCall__Inputs(this); +export class SetFundingRoundFactoryCall extends ethereum.Call { + get inputs(): SetFundingRoundFactoryCall__Inputs { + return new SetFundingRoundFactoryCall__Inputs(this); } - get outputs(): SetMaciParametersCall__Outputs { - return new SetMaciParametersCall__Outputs(this); + get outputs(): SetFundingRoundFactoryCall__Outputs { + return new SetFundingRoundFactoryCall__Outputs(this); } } -export class SetMaciParametersCall__Inputs { - _call: SetMaciParametersCall; +export class SetFundingRoundFactoryCall__Inputs { + _call: SetFundingRoundFactoryCall; - constructor(call: SetMaciParametersCall) { + constructor(call: SetFundingRoundFactoryCall) { this._call = call; } - get _stateTreeDepth(): i32 { - return this._call.inputValues[0].value.toI32(); - } - - get _messageTreeDepth(): i32 { - return this._call.inputValues[1].value.toI32(); + get _roundFactory(): Address { + return this._call.inputValues[0].value.toAddress(); } +} - get _voteOptionTreeDepth(): i32 { - return this._call.inputValues[2].value.toI32(); - } +export class SetFundingRoundFactoryCall__Outputs { + _call: SetFundingRoundFactoryCall; - get _tallyBatchSize(): i32 { - return this._call.inputValues[3].value.toI32(); + constructor(call: SetFundingRoundFactoryCall) { + this._call = call; } +} - get _messageBatchSize(): i32 { - return this._call.inputValues[4].value.toI32(); +export class SetMaciFactoryCall extends ethereum.Call { + get inputs(): SetMaciFactoryCall__Inputs { + return new SetMaciFactoryCall__Inputs(this); } - get _batchUstVerifier(): Address { - return this._call.inputValues[5].value.toAddress(); + get outputs(): SetMaciFactoryCall__Outputs { + return new SetMaciFactoryCall__Outputs(this); } +} - get _qvtVerifier(): Address { - return this._call.inputValues[6].value.toAddress(); - } +export class SetMaciFactoryCall__Inputs { + _call: SetMaciFactoryCall; - get _signUpDuration(): BigInt { - return this._call.inputValues[7].value.toBigInt(); + constructor(call: SetMaciFactoryCall) { + this._call = call; } - get _votingDuration(): BigInt { - return this._call.inputValues[8].value.toBigInt(); + get _maciFactory(): Address { + return this._call.inputValues[0].value.toAddress(); } } -export class SetMaciParametersCall__Outputs { - _call: SetMaciParametersCall; +export class SetMaciFactoryCall__Outputs { + _call: SetMaciFactoryCall; - constructor(call: SetMaciParametersCall) { + constructor(call: SetMaciFactoryCall) { this._call = call; } } @@ -764,6 +933,14 @@ export class TransferMatchingFundsCall__Inputs { get _totalSpentSalt(): BigInt { return this._call.inputValues[1].value.toBigInt(); } + + get _newResultCommitment(): BigInt { + return this._call.inputValues[2].value.toBigInt(); + } + + get _perVOSpentVoiceCreditsHash(): BigInt { + return this._call.inputValues[3].value.toBigInt(); + } } export class TransferMatchingFundsCall__Outputs { diff --git a/subgraph/generated/FundingRoundFactory/FundingRound.ts b/subgraph/generated/ClrFund/FundingRound.ts similarity index 54% rename from subgraph/generated/FundingRoundFactory/FundingRound.ts rename to subgraph/generated/ClrFund/FundingRound.ts index 6c3bcd6cb..32be22df9 100644 --- a/subgraph/generated/FundingRoundFactory/FundingRound.ts +++ b/subgraph/generated/ClrFund/FundingRound.ts @@ -7,7 +7,7 @@ import { Entity, Bytes, Address, - BigInt + BigInt, } from "@graphprotocol/graph-ts"; export class Contribution extends ethereum.Event { @@ -98,6 +98,24 @@ export class OwnershipTransferred__Params { } } +export class PollSet extends ethereum.Event { + get params(): PollSet__Params { + return new PollSet__Params(this); + } +} + +export class PollSet__Params { + _event: PollSet; + + constructor(event: PollSet) { + this._event = event; + } + + get _poll(): Address { + return this._event.parameters[0].value.toAddress(); + } +} + export class TallyPublished extends ethereum.Event { get params(): TallyPublished__Params { return new TallyPublished__Params(this); @@ -116,6 +134,46 @@ export class TallyPublished__Params { } } +export class TallyResultsAdded extends ethereum.Event { + get params(): TallyResultsAdded__Params { + return new TallyResultsAdded__Params(this); + } +} + +export class TallyResultsAdded__Params { + _event: TallyResultsAdded; + + constructor(event: TallyResultsAdded) { + this._event = event; + } + + get _voteOptionIndex(): BigInt { + return this._event.parameters[0].value.toBigInt(); + } + + get _tally(): BigInt { + return this._event.parameters[1].value.toBigInt(); + } +} + +export class TallySet extends ethereum.Event { + get params(): TallySet__Params { + return new TallySet__Params(this); + } +} + +export class TallySet__Params { + _event: TallySet; + + constructor(event: TallySet) { + this._event = event; + } + + get _tally(): Address { + return this._event.parameters[0].value.toAddress(); + } +} + export class Voted extends ethereum.Event { get params(): Voted__Params { return new Voted__Params(this); @@ -134,16 +192,165 @@ export class Voted__Params { } } +export class FundingRound__contributorsResult { + value0: BigInt; + value1: boolean; + + constructor(value0: BigInt, value1: boolean) { + this.value0 = value0; + this.value1 = value1; + } + + toMap(): TypedMap { + let map = new TypedMap(); + map.set("value0", ethereum.Value.fromUnsignedBigInt(this.value0)); + map.set("value1", ethereum.Value.fromBoolean(this.value1)); + return map; + } + + getVoiceCredits(): BigInt { + return this.value0; + } + + getIsRegistered(): boolean { + return this.value1; + } +} + +export class FundingRound__recipientsResult { + value0: boolean; + value1: boolean; + value2: BigInt; + + constructor(value0: boolean, value1: boolean, value2: BigInt) { + this.value0 = value0; + this.value1 = value1; + this.value2 = value2; + } + + toMap(): TypedMap { + let map = new TypedMap(); + map.set("value0", ethereum.Value.fromBoolean(this.value0)); + map.set("value1", ethereum.Value.fromBoolean(this.value1)); + map.set("value2", ethereum.Value.fromUnsignedBigInt(this.value2)); + return map; + } + + getFundsClaimed(): boolean { + return this.value0; + } + + getTallyVerified(): boolean { + return this.value1; + } + + getTallyResult(): BigInt { + return this.value2; + } +} + export class FundingRound extends ethereum.SmartContract { static bind(address: Address): FundingRound { return new FundingRound("FundingRound", address); } + MESSAGE_DATA_LENGTH(): i32 { + let result = super.call( + "MESSAGE_DATA_LENGTH", + "MESSAGE_DATA_LENGTH():(uint8)", + [], + ); + + return result[0].toI32(); + } + + try_MESSAGE_DATA_LENGTH(): ethereum.CallResult { + let result = super.tryCall( + "MESSAGE_DATA_LENGTH", + "MESSAGE_DATA_LENGTH():(uint8)", + [], + ); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toI32()); + } + + TREE_ARITY(): BigInt { + let result = super.call("TREE_ARITY", "TREE_ARITY():(uint256)", []); + + return result[0].toBigInt(); + } + + try_TREE_ARITY(): ethereum.CallResult { + let result = super.tryCall("TREE_ARITY", "TREE_ARITY():(uint256)", []); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toBigInt()); + } + + alpha(): BigInt { + let result = super.call("alpha", "alpha():(uint256)", []); + + return result[0].toBigInt(); + } + + try_alpha(): ethereum.CallResult { + let result = super.tryCall("alpha", "alpha():(uint256)", []); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toBigInt()); + } + + calcAlpha( + _budget: BigInt, + _totalVotesSquares: BigInt, + _totalSpent: BigInt, + ): BigInt { + let result = super.call( + "calcAlpha", + "calcAlpha(uint256,uint256,uint256):(uint256)", + [ + ethereum.Value.fromUnsignedBigInt(_budget), + ethereum.Value.fromUnsignedBigInt(_totalVotesSquares), + ethereum.Value.fromUnsignedBigInt(_totalSpent), + ], + ); + + return result[0].toBigInt(); + } + + try_calcAlpha( + _budget: BigInt, + _totalVotesSquares: BigInt, + _totalSpent: BigInt, + ): ethereum.CallResult { + let result = super.tryCall( + "calcAlpha", + "calcAlpha(uint256,uint256,uint256):(uint256)", + [ + ethereum.Value.fromUnsignedBigInt(_budget), + ethereum.Value.fromUnsignedBigInt(_totalVotesSquares), + ethereum.Value.fromUnsignedBigInt(_totalSpent), + ], + ); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toBigInt()); + } + contributorCount(): BigInt { let result = super.call( "contributorCount", "contributorCount():(uint256)", - [] + [], ); return result[0].toBigInt(); @@ -153,7 +360,7 @@ export class FundingRound extends ethereum.SmartContract { let result = super.tryCall( "contributorCount", "contributorCount():(uint256)", - [] + [], ); if (result.reverted) { return new ethereum.CallResult(); @@ -162,6 +369,39 @@ export class FundingRound extends ethereum.SmartContract { return ethereum.CallResult.fromValue(value[0].toBigInt()); } + contributors(param0: Address): FundingRound__contributorsResult { + let result = super.call( + "contributors", + "contributors(address):(uint256,bool)", + [ethereum.Value.fromAddress(param0)], + ); + + return new FundingRound__contributorsResult( + result[0].toBigInt(), + result[1].toBoolean(), + ); + } + + try_contributors( + param0: Address, + ): ethereum.CallResult { + let result = super.tryCall( + "contributors", + "contributors(address):(uint256,bool)", + [ethereum.Value.fromAddress(param0)], + ); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue( + new FundingRound__contributorsResult( + value[0].toBigInt(), + value[1].toBoolean(), + ), + ); + } + coordinator(): Address { let result = super.call("coordinator", "coordinator():(address)", []); @@ -183,8 +423,8 @@ export class FundingRound extends ethereum.SmartContract { "getAllocatedAmount(uint256,uint256):(uint256)", [ ethereum.Value.fromUnsignedBigInt(_tallyResult), - ethereum.Value.fromUnsignedBigInt(_spent) - ] + ethereum.Value.fromUnsignedBigInt(_spent), + ], ); return result[0].toBigInt(); @@ -192,15 +432,15 @@ export class FundingRound extends ethereum.SmartContract { try_getAllocatedAmount( _tallyResult: BigInt, - _spent: BigInt + _spent: BigInt, ): ethereum.CallResult { let result = super.tryCall( "getAllocatedAmount", "getAllocatedAmount(uint256,uint256):(uint256)", [ ethereum.Value.fromUnsignedBigInt(_tallyResult), - ethereum.Value.fromUnsignedBigInt(_spent) - ] + ethereum.Value.fromUnsignedBigInt(_spent), + ], ); if (result.reverted) { return new ethereum.CallResult(); @@ -213,7 +453,7 @@ export class FundingRound extends ethereum.SmartContract { let result = super.call( "getVoiceCredits", "getVoiceCredits(address,bytes):(uint256)", - [ethereum.Value.fromAddress(param0), ethereum.Value.fromBytes(_data)] + [ethereum.Value.fromAddress(param0), ethereum.Value.fromBytes(_data)], ); return result[0].toBigInt(); @@ -221,12 +461,12 @@ export class FundingRound extends ethereum.SmartContract { try_getVoiceCredits( param0: Address, - _data: Bytes + _data: Bytes, ): ethereum.CallResult { let result = super.tryCall( "getVoiceCredits", "getVoiceCredits(address,bytes):(uint256)", - [ethereum.Value.fromAddress(param0), ethereum.Value.fromBytes(_data)] + [ethereum.Value.fromAddress(param0), ethereum.Value.fromBytes(_data)], ); if (result.reverted) { return new ethereum.CallResult(); @@ -235,6 +475,27 @@ export class FundingRound extends ethereum.SmartContract { return ethereum.CallResult.fromValue(value[0].toBigInt()); } + isAddressZero(addressValue: Address): boolean { + let result = super.call("isAddressZero", "isAddressZero(address):(bool)", [ + ethereum.Value.fromAddress(addressValue), + ]); + + return result[0].toBoolean(); + } + + try_isAddressZero(addressValue: Address): ethereum.CallResult { + let result = super.tryCall( + "isAddressZero", + "isAddressZero(address):(bool)", + [ethereum.Value.fromAddress(addressValue)], + ); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toBoolean()); + } + isCancelled(): boolean { let result = super.call("isCancelled", "isCancelled():(bool)", []); @@ -284,7 +545,7 @@ export class FundingRound extends ethereum.SmartContract { let result = super.call( "matchingPoolSize", "matchingPoolSize():(uint256)", - [] + [], ); return result[0].toBigInt(); @@ -294,7 +555,7 @@ export class FundingRound extends ethereum.SmartContract { let result = super.tryCall( "matchingPoolSize", "matchingPoolSize():(uint256)", - [] + [], ); if (result.reverted) { return new ethereum.CallResult(); @@ -333,11 +594,41 @@ export class FundingRound extends ethereum.SmartContract { return ethereum.CallResult.fromValue(value[0].toAddress()); } + poll(): Address { + let result = super.call("poll", "poll():(address)", []); + + return result[0].toAddress(); + } + + try_poll(): ethereum.CallResult
{ + let result = super.tryCall("poll", "poll():(address)", []); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toAddress()); + } + + pollId(): BigInt { + let result = super.call("pollId", "pollId():(uint256)", []); + + return result[0].toBigInt(); + } + + try_pollId(): ethereum.CallResult { + let result = super.tryCall("pollId", "pollId():(uint256)", []); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toBigInt()); + } + recipientRegistry(): Address { let result = super.call( "recipientRegistry", "recipientRegistry():(address)", - [] + [], ); return result[0].toAddress(); @@ -347,12 +638,62 @@ export class FundingRound extends ethereum.SmartContract { let result = super.tryCall( "recipientRegistry", "recipientRegistry():(address)", - [] + [], + ); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toAddress()); + } + + recipients(param0: BigInt): FundingRound__recipientsResult { + let result = super.call( + "recipients", + "recipients(uint256):(bool,bool,uint256)", + [ethereum.Value.fromUnsignedBigInt(param0)], + ); + + return new FundingRound__recipientsResult( + result[0].toBoolean(), + result[1].toBoolean(), + result[2].toBigInt(), + ); + } + + try_recipients( + param0: BigInt, + ): ethereum.CallResult { + let result = super.tryCall( + "recipients", + "recipients(uint256):(bool,bool,uint256)", + [ethereum.Value.fromUnsignedBigInt(param0)], ); if (result.reverted) { return new ethereum.CallResult(); } let value = result.value; + return ethereum.CallResult.fromValue( + new FundingRound__recipientsResult( + value[0].toBoolean(), + value[1].toBoolean(), + value[2].toBigInt(), + ), + ); + } + + tally(): Address { + let result = super.call("tally", "tally():(address)", []); + + return result[0].toAddress(); + } + + try_tally(): ethereum.CallResult
{ + let result = super.tryCall("tally", "tally():(address)", []); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; return ethereum.CallResult.fromValue(value[0].toAddress()); } @@ -371,6 +712,21 @@ export class FundingRound extends ethereum.SmartContract { return ethereum.CallResult.fromValue(value[0].toString()); } + topupToken(): Address { + let result = super.call("topupToken", "topupToken():(address)", []); + + return result[0].toAddress(); + } + + try_topupToken(): ethereum.CallResult
{ + let result = super.tryCall("topupToken", "topupToken():(address)", []); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toAddress()); + } + totalSpent(): BigInt { let result = super.call("totalSpent", "totalSpent():(uint256)", []); @@ -386,6 +742,29 @@ export class FundingRound extends ethereum.SmartContract { return ethereum.CallResult.fromValue(value[0].toBigInt()); } + totalTallyResults(): BigInt { + let result = super.call( + "totalTallyResults", + "totalTallyResults():(uint256)", + [], + ); + + return result[0].toBigInt(); + } + + try_totalTallyResults(): ethereum.CallResult { + let result = super.tryCall( + "totalTallyResults", + "totalTallyResults():(uint256)", + [], + ); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toBigInt()); + } + totalVotes(): BigInt { let result = super.call("totalVotes", "totalVotes():(uint256)", []); @@ -401,6 +780,29 @@ export class FundingRound extends ethereum.SmartContract { return ethereum.CallResult.fromValue(value[0].toBigInt()); } + totalVotesSquares(): BigInt { + let result = super.call( + "totalVotesSquares", + "totalVotesSquares():(uint256)", + [], + ); + + return result[0].toBigInt(); + } + + try_totalVotesSquares(): ethereum.CallResult { + let result = super.tryCall( + "totalVotesSquares", + "totalVotesSquares():(uint256)", + [], + ); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toBigInt()); + } + userRegistry(): Address { let result = super.call("userRegistry", "userRegistry():(address)", []); @@ -420,7 +822,7 @@ export class FundingRound extends ethereum.SmartContract { let result = super.call( "voiceCreditFactor", "voiceCreditFactor():(uint256)", - [] + [], ); return result[0].toBigInt(); @@ -430,7 +832,7 @@ export class FundingRound extends ethereum.SmartContract { let result = super.tryCall( "voiceCreditFactor", "voiceCreditFactor():(uint256)", - [] + [], ); if (result.reverted) { return new ethereum.CallResult(); @@ -438,6 +840,31 @@ export class FundingRound extends ethereum.SmartContract { let value = result.value; return ethereum.CallResult.fromValue(value[0].toBigInt()); } + + withdrawContributions(_contributors: Array
): Array { + let result = super.call( + "withdrawContributions", + "withdrawContributions(address[]):(bool[])", + [ethereum.Value.fromAddressArray(_contributors)], + ); + + return result[0].toBooleanArray(); + } + + try_withdrawContributions( + _contributors: Array
, + ): ethereum.CallResult> { + let result = super.tryCall( + "withdrawContributions", + "withdrawContributions(address[]):(bool[])", + [ethereum.Value.fromAddressArray(_contributors)], + ); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toBooleanArray()); + } } export class ConstructorCall extends ethereum.Call { @@ -508,6 +935,56 @@ export class CancelCall__Outputs { } } +export class ClaimFundsCall extends ethereum.Call { + get inputs(): ClaimFundsCall__Inputs { + return new ClaimFundsCall__Inputs(this); + } + + get outputs(): ClaimFundsCall__Outputs { + return new ClaimFundsCall__Outputs(this); + } +} + +export class ClaimFundsCall__Inputs { + _call: ClaimFundsCall; + + constructor(call: ClaimFundsCall) { + this._call = call; + } + + get _voteOptionIndex(): BigInt { + return this._call.inputValues[0].value.toBigInt(); + } + + get _spent(): BigInt { + return this._call.inputValues[1].value.toBigInt(); + } + + get _spentProof(): Array> { + return this._call.inputValues[2].value.toBigIntMatrix(); + } + + get _spentSalt(): BigInt { + return this._call.inputValues[3].value.toBigInt(); + } + + get _resultsCommitment(): BigInt { + return this._call.inputValues[4].value.toBigInt(); + } + + get _spentVoiceCreditsCommitment(): BigInt { + return this._call.inputValues[5].value.toBigInt(); + } +} + +export class ClaimFundsCall__Outputs { + _call: ClaimFundsCall; + + constructor(call: ClaimFundsCall) { + this._call = call; + } +} + export class ContributeCall extends ethereum.Call { get inputs(): ContributeCall__Inputs { return new ContributeCall__Inputs(this); @@ -527,7 +1004,7 @@ export class ContributeCall__Inputs { get pubKey(): ContributeCallPubKeyStruct { return changetype( - this._call.inputValues[0].value.toTuple() + this._call.inputValues[0].value.toTuple(), ); } @@ -578,6 +1055,14 @@ export class FinalizeCall__Inputs { get _totalSpentSalt(): BigInt { return this._call.inputValues[1].value.toBigInt(); } + + get _newResultCommitment(): BigInt { + return this._call.inputValues[2].value.toBigInt(); + } + + get _perVOSpentVoiceCreditsHash(): BigInt { + return this._call.inputValues[3].value.toBigInt(); + } } export class FinalizeCall__Outputs { @@ -678,6 +1163,32 @@ export class RenounceOwnershipCall__Outputs { } } +export class ResetTallyCall extends ethereum.Call { + get inputs(): ResetTallyCall__Inputs { + return new ResetTallyCall__Inputs(this); + } + + get outputs(): ResetTallyCall__Outputs { + return new ResetTallyCall__Outputs(this); + } +} + +export class ResetTallyCall__Inputs { + _call: ResetTallyCall; + + constructor(call: ResetTallyCall) { + this._call = call; + } +} + +export class ResetTallyCall__Outputs { + _call: ResetTallyCall; + + constructor(call: ResetTallyCall) { + this._call = call; + } +} + export class SetMaciCall extends ethereum.Call { get inputs(): SetMaciCall__Inputs { return new SetMaciCall__Inputs(this); @@ -698,6 +1209,12 @@ export class SetMaciCall__Inputs { get _maci(): Address { return this._call.inputValues[0].value.toAddress(); } + + get _pollContracts(): SetMaciCall_pollContractsStruct { + return changetype( + this._call.inputValues[1].value.toTuple(), + ); + } } export class SetMaciCall__Outputs { @@ -708,61 +1225,51 @@ export class SetMaciCall__Outputs { } } -export class SubmitMessageBatchCall extends ethereum.Call { - get inputs(): SubmitMessageBatchCall__Inputs { - return new SubmitMessageBatchCall__Inputs(this); +export class SetMaciCall_pollContractsStruct extends ethereum.Tuple { + get poll(): Address { + return this[0].toAddress(); } - get outputs(): SubmitMessageBatchCall__Outputs { - return new SubmitMessageBatchCall__Outputs(this); + get messageProcessor(): Address { + return this[1].toAddress(); } -} -export class SubmitMessageBatchCall__Inputs { - _call: SubmitMessageBatchCall; + get tally(): Address { + return this[2].toAddress(); + } - constructor(call: SubmitMessageBatchCall) { - this._call = call; + get subsidy(): Address { + return this[3].toAddress(); } +} - get _messages(): Array { - return this._call.inputValues[0].value.toTupleArray< - SubmitMessageBatchCall_messagesStruct - >(); +export class SetMaciInstanceCall extends ethereum.Call { + get inputs(): SetMaciInstanceCall__Inputs { + return new SetMaciInstanceCall__Inputs(this); } - get _encPubKeys(): Array { - return this._call.inputValues[1].value.toTupleArray< - SubmitMessageBatchCall_encPubKeysStruct - >(); + get outputs(): SetMaciInstanceCall__Outputs { + return new SetMaciInstanceCall__Outputs(this); } } -export class SubmitMessageBatchCall__Outputs { - _call: SubmitMessageBatchCall; +export class SetMaciInstanceCall__Inputs { + _call: SetMaciInstanceCall; - constructor(call: SubmitMessageBatchCall) { + constructor(call: SetMaciInstanceCall) { this._call = call; } -} -export class SubmitMessageBatchCall_messagesStruct extends ethereum.Tuple { - get iv(): BigInt { - return this[0].toBigInt(); - } - - get data(): Array { - return this[1].toBigIntArray(); + get _maci(): Address { + return this._call.inputValues[0].value.toAddress(); } } -export class SubmitMessageBatchCall_encPubKeysStruct extends ethereum.Tuple { - get x(): BigInt { - return this[0].toBigInt(); - } +export class SetMaciInstanceCall__Outputs { + _call: SetMaciInstanceCall; - get y(): BigInt { - return this[1].toBigInt(); + constructor(call: SetMaciInstanceCall) { + this._call = call; } } @@ -812,16 +1319,46 @@ export class WithdrawContributionCall__Inputs { constructor(call: WithdrawContributionCall) { this._call = call; } +} + +export class WithdrawContributionCall__Outputs { + _call: WithdrawContributionCall; + + constructor(call: WithdrawContributionCall) { + this._call = call; + } +} + +export class WithdrawContributionsCall extends ethereum.Call { + get inputs(): WithdrawContributionsCall__Inputs { + return new WithdrawContributionsCall__Inputs(this); + } + + get outputs(): WithdrawContributionsCall__Outputs { + return new WithdrawContributionsCall__Outputs(this); + } +} + +export class WithdrawContributionsCall__Inputs { + _call: WithdrawContributionsCall; + + constructor(call: WithdrawContributionsCall) { + this._call = call; + } get _contributors(): Array
{ return this._call.inputValues[0].value.toAddressArray(); } } -export class WithdrawContributionCall__Outputs { - _call: WithdrawContributionCall; +export class WithdrawContributionsCall__Outputs { + _call: WithdrawContributionsCall; - constructor(call: WithdrawContributionCall) { + constructor(call: WithdrawContributionsCall) { this._call = call; } + + get result(): Array { + return this._call.outputValues[0].value.toBooleanArray(); + } } diff --git a/subgraph/generated/ClrFund/MACI.ts b/subgraph/generated/ClrFund/MACI.ts new file mode 100644 index 000000000..b1b8238e1 --- /dev/null +++ b/subgraph/generated/ClrFund/MACI.ts @@ -0,0 +1,1235 @@ +// THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. + +import { + ethereum, + JSONValue, + TypedMap, + Entity, + Bytes, + Address, + BigInt, +} from "@graphprotocol/graph-ts"; + +export class DeployPoll extends ethereum.Event { + get params(): DeployPoll__Params { + return new DeployPoll__Params(this); + } +} + +export class DeployPoll__Params { + _event: DeployPoll; + + constructor(event: DeployPoll) { + this._event = event; + } + + get _pollId(): BigInt { + return this._event.parameters[0].value.toBigInt(); + } + + get _coordinatorPubKeyX(): BigInt { + return this._event.parameters[1].value.toBigInt(); + } + + get _coordinatorPubKeyY(): BigInt { + return this._event.parameters[2].value.toBigInt(); + } + + get pollAddr(): DeployPollPollAddrStruct { + return changetype( + this._event.parameters[3].value.toTuple(), + ); + } +} + +export class DeployPollPollAddrStruct extends ethereum.Tuple { + get poll(): Address { + return this[0].toAddress(); + } + + get messageProcessor(): Address { + return this[1].toAddress(); + } + + get tally(): Address { + return this[2].toAddress(); + } + + get subsidy(): Address { + return this[3].toAddress(); + } +} + +export class OwnershipTransferred extends ethereum.Event { + get params(): OwnershipTransferred__Params { + return new OwnershipTransferred__Params(this); + } +} + +export class OwnershipTransferred__Params { + _event: OwnershipTransferred; + + constructor(event: OwnershipTransferred) { + this._event = event; + } + + get previousOwner(): Address { + return this._event.parameters[0].value.toAddress(); + } + + get newOwner(): Address { + return this._event.parameters[1].value.toAddress(); + } +} + +export class SignUp extends ethereum.Event { + get params(): SignUp__Params { + return new SignUp__Params(this); + } +} + +export class SignUp__Params { + _event: SignUp; + + constructor(event: SignUp) { + this._event = event; + } + + get _stateIndex(): BigInt { + return this._event.parameters[0].value.toBigInt(); + } + + get _userPubKeyX(): BigInt { + return this._event.parameters[1].value.toBigInt(); + } + + get _userPubKeyY(): BigInt { + return this._event.parameters[2].value.toBigInt(); + } + + get _voiceCreditBalance(): BigInt { + return this._event.parameters[3].value.toBigInt(); + } + + get _timestamp(): BigInt { + return this._event.parameters[4].value.toBigInt(); + } +} + +export class MACI__deployPollResultPollAddrStruct extends ethereum.Tuple { + get poll(): Address { + return this[0].toAddress(); + } + + get messageProcessor(): Address { + return this[1].toAddress(); + } + + get tally(): Address { + return this[2].toAddress(); + } + + get subsidy(): Address { + return this[3].toAddress(); + } +} + +export class MACI__deployPollInput_treeDepthsStruct extends ethereum.Tuple { + get intStateTreeDepth(): i32 { + return this[0].toI32(); + } + + get messageTreeSubDepth(): i32 { + return this[1].toI32(); + } + + get messageTreeDepth(): i32 { + return this[2].toI32(); + } + + get voteOptionTreeDepth(): i32 { + return this[3].toI32(); + } +} + +export class MACI__deployPollInput_coordinatorPubKeyStruct extends ethereum.Tuple { + get x(): BigInt { + return this[0].toBigInt(); + } + + get y(): BigInt { + return this[1].toBigInt(); + } +} + +export class MACI__hashMessageAndEncPubKeyInput_messageStruct extends ethereum.Tuple { + get msgType(): BigInt { + return this[0].toBigInt(); + } + + get data(): Array { + return this[1].toBigIntArray(); + } +} + +export class MACI__hashMessageAndEncPubKeyInput_encPubKeyStruct extends ethereum.Tuple { + get x(): BigInt { + return this[0].toBigInt(); + } + + get y(): BigInt { + return this[1].toBigInt(); + } +} + +export class MACI__hashStateLeafInput_stateLeafStruct extends ethereum.Tuple { + get pubKey(): MACI__hashStateLeafInput_stateLeafPubKeyStruct { + return changetype( + this[0].toTuple(), + ); + } + + get voiceCreditBalance(): BigInt { + return this[1].toBigInt(); + } + + get timestamp(): BigInt { + return this[2].toBigInt(); + } +} + +export class MACI__hashStateLeafInput_stateLeafPubKeyStruct extends ethereum.Tuple { + get x(): BigInt { + return this[0].toBigInt(); + } + + get y(): BigInt { + return this[1].toBigInt(); + } +} + +export class MACI__padAndHashMessageResultMessageStruct extends ethereum.Tuple { + get msgType(): BigInt { + return this[0].toBigInt(); + } + + get data(): Array { + return this[1].toBigIntArray(); + } +} + +export class MACI__padAndHashMessageResultPadKeyStruct extends ethereum.Tuple { + get x(): BigInt { + return this[0].toBigInt(); + } + + get y(): BigInt { + return this[1].toBigInt(); + } +} + +export class MACI__padAndHashMessageResult { + value0: MACI__padAndHashMessageResultMessageStruct; + value1: MACI__padAndHashMessageResultPadKeyStruct; + value2: BigInt; + + constructor( + value0: MACI__padAndHashMessageResultMessageStruct, + value1: MACI__padAndHashMessageResultPadKeyStruct, + value2: BigInt, + ) { + this.value0 = value0; + this.value1 = value1; + this.value2 = value2; + } + + toMap(): TypedMap { + let map = new TypedMap(); + map.set("value0", ethereum.Value.fromTuple(this.value0)); + map.set("value1", ethereum.Value.fromTuple(this.value1)); + map.set("value2", ethereum.Value.fromUnsignedBigInt(this.value2)); + return map; + } + + getMessage(): MACI__padAndHashMessageResultMessageStruct { + return this.value0; + } + + getPadKey(): MACI__padAndHashMessageResultPadKeyStruct { + return this.value1; + } + + getMsgHash(): BigInt { + return this.value2; + } +} + +export class MACI extends ethereum.SmartContract { + static bind(address: Address): MACI { + return new MACI("MACI", address); + } + + MESSAGE_DATA_LENGTH(): i32 { + let result = super.call( + "MESSAGE_DATA_LENGTH", + "MESSAGE_DATA_LENGTH():(uint8)", + [], + ); + + return result[0].toI32(); + } + + try_MESSAGE_DATA_LENGTH(): ethereum.CallResult { + let result = super.tryCall( + "MESSAGE_DATA_LENGTH", + "MESSAGE_DATA_LENGTH():(uint8)", + [], + ); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toI32()); + } + + deployPoll( + _duration: BigInt, + _treeDepths: MACI__deployPollInput_treeDepthsStruct, + _coordinatorPubKey: MACI__deployPollInput_coordinatorPubKeyStruct, + _verifier: Address, + _vkRegistry: Address, + useSubsidy: boolean, + ): MACI__deployPollResultPollAddrStruct { + let result = super.call( + "deployPoll", + "deployPoll(uint256,(uint8,uint8,uint8,uint8),(uint256,uint256),address,address,bool):((address,address,address,address))", + [ + ethereum.Value.fromUnsignedBigInt(_duration), + ethereum.Value.fromTuple(_treeDepths), + ethereum.Value.fromTuple(_coordinatorPubKey), + ethereum.Value.fromAddress(_verifier), + ethereum.Value.fromAddress(_vkRegistry), + ethereum.Value.fromBoolean(useSubsidy), + ], + ); + + return changetype( + result[0].toTuple(), + ); + } + + try_deployPoll( + _duration: BigInt, + _treeDepths: MACI__deployPollInput_treeDepthsStruct, + _coordinatorPubKey: MACI__deployPollInput_coordinatorPubKeyStruct, + _verifier: Address, + _vkRegistry: Address, + useSubsidy: boolean, + ): ethereum.CallResult { + let result = super.tryCall( + "deployPoll", + "deployPoll(uint256,(uint8,uint8,uint8,uint8),(uint256,uint256),address,address,bool):((address,address,address,address))", + [ + ethereum.Value.fromUnsignedBigInt(_duration), + ethereum.Value.fromTuple(_treeDepths), + ethereum.Value.fromTuple(_coordinatorPubKey), + ethereum.Value.fromAddress(_verifier), + ethereum.Value.fromAddress(_vkRegistry), + ethereum.Value.fromBoolean(useSubsidy), + ], + ); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue( + changetype(value[0].toTuple()), + ); + } + + getPoll(_pollId: BigInt): Address { + let result = super.call("getPoll", "getPoll(uint256):(address)", [ + ethereum.Value.fromUnsignedBigInt(_pollId), + ]); + + return result[0].toAddress(); + } + + try_getPoll(_pollId: BigInt): ethereum.CallResult
{ + let result = super.tryCall("getPoll", "getPoll(uint256):(address)", [ + ethereum.Value.fromUnsignedBigInt(_pollId), + ]); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toAddress()); + } + + getStateAqRoot(): BigInt { + let result = super.call("getStateAqRoot", "getStateAqRoot():(uint256)", []); + + return result[0].toBigInt(); + } + + try_getStateAqRoot(): ethereum.CallResult { + let result = super.tryCall( + "getStateAqRoot", + "getStateAqRoot():(uint256)", + [], + ); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toBigInt()); + } + + hash2(array: Array): BigInt { + let result = super.call("hash2", "hash2(uint256[2]):(uint256)", [ + ethereum.Value.fromUnsignedBigIntArray(array), + ]); + + return result[0].toBigInt(); + } + + try_hash2(array: Array): ethereum.CallResult { + let result = super.tryCall("hash2", "hash2(uint256[2]):(uint256)", [ + ethereum.Value.fromUnsignedBigIntArray(array), + ]); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toBigInt()); + } + + hash3(array: Array): BigInt { + let result = super.call("hash3", "hash3(uint256[3]):(uint256)", [ + ethereum.Value.fromUnsignedBigIntArray(array), + ]); + + return result[0].toBigInt(); + } + + try_hash3(array: Array): ethereum.CallResult { + let result = super.tryCall("hash3", "hash3(uint256[3]):(uint256)", [ + ethereum.Value.fromUnsignedBigIntArray(array), + ]); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toBigInt()); + } + + hash4(array: Array): BigInt { + let result = super.call("hash4", "hash4(uint256[4]):(uint256)", [ + ethereum.Value.fromUnsignedBigIntArray(array), + ]); + + return result[0].toBigInt(); + } + + try_hash4(array: Array): ethereum.CallResult { + let result = super.tryCall("hash4", "hash4(uint256[4]):(uint256)", [ + ethereum.Value.fromUnsignedBigIntArray(array), + ]); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toBigInt()); + } + + hash5(array: Array): BigInt { + let result = super.call("hash5", "hash5(uint256[5]):(uint256)", [ + ethereum.Value.fromUnsignedBigIntArray(array), + ]); + + return result[0].toBigInt(); + } + + try_hash5(array: Array): ethereum.CallResult { + let result = super.tryCall("hash5", "hash5(uint256[5]):(uint256)", [ + ethereum.Value.fromUnsignedBigIntArray(array), + ]); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toBigInt()); + } + + hashLeftRight(left: BigInt, right: BigInt): BigInt { + let result = super.call( + "hashLeftRight", + "hashLeftRight(uint256,uint256):(uint256)", + [ + ethereum.Value.fromUnsignedBigInt(left), + ethereum.Value.fromUnsignedBigInt(right), + ], + ); + + return result[0].toBigInt(); + } + + try_hashLeftRight(left: BigInt, right: BigInt): ethereum.CallResult { + let result = super.tryCall( + "hashLeftRight", + "hashLeftRight(uint256,uint256):(uint256)", + [ + ethereum.Value.fromUnsignedBigInt(left), + ethereum.Value.fromUnsignedBigInt(right), + ], + ); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toBigInt()); + } + + hashMessageAndEncPubKey( + _message: MACI__hashMessageAndEncPubKeyInput_messageStruct, + _encPubKey: MACI__hashMessageAndEncPubKeyInput_encPubKeyStruct, + ): BigInt { + let result = super.call( + "hashMessageAndEncPubKey", + "hashMessageAndEncPubKey((uint256,uint256[10]),(uint256,uint256)):(uint256)", + [ + ethereum.Value.fromTuple(_message), + ethereum.Value.fromTuple(_encPubKey), + ], + ); + + return result[0].toBigInt(); + } + + try_hashMessageAndEncPubKey( + _message: MACI__hashMessageAndEncPubKeyInput_messageStruct, + _encPubKey: MACI__hashMessageAndEncPubKeyInput_encPubKeyStruct, + ): ethereum.CallResult { + let result = super.tryCall( + "hashMessageAndEncPubKey", + "hashMessageAndEncPubKey((uint256,uint256[10]),(uint256,uint256)):(uint256)", + [ + ethereum.Value.fromTuple(_message), + ethereum.Value.fromTuple(_encPubKey), + ], + ); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toBigInt()); + } + + hashStateLeaf(_stateLeaf: MACI__hashStateLeafInput_stateLeafStruct): BigInt { + let result = super.call( + "hashStateLeaf", + "hashStateLeaf(((uint256,uint256),uint256,uint256)):(uint256)", + [ethereum.Value.fromTuple(_stateLeaf)], + ); + + return result[0].toBigInt(); + } + + try_hashStateLeaf( + _stateLeaf: MACI__hashStateLeafInput_stateLeafStruct, + ): ethereum.CallResult { + let result = super.tryCall( + "hashStateLeaf", + "hashStateLeaf(((uint256,uint256),uint256,uint256)):(uint256)", + [ethereum.Value.fromTuple(_stateLeaf)], + ); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toBigInt()); + } + + initialVoiceCreditProxy(): Address { + let result = super.call( + "initialVoiceCreditProxy", + "initialVoiceCreditProxy():(address)", + [], + ); + + return result[0].toAddress(); + } + + try_initialVoiceCreditProxy(): ethereum.CallResult
{ + let result = super.tryCall( + "initialVoiceCreditProxy", + "initialVoiceCreditProxy():(address)", + [], + ); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toAddress()); + } + + mergeStateAq(_pollId: BigInt): BigInt { + let result = super.call("mergeStateAq", "mergeStateAq(uint256):(uint256)", [ + ethereum.Value.fromUnsignedBigInt(_pollId), + ]); + + return result[0].toBigInt(); + } + + try_mergeStateAq(_pollId: BigInt): ethereum.CallResult { + let result = super.tryCall( + "mergeStateAq", + "mergeStateAq(uint256):(uint256)", + [ethereum.Value.fromUnsignedBigInt(_pollId)], + ); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toBigInt()); + } + + messageProcessorFactory(): Address { + let result = super.call( + "messageProcessorFactory", + "messageProcessorFactory():(address)", + [], + ); + + return result[0].toAddress(); + } + + try_messageProcessorFactory(): ethereum.CallResult
{ + let result = super.tryCall( + "messageProcessorFactory", + "messageProcessorFactory():(address)", + [], + ); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toAddress()); + } + + nextPollId(): BigInt { + let result = super.call("nextPollId", "nextPollId():(uint256)", []); + + return result[0].toBigInt(); + } + + try_nextPollId(): ethereum.CallResult { + let result = super.tryCall("nextPollId", "nextPollId():(uint256)", []); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toBigInt()); + } + + numSignUps(): BigInt { + let result = super.call("numSignUps", "numSignUps():(uint256)", []); + + return result[0].toBigInt(); + } + + try_numSignUps(): ethereum.CallResult { + let result = super.tryCall("numSignUps", "numSignUps():(uint256)", []); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toBigInt()); + } + + owner(): Address { + let result = super.call("owner", "owner():(address)", []); + + return result[0].toAddress(); + } + + try_owner(): ethereum.CallResult
{ + let result = super.tryCall("owner", "owner():(address)", []); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toAddress()); + } + + padAndHashMessage( + dataToPad: Array, + msgType: BigInt, + ): MACI__padAndHashMessageResult { + let result = super.call( + "padAndHashMessage", + "padAndHashMessage(uint256[2],uint256):((uint256,uint256[10]),(uint256,uint256),uint256)", + [ + ethereum.Value.fromUnsignedBigIntArray(dataToPad), + ethereum.Value.fromUnsignedBigInt(msgType), + ], + ); + + return changetype( + new MACI__padAndHashMessageResult( + changetype( + result[0].toTuple(), + ), + changetype( + result[1].toTuple(), + ), + result[2].toBigInt(), + ), + ); + } + + try_padAndHashMessage( + dataToPad: Array, + msgType: BigInt, + ): ethereum.CallResult { + let result = super.tryCall( + "padAndHashMessage", + "padAndHashMessage(uint256[2],uint256):((uint256,uint256[10]),(uint256,uint256),uint256)", + [ + ethereum.Value.fromUnsignedBigIntArray(dataToPad), + ethereum.Value.fromUnsignedBigInt(msgType), + ], + ); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue( + changetype( + new MACI__padAndHashMessageResult( + changetype( + value[0].toTuple(), + ), + changetype( + value[1].toTuple(), + ), + value[2].toBigInt(), + ), + ), + ); + } + + pollFactory(): Address { + let result = super.call("pollFactory", "pollFactory():(address)", []); + + return result[0].toAddress(); + } + + try_pollFactory(): ethereum.CallResult
{ + let result = super.tryCall("pollFactory", "pollFactory():(address)", []); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toAddress()); + } + + polls(param0: BigInt): Address { + let result = super.call("polls", "polls(uint256):(address)", [ + ethereum.Value.fromUnsignedBigInt(param0), + ]); + + return result[0].toAddress(); + } + + try_polls(param0: BigInt): ethereum.CallResult
{ + let result = super.tryCall("polls", "polls(uint256):(address)", [ + ethereum.Value.fromUnsignedBigInt(param0), + ]); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toAddress()); + } + + sha256Hash(array: Array): BigInt { + let result = super.call("sha256Hash", "sha256Hash(uint256[]):(uint256)", [ + ethereum.Value.fromUnsignedBigIntArray(array), + ]); + + return result[0].toBigInt(); + } + + try_sha256Hash(array: Array): ethereum.CallResult { + let result = super.tryCall( + "sha256Hash", + "sha256Hash(uint256[]):(uint256)", + [ethereum.Value.fromUnsignedBigIntArray(array)], + ); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toBigInt()); + } + + signUpGatekeeper(): Address { + let result = super.call( + "signUpGatekeeper", + "signUpGatekeeper():(address)", + [], + ); + + return result[0].toAddress(); + } + + try_signUpGatekeeper(): ethereum.CallResult
{ + let result = super.tryCall( + "signUpGatekeeper", + "signUpGatekeeper():(address)", + [], + ); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toAddress()); + } + + stateAq(): Address { + let result = super.call("stateAq", "stateAq():(address)", []); + + return result[0].toAddress(); + } + + try_stateAq(): ethereum.CallResult
{ + let result = super.tryCall("stateAq", "stateAq():(address)", []); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toAddress()); + } + + stateTreeDepth(): i32 { + let result = super.call("stateTreeDepth", "stateTreeDepth():(uint8)", []); + + return result[0].toI32(); + } + + try_stateTreeDepth(): ethereum.CallResult { + let result = super.tryCall( + "stateTreeDepth", + "stateTreeDepth():(uint8)", + [], + ); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toI32()); + } + + subsidyFactory(): Address { + let result = super.call("subsidyFactory", "subsidyFactory():(address)", []); + + return result[0].toAddress(); + } + + try_subsidyFactory(): ethereum.CallResult
{ + let result = super.tryCall( + "subsidyFactory", + "subsidyFactory():(address)", + [], + ); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toAddress()); + } + + subtreesMerged(): boolean { + let result = super.call("subtreesMerged", "subtreesMerged():(bool)", []); + + return result[0].toBoolean(); + } + + try_subtreesMerged(): ethereum.CallResult { + let result = super.tryCall("subtreesMerged", "subtreesMerged():(bool)", []); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toBoolean()); + } + + tallyFactory(): Address { + let result = super.call("tallyFactory", "tallyFactory():(address)", []); + + return result[0].toAddress(); + } + + try_tallyFactory(): ethereum.CallResult
{ + let result = super.tryCall("tallyFactory", "tallyFactory():(address)", []); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toAddress()); + } + + topupCredit(): Address { + let result = super.call("topupCredit", "topupCredit():(address)", []); + + return result[0].toAddress(); + } + + try_topupCredit(): ethereum.CallResult
{ + let result = super.tryCall("topupCredit", "topupCredit():(address)", []); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toAddress()); + } +} + +export class ConstructorCall extends ethereum.Call { + get inputs(): ConstructorCall__Inputs { + return new ConstructorCall__Inputs(this); + } + + get outputs(): ConstructorCall__Outputs { + return new ConstructorCall__Outputs(this); + } +} + +export class ConstructorCall__Inputs { + _call: ConstructorCall; + + constructor(call: ConstructorCall) { + this._call = call; + } + + get _pollFactory(): Address { + return this._call.inputValues[0].value.toAddress(); + } + + get _messageProcessorFactory(): Address { + return this._call.inputValues[1].value.toAddress(); + } + + get _tallyFactory(): Address { + return this._call.inputValues[2].value.toAddress(); + } + + get _subsidyFactory(): Address { + return this._call.inputValues[3].value.toAddress(); + } + + get _signUpGatekeeper(): Address { + return this._call.inputValues[4].value.toAddress(); + } + + get _initialVoiceCreditProxy(): Address { + return this._call.inputValues[5].value.toAddress(); + } + + get _topupCredit(): Address { + return this._call.inputValues[6].value.toAddress(); + } + + get _stateTreeDepth(): i32 { + return this._call.inputValues[7].value.toI32(); + } +} + +export class ConstructorCall__Outputs { + _call: ConstructorCall; + + constructor(call: ConstructorCall) { + this._call = call; + } +} + +export class DeployPollCall extends ethereum.Call { + get inputs(): DeployPollCall__Inputs { + return new DeployPollCall__Inputs(this); + } + + get outputs(): DeployPollCall__Outputs { + return new DeployPollCall__Outputs(this); + } +} + +export class DeployPollCall__Inputs { + _call: DeployPollCall; + + constructor(call: DeployPollCall) { + this._call = call; + } + + get _duration(): BigInt { + return this._call.inputValues[0].value.toBigInt(); + } + + get _treeDepths(): DeployPollCall_treeDepthsStruct { + return changetype( + this._call.inputValues[1].value.toTuple(), + ); + } + + get _coordinatorPubKey(): DeployPollCall_coordinatorPubKeyStruct { + return changetype( + this._call.inputValues[2].value.toTuple(), + ); + } + + get _verifier(): Address { + return this._call.inputValues[3].value.toAddress(); + } + + get _vkRegistry(): Address { + return this._call.inputValues[4].value.toAddress(); + } + + get useSubsidy(): boolean { + return this._call.inputValues[5].value.toBoolean(); + } +} + +export class DeployPollCall__Outputs { + _call: DeployPollCall; + + constructor(call: DeployPollCall) { + this._call = call; + } + + get pollAddr(): DeployPollCallPollAddrStruct { + return changetype( + this._call.outputValues[0].value.toTuple(), + ); + } +} + +export class DeployPollCall_treeDepthsStruct extends ethereum.Tuple { + get intStateTreeDepth(): i32 { + return this[0].toI32(); + } + + get messageTreeSubDepth(): i32 { + return this[1].toI32(); + } + + get messageTreeDepth(): i32 { + return this[2].toI32(); + } + + get voteOptionTreeDepth(): i32 { + return this[3].toI32(); + } +} + +export class DeployPollCall_coordinatorPubKeyStruct extends ethereum.Tuple { + get x(): BigInt { + return this[0].toBigInt(); + } + + get y(): BigInt { + return this[1].toBigInt(); + } +} + +export class DeployPollCallPollAddrStruct extends ethereum.Tuple { + get poll(): Address { + return this[0].toAddress(); + } + + get messageProcessor(): Address { + return this[1].toAddress(); + } + + get tally(): Address { + return this[2].toAddress(); + } + + get subsidy(): Address { + return this[3].toAddress(); + } +} + +export class MergeStateAqCall extends ethereum.Call { + get inputs(): MergeStateAqCall__Inputs { + return new MergeStateAqCall__Inputs(this); + } + + get outputs(): MergeStateAqCall__Outputs { + return new MergeStateAqCall__Outputs(this); + } +} + +export class MergeStateAqCall__Inputs { + _call: MergeStateAqCall; + + constructor(call: MergeStateAqCall) { + this._call = call; + } + + get _pollId(): BigInt { + return this._call.inputValues[0].value.toBigInt(); + } +} + +export class MergeStateAqCall__Outputs { + _call: MergeStateAqCall; + + constructor(call: MergeStateAqCall) { + this._call = call; + } + + get root(): BigInt { + return this._call.outputValues[0].value.toBigInt(); + } +} + +export class MergeStateAqSubRootsCall extends ethereum.Call { + get inputs(): MergeStateAqSubRootsCall__Inputs { + return new MergeStateAqSubRootsCall__Inputs(this); + } + + get outputs(): MergeStateAqSubRootsCall__Outputs { + return new MergeStateAqSubRootsCall__Outputs(this); + } +} + +export class MergeStateAqSubRootsCall__Inputs { + _call: MergeStateAqSubRootsCall; + + constructor(call: MergeStateAqSubRootsCall) { + this._call = call; + } + + get _numSrQueueOps(): BigInt { + return this._call.inputValues[0].value.toBigInt(); + } + + get _pollId(): BigInt { + return this._call.inputValues[1].value.toBigInt(); + } +} + +export class MergeStateAqSubRootsCall__Outputs { + _call: MergeStateAqSubRootsCall; + + constructor(call: MergeStateAqSubRootsCall) { + this._call = call; + } +} + +export class RenounceOwnershipCall extends ethereum.Call { + get inputs(): RenounceOwnershipCall__Inputs { + return new RenounceOwnershipCall__Inputs(this); + } + + get outputs(): RenounceOwnershipCall__Outputs { + return new RenounceOwnershipCall__Outputs(this); + } +} + +export class RenounceOwnershipCall__Inputs { + _call: RenounceOwnershipCall; + + constructor(call: RenounceOwnershipCall) { + this._call = call; + } +} + +export class RenounceOwnershipCall__Outputs { + _call: RenounceOwnershipCall; + + constructor(call: RenounceOwnershipCall) { + this._call = call; + } +} + +export class SignUpCall extends ethereum.Call { + get inputs(): SignUpCall__Inputs { + return new SignUpCall__Inputs(this); + } + + get outputs(): SignUpCall__Outputs { + return new SignUpCall__Outputs(this); + } +} + +export class SignUpCall__Inputs { + _call: SignUpCall; + + constructor(call: SignUpCall) { + this._call = call; + } + + get _pubKey(): SignUpCall_pubKeyStruct { + return changetype( + this._call.inputValues[0].value.toTuple(), + ); + } + + get _signUpGatekeeperData(): Bytes { + return this._call.inputValues[1].value.toBytes(); + } + + get _initialVoiceCreditProxyData(): Bytes { + return this._call.inputValues[2].value.toBytes(); + } +} + +export class SignUpCall__Outputs { + _call: SignUpCall; + + constructor(call: SignUpCall) { + this._call = call; + } +} + +export class SignUpCall_pubKeyStruct extends ethereum.Tuple { + get x(): BigInt { + return this[0].toBigInt(); + } + + get y(): BigInt { + return this[1].toBigInt(); + } +} + +export class TransferOwnershipCall extends ethereum.Call { + get inputs(): TransferOwnershipCall__Inputs { + return new TransferOwnershipCall__Inputs(this); + } + + get outputs(): TransferOwnershipCall__Outputs { + return new TransferOwnershipCall__Outputs(this); + } +} + +export class TransferOwnershipCall__Inputs { + _call: TransferOwnershipCall; + + constructor(call: TransferOwnershipCall) { + this._call = call; + } + + get newOwner(): Address { + return this._call.inputValues[0].value.toAddress(); + } +} + +export class TransferOwnershipCall__Outputs { + _call: TransferOwnershipCall; + + constructor(call: TransferOwnershipCall) { + this._call = call; + } +} diff --git a/subgraph/generated/ClrFund/MACIFactory.ts b/subgraph/generated/ClrFund/MACIFactory.ts new file mode 100644 index 000000000..c9f330074 --- /dev/null +++ b/subgraph/generated/ClrFund/MACIFactory.ts @@ -0,0 +1,898 @@ +// THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. + +import { + ethereum, + JSONValue, + TypedMap, + Entity, + Bytes, + Address, + BigInt, +} from "@graphprotocol/graph-ts"; + +export class MaciDeployed extends ethereum.Event { + get params(): MaciDeployed__Params { + return new MaciDeployed__Params(this); + } +} + +export class MaciDeployed__Params { + _event: MaciDeployed; + + constructor(event: MaciDeployed) { + this._event = event; + } + + get _maci(): Address { + return this._event.parameters[0].value.toAddress(); + } +} + +export class MaciParametersChanged extends ethereum.Event { + get params(): MaciParametersChanged__Params { + return new MaciParametersChanged__Params(this); + } +} + +export class MaciParametersChanged__Params { + _event: MaciParametersChanged; + + constructor(event: MaciParametersChanged) { + this._event = event; + } +} + +export class OwnershipTransferred extends ethereum.Event { + get params(): OwnershipTransferred__Params { + return new OwnershipTransferred__Params(this); + } +} + +export class OwnershipTransferred__Params { + _event: OwnershipTransferred; + + constructor(event: OwnershipTransferred) { + this._event = event; + } + + get previousOwner(): Address { + return this._event.parameters[0].value.toAddress(); + } + + get newOwner(): Address { + return this._event.parameters[1].value.toAddress(); + } +} + +export class MACIFactory__deployMaciResult_pollContractsStruct extends ethereum.Tuple { + get poll(): Address { + return this[0].toAddress(); + } + + get messageProcessor(): Address { + return this[1].toAddress(); + } + + get tally(): Address { + return this[2].toAddress(); + } + + get subsidy(): Address { + return this[3].toAddress(); + } +} + +export class MACIFactory__deployMaciResult { + value0: Address; + value1: MACIFactory__deployMaciResult_pollContractsStruct; + + constructor( + value0: Address, + value1: MACIFactory__deployMaciResult_pollContractsStruct, + ) { + this.value0 = value0; + this.value1 = value1; + } + + toMap(): TypedMap { + let map = new TypedMap(); + map.set("value0", ethereum.Value.fromAddress(this.value0)); + map.set("value1", ethereum.Value.fromTuple(this.value1)); + return map; + } + + get_maci(): Address { + return this.value0; + } + + get_pollContracts(): MACIFactory__deployMaciResult_pollContractsStruct { + return this.value1; + } +} + +export class MACIFactory__deployMaciInputCoordinatorPubKeyStruct extends ethereum.Tuple { + get x(): BigInt { + return this[0].toBigInt(); + } + + get y(): BigInt { + return this[1].toBigInt(); + } +} + +export class MACIFactory__factoriesResult { + value0: Address; + value1: Address; + value2: Address; + value3: Address; + + constructor( + value0: Address, + value1: Address, + value2: Address, + value3: Address, + ) { + this.value0 = value0; + this.value1 = value1; + this.value2 = value2; + this.value3 = value3; + } + + toMap(): TypedMap { + let map = new TypedMap(); + map.set("value0", ethereum.Value.fromAddress(this.value0)); + map.set("value1", ethereum.Value.fromAddress(this.value1)); + map.set("value2", ethereum.Value.fromAddress(this.value2)); + map.set("value3", ethereum.Value.fromAddress(this.value3)); + return map; + } + + getPollFactory(): Address { + return this.value0; + } + + getTallyFactory(): Address { + return this.value1; + } + + getSubsidyFactory(): Address { + return this.value2; + } + + getMessageProcessorFactory(): Address { + return this.value3; + } +} + +export class MACIFactory__treeDepthsResult { + value0: i32; + value1: i32; + value2: i32; + value3: i32; + + constructor(value0: i32, value1: i32, value2: i32, value3: i32) { + this.value0 = value0; + this.value1 = value1; + this.value2 = value2; + this.value3 = value3; + } + + toMap(): TypedMap { + let map = new TypedMap(); + map.set( + "value0", + ethereum.Value.fromUnsignedBigInt(BigInt.fromI32(this.value0)), + ); + map.set( + "value1", + ethereum.Value.fromUnsignedBigInt(BigInt.fromI32(this.value1)), + ); + map.set( + "value2", + ethereum.Value.fromUnsignedBigInt(BigInt.fromI32(this.value2)), + ); + map.set( + "value3", + ethereum.Value.fromUnsignedBigInt(BigInt.fromI32(this.value3)), + ); + return map; + } + + getIntStateTreeDepth(): i32 { + return this.value0; + } + + getMessageTreeSubDepth(): i32 { + return this.value1; + } + + getMessageTreeDepth(): i32 { + return this.value2; + } + + getVoteOptionTreeDepth(): i32 { + return this.value3; + } +} + +export class MACIFactory extends ethereum.SmartContract { + static bind(address: Address): MACIFactory { + return new MACIFactory("MACIFactory", address); + } + + MESSAGE_DATA_LENGTH(): i32 { + let result = super.call( + "MESSAGE_DATA_LENGTH", + "MESSAGE_DATA_LENGTH():(uint8)", + [], + ); + + return result[0].toI32(); + } + + try_MESSAGE_DATA_LENGTH(): ethereum.CallResult { + let result = super.tryCall( + "MESSAGE_DATA_LENGTH", + "MESSAGE_DATA_LENGTH():(uint8)", + [], + ); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toI32()); + } + + TREE_ARITY(): BigInt { + let result = super.call("TREE_ARITY", "TREE_ARITY():(uint256)", []); + + return result[0].toBigInt(); + } + + try_TREE_ARITY(): ethereum.CallResult { + let result = super.tryCall("TREE_ARITY", "TREE_ARITY():(uint256)", []); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toBigInt()); + } + + deployMaci( + signUpGatekeeper: Address, + initialVoiceCreditProxy: Address, + topupCredit: Address, + duration: BigInt, + coordinator: Address, + coordinatorPubKey: MACIFactory__deployMaciInputCoordinatorPubKeyStruct, + maciOwner: Address, + ): MACIFactory__deployMaciResult { + let result = super.call( + "deployMaci", + "deployMaci(address,address,address,uint256,address,(uint256,uint256),address):(address,(address,address,address,address))", + [ + ethereum.Value.fromAddress(signUpGatekeeper), + ethereum.Value.fromAddress(initialVoiceCreditProxy), + ethereum.Value.fromAddress(topupCredit), + ethereum.Value.fromUnsignedBigInt(duration), + ethereum.Value.fromAddress(coordinator), + ethereum.Value.fromTuple(coordinatorPubKey), + ethereum.Value.fromAddress(maciOwner), + ], + ); + + return new MACIFactory__deployMaciResult( + result[0].toAddress(), + changetype( + result[1].toTuple(), + ), + ); + } + + try_deployMaci( + signUpGatekeeper: Address, + initialVoiceCreditProxy: Address, + topupCredit: Address, + duration: BigInt, + coordinator: Address, + coordinatorPubKey: MACIFactory__deployMaciInputCoordinatorPubKeyStruct, + maciOwner: Address, + ): ethereum.CallResult { + let result = super.tryCall( + "deployMaci", + "deployMaci(address,address,address,uint256,address,(uint256,uint256),address):(address,(address,address,address,address))", + [ + ethereum.Value.fromAddress(signUpGatekeeper), + ethereum.Value.fromAddress(initialVoiceCreditProxy), + ethereum.Value.fromAddress(topupCredit), + ethereum.Value.fromUnsignedBigInt(duration), + ethereum.Value.fromAddress(coordinator), + ethereum.Value.fromTuple(coordinatorPubKey), + ethereum.Value.fromAddress(maciOwner), + ], + ); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue( + new MACIFactory__deployMaciResult( + value[0].toAddress(), + changetype( + value[1].toTuple(), + ), + ), + ); + } + + factories(): MACIFactory__factoriesResult { + let result = super.call( + "factories", + "factories():(address,address,address,address)", + [], + ); + + return new MACIFactory__factoriesResult( + result[0].toAddress(), + result[1].toAddress(), + result[2].toAddress(), + result[3].toAddress(), + ); + } + + try_factories(): ethereum.CallResult { + let result = super.tryCall( + "factories", + "factories():(address,address,address,address)", + [], + ); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue( + new MACIFactory__factoriesResult( + value[0].toAddress(), + value[1].toAddress(), + value[2].toAddress(), + value[3].toAddress(), + ), + ); + } + + getMessageBatchSize(messageTreeSubDepth: i32): BigInt { + let result = super.call( + "getMessageBatchSize", + "getMessageBatchSize(uint8):(uint256)", + [ethereum.Value.fromUnsignedBigInt(BigInt.fromI32(messageTreeSubDepth))], + ); + + return result[0].toBigInt(); + } + + try_getMessageBatchSize( + messageTreeSubDepth: i32, + ): ethereum.CallResult { + let result = super.tryCall( + "getMessageBatchSize", + "getMessageBatchSize(uint8):(uint256)", + [ethereum.Value.fromUnsignedBigInt(BigInt.fromI32(messageTreeSubDepth))], + ); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toBigInt()); + } + + owner(): Address { + let result = super.call("owner", "owner():(address)", []); + + return result[0].toAddress(); + } + + try_owner(): ethereum.CallResult
{ + let result = super.tryCall("owner", "owner():(address)", []); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toAddress()); + } + + stateTreeDepth(): i32 { + let result = super.call("stateTreeDepth", "stateTreeDepth():(uint8)", []); + + return result[0].toI32(); + } + + try_stateTreeDepth(): ethereum.CallResult { + let result = super.tryCall( + "stateTreeDepth", + "stateTreeDepth():(uint8)", + [], + ); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toI32()); + } + + treeDepths(): MACIFactory__treeDepthsResult { + let result = super.call( + "treeDepths", + "treeDepths():(uint8,uint8,uint8,uint8)", + [], + ); + + return new MACIFactory__treeDepthsResult( + result[0].toI32(), + result[1].toI32(), + result[2].toI32(), + result[3].toI32(), + ); + } + + try_treeDepths(): ethereum.CallResult { + let result = super.tryCall( + "treeDepths", + "treeDepths():(uint8,uint8,uint8,uint8)", + [], + ); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue( + new MACIFactory__treeDepthsResult( + value[0].toI32(), + value[1].toI32(), + value[2].toI32(), + value[3].toI32(), + ), + ); + } + + verifier(): Address { + let result = super.call("verifier", "verifier():(address)", []); + + return result[0].toAddress(); + } + + try_verifier(): ethereum.CallResult
{ + let result = super.tryCall("verifier", "verifier():(address)", []); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toAddress()); + } + + vkRegistry(): Address { + let result = super.call("vkRegistry", "vkRegistry():(address)", []); + + return result[0].toAddress(); + } + + try_vkRegistry(): ethereum.CallResult
{ + let result = super.tryCall("vkRegistry", "vkRegistry():(address)", []); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toAddress()); + } +} + +export class ConstructorCall extends ethereum.Call { + get inputs(): ConstructorCall__Inputs { + return new ConstructorCall__Inputs(this); + } + + get outputs(): ConstructorCall__Outputs { + return new ConstructorCall__Outputs(this); + } +} + +export class ConstructorCall__Inputs { + _call: ConstructorCall; + + constructor(call: ConstructorCall) { + this._call = call; + } + + get _vkRegistry(): Address { + return this._call.inputValues[0].value.toAddress(); + } + + get _factories(): ConstructorCall_factoriesStruct { + return changetype( + this._call.inputValues[1].value.toTuple(), + ); + } + + get _verifier(): Address { + return this._call.inputValues[2].value.toAddress(); + } +} + +export class ConstructorCall__Outputs { + _call: ConstructorCall; + + constructor(call: ConstructorCall) { + this._call = call; + } +} + +export class ConstructorCall_factoriesStruct extends ethereum.Tuple { + get pollFactory(): Address { + return this[0].toAddress(); + } + + get tallyFactory(): Address { + return this[1].toAddress(); + } + + get subsidyFactory(): Address { + return this[2].toAddress(); + } + + get messageProcessorFactory(): Address { + return this[3].toAddress(); + } +} + +export class DeployMaciCall extends ethereum.Call { + get inputs(): DeployMaciCall__Inputs { + return new DeployMaciCall__Inputs(this); + } + + get outputs(): DeployMaciCall__Outputs { + return new DeployMaciCall__Outputs(this); + } +} + +export class DeployMaciCall__Inputs { + _call: DeployMaciCall; + + constructor(call: DeployMaciCall) { + this._call = call; + } + + get signUpGatekeeper(): Address { + return this._call.inputValues[0].value.toAddress(); + } + + get initialVoiceCreditProxy(): Address { + return this._call.inputValues[1].value.toAddress(); + } + + get topupCredit(): Address { + return this._call.inputValues[2].value.toAddress(); + } + + get duration(): BigInt { + return this._call.inputValues[3].value.toBigInt(); + } + + get coordinator(): Address { + return this._call.inputValues[4].value.toAddress(); + } + + get coordinatorPubKey(): DeployMaciCallCoordinatorPubKeyStruct { + return changetype( + this._call.inputValues[5].value.toTuple(), + ); + } + + get maciOwner(): Address { + return this._call.inputValues[6].value.toAddress(); + } +} + +export class DeployMaciCall__Outputs { + _call: DeployMaciCall; + + constructor(call: DeployMaciCall) { + this._call = call; + } + + get _maci(): Address { + return this._call.outputValues[0].value.toAddress(); + } + + get _pollContracts(): DeployMaciCall_pollContractsStruct { + return changetype( + this._call.outputValues[1].value.toTuple(), + ); + } +} + +export class DeployMaciCallCoordinatorPubKeyStruct extends ethereum.Tuple { + get x(): BigInt { + return this[0].toBigInt(); + } + + get y(): BigInt { + return this[1].toBigInt(); + } +} + +export class DeployMaciCall_pollContractsStruct extends ethereum.Tuple { + get poll(): Address { + return this[0].toAddress(); + } + + get messageProcessor(): Address { + return this[1].toAddress(); + } + + get tally(): Address { + return this[2].toAddress(); + } + + get subsidy(): Address { + return this[3].toAddress(); + } +} + +export class RenounceOwnershipCall extends ethereum.Call { + get inputs(): RenounceOwnershipCall__Inputs { + return new RenounceOwnershipCall__Inputs(this); + } + + get outputs(): RenounceOwnershipCall__Outputs { + return new RenounceOwnershipCall__Outputs(this); + } +} + +export class RenounceOwnershipCall__Inputs { + _call: RenounceOwnershipCall; + + constructor(call: RenounceOwnershipCall) { + this._call = call; + } +} + +export class RenounceOwnershipCall__Outputs { + _call: RenounceOwnershipCall; + + constructor(call: RenounceOwnershipCall) { + this._call = call; + } +} + +export class SetMaciParametersCall extends ethereum.Call { + get inputs(): SetMaciParametersCall__Inputs { + return new SetMaciParametersCall__Inputs(this); + } + + get outputs(): SetMaciParametersCall__Outputs { + return new SetMaciParametersCall__Outputs(this); + } +} + +export class SetMaciParametersCall__Inputs { + _call: SetMaciParametersCall; + + constructor(call: SetMaciParametersCall) { + this._call = call; + } + + get _stateTreeDepth(): i32 { + return this._call.inputValues[0].value.toI32(); + } + + get _treeDepths(): SetMaciParametersCall_treeDepthsStruct { + return changetype( + this._call.inputValues[1].value.toTuple(), + ); + } +} + +export class SetMaciParametersCall__Outputs { + _call: SetMaciParametersCall; + + constructor(call: SetMaciParametersCall) { + this._call = call; + } +} + +export class SetMaciParametersCall_treeDepthsStruct extends ethereum.Tuple { + get intStateTreeDepth(): i32 { + return this[0].toI32(); + } + + get messageTreeSubDepth(): i32 { + return this[1].toI32(); + } + + get messageTreeDepth(): i32 { + return this[2].toI32(); + } + + get voteOptionTreeDepth(): i32 { + return this[3].toI32(); + } +} + +export class SetMessageProcessorFactoryCall extends ethereum.Call { + get inputs(): SetMessageProcessorFactoryCall__Inputs { + return new SetMessageProcessorFactoryCall__Inputs(this); + } + + get outputs(): SetMessageProcessorFactoryCall__Outputs { + return new SetMessageProcessorFactoryCall__Outputs(this); + } +} + +export class SetMessageProcessorFactoryCall__Inputs { + _call: SetMessageProcessorFactoryCall; + + constructor(call: SetMessageProcessorFactoryCall) { + this._call = call; + } + + get _messageProcessorFactory(): Address { + return this._call.inputValues[0].value.toAddress(); + } +} + +export class SetMessageProcessorFactoryCall__Outputs { + _call: SetMessageProcessorFactoryCall; + + constructor(call: SetMessageProcessorFactoryCall) { + this._call = call; + } +} + +export class SetPollFactoryCall extends ethereum.Call { + get inputs(): SetPollFactoryCall__Inputs { + return new SetPollFactoryCall__Inputs(this); + } + + get outputs(): SetPollFactoryCall__Outputs { + return new SetPollFactoryCall__Outputs(this); + } +} + +export class SetPollFactoryCall__Inputs { + _call: SetPollFactoryCall; + + constructor(call: SetPollFactoryCall) { + this._call = call; + } + + get _pollFactory(): Address { + return this._call.inputValues[0].value.toAddress(); + } +} + +export class SetPollFactoryCall__Outputs { + _call: SetPollFactoryCall; + + constructor(call: SetPollFactoryCall) { + this._call = call; + } +} + +export class SetTallyFactoryCall extends ethereum.Call { + get inputs(): SetTallyFactoryCall__Inputs { + return new SetTallyFactoryCall__Inputs(this); + } + + get outputs(): SetTallyFactoryCall__Outputs { + return new SetTallyFactoryCall__Outputs(this); + } +} + +export class SetTallyFactoryCall__Inputs { + _call: SetTallyFactoryCall; + + constructor(call: SetTallyFactoryCall) { + this._call = call; + } + + get _tallyFactory(): Address { + return this._call.inputValues[0].value.toAddress(); + } +} + +export class SetTallyFactoryCall__Outputs { + _call: SetTallyFactoryCall; + + constructor(call: SetTallyFactoryCall) { + this._call = call; + } +} + +export class SetVerifierCall extends ethereum.Call { + get inputs(): SetVerifierCall__Inputs { + return new SetVerifierCall__Inputs(this); + } + + get outputs(): SetVerifierCall__Outputs { + return new SetVerifierCall__Outputs(this); + } +} + +export class SetVerifierCall__Inputs { + _call: SetVerifierCall; + + constructor(call: SetVerifierCall) { + this._call = call; + } + + get _verifier(): Address { + return this._call.inputValues[0].value.toAddress(); + } +} + +export class SetVerifierCall__Outputs { + _call: SetVerifierCall; + + constructor(call: SetVerifierCall) { + this._call = call; + } +} + +export class SetVkRegistryCall extends ethereum.Call { + get inputs(): SetVkRegistryCall__Inputs { + return new SetVkRegistryCall__Inputs(this); + } + + get outputs(): SetVkRegistryCall__Outputs { + return new SetVkRegistryCall__Outputs(this); + } +} + +export class SetVkRegistryCall__Inputs { + _call: SetVkRegistryCall; + + constructor(call: SetVkRegistryCall) { + this._call = call; + } + + get _vkRegistry(): Address { + return this._call.inputValues[0].value.toAddress(); + } +} + +export class SetVkRegistryCall__Outputs { + _call: SetVkRegistryCall; + + constructor(call: SetVkRegistryCall) { + this._call = call; + } +} + +export class TransferOwnershipCall extends ethereum.Call { + get inputs(): TransferOwnershipCall__Inputs { + return new TransferOwnershipCall__Inputs(this); + } + + get outputs(): TransferOwnershipCall__Outputs { + return new TransferOwnershipCall__Outputs(this); + } +} + +export class TransferOwnershipCall__Inputs { + _call: TransferOwnershipCall; + + constructor(call: TransferOwnershipCall) { + this._call = call; + } + + get newOwner(): Address { + return this._call.inputValues[0].value.toAddress(); + } +} + +export class TransferOwnershipCall__Outputs { + _call: TransferOwnershipCall; + + constructor(call: TransferOwnershipCall) { + this._call = call; + } +} diff --git a/subgraph/generated/FundingRoundFactory/OptimisticRecipientRegistry.ts b/subgraph/generated/ClrFund/OptimisticRecipientRegistry.ts similarity index 92% rename from subgraph/generated/FundingRoundFactory/OptimisticRecipientRegistry.ts rename to subgraph/generated/ClrFund/OptimisticRecipientRegistry.ts index 20d805ce5..80ec65e55 100644 --- a/subgraph/generated/FundingRoundFactory/OptimisticRecipientRegistry.ts +++ b/subgraph/generated/ClrFund/OptimisticRecipientRegistry.ts @@ -7,7 +7,7 @@ import { Entity, Bytes, Address, - BigInt + BigInt, } from "@graphprotocol/graph-ts"; export class OwnershipTransferred extends ethereum.Event { @@ -104,7 +104,7 @@ export class OptimisticRecipientRegistry extends ethereum.SmartContract { static bind(address: Address): OptimisticRecipientRegistry { return new OptimisticRecipientRegistry( "OptimisticRecipientRegistry", - address + address, ); } @@ -127,7 +127,7 @@ export class OptimisticRecipientRegistry extends ethereum.SmartContract { let result = super.call( "challengePeriodDuration", "challengePeriodDuration():(uint256)", - [] + [], ); return result[0].toBigInt(); @@ -137,7 +137,7 @@ export class OptimisticRecipientRegistry extends ethereum.SmartContract { let result = super.tryCall( "challengePeriodDuration", "challengePeriodDuration():(uint256)", - [] + [], ); if (result.reverted) { return new ethereum.CallResult(); @@ -152,8 +152,8 @@ export class OptimisticRecipientRegistry extends ethereum.SmartContract { "challengeRequest(bytes32,address):(bool)", [ ethereum.Value.fromFixedBytes(_recipientId), - ethereum.Value.fromAddress(_beneficiary) - ] + ethereum.Value.fromAddress(_beneficiary), + ], ); return result[0].toBoolean(); @@ -161,15 +161,15 @@ export class OptimisticRecipientRegistry extends ethereum.SmartContract { try_challengeRequest( _recipientId: Bytes, - _beneficiary: Address + _beneficiary: Address, ): ethereum.CallResult { let result = super.tryCall( "challengeRequest", "challengeRequest(bytes32,address):(bool)", [ ethereum.Value.fromFixedBytes(_recipientId), - ethereum.Value.fromAddress(_beneficiary) - ] + ethereum.Value.fromAddress(_beneficiary), + ], ); if (result.reverted) { return new ethereum.CallResult(); @@ -197,7 +197,7 @@ export class OptimisticRecipientRegistry extends ethereum.SmartContract { let result = super.call( "executeRequest", "executeRequest(bytes32):(bool)", - [ethereum.Value.fromFixedBytes(_recipientId)] + [ethereum.Value.fromFixedBytes(_recipientId)], ); return result[0].toBoolean(); @@ -207,7 +207,7 @@ export class OptimisticRecipientRegistry extends ethereum.SmartContract { let result = super.tryCall( "executeRequest", "executeRequest(bytes32):(bool)", - [ethereum.Value.fromFixedBytes(_recipientId)] + [ethereum.Value.fromFixedBytes(_recipientId)], ); if (result.reverted) { return new ethereum.CallResult(); @@ -219,7 +219,7 @@ export class OptimisticRecipientRegistry extends ethereum.SmartContract { getRecipientAddress( _index: BigInt, _startTime: BigInt, - _endTime: BigInt + _endTime: BigInt, ): Address { let result = super.call( "getRecipientAddress", @@ -227,8 +227,8 @@ export class OptimisticRecipientRegistry extends ethereum.SmartContract { [ ethereum.Value.fromUnsignedBigInt(_index), ethereum.Value.fromUnsignedBigInt(_startTime), - ethereum.Value.fromUnsignedBigInt(_endTime) - ] + ethereum.Value.fromUnsignedBigInt(_endTime), + ], ); return result[0].toAddress(); @@ -237,7 +237,7 @@ export class OptimisticRecipientRegistry extends ethereum.SmartContract { try_getRecipientAddress( _index: BigInt, _startTime: BigInt, - _endTime: BigInt + _endTime: BigInt, ): ethereum.CallResult
{ let result = super.tryCall( "getRecipientAddress", @@ -245,8 +245,8 @@ export class OptimisticRecipientRegistry extends ethereum.SmartContract { [ ethereum.Value.fromUnsignedBigInt(_index), ethereum.Value.fromUnsignedBigInt(_startTime), - ethereum.Value.fromUnsignedBigInt(_endTime) - ] + ethereum.Value.fromUnsignedBigInt(_endTime), + ], ); if (result.reverted) { return new ethereum.CallResult(); @@ -255,6 +255,29 @@ export class OptimisticRecipientRegistry extends ethereum.SmartContract { return ethereum.CallResult.fromValue(value[0].toAddress()); } + getRecipientCount(): BigInt { + let result = super.call( + "getRecipientCount", + "getRecipientCount():(uint256)", + [], + ); + + return result[0].toBigInt(); + } + + try_getRecipientCount(): ethereum.CallResult { + let result = super.tryCall( + "getRecipientCount", + "getRecipientCount():(uint256)", + [], + ); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toBigInt()); + } + maxRecipients(): BigInt { let result = super.call("maxRecipients", "maxRecipients():(uint256)", []); @@ -265,7 +288,7 @@ export class OptimisticRecipientRegistry extends ethereum.SmartContract { let result = super.tryCall( "maxRecipients", "maxRecipients():(uint256)", - [] + [], ); if (result.reverted) { return new ethereum.CallResult(); @@ -293,7 +316,7 @@ export class OptimisticRecipientRegistry extends ethereum.SmartContract { let result = super.call( "setMaxRecipients", "setMaxRecipients(uint256):(bool)", - [ethereum.Value.fromUnsignedBigInt(_maxRecipients)] + [ethereum.Value.fromUnsignedBigInt(_maxRecipients)], ); return result[0].toBoolean(); @@ -303,7 +326,7 @@ export class OptimisticRecipientRegistry extends ethereum.SmartContract { let result = super.tryCall( "setMaxRecipients", "setMaxRecipients(uint256):(bool)", - [ethereum.Value.fromUnsignedBigInt(_maxRecipients)] + [ethereum.Value.fromUnsignedBigInt(_maxRecipients)], ); if (result.reverted) { return new ethereum.CallResult(); diff --git a/subgraph/generated/ClrFund/Poll.ts b/subgraph/generated/ClrFund/Poll.ts new file mode 100644 index 000000000..f8e20dff2 --- /dev/null +++ b/subgraph/generated/ClrFund/Poll.ts @@ -0,0 +1,1510 @@ +// THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. + +import { + ethereum, + JSONValue, + TypedMap, + Entity, + Bytes, + Address, + BigInt, +} from "@graphprotocol/graph-ts"; + +export class MergeMaciStateAq extends ethereum.Event { + get params(): MergeMaciStateAq__Params { + return new MergeMaciStateAq__Params(this); + } +} + +export class MergeMaciStateAq__Params { + _event: MergeMaciStateAq; + + constructor(event: MergeMaciStateAq) { + this._event = event; + } + + get _stateRoot(): BigInt { + return this._event.parameters[0].value.toBigInt(); + } + + get _numSignups(): BigInt { + return this._event.parameters[1].value.toBigInt(); + } +} + +export class MergeMaciStateAqSubRoots extends ethereum.Event { + get params(): MergeMaciStateAqSubRoots__Params { + return new MergeMaciStateAqSubRoots__Params(this); + } +} + +export class MergeMaciStateAqSubRoots__Params { + _event: MergeMaciStateAqSubRoots; + + constructor(event: MergeMaciStateAqSubRoots) { + this._event = event; + } + + get _numSrQueueOps(): BigInt { + return this._event.parameters[0].value.toBigInt(); + } +} + +export class MergeMessageAq extends ethereum.Event { + get params(): MergeMessageAq__Params { + return new MergeMessageAq__Params(this); + } +} + +export class MergeMessageAq__Params { + _event: MergeMessageAq; + + constructor(event: MergeMessageAq) { + this._event = event; + } + + get _messageRoot(): BigInt { + return this._event.parameters[0].value.toBigInt(); + } +} + +export class MergeMessageAqSubRoots extends ethereum.Event { + get params(): MergeMessageAqSubRoots__Params { + return new MergeMessageAqSubRoots__Params(this); + } +} + +export class MergeMessageAqSubRoots__Params { + _event: MergeMessageAqSubRoots; + + constructor(event: MergeMessageAqSubRoots) { + this._event = event; + } + + get _numSrQueueOps(): BigInt { + return this._event.parameters[0].value.toBigInt(); + } +} + +export class OwnershipTransferred extends ethereum.Event { + get params(): OwnershipTransferred__Params { + return new OwnershipTransferred__Params(this); + } +} + +export class OwnershipTransferred__Params { + _event: OwnershipTransferred; + + constructor(event: OwnershipTransferred) { + this._event = event; + } + + get previousOwner(): Address { + return this._event.parameters[0].value.toAddress(); + } + + get newOwner(): Address { + return this._event.parameters[1].value.toAddress(); + } +} + +export class PublishMessage extends ethereum.Event { + get params(): PublishMessage__Params { + return new PublishMessage__Params(this); + } +} + +export class PublishMessage__Params { + _event: PublishMessage; + + constructor(event: PublishMessage) { + this._event = event; + } + + get _message(): PublishMessage_messageStruct { + return changetype( + this._event.parameters[0].value.toTuple(), + ); + } + + get _encPubKey(): PublishMessage_encPubKeyStruct { + return changetype( + this._event.parameters[1].value.toTuple(), + ); + } +} + +export class PublishMessage_messageStruct extends ethereum.Tuple { + get msgType(): BigInt { + return this[0].toBigInt(); + } + + get data(): Array { + return this[1].toBigIntArray(); + } +} + +export class PublishMessage_encPubKeyStruct extends ethereum.Tuple { + get x(): BigInt { + return this[0].toBigInt(); + } + + get y(): BigInt { + return this[1].toBigInt(); + } +} + +export class TopupMessage extends ethereum.Event { + get params(): TopupMessage__Params { + return new TopupMessage__Params(this); + } +} + +export class TopupMessage__Params { + _event: TopupMessage; + + constructor(event: TopupMessage) { + this._event = event; + } + + get _message(): TopupMessage_messageStruct { + return changetype( + this._event.parameters[0].value.toTuple(), + ); + } +} + +export class TopupMessage_messageStruct extends ethereum.Tuple { + get msgType(): BigInt { + return this[0].toBigInt(); + } + + get data(): Array { + return this[1].toBigIntArray(); + } +} + +export class Poll__coordinatorPubKeyResult { + value0: BigInt; + value1: BigInt; + + constructor(value0: BigInt, value1: BigInt) { + this.value0 = value0; + this.value1 = value1; + } + + toMap(): TypedMap { + let map = new TypedMap(); + map.set("value0", ethereum.Value.fromUnsignedBigInt(this.value0)); + map.set("value1", ethereum.Value.fromUnsignedBigInt(this.value1)); + return map; + } + + getX(): BigInt { + return this.value0; + } + + getY(): BigInt { + return this.value1; + } +} + +export class Poll__extContractsResult { + value0: Address; + value1: Address; + value2: Address; + + constructor(value0: Address, value1: Address, value2: Address) { + this.value0 = value0; + this.value1 = value1; + this.value2 = value2; + } + + toMap(): TypedMap { + let map = new TypedMap(); + map.set("value0", ethereum.Value.fromAddress(this.value0)); + map.set("value1", ethereum.Value.fromAddress(this.value1)); + map.set("value2", ethereum.Value.fromAddress(this.value2)); + return map; + } + + getMaci(): Address { + return this.value0; + } + + getMessageAq(): Address { + return this.value1; + } + + getTopupCredit(): Address { + return this.value2; + } +} + +export class Poll__getDeployTimeAndDurationResult { + value0: BigInt; + value1: BigInt; + + constructor(value0: BigInt, value1: BigInt) { + this.value0 = value0; + this.value1 = value1; + } + + toMap(): TypedMap { + let map = new TypedMap(); + map.set("value0", ethereum.Value.fromUnsignedBigInt(this.value0)); + map.set("value1", ethereum.Value.fromUnsignedBigInt(this.value1)); + return map; + } + + getPollDeployTime(): BigInt { + return this.value0; + } + + getPollDuration(): BigInt { + return this.value1; + } +} + +export class Poll__hashMessageAndEncPubKeyInput_messageStruct extends ethereum.Tuple { + get msgType(): BigInt { + return this[0].toBigInt(); + } + + get data(): Array { + return this[1].toBigIntArray(); + } +} + +export class Poll__hashMessageAndEncPubKeyInput_encPubKeyStruct extends ethereum.Tuple { + get x(): BigInt { + return this[0].toBigInt(); + } + + get y(): BigInt { + return this[1].toBigInt(); + } +} + +export class Poll__hashStateLeafInput_stateLeafStruct extends ethereum.Tuple { + get pubKey(): Poll__hashStateLeafInput_stateLeafPubKeyStruct { + return changetype( + this[0].toTuple(), + ); + } + + get voiceCreditBalance(): BigInt { + return this[1].toBigInt(); + } + + get timestamp(): BigInt { + return this[2].toBigInt(); + } +} + +export class Poll__hashStateLeafInput_stateLeafPubKeyStruct extends ethereum.Tuple { + get x(): BigInt { + return this[0].toBigInt(); + } + + get y(): BigInt { + return this[1].toBigInt(); + } +} + +export class Poll__maxValuesResult { + value0: BigInt; + value1: BigInt; + + constructor(value0: BigInt, value1: BigInt) { + this.value0 = value0; + this.value1 = value1; + } + + toMap(): TypedMap { + let map = new TypedMap(); + map.set("value0", ethereum.Value.fromUnsignedBigInt(this.value0)); + map.set("value1", ethereum.Value.fromUnsignedBigInt(this.value1)); + return map; + } + + getMaxMessages(): BigInt { + return this.value0; + } + + getMaxVoteOptions(): BigInt { + return this.value1; + } +} + +export class Poll__numSignUpsAndMessagesResult { + value0: BigInt; + value1: BigInt; + + constructor(value0: BigInt, value1: BigInt) { + this.value0 = value0; + this.value1 = value1; + } + + toMap(): TypedMap { + let map = new TypedMap(); + map.set("value0", ethereum.Value.fromUnsignedBigInt(this.value0)); + map.set("value1", ethereum.Value.fromUnsignedBigInt(this.value1)); + return map; + } + + getNumSUps(): BigInt { + return this.value0; + } + + getNumMsgs(): BigInt { + return this.value1; + } +} + +export class Poll__padAndHashMessageResultMessageStruct extends ethereum.Tuple { + get msgType(): BigInt { + return this[0].toBigInt(); + } + + get data(): Array { + return this[1].toBigIntArray(); + } +} + +export class Poll__padAndHashMessageResultPadKeyStruct extends ethereum.Tuple { + get x(): BigInt { + return this[0].toBigInt(); + } + + get y(): BigInt { + return this[1].toBigInt(); + } +} + +export class Poll__padAndHashMessageResult { + value0: Poll__padAndHashMessageResultMessageStruct; + value1: Poll__padAndHashMessageResultPadKeyStruct; + value2: BigInt; + + constructor( + value0: Poll__padAndHashMessageResultMessageStruct, + value1: Poll__padAndHashMessageResultPadKeyStruct, + value2: BigInt, + ) { + this.value0 = value0; + this.value1 = value1; + this.value2 = value2; + } + + toMap(): TypedMap { + let map = new TypedMap(); + map.set("value0", ethereum.Value.fromTuple(this.value0)); + map.set("value1", ethereum.Value.fromTuple(this.value1)); + map.set("value2", ethereum.Value.fromUnsignedBigInt(this.value2)); + return map; + } + + getMessage(): Poll__padAndHashMessageResultMessageStruct { + return this.value0; + } + + getPadKey(): Poll__padAndHashMessageResultPadKeyStruct { + return this.value1; + } + + getMsgHash(): BigInt { + return this.value2; + } +} + +export class Poll__treeDepthsResult { + value0: i32; + value1: i32; + value2: i32; + value3: i32; + + constructor(value0: i32, value1: i32, value2: i32, value3: i32) { + this.value0 = value0; + this.value1 = value1; + this.value2 = value2; + this.value3 = value3; + } + + toMap(): TypedMap { + let map = new TypedMap(); + map.set( + "value0", + ethereum.Value.fromUnsignedBigInt(BigInt.fromI32(this.value0)), + ); + map.set( + "value1", + ethereum.Value.fromUnsignedBigInt(BigInt.fromI32(this.value1)), + ); + map.set( + "value2", + ethereum.Value.fromUnsignedBigInt(BigInt.fromI32(this.value2)), + ); + map.set( + "value3", + ethereum.Value.fromUnsignedBigInt(BigInt.fromI32(this.value3)), + ); + return map; + } + + getIntStateTreeDepth(): i32 { + return this.value0; + } + + getMessageTreeSubDepth(): i32 { + return this.value1; + } + + getMessageTreeDepth(): i32 { + return this.value2; + } + + getVoteOptionTreeDepth(): i32 { + return this.value3; + } +} + +export class Poll extends ethereum.SmartContract { + static bind(address: Address): Poll { + return new Poll("Poll", address); + } + + MESSAGE_DATA_LENGTH(): i32 { + let result = super.call( + "MESSAGE_DATA_LENGTH", + "MESSAGE_DATA_LENGTH():(uint8)", + [], + ); + + return result[0].toI32(); + } + + try_MESSAGE_DATA_LENGTH(): ethereum.CallResult { + let result = super.tryCall( + "MESSAGE_DATA_LENGTH", + "MESSAGE_DATA_LENGTH():(uint8)", + [], + ); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toI32()); + } + + coordinatorPubKey(): Poll__coordinatorPubKeyResult { + let result = super.call( + "coordinatorPubKey", + "coordinatorPubKey():(uint256,uint256)", + [], + ); + + return new Poll__coordinatorPubKeyResult( + result[0].toBigInt(), + result[1].toBigInt(), + ); + } + + try_coordinatorPubKey(): ethereum.CallResult { + let result = super.tryCall( + "coordinatorPubKey", + "coordinatorPubKey():(uint256,uint256)", + [], + ); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue( + new Poll__coordinatorPubKeyResult( + value[0].toBigInt(), + value[1].toBigInt(), + ), + ); + } + + coordinatorPubKeyHash(): BigInt { + let result = super.call( + "coordinatorPubKeyHash", + "coordinatorPubKeyHash():(uint256)", + [], + ); + + return result[0].toBigInt(); + } + + try_coordinatorPubKeyHash(): ethereum.CallResult { + let result = super.tryCall( + "coordinatorPubKeyHash", + "coordinatorPubKeyHash():(uint256)", + [], + ); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toBigInt()); + } + + currentSbCommitment(): BigInt { + let result = super.call( + "currentSbCommitment", + "currentSbCommitment():(uint256)", + [], + ); + + return result[0].toBigInt(); + } + + try_currentSbCommitment(): ethereum.CallResult { + let result = super.tryCall( + "currentSbCommitment", + "currentSbCommitment():(uint256)", + [], + ); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toBigInt()); + } + + extContracts(): Poll__extContractsResult { + let result = super.call( + "extContracts", + "extContracts():(address,address,address)", + [], + ); + + return new Poll__extContractsResult( + result[0].toAddress(), + result[1].toAddress(), + result[2].toAddress(), + ); + } + + try_extContracts(): ethereum.CallResult { + let result = super.tryCall( + "extContracts", + "extContracts():(address,address,address)", + [], + ); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue( + new Poll__extContractsResult( + value[0].toAddress(), + value[1].toAddress(), + value[2].toAddress(), + ), + ); + } + + getDeployTimeAndDuration(): Poll__getDeployTimeAndDurationResult { + let result = super.call( + "getDeployTimeAndDuration", + "getDeployTimeAndDuration():(uint256,uint256)", + [], + ); + + return new Poll__getDeployTimeAndDurationResult( + result[0].toBigInt(), + result[1].toBigInt(), + ); + } + + try_getDeployTimeAndDuration(): ethereum.CallResult { + let result = super.tryCall( + "getDeployTimeAndDuration", + "getDeployTimeAndDuration():(uint256,uint256)", + [], + ); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue( + new Poll__getDeployTimeAndDurationResult( + value[0].toBigInt(), + value[1].toBigInt(), + ), + ); + } + + hash2(array: Array): BigInt { + let result = super.call("hash2", "hash2(uint256[2]):(uint256)", [ + ethereum.Value.fromUnsignedBigIntArray(array), + ]); + + return result[0].toBigInt(); + } + + try_hash2(array: Array): ethereum.CallResult { + let result = super.tryCall("hash2", "hash2(uint256[2]):(uint256)", [ + ethereum.Value.fromUnsignedBigIntArray(array), + ]); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toBigInt()); + } + + hash3(array: Array): BigInt { + let result = super.call("hash3", "hash3(uint256[3]):(uint256)", [ + ethereum.Value.fromUnsignedBigIntArray(array), + ]); + + return result[0].toBigInt(); + } + + try_hash3(array: Array): ethereum.CallResult { + let result = super.tryCall("hash3", "hash3(uint256[3]):(uint256)", [ + ethereum.Value.fromUnsignedBigIntArray(array), + ]); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toBigInt()); + } + + hash4(array: Array): BigInt { + let result = super.call("hash4", "hash4(uint256[4]):(uint256)", [ + ethereum.Value.fromUnsignedBigIntArray(array), + ]); + + return result[0].toBigInt(); + } + + try_hash4(array: Array): ethereum.CallResult { + let result = super.tryCall("hash4", "hash4(uint256[4]):(uint256)", [ + ethereum.Value.fromUnsignedBigIntArray(array), + ]); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toBigInt()); + } + + hash5(array: Array): BigInt { + let result = super.call("hash5", "hash5(uint256[5]):(uint256)", [ + ethereum.Value.fromUnsignedBigIntArray(array), + ]); + + return result[0].toBigInt(); + } + + try_hash5(array: Array): ethereum.CallResult { + let result = super.tryCall("hash5", "hash5(uint256[5]):(uint256)", [ + ethereum.Value.fromUnsignedBigIntArray(array), + ]); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toBigInt()); + } + + hashLeftRight(left: BigInt, right: BigInt): BigInt { + let result = super.call( + "hashLeftRight", + "hashLeftRight(uint256,uint256):(uint256)", + [ + ethereum.Value.fromUnsignedBigInt(left), + ethereum.Value.fromUnsignedBigInt(right), + ], + ); + + return result[0].toBigInt(); + } + + try_hashLeftRight(left: BigInt, right: BigInt): ethereum.CallResult { + let result = super.tryCall( + "hashLeftRight", + "hashLeftRight(uint256,uint256):(uint256)", + [ + ethereum.Value.fromUnsignedBigInt(left), + ethereum.Value.fromUnsignedBigInt(right), + ], + ); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toBigInt()); + } + + hashMessageAndEncPubKey( + _message: Poll__hashMessageAndEncPubKeyInput_messageStruct, + _encPubKey: Poll__hashMessageAndEncPubKeyInput_encPubKeyStruct, + ): BigInt { + let result = super.call( + "hashMessageAndEncPubKey", + "hashMessageAndEncPubKey((uint256,uint256[10]),(uint256,uint256)):(uint256)", + [ + ethereum.Value.fromTuple(_message), + ethereum.Value.fromTuple(_encPubKey), + ], + ); + + return result[0].toBigInt(); + } + + try_hashMessageAndEncPubKey( + _message: Poll__hashMessageAndEncPubKeyInput_messageStruct, + _encPubKey: Poll__hashMessageAndEncPubKeyInput_encPubKeyStruct, + ): ethereum.CallResult { + let result = super.tryCall( + "hashMessageAndEncPubKey", + "hashMessageAndEncPubKey((uint256,uint256[10]),(uint256,uint256)):(uint256)", + [ + ethereum.Value.fromTuple(_message), + ethereum.Value.fromTuple(_encPubKey), + ], + ); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toBigInt()); + } + + hashStateLeaf(_stateLeaf: Poll__hashStateLeafInput_stateLeafStruct): BigInt { + let result = super.call( + "hashStateLeaf", + "hashStateLeaf(((uint256,uint256),uint256,uint256)):(uint256)", + [ethereum.Value.fromTuple(_stateLeaf)], + ); + + return result[0].toBigInt(); + } + + try_hashStateLeaf( + _stateLeaf: Poll__hashStateLeafInput_stateLeafStruct, + ): ethereum.CallResult { + let result = super.tryCall( + "hashStateLeaf", + "hashStateLeaf(((uint256,uint256),uint256,uint256)):(uint256)", + [ethereum.Value.fromTuple(_stateLeaf)], + ); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toBigInt()); + } + + maxValues(): Poll__maxValuesResult { + let result = super.call("maxValues", "maxValues():(uint256,uint256)", []); + + return new Poll__maxValuesResult( + result[0].toBigInt(), + result[1].toBigInt(), + ); + } + + try_maxValues(): ethereum.CallResult { + let result = super.tryCall( + "maxValues", + "maxValues():(uint256,uint256)", + [], + ); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue( + new Poll__maxValuesResult(value[0].toBigInt(), value[1].toBigInt()), + ); + } + + mergedStateRoot(): BigInt { + let result = super.call( + "mergedStateRoot", + "mergedStateRoot():(uint256)", + [], + ); + + return result[0].toBigInt(); + } + + try_mergedStateRoot(): ethereum.CallResult { + let result = super.tryCall( + "mergedStateRoot", + "mergedStateRoot():(uint256)", + [], + ); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toBigInt()); + } + + numMessages(): BigInt { + let result = super.call("numMessages", "numMessages():(uint256)", []); + + return result[0].toBigInt(); + } + + try_numMessages(): ethereum.CallResult { + let result = super.tryCall("numMessages", "numMessages():(uint256)", []); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toBigInt()); + } + + numSignUpsAndMessages(): Poll__numSignUpsAndMessagesResult { + let result = super.call( + "numSignUpsAndMessages", + "numSignUpsAndMessages():(uint256,uint256)", + [], + ); + + return new Poll__numSignUpsAndMessagesResult( + result[0].toBigInt(), + result[1].toBigInt(), + ); + } + + try_numSignUpsAndMessages(): ethereum.CallResult { + let result = super.tryCall( + "numSignUpsAndMessages", + "numSignUpsAndMessages():(uint256,uint256)", + [], + ); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue( + new Poll__numSignUpsAndMessagesResult( + value[0].toBigInt(), + value[1].toBigInt(), + ), + ); + } + + numSignups(): BigInt { + let result = super.call("numSignups", "numSignups():(uint256)", []); + + return result[0].toBigInt(); + } + + try_numSignups(): ethereum.CallResult { + let result = super.tryCall("numSignups", "numSignups():(uint256)", []); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toBigInt()); + } + + owner(): Address { + let result = super.call("owner", "owner():(address)", []); + + return result[0].toAddress(); + } + + try_owner(): ethereum.CallResult
{ + let result = super.tryCall("owner", "owner():(address)", []); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toAddress()); + } + + padAndHashMessage( + dataToPad: Array, + msgType: BigInt, + ): Poll__padAndHashMessageResult { + let result = super.call( + "padAndHashMessage", + "padAndHashMessage(uint256[2],uint256):((uint256,uint256[10]),(uint256,uint256),uint256)", + [ + ethereum.Value.fromUnsignedBigIntArray(dataToPad), + ethereum.Value.fromUnsignedBigInt(msgType), + ], + ); + + return changetype( + new Poll__padAndHashMessageResult( + changetype( + result[0].toTuple(), + ), + changetype( + result[1].toTuple(), + ), + result[2].toBigInt(), + ), + ); + } + + try_padAndHashMessage( + dataToPad: Array, + msgType: BigInt, + ): ethereum.CallResult { + let result = super.tryCall( + "padAndHashMessage", + "padAndHashMessage(uint256[2],uint256):((uint256,uint256[10]),(uint256,uint256),uint256)", + [ + ethereum.Value.fromUnsignedBigIntArray(dataToPad), + ethereum.Value.fromUnsignedBigInt(msgType), + ], + ); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue( + changetype( + new Poll__padAndHashMessageResult( + changetype( + value[0].toTuple(), + ), + changetype( + value[1].toTuple(), + ), + value[2].toBigInt(), + ), + ), + ); + } + + sha256Hash(array: Array): BigInt { + let result = super.call("sha256Hash", "sha256Hash(uint256[]):(uint256)", [ + ethereum.Value.fromUnsignedBigIntArray(array), + ]); + + return result[0].toBigInt(); + } + + try_sha256Hash(array: Array): ethereum.CallResult { + let result = super.tryCall( + "sha256Hash", + "sha256Hash(uint256[]):(uint256)", + [ethereum.Value.fromUnsignedBigIntArray(array)], + ); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toBigInt()); + } + + stateAqMerged(): boolean { + let result = super.call("stateAqMerged", "stateAqMerged():(bool)", []); + + return result[0].toBoolean(); + } + + try_stateAqMerged(): ethereum.CallResult { + let result = super.tryCall("stateAqMerged", "stateAqMerged():(bool)", []); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toBoolean()); + } + + treeDepths(): Poll__treeDepthsResult { + let result = super.call( + "treeDepths", + "treeDepths():(uint8,uint8,uint8,uint8)", + [], + ); + + return new Poll__treeDepthsResult( + result[0].toI32(), + result[1].toI32(), + result[2].toI32(), + result[3].toI32(), + ); + } + + try_treeDepths(): ethereum.CallResult { + let result = super.tryCall( + "treeDepths", + "treeDepths():(uint8,uint8,uint8,uint8)", + [], + ); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue( + new Poll__treeDepthsResult( + value[0].toI32(), + value[1].toI32(), + value[2].toI32(), + value[3].toI32(), + ), + ); + } +} + +export class ConstructorCall extends ethereum.Call { + get inputs(): ConstructorCall__Inputs { + return new ConstructorCall__Inputs(this); + } + + get outputs(): ConstructorCall__Outputs { + return new ConstructorCall__Outputs(this); + } +} + +export class ConstructorCall__Inputs { + _call: ConstructorCall; + + constructor(call: ConstructorCall) { + this._call = call; + } + + get _duration(): BigInt { + return this._call.inputValues[0].value.toBigInt(); + } + + get _maxValues(): ConstructorCall_maxValuesStruct { + return changetype( + this._call.inputValues[1].value.toTuple(), + ); + } + + get _treeDepths(): ConstructorCall_treeDepthsStruct { + return changetype( + this._call.inputValues[2].value.toTuple(), + ); + } + + get _coordinatorPubKey(): ConstructorCall_coordinatorPubKeyStruct { + return changetype( + this._call.inputValues[3].value.toTuple(), + ); + } + + get _extContracts(): ConstructorCall_extContractsStruct { + return changetype( + this._call.inputValues[4].value.toTuple(), + ); + } +} + +export class ConstructorCall__Outputs { + _call: ConstructorCall; + + constructor(call: ConstructorCall) { + this._call = call; + } +} + +export class ConstructorCall_maxValuesStruct extends ethereum.Tuple { + get maxMessages(): BigInt { + return this[0].toBigInt(); + } + + get maxVoteOptions(): BigInt { + return this[1].toBigInt(); + } +} + +export class ConstructorCall_treeDepthsStruct extends ethereum.Tuple { + get intStateTreeDepth(): i32 { + return this[0].toI32(); + } + + get messageTreeSubDepth(): i32 { + return this[1].toI32(); + } + + get messageTreeDepth(): i32 { + return this[2].toI32(); + } + + get voteOptionTreeDepth(): i32 { + return this[3].toI32(); + } +} + +export class ConstructorCall_coordinatorPubKeyStruct extends ethereum.Tuple { + get x(): BigInt { + return this[0].toBigInt(); + } + + get y(): BigInt { + return this[1].toBigInt(); + } +} + +export class ConstructorCall_extContractsStruct extends ethereum.Tuple { + get maci(): Address { + return this[0].toAddress(); + } + + get messageAq(): Address { + return this[1].toAddress(); + } + + get topupCredit(): Address { + return this[2].toAddress(); + } +} + +export class InitCall extends ethereum.Call { + get inputs(): InitCall__Inputs { + return new InitCall__Inputs(this); + } + + get outputs(): InitCall__Outputs { + return new InitCall__Outputs(this); + } +} + +export class InitCall__Inputs { + _call: InitCall; + + constructor(call: InitCall) { + this._call = call; + } +} + +export class InitCall__Outputs { + _call: InitCall; + + constructor(call: InitCall) { + this._call = call; + } +} + +export class MergeMaciStateAqCall extends ethereum.Call { + get inputs(): MergeMaciStateAqCall__Inputs { + return new MergeMaciStateAqCall__Inputs(this); + } + + get outputs(): MergeMaciStateAqCall__Outputs { + return new MergeMaciStateAqCall__Outputs(this); + } +} + +export class MergeMaciStateAqCall__Inputs { + _call: MergeMaciStateAqCall; + + constructor(call: MergeMaciStateAqCall) { + this._call = call; + } + + get _pollId(): BigInt { + return this._call.inputValues[0].value.toBigInt(); + } +} + +export class MergeMaciStateAqCall__Outputs { + _call: MergeMaciStateAqCall; + + constructor(call: MergeMaciStateAqCall) { + this._call = call; + } +} + +export class MergeMaciStateAqSubRootsCall extends ethereum.Call { + get inputs(): MergeMaciStateAqSubRootsCall__Inputs { + return new MergeMaciStateAqSubRootsCall__Inputs(this); + } + + get outputs(): MergeMaciStateAqSubRootsCall__Outputs { + return new MergeMaciStateAqSubRootsCall__Outputs(this); + } +} + +export class MergeMaciStateAqSubRootsCall__Inputs { + _call: MergeMaciStateAqSubRootsCall; + + constructor(call: MergeMaciStateAqSubRootsCall) { + this._call = call; + } + + get _numSrQueueOps(): BigInt { + return this._call.inputValues[0].value.toBigInt(); + } + + get _pollId(): BigInt { + return this._call.inputValues[1].value.toBigInt(); + } +} + +export class MergeMaciStateAqSubRootsCall__Outputs { + _call: MergeMaciStateAqSubRootsCall; + + constructor(call: MergeMaciStateAqSubRootsCall) { + this._call = call; + } +} + +export class MergeMessageAqCall extends ethereum.Call { + get inputs(): MergeMessageAqCall__Inputs { + return new MergeMessageAqCall__Inputs(this); + } + + get outputs(): MergeMessageAqCall__Outputs { + return new MergeMessageAqCall__Outputs(this); + } +} + +export class MergeMessageAqCall__Inputs { + _call: MergeMessageAqCall; + + constructor(call: MergeMessageAqCall) { + this._call = call; + } +} + +export class MergeMessageAqCall__Outputs { + _call: MergeMessageAqCall; + + constructor(call: MergeMessageAqCall) { + this._call = call; + } +} + +export class MergeMessageAqSubRootsCall extends ethereum.Call { + get inputs(): MergeMessageAqSubRootsCall__Inputs { + return new MergeMessageAqSubRootsCall__Inputs(this); + } + + get outputs(): MergeMessageAqSubRootsCall__Outputs { + return new MergeMessageAqSubRootsCall__Outputs(this); + } +} + +export class MergeMessageAqSubRootsCall__Inputs { + _call: MergeMessageAqSubRootsCall; + + constructor(call: MergeMessageAqSubRootsCall) { + this._call = call; + } + + get _numSrQueueOps(): BigInt { + return this._call.inputValues[0].value.toBigInt(); + } +} + +export class MergeMessageAqSubRootsCall__Outputs { + _call: MergeMessageAqSubRootsCall; + + constructor(call: MergeMessageAqSubRootsCall) { + this._call = call; + } +} + +export class PublishMessageCall extends ethereum.Call { + get inputs(): PublishMessageCall__Inputs { + return new PublishMessageCall__Inputs(this); + } + + get outputs(): PublishMessageCall__Outputs { + return new PublishMessageCall__Outputs(this); + } +} + +export class PublishMessageCall__Inputs { + _call: PublishMessageCall; + + constructor(call: PublishMessageCall) { + this._call = call; + } + + get _message(): PublishMessageCall_messageStruct { + return changetype( + this._call.inputValues[0].value.toTuple(), + ); + } + + get _encPubKey(): PublishMessageCall_encPubKeyStruct { + return changetype( + this._call.inputValues[1].value.toTuple(), + ); + } +} + +export class PublishMessageCall__Outputs { + _call: PublishMessageCall; + + constructor(call: PublishMessageCall) { + this._call = call; + } +} + +export class PublishMessageCall_messageStruct extends ethereum.Tuple { + get msgType(): BigInt { + return this[0].toBigInt(); + } + + get data(): Array { + return this[1].toBigIntArray(); + } +} + +export class PublishMessageCall_encPubKeyStruct extends ethereum.Tuple { + get x(): BigInt { + return this[0].toBigInt(); + } + + get y(): BigInt { + return this[1].toBigInt(); + } +} + +export class PublishMessageBatchCall extends ethereum.Call { + get inputs(): PublishMessageBatchCall__Inputs { + return new PublishMessageBatchCall__Inputs(this); + } + + get outputs(): PublishMessageBatchCall__Outputs { + return new PublishMessageBatchCall__Outputs(this); + } +} + +export class PublishMessageBatchCall__Inputs { + _call: PublishMessageBatchCall; + + constructor(call: PublishMessageBatchCall) { + this._call = call; + } + + get _messages(): Array { + return this._call.inputValues[0].value.toTupleArray(); + } + + get _encPubKeys(): Array { + return this._call.inputValues[1].value.toTupleArray(); + } +} + +export class PublishMessageBatchCall__Outputs { + _call: PublishMessageBatchCall; + + constructor(call: PublishMessageBatchCall) { + this._call = call; + } +} + +export class PublishMessageBatchCall_messagesStruct extends ethereum.Tuple { + get msgType(): BigInt { + return this[0].toBigInt(); + } + + get data(): Array { + return this[1].toBigIntArray(); + } +} + +export class PublishMessageBatchCall_encPubKeysStruct extends ethereum.Tuple { + get x(): BigInt { + return this[0].toBigInt(); + } + + get y(): BigInt { + return this[1].toBigInt(); + } +} + +export class RenounceOwnershipCall extends ethereum.Call { + get inputs(): RenounceOwnershipCall__Inputs { + return new RenounceOwnershipCall__Inputs(this); + } + + get outputs(): RenounceOwnershipCall__Outputs { + return new RenounceOwnershipCall__Outputs(this); + } +} + +export class RenounceOwnershipCall__Inputs { + _call: RenounceOwnershipCall; + + constructor(call: RenounceOwnershipCall) { + this._call = call; + } +} + +export class RenounceOwnershipCall__Outputs { + _call: RenounceOwnershipCall; + + constructor(call: RenounceOwnershipCall) { + this._call = call; + } +} + +export class TopupCall extends ethereum.Call { + get inputs(): TopupCall__Inputs { + return new TopupCall__Inputs(this); + } + + get outputs(): TopupCall__Outputs { + return new TopupCall__Outputs(this); + } +} + +export class TopupCall__Inputs { + _call: TopupCall; + + constructor(call: TopupCall) { + this._call = call; + } + + get stateIndex(): BigInt { + return this._call.inputValues[0].value.toBigInt(); + } + + get amount(): BigInt { + return this._call.inputValues[1].value.toBigInt(); + } +} + +export class TopupCall__Outputs { + _call: TopupCall; + + constructor(call: TopupCall) { + this._call = call; + } +} + +export class TransferOwnershipCall extends ethereum.Call { + get inputs(): TransferOwnershipCall__Inputs { + return new TransferOwnershipCall__Inputs(this); + } + + get outputs(): TransferOwnershipCall__Outputs { + return new TransferOwnershipCall__Outputs(this); + } +} + +export class TransferOwnershipCall__Inputs { + _call: TransferOwnershipCall; + + constructor(call: TransferOwnershipCall) { + this._call = call; + } + + get newOwner(): Address { + return this._call.inputValues[0].value.toAddress(); + } +} + +export class TransferOwnershipCall__Outputs { + _call: TransferOwnershipCall; + + constructor(call: TransferOwnershipCall) { + this._call = call; + } +} diff --git a/subgraph/generated/FundingRoundFactory/Token.ts b/subgraph/generated/ClrFund/Token.ts similarity index 93% rename from subgraph/generated/FundingRoundFactory/Token.ts rename to subgraph/generated/ClrFund/Token.ts index 0b38c9c82..72becb876 100644 --- a/subgraph/generated/FundingRoundFactory/Token.ts +++ b/subgraph/generated/ClrFund/Token.ts @@ -7,7 +7,7 @@ import { Entity, Bytes, Address, - BigInt + BigInt, } from "@graphprotocol/graph-ts"; export class Approval extends ethereum.Event { @@ -71,7 +71,7 @@ export class Token extends ethereum.SmartContract { let result = super.call( "allowance", "allowance(address,address):(uint256)", - [ethereum.Value.fromAddress(owner), ethereum.Value.fromAddress(spender)] + [ethereum.Value.fromAddress(owner), ethereum.Value.fromAddress(spender)], ); return result[0].toBigInt(); @@ -81,7 +81,7 @@ export class Token extends ethereum.SmartContract { let result = super.tryCall( "allowance", "allowance(address,address):(uint256)", - [ethereum.Value.fromAddress(owner), ethereum.Value.fromAddress(spender)] + [ethereum.Value.fromAddress(owner), ethereum.Value.fromAddress(spender)], ); if (result.reverted) { return new ethereum.CallResult(); @@ -93,7 +93,7 @@ export class Token extends ethereum.SmartContract { approve(spender: Address, amount: BigInt): boolean { let result = super.call("approve", "approve(address,uint256):(bool)", [ ethereum.Value.fromAddress(spender), - ethereum.Value.fromUnsignedBigInt(amount) + ethereum.Value.fromUnsignedBigInt(amount), ]); return result[0].toBoolean(); @@ -102,7 +102,7 @@ export class Token extends ethereum.SmartContract { try_approve(spender: Address, amount: BigInt): ethereum.CallResult { let result = super.tryCall("approve", "approve(address,uint256):(bool)", [ ethereum.Value.fromAddress(spender), - ethereum.Value.fromUnsignedBigInt(amount) + ethereum.Value.fromUnsignedBigInt(amount), ]); if (result.reverted) { return new ethereum.CallResult(); @@ -113,7 +113,7 @@ export class Token extends ethereum.SmartContract { balanceOf(account: Address): BigInt { let result = super.call("balanceOf", "balanceOf(address):(uint256)", [ - ethereum.Value.fromAddress(account) + ethereum.Value.fromAddress(account), ]); return result[0].toBigInt(); @@ -121,7 +121,7 @@ export class Token extends ethereum.SmartContract { try_balanceOf(account: Address): ethereum.CallResult { let result = super.tryCall("balanceOf", "balanceOf(address):(uint256)", [ - ethereum.Value.fromAddress(account) + ethereum.Value.fromAddress(account), ]); if (result.reverted) { return new ethereum.CallResult(); @@ -151,8 +151,8 @@ export class Token extends ethereum.SmartContract { "decreaseAllowance(address,uint256):(bool)", [ ethereum.Value.fromAddress(spender), - ethereum.Value.fromUnsignedBigInt(subtractedValue) - ] + ethereum.Value.fromUnsignedBigInt(subtractedValue), + ], ); return result[0].toBoolean(); @@ -160,15 +160,15 @@ export class Token extends ethereum.SmartContract { try_decreaseAllowance( spender: Address, - subtractedValue: BigInt + subtractedValue: BigInt, ): ethereum.CallResult { let result = super.tryCall( "decreaseAllowance", "decreaseAllowance(address,uint256):(bool)", [ ethereum.Value.fromAddress(spender), - ethereum.Value.fromUnsignedBigInt(subtractedValue) - ] + ethereum.Value.fromUnsignedBigInt(subtractedValue), + ], ); if (result.reverted) { return new ethereum.CallResult(); @@ -183,8 +183,8 @@ export class Token extends ethereum.SmartContract { "increaseAllowance(address,uint256):(bool)", [ ethereum.Value.fromAddress(spender), - ethereum.Value.fromUnsignedBigInt(addedValue) - ] + ethereum.Value.fromUnsignedBigInt(addedValue), + ], ); return result[0].toBoolean(); @@ -192,15 +192,15 @@ export class Token extends ethereum.SmartContract { try_increaseAllowance( spender: Address, - addedValue: BigInt + addedValue: BigInt, ): ethereum.CallResult { let result = super.tryCall( "increaseAllowance", "increaseAllowance(address,uint256):(bool)", [ ethereum.Value.fromAddress(spender), - ethereum.Value.fromUnsignedBigInt(addedValue) - ] + ethereum.Value.fromUnsignedBigInt(addedValue), + ], ); if (result.reverted) { return new ethereum.CallResult(); @@ -257,7 +257,7 @@ export class Token extends ethereum.SmartContract { transfer(recipient: Address, amount: BigInt): boolean { let result = super.call("transfer", "transfer(address,uint256):(bool)", [ ethereum.Value.fromAddress(recipient), - ethereum.Value.fromUnsignedBigInt(amount) + ethereum.Value.fromUnsignedBigInt(amount), ]); return result[0].toBoolean(); @@ -265,11 +265,11 @@ export class Token extends ethereum.SmartContract { try_transfer( recipient: Address, - amount: BigInt + amount: BigInt, ): ethereum.CallResult { let result = super.tryCall("transfer", "transfer(address,uint256):(bool)", [ ethereum.Value.fromAddress(recipient), - ethereum.Value.fromUnsignedBigInt(amount) + ethereum.Value.fromUnsignedBigInt(amount), ]); if (result.reverted) { return new ethereum.CallResult(); @@ -285,8 +285,8 @@ export class Token extends ethereum.SmartContract { [ ethereum.Value.fromAddress(sender), ethereum.Value.fromAddress(recipient), - ethereum.Value.fromUnsignedBigInt(amount) - ] + ethereum.Value.fromUnsignedBigInt(amount), + ], ); return result[0].toBoolean(); @@ -295,7 +295,7 @@ export class Token extends ethereum.SmartContract { try_transferFrom( sender: Address, recipient: Address, - amount: BigInt + amount: BigInt, ): ethereum.CallResult { let result = super.tryCall( "transferFrom", @@ -303,8 +303,8 @@ export class Token extends ethereum.SmartContract { [ ethereum.Value.fromAddress(sender), ethereum.Value.fromAddress(recipient), - ethereum.Value.fromUnsignedBigInt(amount) - ] + ethereum.Value.fromUnsignedBigInt(amount), + ], ); if (result.reverted) { return new ethereum.CallResult(); diff --git a/subgraph/generated/FundingRoundFactory/MACIFactory.ts b/subgraph/generated/FundingRoundFactory/MACIFactory.ts deleted file mode 100644 index a806996ad..000000000 --- a/subgraph/generated/FundingRoundFactory/MACIFactory.ts +++ /dev/null @@ -1,643 +0,0 @@ -// THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. - -import { - ethereum, - JSONValue, - TypedMap, - Entity, - Bytes, - Address, - BigInt -} from "@graphprotocol/graph-ts"; - -export class MaciDeployed extends ethereum.Event { - get params(): MaciDeployed__Params { - return new MaciDeployed__Params(this); - } -} - -export class MaciDeployed__Params { - _event: MaciDeployed; - - constructor(event: MaciDeployed) { - this._event = event; - } - - get _maci(): Address { - return this._event.parameters[0].value.toAddress(); - } -} - -export class MaciParametersChanged extends ethereum.Event { - get params(): MaciParametersChanged__Params { - return new MaciParametersChanged__Params(this); - } -} - -export class MaciParametersChanged__Params { - _event: MaciParametersChanged; - - constructor(event: MaciParametersChanged) { - this._event = event; - } -} - -export class OwnershipTransferred extends ethereum.Event { - get params(): OwnershipTransferred__Params { - return new OwnershipTransferred__Params(this); - } -} - -export class OwnershipTransferred__Params { - _event: OwnershipTransferred; - - constructor(event: OwnershipTransferred) { - this._event = event; - } - - get previousOwner(): Address { - return this._event.parameters[0].value.toAddress(); - } - - get newOwner(): Address { - return this._event.parameters[1].value.toAddress(); - } -} - -export class MACIFactory__batchSizesResult { - value0: i32; - value1: i32; - - constructor(value0: i32, value1: i32) { - this.value0 = value0; - this.value1 = value1; - } - - toMap(): TypedMap { - let map = new TypedMap(); - map.set( - "value0", - ethereum.Value.fromUnsignedBigInt(BigInt.fromI32(this.value0)) - ); - map.set( - "value1", - ethereum.Value.fromUnsignedBigInt(BigInt.fromI32(this.value1)) - ); - return map; - } - - getTallyBatchSize(): i32 { - return this.value0; - } - - getMessageBatchSize(): i32 { - return this.value1; - } -} - -export class MACIFactory__deployMaciInput_coordinatorPubKeyStruct extends ethereum.Tuple { - get x(): BigInt { - return this[0].toBigInt(); - } - - get y(): BigInt { - return this[1].toBigInt(); - } -} - -export class MACIFactory__maxValuesResult { - value0: BigInt; - value1: BigInt; - value2: BigInt; - - constructor(value0: BigInt, value1: BigInt, value2: BigInt) { - this.value0 = value0; - this.value1 = value1; - this.value2 = value2; - } - - toMap(): TypedMap { - let map = new TypedMap(); - map.set("value0", ethereum.Value.fromUnsignedBigInt(this.value0)); - map.set("value1", ethereum.Value.fromUnsignedBigInt(this.value1)); - map.set("value2", ethereum.Value.fromUnsignedBigInt(this.value2)); - return map; - } - - getMaxUsers(): BigInt { - return this.value0; - } - - getMaxMessages(): BigInt { - return this.value1; - } - - getMaxVoteOptions(): BigInt { - return this.value2; - } -} - -export class MACIFactory__treeDepthsResult { - value0: i32; - value1: i32; - value2: i32; - - constructor(value0: i32, value1: i32, value2: i32) { - this.value0 = value0; - this.value1 = value1; - this.value2 = value2; - } - - toMap(): TypedMap { - let map = new TypedMap(); - map.set( - "value0", - ethereum.Value.fromUnsignedBigInt(BigInt.fromI32(this.value0)) - ); - map.set( - "value1", - ethereum.Value.fromUnsignedBigInt(BigInt.fromI32(this.value1)) - ); - map.set( - "value2", - ethereum.Value.fromUnsignedBigInt(BigInt.fromI32(this.value2)) - ); - return map; - } - - getStateTreeDepth(): i32 { - return this.value0; - } - - getMessageTreeDepth(): i32 { - return this.value1; - } - - getVoteOptionTreeDepth(): i32 { - return this.value2; - } -} - -export class MACIFactory extends ethereum.SmartContract { - static bind(address: Address): MACIFactory { - return new MACIFactory("MACIFactory", address); - } - - batchSizes(): MACIFactory__batchSizesResult { - let result = super.call("batchSizes", "batchSizes():(uint8,uint8)", []); - - return new MACIFactory__batchSizesResult( - result[0].toI32(), - result[1].toI32() - ); - } - - try_batchSizes(): ethereum.CallResult { - let result = super.tryCall("batchSizes", "batchSizes():(uint8,uint8)", []); - if (result.reverted) { - return new ethereum.CallResult(); - } - let value = result.value; - return ethereum.CallResult.fromValue( - new MACIFactory__batchSizesResult(value[0].toI32(), value[1].toI32()) - ); - } - - batchUstVerifier(): Address { - let result = super.call( - "batchUstVerifier", - "batchUstVerifier():(address)", - [] - ); - - return result[0].toAddress(); - } - - try_batchUstVerifier(): ethereum.CallResult
{ - let result = super.tryCall( - "batchUstVerifier", - "batchUstVerifier():(address)", - [] - ); - if (result.reverted) { - return new ethereum.CallResult(); - } - let value = result.value; - return ethereum.CallResult.fromValue(value[0].toAddress()); - } - - deployMaci( - _signUpGatekeeper: Address, - _initialVoiceCreditProxy: Address, - _coordinator: Address, - _coordinatorPubKey: MACIFactory__deployMaciInput_coordinatorPubKeyStruct - ): Address { - let result = super.call( - "deployMaci", - "deployMaci(address,address,address,(uint256,uint256)):(address)", - [ - ethereum.Value.fromAddress(_signUpGatekeeper), - ethereum.Value.fromAddress(_initialVoiceCreditProxy), - ethereum.Value.fromAddress(_coordinator), - ethereum.Value.fromTuple(_coordinatorPubKey) - ] - ); - - return result[0].toAddress(); - } - - try_deployMaci( - _signUpGatekeeper: Address, - _initialVoiceCreditProxy: Address, - _coordinator: Address, - _coordinatorPubKey: MACIFactory__deployMaciInput_coordinatorPubKeyStruct - ): ethereum.CallResult
{ - let result = super.tryCall( - "deployMaci", - "deployMaci(address,address,address,(uint256,uint256)):(address)", - [ - ethereum.Value.fromAddress(_signUpGatekeeper), - ethereum.Value.fromAddress(_initialVoiceCreditProxy), - ethereum.Value.fromAddress(_coordinator), - ethereum.Value.fromTuple(_coordinatorPubKey) - ] - ); - if (result.reverted) { - return new ethereum.CallResult(); - } - let value = result.value; - return ethereum.CallResult.fromValue(value[0].toAddress()); - } - - maxValues(): MACIFactory__maxValuesResult { - let result = super.call( - "maxValues", - "maxValues():(uint256,uint256,uint256)", - [] - ); - - return new MACIFactory__maxValuesResult( - result[0].toBigInt(), - result[1].toBigInt(), - result[2].toBigInt() - ); - } - - try_maxValues(): ethereum.CallResult { - let result = super.tryCall( - "maxValues", - "maxValues():(uint256,uint256,uint256)", - [] - ); - if (result.reverted) { - return new ethereum.CallResult(); - } - let value = result.value; - return ethereum.CallResult.fromValue( - new MACIFactory__maxValuesResult( - value[0].toBigInt(), - value[1].toBigInt(), - value[2].toBigInt() - ) - ); - } - - owner(): Address { - let result = super.call("owner", "owner():(address)", []); - - return result[0].toAddress(); - } - - try_owner(): ethereum.CallResult
{ - let result = super.tryCall("owner", "owner():(address)", []); - if (result.reverted) { - return new ethereum.CallResult(); - } - let value = result.value; - return ethereum.CallResult.fromValue(value[0].toAddress()); - } - - qvtVerifier(): Address { - let result = super.call("qvtVerifier", "qvtVerifier():(address)", []); - - return result[0].toAddress(); - } - - try_qvtVerifier(): ethereum.CallResult
{ - let result = super.tryCall("qvtVerifier", "qvtVerifier():(address)", []); - if (result.reverted) { - return new ethereum.CallResult(); - } - let value = result.value; - return ethereum.CallResult.fromValue(value[0].toAddress()); - } - - signUpDuration(): BigInt { - let result = super.call("signUpDuration", "signUpDuration():(uint256)", []); - - return result[0].toBigInt(); - } - - try_signUpDuration(): ethereum.CallResult { - let result = super.tryCall( - "signUpDuration", - "signUpDuration():(uint256)", - [] - ); - if (result.reverted) { - return new ethereum.CallResult(); - } - let value = result.value; - return ethereum.CallResult.fromValue(value[0].toBigInt()); - } - - treeDepths(): MACIFactory__treeDepthsResult { - let result = super.call( - "treeDepths", - "treeDepths():(uint8,uint8,uint8)", - [] - ); - - return new MACIFactory__treeDepthsResult( - result[0].toI32(), - result[1].toI32(), - result[2].toI32() - ); - } - - try_treeDepths(): ethereum.CallResult { - let result = super.tryCall( - "treeDepths", - "treeDepths():(uint8,uint8,uint8)", - [] - ); - if (result.reverted) { - return new ethereum.CallResult(); - } - let value = result.value; - return ethereum.CallResult.fromValue( - new MACIFactory__treeDepthsResult( - value[0].toI32(), - value[1].toI32(), - value[2].toI32() - ) - ); - } - - votingDuration(): BigInt { - let result = super.call("votingDuration", "votingDuration():(uint256)", []); - - return result[0].toBigInt(); - } - - try_votingDuration(): ethereum.CallResult { - let result = super.tryCall( - "votingDuration", - "votingDuration():(uint256)", - [] - ); - if (result.reverted) { - return new ethereum.CallResult(); - } - let value = result.value; - return ethereum.CallResult.fromValue(value[0].toBigInt()); - } -} - -export class ConstructorCall extends ethereum.Call { - get inputs(): ConstructorCall__Inputs { - return new ConstructorCall__Inputs(this); - } - - get outputs(): ConstructorCall__Outputs { - return new ConstructorCall__Outputs(this); - } -} - -export class ConstructorCall__Inputs { - _call: ConstructorCall; - - constructor(call: ConstructorCall) { - this._call = call; - } - - get _stateTreeDepth(): i32 { - return this._call.inputValues[0].value.toI32(); - } - - get _messageTreeDepth(): i32 { - return this._call.inputValues[1].value.toI32(); - } - - get _voteOptionTreeDepth(): i32 { - return this._call.inputValues[2].value.toI32(); - } - - get _tallyBatchSize(): i32 { - return this._call.inputValues[3].value.toI32(); - } - - get _messageBatchSize(): i32 { - return this._call.inputValues[4].value.toI32(); - } - - get _batchUstVerifier(): Address { - return this._call.inputValues[5].value.toAddress(); - } - - get _qvtVerifier(): Address { - return this._call.inputValues[6].value.toAddress(); - } - - get _signUpDuration(): BigInt { - return this._call.inputValues[7].value.toBigInt(); - } - - get _votingDuration(): BigInt { - return this._call.inputValues[8].value.toBigInt(); - } -} - -export class ConstructorCall__Outputs { - _call: ConstructorCall; - - constructor(call: ConstructorCall) { - this._call = call; - } -} - -export class DeployMaciCall extends ethereum.Call { - get inputs(): DeployMaciCall__Inputs { - return new DeployMaciCall__Inputs(this); - } - - get outputs(): DeployMaciCall__Outputs { - return new DeployMaciCall__Outputs(this); - } -} - -export class DeployMaciCall__Inputs { - _call: DeployMaciCall; - - constructor(call: DeployMaciCall) { - this._call = call; - } - - get _signUpGatekeeper(): Address { - return this._call.inputValues[0].value.toAddress(); - } - - get _initialVoiceCreditProxy(): Address { - return this._call.inputValues[1].value.toAddress(); - } - - get _coordinator(): Address { - return this._call.inputValues[2].value.toAddress(); - } - - get _coordinatorPubKey(): DeployMaciCall_coordinatorPubKeyStruct { - return changetype( - this._call.inputValues[3].value.toTuple() - ); - } -} - -export class DeployMaciCall__Outputs { - _call: DeployMaciCall; - - constructor(call: DeployMaciCall) { - this._call = call; - } - - get _maci(): Address { - return this._call.outputValues[0].value.toAddress(); - } -} - -export class DeployMaciCall_coordinatorPubKeyStruct extends ethereum.Tuple { - get x(): BigInt { - return this[0].toBigInt(); - } - - get y(): BigInt { - return this[1].toBigInt(); - } -} - -export class RenounceOwnershipCall extends ethereum.Call { - get inputs(): RenounceOwnershipCall__Inputs { - return new RenounceOwnershipCall__Inputs(this); - } - - get outputs(): RenounceOwnershipCall__Outputs { - return new RenounceOwnershipCall__Outputs(this); - } -} - -export class RenounceOwnershipCall__Inputs { - _call: RenounceOwnershipCall; - - constructor(call: RenounceOwnershipCall) { - this._call = call; - } -} - -export class RenounceOwnershipCall__Outputs { - _call: RenounceOwnershipCall; - - constructor(call: RenounceOwnershipCall) { - this._call = call; - } -} - -export class SetMaciParametersCall extends ethereum.Call { - get inputs(): SetMaciParametersCall__Inputs { - return new SetMaciParametersCall__Inputs(this); - } - - get outputs(): SetMaciParametersCall__Outputs { - return new SetMaciParametersCall__Outputs(this); - } -} - -export class SetMaciParametersCall__Inputs { - _call: SetMaciParametersCall; - - constructor(call: SetMaciParametersCall) { - this._call = call; - } - - get _stateTreeDepth(): i32 { - return this._call.inputValues[0].value.toI32(); - } - - get _messageTreeDepth(): i32 { - return this._call.inputValues[1].value.toI32(); - } - - get _voteOptionTreeDepth(): i32 { - return this._call.inputValues[2].value.toI32(); - } - - get _tallyBatchSize(): i32 { - return this._call.inputValues[3].value.toI32(); - } - - get _messageBatchSize(): i32 { - return this._call.inputValues[4].value.toI32(); - } - - get _batchUstVerifier(): Address { - return this._call.inputValues[5].value.toAddress(); - } - - get _qvtVerifier(): Address { - return this._call.inputValues[6].value.toAddress(); - } - - get _signUpDuration(): BigInt { - return this._call.inputValues[7].value.toBigInt(); - } - - get _votingDuration(): BigInt { - return this._call.inputValues[8].value.toBigInt(); - } -} - -export class SetMaciParametersCall__Outputs { - _call: SetMaciParametersCall; - - constructor(call: SetMaciParametersCall) { - this._call = call; - } -} - -export class TransferOwnershipCall extends ethereum.Call { - get inputs(): TransferOwnershipCall__Inputs { - return new TransferOwnershipCall__Inputs(this); - } - - get outputs(): TransferOwnershipCall__Outputs { - return new TransferOwnershipCall__Outputs(this); - } -} - -export class TransferOwnershipCall__Inputs { - _call: TransferOwnershipCall; - - constructor(call: TransferOwnershipCall) { - this._call = call; - } - - get newOwner(): Address { - return this._call.inputValues[0].value.toAddress(); - } -} - -export class TransferOwnershipCall__Outputs { - _call: TransferOwnershipCall; - - constructor(call: TransferOwnershipCall) { - this._call = call; - } -} diff --git a/subgraph/generated/OptimisticRecipientRegistry/OptimisticRecipientRegistry.ts b/subgraph/generated/OptimisticRecipientRegistry/OptimisticRecipientRegistry.ts index 20d805ce5..80ec65e55 100644 --- a/subgraph/generated/OptimisticRecipientRegistry/OptimisticRecipientRegistry.ts +++ b/subgraph/generated/OptimisticRecipientRegistry/OptimisticRecipientRegistry.ts @@ -7,7 +7,7 @@ import { Entity, Bytes, Address, - BigInt + BigInt, } from "@graphprotocol/graph-ts"; export class OwnershipTransferred extends ethereum.Event { @@ -104,7 +104,7 @@ export class OptimisticRecipientRegistry extends ethereum.SmartContract { static bind(address: Address): OptimisticRecipientRegistry { return new OptimisticRecipientRegistry( "OptimisticRecipientRegistry", - address + address, ); } @@ -127,7 +127,7 @@ export class OptimisticRecipientRegistry extends ethereum.SmartContract { let result = super.call( "challengePeriodDuration", "challengePeriodDuration():(uint256)", - [] + [], ); return result[0].toBigInt(); @@ -137,7 +137,7 @@ export class OptimisticRecipientRegistry extends ethereum.SmartContract { let result = super.tryCall( "challengePeriodDuration", "challengePeriodDuration():(uint256)", - [] + [], ); if (result.reverted) { return new ethereum.CallResult(); @@ -152,8 +152,8 @@ export class OptimisticRecipientRegistry extends ethereum.SmartContract { "challengeRequest(bytes32,address):(bool)", [ ethereum.Value.fromFixedBytes(_recipientId), - ethereum.Value.fromAddress(_beneficiary) - ] + ethereum.Value.fromAddress(_beneficiary), + ], ); return result[0].toBoolean(); @@ -161,15 +161,15 @@ export class OptimisticRecipientRegistry extends ethereum.SmartContract { try_challengeRequest( _recipientId: Bytes, - _beneficiary: Address + _beneficiary: Address, ): ethereum.CallResult { let result = super.tryCall( "challengeRequest", "challengeRequest(bytes32,address):(bool)", [ ethereum.Value.fromFixedBytes(_recipientId), - ethereum.Value.fromAddress(_beneficiary) - ] + ethereum.Value.fromAddress(_beneficiary), + ], ); if (result.reverted) { return new ethereum.CallResult(); @@ -197,7 +197,7 @@ export class OptimisticRecipientRegistry extends ethereum.SmartContract { let result = super.call( "executeRequest", "executeRequest(bytes32):(bool)", - [ethereum.Value.fromFixedBytes(_recipientId)] + [ethereum.Value.fromFixedBytes(_recipientId)], ); return result[0].toBoolean(); @@ -207,7 +207,7 @@ export class OptimisticRecipientRegistry extends ethereum.SmartContract { let result = super.tryCall( "executeRequest", "executeRequest(bytes32):(bool)", - [ethereum.Value.fromFixedBytes(_recipientId)] + [ethereum.Value.fromFixedBytes(_recipientId)], ); if (result.reverted) { return new ethereum.CallResult(); @@ -219,7 +219,7 @@ export class OptimisticRecipientRegistry extends ethereum.SmartContract { getRecipientAddress( _index: BigInt, _startTime: BigInt, - _endTime: BigInt + _endTime: BigInt, ): Address { let result = super.call( "getRecipientAddress", @@ -227,8 +227,8 @@ export class OptimisticRecipientRegistry extends ethereum.SmartContract { [ ethereum.Value.fromUnsignedBigInt(_index), ethereum.Value.fromUnsignedBigInt(_startTime), - ethereum.Value.fromUnsignedBigInt(_endTime) - ] + ethereum.Value.fromUnsignedBigInt(_endTime), + ], ); return result[0].toAddress(); @@ -237,7 +237,7 @@ export class OptimisticRecipientRegistry extends ethereum.SmartContract { try_getRecipientAddress( _index: BigInt, _startTime: BigInt, - _endTime: BigInt + _endTime: BigInt, ): ethereum.CallResult
{ let result = super.tryCall( "getRecipientAddress", @@ -245,8 +245,8 @@ export class OptimisticRecipientRegistry extends ethereum.SmartContract { [ ethereum.Value.fromUnsignedBigInt(_index), ethereum.Value.fromUnsignedBigInt(_startTime), - ethereum.Value.fromUnsignedBigInt(_endTime) - ] + ethereum.Value.fromUnsignedBigInt(_endTime), + ], ); if (result.reverted) { return new ethereum.CallResult(); @@ -255,6 +255,29 @@ export class OptimisticRecipientRegistry extends ethereum.SmartContract { return ethereum.CallResult.fromValue(value[0].toAddress()); } + getRecipientCount(): BigInt { + let result = super.call( + "getRecipientCount", + "getRecipientCount():(uint256)", + [], + ); + + return result[0].toBigInt(); + } + + try_getRecipientCount(): ethereum.CallResult { + let result = super.tryCall( + "getRecipientCount", + "getRecipientCount():(uint256)", + [], + ); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toBigInt()); + } + maxRecipients(): BigInt { let result = super.call("maxRecipients", "maxRecipients():(uint256)", []); @@ -265,7 +288,7 @@ export class OptimisticRecipientRegistry extends ethereum.SmartContract { let result = super.tryCall( "maxRecipients", "maxRecipients():(uint256)", - [] + [], ); if (result.reverted) { return new ethereum.CallResult(); @@ -293,7 +316,7 @@ export class OptimisticRecipientRegistry extends ethereum.SmartContract { let result = super.call( "setMaxRecipients", "setMaxRecipients(uint256):(bool)", - [ethereum.Value.fromUnsignedBigInt(_maxRecipients)] + [ethereum.Value.fromUnsignedBigInt(_maxRecipients)], ); return result[0].toBoolean(); @@ -303,7 +326,7 @@ export class OptimisticRecipientRegistry extends ethereum.SmartContract { let result = super.tryCall( "setMaxRecipients", "setMaxRecipients(uint256):(bool)", - [ethereum.Value.fromUnsignedBigInt(_maxRecipients)] + [ethereum.Value.fromUnsignedBigInt(_maxRecipients)], ); if (result.reverted) { return new ethereum.CallResult(); diff --git a/subgraph/generated/schema.ts b/subgraph/generated/schema.ts index b18f21bdc..97e62f0d3 100644 --- a/subgraph/generated/schema.ts +++ b/subgraph/generated/schema.ts @@ -8,10 +8,10 @@ import { store, Bytes, BigInt, - BigDecimal + BigDecimal, } from "@graphprotocol/graph-ts"; -export class FundingRoundFactory extends Entity { +export class ClrFund extends Entity { constructor(id: string) { super(); this.set("id", Value.fromString(id)); @@ -19,25 +19,31 @@ export class FundingRoundFactory extends Entity { save(): void { let id = this.get("id"); - assert(id != null, "Cannot save FundingRoundFactory entity without an ID"); + assert(id != null, "Cannot save ClrFund entity without an ID"); if (id) { assert( id.kind == ValueKind.STRING, - `Entities of type FundingRoundFactory must have an ID of type String but the id '${id.displayData()}' is of type ${id.displayKind()}` + `Entities of type ClrFund must have an ID of type String but the id '${id.displayData()}' is of type ${id.displayKind()}`, ); - store.set("FundingRoundFactory", id.toString(), this); + store.set("ClrFund", id.toString(), this); } } - static load(id: string): FundingRoundFactory | null { - return changetype( - store.get("FundingRoundFactory", id) - ); + static loadInBlock(id: string): ClrFund | null { + return changetype(store.get_in_block("ClrFund", id)); + } + + static load(id: string): ClrFund | null { + return changetype(store.get("ClrFund", id)); } get id(): string { let value = this.get("id"); - return value!.toString(); + if (!value || value.kind == ValueKind.NULL) { + throw new Error("Cannot return null for a required field."); + } else { + return value.toString(); + } } set id(value: string) { @@ -282,166 +288,12 @@ export class FundingRoundFactory extends Entity { } } - get tallyBatchSize(): BigInt | null { - let value = this.get("tallyBatchSize"); - if (!value || value.kind == ValueKind.NULL) { - return null; - } else { - return value.toBigInt(); - } - } - - set tallyBatchSize(value: BigInt | null) { - if (!value) { - this.unset("tallyBatchSize"); - } else { - this.set("tallyBatchSize", Value.fromBigInt(value)); - } - } - - get messageBatchSize(): BigInt | null { - let value = this.get("messageBatchSize"); - if (!value || value.kind == ValueKind.NULL) { - return null; - } else { - return value.toBigInt(); - } - } - - set messageBatchSize(value: BigInt | null) { - if (!value) { - this.unset("messageBatchSize"); - } else { - this.set("messageBatchSize", Value.fromBigInt(value)); - } - } - - get batchUstVerifier(): Bytes | null { - let value = this.get("batchUstVerifier"); - if (!value || value.kind == ValueKind.NULL) { - return null; - } else { - return value.toBytes(); - } - } - - set batchUstVerifier(value: Bytes | null) { - if (!value) { - this.unset("batchUstVerifier"); - } else { - this.set("batchUstVerifier", Value.fromBytes(value)); - } - } - - get qvtVerifier(): Bytes | null { - let value = this.get("qvtVerifier"); - if (!value || value.kind == ValueKind.NULL) { - return null; - } else { - return value.toBytes(); - } - } - - set qvtVerifier(value: Bytes | null) { - if (!value) { - this.unset("qvtVerifier"); - } else { - this.set("qvtVerifier", Value.fromBytes(value)); - } - } - - get signUpDuration(): BigInt | null { - let value = this.get("signUpDuration"); - if (!value || value.kind == ValueKind.NULL) { - return null; - } else { - return value.toBigInt(); - } - } - - set signUpDuration(value: BigInt | null) { - if (!value) { - this.unset("signUpDuration"); - } else { - this.set("signUpDuration", Value.fromBigInt(value)); - } - } - - get votingDuration(): BigInt | null { - let value = this.get("votingDuration"); - if (!value || value.kind == ValueKind.NULL) { - return null; - } else { - return value.toBigInt(); - } - } - - set votingDuration(value: BigInt | null) { - if (!value) { - this.unset("votingDuration"); - } else { - this.set("votingDuration", Value.fromBigInt(value)); - } - } - - get maxUsers(): BigInt | null { - let value = this.get("maxUsers"); - if (!value || value.kind == ValueKind.NULL) { - return null; - } else { - return value.toBigInt(); - } - } - - set maxUsers(value: BigInt | null) { - if (!value) { - this.unset("maxUsers"); - } else { - this.set("maxUsers", Value.fromBigInt(value)); - } - } - - get maxMessages(): BigInt | null { - let value = this.get("maxMessages"); - if (!value || value.kind == ValueKind.NULL) { - return null; - } else { - return value.toBigInt(); - } - } - - set maxMessages(value: BigInt | null) { - if (!value) { - this.unset("maxMessages"); - } else { - this.set("maxMessages", Value.fromBigInt(value)); - } - } - - get maxVoteOptions(): BigInt | null { - let value = this.get("maxVoteOptions"); - if (!value || value.kind == ValueKind.NULL) { - return null; - } else { - return value.toBigInt(); - } - } - - set maxVoteOptions(value: BigInt | null) { - if (!value) { - this.unset("maxVoteOptions"); - } else { - this.set("maxVoteOptions", Value.fromBigInt(value)); - } - } - - get fundingRounds(): Array | null { - let value = this.get("fundingRounds"); - if (!value || value.kind == ValueKind.NULL) { - return null; - } else { - return value.toStringArray(); - } + get fundingRounds(): FundingRoundLoader { + return new FundingRoundLoader( + "ClrFund", + this.get("id")!.toString(), + "fundingRounds", + ); } get createdAt(): string | null { @@ -491,19 +343,27 @@ export class Message extends Entity { if (id) { assert( id.kind == ValueKind.STRING, - `Entities of type Message must have an ID of type String but the id '${id.displayData()}' is of type ${id.displayKind()}` + `Entities of type Message must have an ID of type String but the id '${id.displayData()}' is of type ${id.displayKind()}`, ); store.set("Message", id.toString(), this); } } + static loadInBlock(id: string): Message | null { + return changetype(store.get_in_block("Message", id)); + } + static load(id: string): Message | null { return changetype(store.get("Message", id)); } get id(): string { let value = this.get("id"); - return value!.toString(); + if (!value || value.kind == ValueKind.NULL) { + throw new Error("Cannot return null for a required field."); + } else { + return value.toString(); + } } set id(value: string) { @@ -527,13 +387,17 @@ export class Message extends Entity { } } - get iv(): BigInt { - let value = this.get("iv"); - return value!.toBigInt(); + get msgType(): BigInt { + let value = this.get("msgType"); + if (!value || value.kind == ValueKind.NULL) { + throw new Error("Cannot return null for a required field."); + } else { + return value.toBigInt(); + } } - set iv(value: BigInt) { - this.set("iv", Value.fromBigInt(value)); + set msgType(value: BigInt) { + this.set("msgType", Value.fromBigInt(value)); } get publicKey(): string | null { @@ -570,6 +434,23 @@ export class Message extends Entity { } } + get poll(): string | null { + let value = this.get("poll"); + if (!value || value.kind == ValueKind.NULL) { + return null; + } else { + return value.toString(); + } + } + + set poll(value: string | null) { + if (!value) { + this.unset("poll"); + } else { + this.set("poll", Value.fromString(value)); + } + } + get submittedBy(): Bytes | null { let value = this.get("submittedBy"); if (!value || value.kind == ValueKind.NULL) { @@ -606,7 +487,11 @@ export class Message extends Entity { get blockNumber(): BigInt { let value = this.get("blockNumber"); - return value!.toBigInt(); + if (!value || value.kind == ValueKind.NULL) { + throw new Error("Cannot return null for a required field."); + } else { + return value.toBigInt(); + } } set blockNumber(value: BigInt) { @@ -615,7 +500,11 @@ export class Message extends Entity { get transactionIndex(): BigInt { let value = this.get("transactionIndex"); - return value!.toBigInt(); + if (!value || value.kind == ValueKind.NULL) { + throw new Error("Cannot return null for a required field."); + } else { + return value.toBigInt(); + } } set transactionIndex(value: BigInt) { @@ -635,19 +524,27 @@ export class PublicKey extends Entity { if (id) { assert( id.kind == ValueKind.STRING, - `Entities of type PublicKey must have an ID of type String but the id '${id.displayData()}' is of type ${id.displayKind()}` + `Entities of type PublicKey must have an ID of type String but the id '${id.displayData()}' is of type ${id.displayKind()}`, ); store.set("PublicKey", id.toString(), this); } } + static loadInBlock(id: string): PublicKey | null { + return changetype(store.get_in_block("PublicKey", id)); + } + static load(id: string): PublicKey | null { return changetype(store.get("PublicKey", id)); } get id(): string { let value = this.get("id"); - return value!.toString(); + if (!value || value.kind == ValueKind.NULL) { + throw new Error("Cannot return null for a required field."); + } else { + return value.toString(); + } } set id(value: string) { @@ -671,18 +568,21 @@ export class PublicKey extends Entity { } } - get messages(): Array | null { - let value = this.get("messages"); - if (!value || value.kind == ValueKind.NULL) { - return null; - } else { - return value.toStringArray(); - } + get messages(): MessageLoader { + return new MessageLoader( + "PublicKey", + this.get("id")!.toString(), + "messages", + ); } get x(): BigInt { let value = this.get("x"); - return value!.toBigInt(); + if (!value || value.kind == ValueKind.NULL) { + throw new Error("Cannot return null for a required field."); + } else { + return value.toBigInt(); + } } set x(value: BigInt) { @@ -691,7 +591,11 @@ export class PublicKey extends Entity { get y(): BigInt { let value = this.get("y"); - return value!.toBigInt(); + if (!value || value.kind == ValueKind.NULL) { + throw new Error("Cannot return null for a required field."); + } else { + return value.toBigInt(); + } } set y(value: BigInt) { @@ -733,6 +637,63 @@ export class PublicKey extends Entity { } } +export class Poll extends Entity { + constructor(id: string) { + super(); + this.set("id", Value.fromString(id)); + } + + save(): void { + let id = this.get("id"); + assert(id != null, "Cannot save Poll entity without an ID"); + if (id) { + assert( + id.kind == ValueKind.STRING, + `Entities of type Poll must have an ID of type String but the id '${id.displayData()}' is of type ${id.displayKind()}`, + ); + store.set("Poll", id.toString(), this); + } + } + + static loadInBlock(id: string): Poll | null { + return changetype(store.get_in_block("Poll", id)); + } + + static load(id: string): Poll | null { + return changetype(store.get("Poll", id)); + } + + get id(): string { + let value = this.get("id"); + if (!value || value.kind == ValueKind.NULL) { + throw new Error("Cannot return null for a required field."); + } else { + return value.toString(); + } + } + + set id(value: string) { + this.set("id", Value.fromString(value)); + } + + get fundingRound(): string { + let value = this.get("fundingRound"); + if (!value || value.kind == ValueKind.NULL) { + throw new Error("Cannot return null for a required field."); + } else { + return value.toString(); + } + } + + set fundingRound(value: string) { + this.set("fundingRound", Value.fromString(value)); + } + + get messages(): MessageLoader { + return new MessageLoader("Poll", this.get("id")!.toString(), "messages"); + } +} + export class FundingRound extends Entity { constructor(id: string) { super(); @@ -745,27 +706,37 @@ export class FundingRound extends Entity { if (id) { assert( id.kind == ValueKind.STRING, - `Entities of type FundingRound must have an ID of type String but the id '${id.displayData()}' is of type ${id.displayKind()}` + `Entities of type FundingRound must have an ID of type String but the id '${id.displayData()}' is of type ${id.displayKind()}`, ); store.set("FundingRound", id.toString(), this); } } + static loadInBlock(id: string): FundingRound | null { + return changetype( + store.get_in_block("FundingRound", id), + ); + } + static load(id: string): FundingRound | null { return changetype(store.get("FundingRound", id)); } get id(): string { let value = this.get("id"); - return value!.toString(); + if (!value || value.kind == ValueKind.NULL) { + throw new Error("Cannot return null for a required field."); + } else { + return value.toString(); + } } set id(value: string) { this.set("id", Value.fromString(value)); } - get fundingRoundFactory(): string | null { - let value = this.get("fundingRoundFactory"); + get clrFund(): string | null { + let value = this.get("clrFund"); if (!value || value.kind == ValueKind.NULL) { return null; } else { @@ -773,11 +744,11 @@ export class FundingRound extends Entity { } } - set fundingRoundFactory(value: string | null) { + set clrFund(value: string | null) { if (!value) { - this.unset("fundingRoundFactory"); + this.unset("clrFund"); } else { - this.set("fundingRoundFactory", Value.fromString(value)); + this.set("clrFund", Value.fromString(value)); } } @@ -798,15 +769,65 @@ export class FundingRound extends Entity { } } - get messages(): Array | null { - let value = this.get("messages"); + get maciTxHash(): Bytes | null { + let value = this.get("maciTxHash"); if (!value || value.kind == ValueKind.NULL) { return null; } else { - return value.toStringArray(); + return value.toBytes(); + } + } + + set maciTxHash(value: Bytes | null) { + if (!value) { + this.unset("maciTxHash"); + } else { + this.set("maciTxHash", Value.fromBytes(value)); + } + } + + get pollId(): BigInt | null { + let value = this.get("pollId"); + if (!value || value.kind == ValueKind.NULL) { + return null; + } else { + return value.toBigInt(); + } + } + + set pollId(value: BigInt | null) { + if (!value) { + this.unset("pollId"); + } else { + this.set("pollId", Value.fromBigInt(value)); + } + } + + get pollAddress(): Bytes | null { + let value = this.get("pollAddress"); + if (!value || value.kind == ValueKind.NULL) { + return null; + } else { + return value.toBytes(); + } + } + + set pollAddress(value: Bytes | null) { + if (!value) { + this.unset("pollAddress"); + } else { + this.set("pollAddress", Value.fromBytes(value)); } } + get messages(): MessageLoader { + return new MessageLoader( + "FundingRound", + this.get("id")!.toString(), + "messages", + ); + } + get recipientRegistry(): string | null { let value = this.get("recipientRegistry"); if (!value || value.kind == ValueKind.NULL) { @@ -922,12 +943,85 @@ export class FundingRound extends Entity { if (!value) { this.unset("startTime"); } else { - this.set("startTime", Value.fromBigInt(value)); + this.set("startTime", Value.fromBigInt(value)); + } + } + + get signUpDeadline(): BigInt | null { + let value = this.get("signUpDeadline"); + if (!value || value.kind == ValueKind.NULL) { + return null; + } else { + return value.toBigInt(); + } + } + + set signUpDeadline(value: BigInt | null) { + if (!value) { + this.unset("signUpDeadline"); + } else { + this.set("signUpDeadline", Value.fromBigInt(value)); + } + } + + get votingDeadline(): BigInt | null { + let value = this.get("votingDeadline"); + if (!value || value.kind == ValueKind.NULL) { + return null; + } else { + return value.toBigInt(); + } + } + + set votingDeadline(value: BigInt | null) { + if (!value) { + this.unset("votingDeadline"); + } else { + this.set("votingDeadline", Value.fromBigInt(value)); + } + } + + get stateTreeDepth(): i32 { + let value = this.get("stateTreeDepth"); + if (!value || value.kind == ValueKind.NULL) { + return 0; + } else { + return value.toI32(); + } + } + + set stateTreeDepth(value: i32) { + this.set("stateTreeDepth", Value.fromI32(value)); + } + + get messageTreeDepth(): i32 { + let value = this.get("messageTreeDepth"); + if (!value || value.kind == ValueKind.NULL) { + return 0; + } else { + return value.toI32(); + } + } + + set messageTreeDepth(value: i32) { + this.set("messageTreeDepth", Value.fromI32(value)); + } + + get voteOptionTreeDepth(): i32 { + let value = this.get("voteOptionTreeDepth"); + if (!value || value.kind == ValueKind.NULL) { + return 0; + } else { + return value.toI32(); } } - get signUpDeadline(): BigInt | null { - let value = this.get("signUpDeadline"); + set voteOptionTreeDepth(value: i32) { + this.set("voteOptionTreeDepth", Value.fromI32(value)); + } + + get coordinatorPubKeyX(): BigInt | null { + let value = this.get("coordinatorPubKeyX"); if (!value || value.kind == ValueKind.NULL) { return null; } else { @@ -935,16 +1029,16 @@ export class FundingRound extends Entity { } } - set signUpDeadline(value: BigInt | null) { + set coordinatorPubKeyX(value: BigInt | null) { if (!value) { - this.unset("signUpDeadline"); + this.unset("coordinatorPubKeyX"); } else { - this.set("signUpDeadline", Value.fromBigInt(value)); + this.set("coordinatorPubKeyX", Value.fromBigInt(value)); } } - get votingDeadline(): BigInt | null { - let value = this.get("votingDeadline"); + get coordinatorPubKeyY(): BigInt | null { + let value = this.get("coordinatorPubKeyY"); if (!value || value.kind == ValueKind.NULL) { return null; } else { @@ -952,11 +1046,11 @@ export class FundingRound extends Entity { } } - set votingDeadline(value: BigInt | null) { + set coordinatorPubKeyY(value: BigInt | null) { if (!value) { - this.unset("votingDeadline"); + this.unset("coordinatorPubKeyY"); } else { - this.set("votingDeadline", Value.fromBigInt(value)); + this.set("coordinatorPubKeyY", Value.fromBigInt(value)); } } @@ -996,7 +1090,11 @@ export class FundingRound extends Entity { get contributorCount(): BigInt { let value = this.get("contributorCount"); - return value!.toBigInt(); + if (!value || value.kind == ValueKind.NULL) { + throw new Error("Cannot return null for a required field."); + } else { + return value.toBigInt(); + } } set contributorCount(value: BigInt) { @@ -1005,7 +1103,11 @@ export class FundingRound extends Entity { get recipientCount(): BigInt { let value = this.get("recipientCount"); - return value!.toBigInt(); + if (!value || value.kind == ValueKind.NULL) { + throw new Error("Cannot return null for a required field."); + } else { + return value.toBigInt(); + } } set recipientCount(value: BigInt) { @@ -1065,7 +1167,11 @@ export class FundingRound extends Entity { get isFinalized(): boolean { let value = this.get("isFinalized"); - return value!.toBoolean(); + if (!value || value.kind == ValueKind.NULL) { + return false; + } else { + return value.toBoolean(); + } } set isFinalized(value: boolean) { @@ -1074,7 +1180,11 @@ export class FundingRound extends Entity { get isCancelled(): boolean { let value = this.get("isCancelled"); - return value!.toBoolean(); + if (!value || value.kind == ValueKind.NULL) { + return false; + } else { + return value.toBoolean(); + } } set isCancelled(value: boolean) { @@ -1098,40 +1208,28 @@ export class FundingRound extends Entity { } } - get recipients(): Array | null { - let value = this.get("recipients"); - if (!value || value.kind == ValueKind.NULL) { - return null; - } else { - return value.toStringArray(); - } - } - - get contributors(): Array | null { - let value = this.get("contributors"); - if (!value || value.kind == ValueKind.NULL) { - return null; - } else { - return value.toStringArray(); - } + get recipients(): RecipientLoader { + return new RecipientLoader( + "FundingRound", + this.get("id")!.toString(), + "recipients", + ); } - get contributions(): Array | null { - let value = this.get("contributions"); - if (!value || value.kind == ValueKind.NULL) { - return null; - } else { - return value.toStringArray(); - } + get contributors(): ContributorLoader { + return new ContributorLoader( + "FundingRound", + this.get("id")!.toString(), + "contributors", + ); } - get votes(): Array | null { - let value = this.get("votes"); - if (!value || value.kind == ValueKind.NULL) { - return null; - } else { - return value.toStringArray(); - } + get contributions(): ContributionLoader { + return new ContributionLoader( + "FundingRound", + this.get("id")!.toString(), + "contributions", + ); } get createdAt(): string | null { @@ -1181,29 +1279,39 @@ export class RecipientRegistry extends Entity { if (id) { assert( id.kind == ValueKind.STRING, - `Entities of type RecipientRegistry must have an ID of type String but the id '${id.displayData()}' is of type ${id.displayKind()}` + `Entities of type RecipientRegistry must have an ID of type String but the id '${id.displayData()}' is of type ${id.displayKind()}`, ); store.set("RecipientRegistry", id.toString(), this); } } + static loadInBlock(id: string): RecipientRegistry | null { + return changetype( + store.get_in_block("RecipientRegistry", id), + ); + } + static load(id: string): RecipientRegistry | null { return changetype( - store.get("RecipientRegistry", id) + store.get("RecipientRegistry", id), ); } get id(): string { let value = this.get("id"); - return value!.toString(); + if (!value || value.kind == ValueKind.NULL) { + throw new Error("Cannot return null for a required field."); + } else { + return value.toString(); + } } set id(value: string) { this.set("id", Value.fromString(value)); } - get fundingRoundFactory(): string | null { - let value = this.get("fundingRoundFactory"); + get clrFund(): string | null { + let value = this.get("clrFund"); if (!value || value.kind == ValueKind.NULL) { return null; } else { @@ -1211,11 +1319,11 @@ export class RecipientRegistry extends Entity { } } - set fundingRoundFactory(value: string | null) { + set clrFund(value: string | null) { if (!value) { - this.unset("fundingRoundFactory"); + this.unset("clrFund"); } else { - this.set("fundingRoundFactory", Value.fromString(value)); + this.set("clrFund", Value.fromString(value)); } } @@ -1304,13 +1412,12 @@ export class RecipientRegistry extends Entity { } } - get recipients(): Array | null { - let value = this.get("recipients"); - if (!value || value.kind == ValueKind.NULL) { - return null; - } else { - return value.toStringArray(); - } + get recipients(): RecipientLoader { + return new RecipientLoader( + "RecipientRegistry", + this.get("id")!.toString(), + "recipients", + ); } get createdAt(): string | null { @@ -1360,19 +1467,27 @@ export class Recipient extends Entity { if (id) { assert( id.kind == ValueKind.STRING, - `Entities of type Recipient must have an ID of type String but the id '${id.displayData()}' is of type ${id.displayKind()}` + `Entities of type Recipient must have an ID of type String but the id '${id.displayData()}' is of type ${id.displayKind()}`, ); store.set("Recipient", id.toString(), this); } } + static loadInBlock(id: string): Recipient | null { + return changetype(store.get_in_block("Recipient", id)); + } + static load(id: string): Recipient | null { return changetype(store.get("Recipient", id)); } get id(): string { let value = this.get("id"); - return value!.toString(); + if (!value || value.kind == ValueKind.NULL) { + throw new Error("Cannot return null for a required field."); + } else { + return value.toString(); + } } set id(value: string) { @@ -1517,7 +1632,11 @@ export class Recipient extends Entity { get rejected(): boolean { let value = this.get("rejected"); - return value!.toBoolean(); + if (!value || value.kind == ValueKind.NULL) { + return false; + } else { + return value.toBoolean(); + } } set rejected(value: boolean) { @@ -1526,7 +1645,11 @@ export class Recipient extends Entity { get verified(): boolean { let value = this.get("verified"); - return value!.toBoolean(); + if (!value || value.kind == ValueKind.NULL) { + return false; + } else { + return value.toBoolean(); + } } set verified(value: boolean) { @@ -1648,34 +1771,48 @@ export class ContributorRegistry extends Entity { if (id) { assert( id.kind == ValueKind.STRING, - `Entities of type ContributorRegistry must have an ID of type String but the id '${id.displayData()}' is of type ${id.displayKind()}` + `Entities of type ContributorRegistry must have an ID of type String but the id '${id.displayData()}' is of type ${id.displayKind()}`, ); store.set("ContributorRegistry", id.toString(), this); } } + static loadInBlock(id: string): ContributorRegistry | null { + return changetype( + store.get_in_block("ContributorRegistry", id), + ); + } + static load(id: string): ContributorRegistry | null { return changetype( - store.get("ContributorRegistry", id) + store.get("ContributorRegistry", id), ); } get id(): string { let value = this.get("id"); - return value!.toString(); + if (!value || value.kind == ValueKind.NULL) { + throw new Error("Cannot return null for a required field."); + } else { + return value.toString(); + } } set id(value: string) { this.set("id", Value.fromString(value)); } - get fundingRoundFactory(): string { - let value = this.get("fundingRoundFactory"); - return value!.toString(); + get clrFund(): string { + let value = this.get("clrFund"); + if (!value || value.kind == ValueKind.NULL) { + throw new Error("Cannot return null for a required field."); + } else { + return value.toString(); + } } - set fundingRoundFactory(value: string) { - this.set("fundingRoundFactory", Value.fromString(value)); + set clrFund(value: string) { + this.set("clrFund", Value.fromString(value)); } get context(): string | null { @@ -1712,13 +1849,12 @@ export class ContributorRegistry extends Entity { } } - get contributors(): Array | null { - let value = this.get("contributors"); - if (!value || value.kind == ValueKind.NULL) { - return null; - } else { - return value.toStringArray(); - } + get contributors(): ContributorLoader { + return new ContributorLoader( + "ContributorRegistry", + this.get("id")!.toString(), + "contributors", + ); } get createdAt(): string | null { @@ -1768,19 +1904,29 @@ export class Contributor extends Entity { if (id) { assert( id.kind == ValueKind.STRING, - `Entities of type Contributor must have an ID of type String but the id '${id.displayData()}' is of type ${id.displayKind()}` + `Entities of type Contributor must have an ID of type String but the id '${id.displayData()}' is of type ${id.displayKind()}`, ); store.set("Contributor", id.toString(), this); } } + static loadInBlock(id: string): Contributor | null { + return changetype( + store.get_in_block("Contributor", id), + ); + } + static load(id: string): Contributor | null { return changetype(store.get("Contributor", id)); } get id(): string { let value = this.get("id"); - return value!.toString(); + if (!value || value.kind == ValueKind.NULL) { + throw new Error("Cannot return null for a required field."); + } else { + return value.toString(); + } } set id(value: string) { @@ -1789,22 +1935,17 @@ export class Contributor extends Entity { get contributorRegistry(): string { let value = this.get("contributorRegistry"); - return value!.toString(); + if (!value || value.kind == ValueKind.NULL) { + throw new Error("Cannot return null for a required field."); + } else { + return value.toString(); + } } set contributorRegistry(value: string) { this.set("contributorRegistry", Value.fromString(value)); } - get votes(): Array | null { - let value = this.get("votes"); - if (!value || value.kind == ValueKind.NULL) { - return null; - } else { - return value.toStringArray(); - } - } - get verifiedTimeStamp(): string | null { let value = this.get("verifiedTimeStamp"); if (!value || value.kind == ValueKind.NULL) { @@ -1856,13 +1997,12 @@ export class Contributor extends Entity { } } - get contributions(): Array | null { - let value = this.get("contributions"); - if (!value || value.kind == ValueKind.NULL) { - return null; - } else { - return value.toStringArray(); - } + get contributions(): ContributionLoader { + return new ContributionLoader( + "Contributor", + this.get("id")!.toString(), + "contributions", + ); } get createdAt(): string | null { @@ -1912,19 +2052,29 @@ export class Coordinator extends Entity { if (id) { assert( id.kind == ValueKind.STRING, - `Entities of type Coordinator must have an ID of type String but the id '${id.displayData()}' is of type ${id.displayKind()}` + `Entities of type Coordinator must have an ID of type String but the id '${id.displayData()}' is of type ${id.displayKind()}`, ); store.set("Coordinator", id.toString(), this); } } + static loadInBlock(id: string): Coordinator | null { + return changetype( + store.get_in_block("Coordinator", id), + ); + } + static load(id: string): Coordinator | null { return changetype(store.get("Coordinator", id)); } get id(): string { let value = this.get("id"); - return value!.toString(); + if (!value || value.kind == ValueKind.NULL) { + throw new Error("Cannot return null for a required field."); + } else { + return value.toString(); + } } set id(value: string) { @@ -1995,19 +2145,29 @@ export class Contribution extends Entity { if (id) { assert( id.kind == ValueKind.STRING, - `Entities of type Contribution must have an ID of type String but the id '${id.displayData()}' is of type ${id.displayKind()}` + `Entities of type Contribution must have an ID of type String but the id '${id.displayData()}' is of type ${id.displayKind()}`, ); store.set("Contribution", id.toString(), this); } } + static loadInBlock(id: string): Contribution | null { + return changetype( + store.get_in_block("Contribution", id), + ); + } + static load(id: string): Contribution | null { return changetype(store.get("Contribution", id)); } get id(): string { let value = this.get("id"); - return value!.toString(); + if (!value || value.kind == ValueKind.NULL) { + throw new Error("Cannot return null for a required field."); + } else { + return value.toString(); + } } set id(value: string) { @@ -2100,98 +2260,6 @@ export class Contribution extends Entity { } } -export class Vote extends Entity { - constructor(id: string) { - super(); - this.set("id", Value.fromString(id)); - } - - save(): void { - let id = this.get("id"); - assert(id != null, "Cannot save Vote entity without an ID"); - if (id) { - assert( - id.kind == ValueKind.STRING, - `Entities of type Vote must have an ID of type String but the id '${id.displayData()}' is of type ${id.displayKind()}` - ); - store.set("Vote", id.toString(), this); - } - } - - static load(id: string): Vote | null { - return changetype(store.get("Vote", id)); - } - - get id(): string { - let value = this.get("id"); - return value!.toString(); - } - - set id(value: string) { - this.set("id", Value.fromString(value)); - } - - get contributor(): string | null { - let value = this.get("contributor"); - if (!value || value.kind == ValueKind.NULL) { - return null; - } else { - return value.toString(); - } - } - - set contributor(value: string | null) { - if (!value) { - this.unset("contributor"); - } else { - this.set("contributor", Value.fromString(value)); - } - } - - get fundingRound(): string | null { - let value = this.get("fundingRound"); - if (!value || value.kind == ValueKind.NULL) { - return null; - } else { - return value.toString(); - } - } - - set fundingRound(value: string | null) { - if (!value) { - this.unset("fundingRound"); - } else { - this.set("fundingRound", Value.fromString(value)); - } - } - - get voterAddress(): Bytes | null { - let value = this.get("voterAddress"); - if (!value || value.kind == ValueKind.NULL) { - return null; - } else { - return value.toBytes(); - } - } - - set voterAddress(value: Bytes | null) { - if (!value) { - this.unset("voterAddress"); - } else { - this.set("voterAddress", Value.fromBytes(value)); - } - } - - get secret(): boolean { - let value = this.get("secret"); - return value!.toBoolean(); - } - - set secret(value: boolean) { - this.set("secret", Value.fromBoolean(value)); - } -} - export class Donation extends Entity { constructor(id: string) { super(); @@ -2204,19 +2272,27 @@ export class Donation extends Entity { if (id) { assert( id.kind == ValueKind.STRING, - `Entities of type Donation must have an ID of type String but the id '${id.displayData()}' is of type ${id.displayKind()}` + `Entities of type Donation must have an ID of type String but the id '${id.displayData()}' is of type ${id.displayKind()}`, ); store.set("Donation", id.toString(), this); } } + static loadInBlock(id: string): Donation | null { + return changetype(store.get_in_block("Donation", id)); + } + static load(id: string): Donation | null { return changetype(store.get("Donation", id)); } get id(): string { let value = this.get("id"); - return value!.toString(); + if (!value || value.kind == ValueKind.NULL) { + throw new Error("Cannot return null for a required field."); + } else { + return value.toString(); + } } set id(value: string) { @@ -2321,19 +2397,27 @@ export class Token extends Entity { if (id) { assert( id.kind == ValueKind.STRING, - `Entities of type Token must have an ID of type String but the id '${id.displayData()}' is of type ${id.displayKind()}` + `Entities of type Token must have an ID of type String but the id '${id.displayData()}' is of type ${id.displayKind()}`, ); store.set("Token", id.toString(), this); } } + static loadInBlock(id: string): Token | null { + return changetype(store.get_in_block("Token", id)); + } + static load(id: string): Token | null { return changetype(store.get("Token", id)); } get id(): string { let value = this.get("id"); - return value!.toString(); + if (!value || value.kind == ValueKind.NULL) { + throw new Error("Cannot return null for a required field."); + } else { + return value.toString(); + } } set id(value: string) { @@ -2425,3 +2509,93 @@ export class Token extends Entity { } } } + +export class FundingRoundLoader extends Entity { + _entity: string; + _field: string; + _id: string; + + constructor(entity: string, id: string, field: string) { + super(); + this._entity = entity; + this._id = id; + this._field = field; + } + + load(): FundingRound[] { + let value = store.loadRelated(this._entity, this._id, this._field); + return changetype(value); + } +} + +export class MessageLoader extends Entity { + _entity: string; + _field: string; + _id: string; + + constructor(entity: string, id: string, field: string) { + super(); + this._entity = entity; + this._id = id; + this._field = field; + } + + load(): Message[] { + let value = store.loadRelated(this._entity, this._id, this._field); + return changetype(value); + } +} + +export class RecipientLoader extends Entity { + _entity: string; + _field: string; + _id: string; + + constructor(entity: string, id: string, field: string) { + super(); + this._entity = entity; + this._id = id; + this._field = field; + } + + load(): Recipient[] { + let value = store.loadRelated(this._entity, this._id, this._field); + return changetype(value); + } +} + +export class ContributorLoader extends Entity { + _entity: string; + _field: string; + _id: string; + + constructor(entity: string, id: string, field: string) { + super(); + this._entity = entity; + this._id = id; + this._field = field; + } + + load(): Contributor[] { + let value = store.loadRelated(this._entity, this._id, this._field); + return changetype(value); + } +} + +export class ContributionLoader extends Entity { + _entity: string; + _field: string; + _id: string; + + constructor(entity: string, id: string, field: string) { + super(); + this._entity = entity; + this._id = id; + this._field = field; + } + + load(): Contribution[] { + let value = store.loadRelated(this._entity, this._id, this._field); + return changetype(value); + } +} diff --git a/subgraph/generated/templates.ts b/subgraph/generated/templates.ts index 754dd9bd0..b920a2826 100644 --- a/subgraph/generated/templates.ts +++ b/subgraph/generated/templates.ts @@ -3,7 +3,7 @@ import { Address, DataSourceTemplate, - DataSourceContext + DataSourceContext, } from "@graphprotocol/graph-ts"; export class FundingRound extends DataSourceTemplate { @@ -15,7 +15,7 @@ export class FundingRound extends DataSourceTemplate { DataSourceTemplate.createWithContext( "FundingRound", [address.toHex()], - context + context, ); } } @@ -29,7 +29,7 @@ export class OptimisticRecipientRegistry extends DataSourceTemplate { DataSourceTemplate.createWithContext( "OptimisticRecipientRegistry", [address.toHex()], - context + context, ); } } @@ -43,7 +43,7 @@ export class BrightIdUserRegistry extends DataSourceTemplate { DataSourceTemplate.createWithContext( "BrightIdUserRegistry", [address.toHex()], - context + context, ); } } @@ -57,3 +57,13 @@ export class MACI extends DataSourceTemplate { DataSourceTemplate.createWithContext("MACI", [address.toHex()], context); } } + +export class Poll extends DataSourceTemplate { + static create(address: Address): void { + DataSourceTemplate.create("Poll", [address.toHex()]); + } + + static createWithContext(address: Address, context: DataSourceContext): void { + DataSourceTemplate.createWithContext("Poll", [address.toHex()], context); + } +} diff --git a/subgraph/generated/templates/BrightIdUserRegistry/BrightIdUserRegistry.ts b/subgraph/generated/templates/BrightIdUserRegistry/BrightIdUserRegistry.ts index 7d1e77f55..1209bacdb 100644 --- a/subgraph/generated/templates/BrightIdUserRegistry/BrightIdUserRegistry.ts +++ b/subgraph/generated/templates/BrightIdUserRegistry/BrightIdUserRegistry.ts @@ -7,7 +7,7 @@ import { Entity, Bytes, Address, - BigInt + BigInt, } from "@graphprotocol/graph-ts"; export class OwnershipTransferred extends ethereum.Event { @@ -103,7 +103,7 @@ export class BrightIdUserRegistry extends ethereum.SmartContract { let result = super.call( "brightIdSponsor", "brightIdSponsor():(address)", - [] + [], ); return result[0].toAddress(); @@ -113,7 +113,7 @@ export class BrightIdUserRegistry extends ethereum.SmartContract { let result = super.tryCall( "brightIdSponsor", "brightIdSponsor():(address)", - [] + [], ); if (result.reverted) { return new ethereum.CallResult(); @@ -141,7 +141,7 @@ export class BrightIdUserRegistry extends ethereum.SmartContract { let result = super.call( "isVerifiedUser", "isVerifiedUser(address):(bool)", - [ethereum.Value.fromAddress(_user)] + [ethereum.Value.fromAddress(_user)], ); return result[0].toBoolean(); @@ -151,7 +151,7 @@ export class BrightIdUserRegistry extends ethereum.SmartContract { let result = super.tryCall( "isVerifiedUser", "isVerifiedUser(address):(bool)", - [ethereum.Value.fromAddress(_user)] + [ethereum.Value.fromAddress(_user)], ); if (result.reverted) { return new ethereum.CallResult(); @@ -179,7 +179,7 @@ export class BrightIdUserRegistry extends ethereum.SmartContract { let result = super.call( "verifications", "verifications(address):(uint256)", - [ethereum.Value.fromAddress(param0)] + [ethereum.Value.fromAddress(param0)], ); return result[0].toBigInt(); @@ -189,7 +189,7 @@ export class BrightIdUserRegistry extends ethereum.SmartContract { let result = super.tryCall( "verifications", "verifications(address):(uint256)", - [ethereum.Value.fromAddress(param0)] + [ethereum.Value.fromAddress(param0)], ); if (result.reverted) { return new ethereum.CallResult(); diff --git a/subgraph/generated/templates/FundingRound/BrightIdUserRegistry.ts b/subgraph/generated/templates/FundingRound/BrightIdUserRegistry.ts index 7d1e77f55..1209bacdb 100644 --- a/subgraph/generated/templates/FundingRound/BrightIdUserRegistry.ts +++ b/subgraph/generated/templates/FundingRound/BrightIdUserRegistry.ts @@ -7,7 +7,7 @@ import { Entity, Bytes, Address, - BigInt + BigInt, } from "@graphprotocol/graph-ts"; export class OwnershipTransferred extends ethereum.Event { @@ -103,7 +103,7 @@ export class BrightIdUserRegistry extends ethereum.SmartContract { let result = super.call( "brightIdSponsor", "brightIdSponsor():(address)", - [] + [], ); return result[0].toAddress(); @@ -113,7 +113,7 @@ export class BrightIdUserRegistry extends ethereum.SmartContract { let result = super.tryCall( "brightIdSponsor", "brightIdSponsor():(address)", - [] + [], ); if (result.reverted) { return new ethereum.CallResult(); @@ -141,7 +141,7 @@ export class BrightIdUserRegistry extends ethereum.SmartContract { let result = super.call( "isVerifiedUser", "isVerifiedUser(address):(bool)", - [ethereum.Value.fromAddress(_user)] + [ethereum.Value.fromAddress(_user)], ); return result[0].toBoolean(); @@ -151,7 +151,7 @@ export class BrightIdUserRegistry extends ethereum.SmartContract { let result = super.tryCall( "isVerifiedUser", "isVerifiedUser(address):(bool)", - [ethereum.Value.fromAddress(_user)] + [ethereum.Value.fromAddress(_user)], ); if (result.reverted) { return new ethereum.CallResult(); @@ -179,7 +179,7 @@ export class BrightIdUserRegistry extends ethereum.SmartContract { let result = super.call( "verifications", "verifications(address):(uint256)", - [ethereum.Value.fromAddress(param0)] + [ethereum.Value.fromAddress(param0)], ); return result[0].toBigInt(); @@ -189,7 +189,7 @@ export class BrightIdUserRegistry extends ethereum.SmartContract { let result = super.tryCall( "verifications", "verifications(address):(uint256)", - [ethereum.Value.fromAddress(param0)] + [ethereum.Value.fromAddress(param0)], ); if (result.reverted) { return new ethereum.CallResult(); diff --git a/subgraph/generated/templates/FundingRound/FundingRound.ts b/subgraph/generated/templates/FundingRound/FundingRound.ts index 6c3bcd6cb..32be22df9 100644 --- a/subgraph/generated/templates/FundingRound/FundingRound.ts +++ b/subgraph/generated/templates/FundingRound/FundingRound.ts @@ -7,7 +7,7 @@ import { Entity, Bytes, Address, - BigInt + BigInt, } from "@graphprotocol/graph-ts"; export class Contribution extends ethereum.Event { @@ -98,6 +98,24 @@ export class OwnershipTransferred__Params { } } +export class PollSet extends ethereum.Event { + get params(): PollSet__Params { + return new PollSet__Params(this); + } +} + +export class PollSet__Params { + _event: PollSet; + + constructor(event: PollSet) { + this._event = event; + } + + get _poll(): Address { + return this._event.parameters[0].value.toAddress(); + } +} + export class TallyPublished extends ethereum.Event { get params(): TallyPublished__Params { return new TallyPublished__Params(this); @@ -116,6 +134,46 @@ export class TallyPublished__Params { } } +export class TallyResultsAdded extends ethereum.Event { + get params(): TallyResultsAdded__Params { + return new TallyResultsAdded__Params(this); + } +} + +export class TallyResultsAdded__Params { + _event: TallyResultsAdded; + + constructor(event: TallyResultsAdded) { + this._event = event; + } + + get _voteOptionIndex(): BigInt { + return this._event.parameters[0].value.toBigInt(); + } + + get _tally(): BigInt { + return this._event.parameters[1].value.toBigInt(); + } +} + +export class TallySet extends ethereum.Event { + get params(): TallySet__Params { + return new TallySet__Params(this); + } +} + +export class TallySet__Params { + _event: TallySet; + + constructor(event: TallySet) { + this._event = event; + } + + get _tally(): Address { + return this._event.parameters[0].value.toAddress(); + } +} + export class Voted extends ethereum.Event { get params(): Voted__Params { return new Voted__Params(this); @@ -134,16 +192,165 @@ export class Voted__Params { } } +export class FundingRound__contributorsResult { + value0: BigInt; + value1: boolean; + + constructor(value0: BigInt, value1: boolean) { + this.value0 = value0; + this.value1 = value1; + } + + toMap(): TypedMap { + let map = new TypedMap(); + map.set("value0", ethereum.Value.fromUnsignedBigInt(this.value0)); + map.set("value1", ethereum.Value.fromBoolean(this.value1)); + return map; + } + + getVoiceCredits(): BigInt { + return this.value0; + } + + getIsRegistered(): boolean { + return this.value1; + } +} + +export class FundingRound__recipientsResult { + value0: boolean; + value1: boolean; + value2: BigInt; + + constructor(value0: boolean, value1: boolean, value2: BigInt) { + this.value0 = value0; + this.value1 = value1; + this.value2 = value2; + } + + toMap(): TypedMap { + let map = new TypedMap(); + map.set("value0", ethereum.Value.fromBoolean(this.value0)); + map.set("value1", ethereum.Value.fromBoolean(this.value1)); + map.set("value2", ethereum.Value.fromUnsignedBigInt(this.value2)); + return map; + } + + getFundsClaimed(): boolean { + return this.value0; + } + + getTallyVerified(): boolean { + return this.value1; + } + + getTallyResult(): BigInt { + return this.value2; + } +} + export class FundingRound extends ethereum.SmartContract { static bind(address: Address): FundingRound { return new FundingRound("FundingRound", address); } + MESSAGE_DATA_LENGTH(): i32 { + let result = super.call( + "MESSAGE_DATA_LENGTH", + "MESSAGE_DATA_LENGTH():(uint8)", + [], + ); + + return result[0].toI32(); + } + + try_MESSAGE_DATA_LENGTH(): ethereum.CallResult { + let result = super.tryCall( + "MESSAGE_DATA_LENGTH", + "MESSAGE_DATA_LENGTH():(uint8)", + [], + ); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toI32()); + } + + TREE_ARITY(): BigInt { + let result = super.call("TREE_ARITY", "TREE_ARITY():(uint256)", []); + + return result[0].toBigInt(); + } + + try_TREE_ARITY(): ethereum.CallResult { + let result = super.tryCall("TREE_ARITY", "TREE_ARITY():(uint256)", []); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toBigInt()); + } + + alpha(): BigInt { + let result = super.call("alpha", "alpha():(uint256)", []); + + return result[0].toBigInt(); + } + + try_alpha(): ethereum.CallResult { + let result = super.tryCall("alpha", "alpha():(uint256)", []); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toBigInt()); + } + + calcAlpha( + _budget: BigInt, + _totalVotesSquares: BigInt, + _totalSpent: BigInt, + ): BigInt { + let result = super.call( + "calcAlpha", + "calcAlpha(uint256,uint256,uint256):(uint256)", + [ + ethereum.Value.fromUnsignedBigInt(_budget), + ethereum.Value.fromUnsignedBigInt(_totalVotesSquares), + ethereum.Value.fromUnsignedBigInt(_totalSpent), + ], + ); + + return result[0].toBigInt(); + } + + try_calcAlpha( + _budget: BigInt, + _totalVotesSquares: BigInt, + _totalSpent: BigInt, + ): ethereum.CallResult { + let result = super.tryCall( + "calcAlpha", + "calcAlpha(uint256,uint256,uint256):(uint256)", + [ + ethereum.Value.fromUnsignedBigInt(_budget), + ethereum.Value.fromUnsignedBigInt(_totalVotesSquares), + ethereum.Value.fromUnsignedBigInt(_totalSpent), + ], + ); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toBigInt()); + } + contributorCount(): BigInt { let result = super.call( "contributorCount", "contributorCount():(uint256)", - [] + [], ); return result[0].toBigInt(); @@ -153,7 +360,7 @@ export class FundingRound extends ethereum.SmartContract { let result = super.tryCall( "contributorCount", "contributorCount():(uint256)", - [] + [], ); if (result.reverted) { return new ethereum.CallResult(); @@ -162,6 +369,39 @@ export class FundingRound extends ethereum.SmartContract { return ethereum.CallResult.fromValue(value[0].toBigInt()); } + contributors(param0: Address): FundingRound__contributorsResult { + let result = super.call( + "contributors", + "contributors(address):(uint256,bool)", + [ethereum.Value.fromAddress(param0)], + ); + + return new FundingRound__contributorsResult( + result[0].toBigInt(), + result[1].toBoolean(), + ); + } + + try_contributors( + param0: Address, + ): ethereum.CallResult { + let result = super.tryCall( + "contributors", + "contributors(address):(uint256,bool)", + [ethereum.Value.fromAddress(param0)], + ); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue( + new FundingRound__contributorsResult( + value[0].toBigInt(), + value[1].toBoolean(), + ), + ); + } + coordinator(): Address { let result = super.call("coordinator", "coordinator():(address)", []); @@ -183,8 +423,8 @@ export class FundingRound extends ethereum.SmartContract { "getAllocatedAmount(uint256,uint256):(uint256)", [ ethereum.Value.fromUnsignedBigInt(_tallyResult), - ethereum.Value.fromUnsignedBigInt(_spent) - ] + ethereum.Value.fromUnsignedBigInt(_spent), + ], ); return result[0].toBigInt(); @@ -192,15 +432,15 @@ export class FundingRound extends ethereum.SmartContract { try_getAllocatedAmount( _tallyResult: BigInt, - _spent: BigInt + _spent: BigInt, ): ethereum.CallResult { let result = super.tryCall( "getAllocatedAmount", "getAllocatedAmount(uint256,uint256):(uint256)", [ ethereum.Value.fromUnsignedBigInt(_tallyResult), - ethereum.Value.fromUnsignedBigInt(_spent) - ] + ethereum.Value.fromUnsignedBigInt(_spent), + ], ); if (result.reverted) { return new ethereum.CallResult(); @@ -213,7 +453,7 @@ export class FundingRound extends ethereum.SmartContract { let result = super.call( "getVoiceCredits", "getVoiceCredits(address,bytes):(uint256)", - [ethereum.Value.fromAddress(param0), ethereum.Value.fromBytes(_data)] + [ethereum.Value.fromAddress(param0), ethereum.Value.fromBytes(_data)], ); return result[0].toBigInt(); @@ -221,12 +461,12 @@ export class FundingRound extends ethereum.SmartContract { try_getVoiceCredits( param0: Address, - _data: Bytes + _data: Bytes, ): ethereum.CallResult { let result = super.tryCall( "getVoiceCredits", "getVoiceCredits(address,bytes):(uint256)", - [ethereum.Value.fromAddress(param0), ethereum.Value.fromBytes(_data)] + [ethereum.Value.fromAddress(param0), ethereum.Value.fromBytes(_data)], ); if (result.reverted) { return new ethereum.CallResult(); @@ -235,6 +475,27 @@ export class FundingRound extends ethereum.SmartContract { return ethereum.CallResult.fromValue(value[0].toBigInt()); } + isAddressZero(addressValue: Address): boolean { + let result = super.call("isAddressZero", "isAddressZero(address):(bool)", [ + ethereum.Value.fromAddress(addressValue), + ]); + + return result[0].toBoolean(); + } + + try_isAddressZero(addressValue: Address): ethereum.CallResult { + let result = super.tryCall( + "isAddressZero", + "isAddressZero(address):(bool)", + [ethereum.Value.fromAddress(addressValue)], + ); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toBoolean()); + } + isCancelled(): boolean { let result = super.call("isCancelled", "isCancelled():(bool)", []); @@ -284,7 +545,7 @@ export class FundingRound extends ethereum.SmartContract { let result = super.call( "matchingPoolSize", "matchingPoolSize():(uint256)", - [] + [], ); return result[0].toBigInt(); @@ -294,7 +555,7 @@ export class FundingRound extends ethereum.SmartContract { let result = super.tryCall( "matchingPoolSize", "matchingPoolSize():(uint256)", - [] + [], ); if (result.reverted) { return new ethereum.CallResult(); @@ -333,11 +594,41 @@ export class FundingRound extends ethereum.SmartContract { return ethereum.CallResult.fromValue(value[0].toAddress()); } + poll(): Address { + let result = super.call("poll", "poll():(address)", []); + + return result[0].toAddress(); + } + + try_poll(): ethereum.CallResult
{ + let result = super.tryCall("poll", "poll():(address)", []); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toAddress()); + } + + pollId(): BigInt { + let result = super.call("pollId", "pollId():(uint256)", []); + + return result[0].toBigInt(); + } + + try_pollId(): ethereum.CallResult { + let result = super.tryCall("pollId", "pollId():(uint256)", []); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toBigInt()); + } + recipientRegistry(): Address { let result = super.call( "recipientRegistry", "recipientRegistry():(address)", - [] + [], ); return result[0].toAddress(); @@ -347,12 +638,62 @@ export class FundingRound extends ethereum.SmartContract { let result = super.tryCall( "recipientRegistry", "recipientRegistry():(address)", - [] + [], + ); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toAddress()); + } + + recipients(param0: BigInt): FundingRound__recipientsResult { + let result = super.call( + "recipients", + "recipients(uint256):(bool,bool,uint256)", + [ethereum.Value.fromUnsignedBigInt(param0)], + ); + + return new FundingRound__recipientsResult( + result[0].toBoolean(), + result[1].toBoolean(), + result[2].toBigInt(), + ); + } + + try_recipients( + param0: BigInt, + ): ethereum.CallResult { + let result = super.tryCall( + "recipients", + "recipients(uint256):(bool,bool,uint256)", + [ethereum.Value.fromUnsignedBigInt(param0)], ); if (result.reverted) { return new ethereum.CallResult(); } let value = result.value; + return ethereum.CallResult.fromValue( + new FundingRound__recipientsResult( + value[0].toBoolean(), + value[1].toBoolean(), + value[2].toBigInt(), + ), + ); + } + + tally(): Address { + let result = super.call("tally", "tally():(address)", []); + + return result[0].toAddress(); + } + + try_tally(): ethereum.CallResult
{ + let result = super.tryCall("tally", "tally():(address)", []); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; return ethereum.CallResult.fromValue(value[0].toAddress()); } @@ -371,6 +712,21 @@ export class FundingRound extends ethereum.SmartContract { return ethereum.CallResult.fromValue(value[0].toString()); } + topupToken(): Address { + let result = super.call("topupToken", "topupToken():(address)", []); + + return result[0].toAddress(); + } + + try_topupToken(): ethereum.CallResult
{ + let result = super.tryCall("topupToken", "topupToken():(address)", []); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toAddress()); + } + totalSpent(): BigInt { let result = super.call("totalSpent", "totalSpent():(uint256)", []); @@ -386,6 +742,29 @@ export class FundingRound extends ethereum.SmartContract { return ethereum.CallResult.fromValue(value[0].toBigInt()); } + totalTallyResults(): BigInt { + let result = super.call( + "totalTallyResults", + "totalTallyResults():(uint256)", + [], + ); + + return result[0].toBigInt(); + } + + try_totalTallyResults(): ethereum.CallResult { + let result = super.tryCall( + "totalTallyResults", + "totalTallyResults():(uint256)", + [], + ); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toBigInt()); + } + totalVotes(): BigInt { let result = super.call("totalVotes", "totalVotes():(uint256)", []); @@ -401,6 +780,29 @@ export class FundingRound extends ethereum.SmartContract { return ethereum.CallResult.fromValue(value[0].toBigInt()); } + totalVotesSquares(): BigInt { + let result = super.call( + "totalVotesSquares", + "totalVotesSquares():(uint256)", + [], + ); + + return result[0].toBigInt(); + } + + try_totalVotesSquares(): ethereum.CallResult { + let result = super.tryCall( + "totalVotesSquares", + "totalVotesSquares():(uint256)", + [], + ); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toBigInt()); + } + userRegistry(): Address { let result = super.call("userRegistry", "userRegistry():(address)", []); @@ -420,7 +822,7 @@ export class FundingRound extends ethereum.SmartContract { let result = super.call( "voiceCreditFactor", "voiceCreditFactor():(uint256)", - [] + [], ); return result[0].toBigInt(); @@ -430,7 +832,7 @@ export class FundingRound extends ethereum.SmartContract { let result = super.tryCall( "voiceCreditFactor", "voiceCreditFactor():(uint256)", - [] + [], ); if (result.reverted) { return new ethereum.CallResult(); @@ -438,6 +840,31 @@ export class FundingRound extends ethereum.SmartContract { let value = result.value; return ethereum.CallResult.fromValue(value[0].toBigInt()); } + + withdrawContributions(_contributors: Array
): Array { + let result = super.call( + "withdrawContributions", + "withdrawContributions(address[]):(bool[])", + [ethereum.Value.fromAddressArray(_contributors)], + ); + + return result[0].toBooleanArray(); + } + + try_withdrawContributions( + _contributors: Array
, + ): ethereum.CallResult> { + let result = super.tryCall( + "withdrawContributions", + "withdrawContributions(address[]):(bool[])", + [ethereum.Value.fromAddressArray(_contributors)], + ); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toBooleanArray()); + } } export class ConstructorCall extends ethereum.Call { @@ -508,6 +935,56 @@ export class CancelCall__Outputs { } } +export class ClaimFundsCall extends ethereum.Call { + get inputs(): ClaimFundsCall__Inputs { + return new ClaimFundsCall__Inputs(this); + } + + get outputs(): ClaimFundsCall__Outputs { + return new ClaimFundsCall__Outputs(this); + } +} + +export class ClaimFundsCall__Inputs { + _call: ClaimFundsCall; + + constructor(call: ClaimFundsCall) { + this._call = call; + } + + get _voteOptionIndex(): BigInt { + return this._call.inputValues[0].value.toBigInt(); + } + + get _spent(): BigInt { + return this._call.inputValues[1].value.toBigInt(); + } + + get _spentProof(): Array> { + return this._call.inputValues[2].value.toBigIntMatrix(); + } + + get _spentSalt(): BigInt { + return this._call.inputValues[3].value.toBigInt(); + } + + get _resultsCommitment(): BigInt { + return this._call.inputValues[4].value.toBigInt(); + } + + get _spentVoiceCreditsCommitment(): BigInt { + return this._call.inputValues[5].value.toBigInt(); + } +} + +export class ClaimFundsCall__Outputs { + _call: ClaimFundsCall; + + constructor(call: ClaimFundsCall) { + this._call = call; + } +} + export class ContributeCall extends ethereum.Call { get inputs(): ContributeCall__Inputs { return new ContributeCall__Inputs(this); @@ -527,7 +1004,7 @@ export class ContributeCall__Inputs { get pubKey(): ContributeCallPubKeyStruct { return changetype( - this._call.inputValues[0].value.toTuple() + this._call.inputValues[0].value.toTuple(), ); } @@ -578,6 +1055,14 @@ export class FinalizeCall__Inputs { get _totalSpentSalt(): BigInt { return this._call.inputValues[1].value.toBigInt(); } + + get _newResultCommitment(): BigInt { + return this._call.inputValues[2].value.toBigInt(); + } + + get _perVOSpentVoiceCreditsHash(): BigInt { + return this._call.inputValues[3].value.toBigInt(); + } } export class FinalizeCall__Outputs { @@ -678,6 +1163,32 @@ export class RenounceOwnershipCall__Outputs { } } +export class ResetTallyCall extends ethereum.Call { + get inputs(): ResetTallyCall__Inputs { + return new ResetTallyCall__Inputs(this); + } + + get outputs(): ResetTallyCall__Outputs { + return new ResetTallyCall__Outputs(this); + } +} + +export class ResetTallyCall__Inputs { + _call: ResetTallyCall; + + constructor(call: ResetTallyCall) { + this._call = call; + } +} + +export class ResetTallyCall__Outputs { + _call: ResetTallyCall; + + constructor(call: ResetTallyCall) { + this._call = call; + } +} + export class SetMaciCall extends ethereum.Call { get inputs(): SetMaciCall__Inputs { return new SetMaciCall__Inputs(this); @@ -698,6 +1209,12 @@ export class SetMaciCall__Inputs { get _maci(): Address { return this._call.inputValues[0].value.toAddress(); } + + get _pollContracts(): SetMaciCall_pollContractsStruct { + return changetype( + this._call.inputValues[1].value.toTuple(), + ); + } } export class SetMaciCall__Outputs { @@ -708,61 +1225,51 @@ export class SetMaciCall__Outputs { } } -export class SubmitMessageBatchCall extends ethereum.Call { - get inputs(): SubmitMessageBatchCall__Inputs { - return new SubmitMessageBatchCall__Inputs(this); +export class SetMaciCall_pollContractsStruct extends ethereum.Tuple { + get poll(): Address { + return this[0].toAddress(); } - get outputs(): SubmitMessageBatchCall__Outputs { - return new SubmitMessageBatchCall__Outputs(this); + get messageProcessor(): Address { + return this[1].toAddress(); } -} -export class SubmitMessageBatchCall__Inputs { - _call: SubmitMessageBatchCall; + get tally(): Address { + return this[2].toAddress(); + } - constructor(call: SubmitMessageBatchCall) { - this._call = call; + get subsidy(): Address { + return this[3].toAddress(); } +} - get _messages(): Array { - return this._call.inputValues[0].value.toTupleArray< - SubmitMessageBatchCall_messagesStruct - >(); +export class SetMaciInstanceCall extends ethereum.Call { + get inputs(): SetMaciInstanceCall__Inputs { + return new SetMaciInstanceCall__Inputs(this); } - get _encPubKeys(): Array { - return this._call.inputValues[1].value.toTupleArray< - SubmitMessageBatchCall_encPubKeysStruct - >(); + get outputs(): SetMaciInstanceCall__Outputs { + return new SetMaciInstanceCall__Outputs(this); } } -export class SubmitMessageBatchCall__Outputs { - _call: SubmitMessageBatchCall; +export class SetMaciInstanceCall__Inputs { + _call: SetMaciInstanceCall; - constructor(call: SubmitMessageBatchCall) { + constructor(call: SetMaciInstanceCall) { this._call = call; } -} -export class SubmitMessageBatchCall_messagesStruct extends ethereum.Tuple { - get iv(): BigInt { - return this[0].toBigInt(); - } - - get data(): Array { - return this[1].toBigIntArray(); + get _maci(): Address { + return this._call.inputValues[0].value.toAddress(); } } -export class SubmitMessageBatchCall_encPubKeysStruct extends ethereum.Tuple { - get x(): BigInt { - return this[0].toBigInt(); - } +export class SetMaciInstanceCall__Outputs { + _call: SetMaciInstanceCall; - get y(): BigInt { - return this[1].toBigInt(); + constructor(call: SetMaciInstanceCall) { + this._call = call; } } @@ -812,16 +1319,46 @@ export class WithdrawContributionCall__Inputs { constructor(call: WithdrawContributionCall) { this._call = call; } +} + +export class WithdrawContributionCall__Outputs { + _call: WithdrawContributionCall; + + constructor(call: WithdrawContributionCall) { + this._call = call; + } +} + +export class WithdrawContributionsCall extends ethereum.Call { + get inputs(): WithdrawContributionsCall__Inputs { + return new WithdrawContributionsCall__Inputs(this); + } + + get outputs(): WithdrawContributionsCall__Outputs { + return new WithdrawContributionsCall__Outputs(this); + } +} + +export class WithdrawContributionsCall__Inputs { + _call: WithdrawContributionsCall; + + constructor(call: WithdrawContributionsCall) { + this._call = call; + } get _contributors(): Array
{ return this._call.inputValues[0].value.toAddressArray(); } } -export class WithdrawContributionCall__Outputs { - _call: WithdrawContributionCall; +export class WithdrawContributionsCall__Outputs { + _call: WithdrawContributionsCall; - constructor(call: WithdrawContributionCall) { + constructor(call: WithdrawContributionsCall) { this._call = call; } + + get result(): Array { + return this._call.outputValues[0].value.toBooleanArray(); + } } diff --git a/subgraph/generated/templates/FundingRound/OptimisticRecipientRegistry.ts b/subgraph/generated/templates/FundingRound/OptimisticRecipientRegistry.ts index 20d805ce5..80ec65e55 100644 --- a/subgraph/generated/templates/FundingRound/OptimisticRecipientRegistry.ts +++ b/subgraph/generated/templates/FundingRound/OptimisticRecipientRegistry.ts @@ -7,7 +7,7 @@ import { Entity, Bytes, Address, - BigInt + BigInt, } from "@graphprotocol/graph-ts"; export class OwnershipTransferred extends ethereum.Event { @@ -104,7 +104,7 @@ export class OptimisticRecipientRegistry extends ethereum.SmartContract { static bind(address: Address): OptimisticRecipientRegistry { return new OptimisticRecipientRegistry( "OptimisticRecipientRegistry", - address + address, ); } @@ -127,7 +127,7 @@ export class OptimisticRecipientRegistry extends ethereum.SmartContract { let result = super.call( "challengePeriodDuration", "challengePeriodDuration():(uint256)", - [] + [], ); return result[0].toBigInt(); @@ -137,7 +137,7 @@ export class OptimisticRecipientRegistry extends ethereum.SmartContract { let result = super.tryCall( "challengePeriodDuration", "challengePeriodDuration():(uint256)", - [] + [], ); if (result.reverted) { return new ethereum.CallResult(); @@ -152,8 +152,8 @@ export class OptimisticRecipientRegistry extends ethereum.SmartContract { "challengeRequest(bytes32,address):(bool)", [ ethereum.Value.fromFixedBytes(_recipientId), - ethereum.Value.fromAddress(_beneficiary) - ] + ethereum.Value.fromAddress(_beneficiary), + ], ); return result[0].toBoolean(); @@ -161,15 +161,15 @@ export class OptimisticRecipientRegistry extends ethereum.SmartContract { try_challengeRequest( _recipientId: Bytes, - _beneficiary: Address + _beneficiary: Address, ): ethereum.CallResult { let result = super.tryCall( "challengeRequest", "challengeRequest(bytes32,address):(bool)", [ ethereum.Value.fromFixedBytes(_recipientId), - ethereum.Value.fromAddress(_beneficiary) - ] + ethereum.Value.fromAddress(_beneficiary), + ], ); if (result.reverted) { return new ethereum.CallResult(); @@ -197,7 +197,7 @@ export class OptimisticRecipientRegistry extends ethereum.SmartContract { let result = super.call( "executeRequest", "executeRequest(bytes32):(bool)", - [ethereum.Value.fromFixedBytes(_recipientId)] + [ethereum.Value.fromFixedBytes(_recipientId)], ); return result[0].toBoolean(); @@ -207,7 +207,7 @@ export class OptimisticRecipientRegistry extends ethereum.SmartContract { let result = super.tryCall( "executeRequest", "executeRequest(bytes32):(bool)", - [ethereum.Value.fromFixedBytes(_recipientId)] + [ethereum.Value.fromFixedBytes(_recipientId)], ); if (result.reverted) { return new ethereum.CallResult(); @@ -219,7 +219,7 @@ export class OptimisticRecipientRegistry extends ethereum.SmartContract { getRecipientAddress( _index: BigInt, _startTime: BigInt, - _endTime: BigInt + _endTime: BigInt, ): Address { let result = super.call( "getRecipientAddress", @@ -227,8 +227,8 @@ export class OptimisticRecipientRegistry extends ethereum.SmartContract { [ ethereum.Value.fromUnsignedBigInt(_index), ethereum.Value.fromUnsignedBigInt(_startTime), - ethereum.Value.fromUnsignedBigInt(_endTime) - ] + ethereum.Value.fromUnsignedBigInt(_endTime), + ], ); return result[0].toAddress(); @@ -237,7 +237,7 @@ export class OptimisticRecipientRegistry extends ethereum.SmartContract { try_getRecipientAddress( _index: BigInt, _startTime: BigInt, - _endTime: BigInt + _endTime: BigInt, ): ethereum.CallResult
{ let result = super.tryCall( "getRecipientAddress", @@ -245,8 +245,8 @@ export class OptimisticRecipientRegistry extends ethereum.SmartContract { [ ethereum.Value.fromUnsignedBigInt(_index), ethereum.Value.fromUnsignedBigInt(_startTime), - ethereum.Value.fromUnsignedBigInt(_endTime) - ] + ethereum.Value.fromUnsignedBigInt(_endTime), + ], ); if (result.reverted) { return new ethereum.CallResult(); @@ -255,6 +255,29 @@ export class OptimisticRecipientRegistry extends ethereum.SmartContract { return ethereum.CallResult.fromValue(value[0].toAddress()); } + getRecipientCount(): BigInt { + let result = super.call( + "getRecipientCount", + "getRecipientCount():(uint256)", + [], + ); + + return result[0].toBigInt(); + } + + try_getRecipientCount(): ethereum.CallResult { + let result = super.tryCall( + "getRecipientCount", + "getRecipientCount():(uint256)", + [], + ); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toBigInt()); + } + maxRecipients(): BigInt { let result = super.call("maxRecipients", "maxRecipients():(uint256)", []); @@ -265,7 +288,7 @@ export class OptimisticRecipientRegistry extends ethereum.SmartContract { let result = super.tryCall( "maxRecipients", "maxRecipients():(uint256)", - [] + [], ); if (result.reverted) { return new ethereum.CallResult(); @@ -293,7 +316,7 @@ export class OptimisticRecipientRegistry extends ethereum.SmartContract { let result = super.call( "setMaxRecipients", "setMaxRecipients(uint256):(bool)", - [ethereum.Value.fromUnsignedBigInt(_maxRecipients)] + [ethereum.Value.fromUnsignedBigInt(_maxRecipients)], ); return result[0].toBoolean(); @@ -303,7 +326,7 @@ export class OptimisticRecipientRegistry extends ethereum.SmartContract { let result = super.tryCall( "setMaxRecipients", "setMaxRecipients(uint256):(bool)", - [ethereum.Value.fromUnsignedBigInt(_maxRecipients)] + [ethereum.Value.fromUnsignedBigInt(_maxRecipients)], ); if (result.reverted) { return new ethereum.CallResult(); diff --git a/subgraph/generated/templates/MACI/FundingRound.ts b/subgraph/generated/templates/MACI/FundingRound.ts index 6c3bcd6cb..32be22df9 100644 --- a/subgraph/generated/templates/MACI/FundingRound.ts +++ b/subgraph/generated/templates/MACI/FundingRound.ts @@ -7,7 +7,7 @@ import { Entity, Bytes, Address, - BigInt + BigInt, } from "@graphprotocol/graph-ts"; export class Contribution extends ethereum.Event { @@ -98,6 +98,24 @@ export class OwnershipTransferred__Params { } } +export class PollSet extends ethereum.Event { + get params(): PollSet__Params { + return new PollSet__Params(this); + } +} + +export class PollSet__Params { + _event: PollSet; + + constructor(event: PollSet) { + this._event = event; + } + + get _poll(): Address { + return this._event.parameters[0].value.toAddress(); + } +} + export class TallyPublished extends ethereum.Event { get params(): TallyPublished__Params { return new TallyPublished__Params(this); @@ -116,6 +134,46 @@ export class TallyPublished__Params { } } +export class TallyResultsAdded extends ethereum.Event { + get params(): TallyResultsAdded__Params { + return new TallyResultsAdded__Params(this); + } +} + +export class TallyResultsAdded__Params { + _event: TallyResultsAdded; + + constructor(event: TallyResultsAdded) { + this._event = event; + } + + get _voteOptionIndex(): BigInt { + return this._event.parameters[0].value.toBigInt(); + } + + get _tally(): BigInt { + return this._event.parameters[1].value.toBigInt(); + } +} + +export class TallySet extends ethereum.Event { + get params(): TallySet__Params { + return new TallySet__Params(this); + } +} + +export class TallySet__Params { + _event: TallySet; + + constructor(event: TallySet) { + this._event = event; + } + + get _tally(): Address { + return this._event.parameters[0].value.toAddress(); + } +} + export class Voted extends ethereum.Event { get params(): Voted__Params { return new Voted__Params(this); @@ -134,16 +192,165 @@ export class Voted__Params { } } +export class FundingRound__contributorsResult { + value0: BigInt; + value1: boolean; + + constructor(value0: BigInt, value1: boolean) { + this.value0 = value0; + this.value1 = value1; + } + + toMap(): TypedMap { + let map = new TypedMap(); + map.set("value0", ethereum.Value.fromUnsignedBigInt(this.value0)); + map.set("value1", ethereum.Value.fromBoolean(this.value1)); + return map; + } + + getVoiceCredits(): BigInt { + return this.value0; + } + + getIsRegistered(): boolean { + return this.value1; + } +} + +export class FundingRound__recipientsResult { + value0: boolean; + value1: boolean; + value2: BigInt; + + constructor(value0: boolean, value1: boolean, value2: BigInt) { + this.value0 = value0; + this.value1 = value1; + this.value2 = value2; + } + + toMap(): TypedMap { + let map = new TypedMap(); + map.set("value0", ethereum.Value.fromBoolean(this.value0)); + map.set("value1", ethereum.Value.fromBoolean(this.value1)); + map.set("value2", ethereum.Value.fromUnsignedBigInt(this.value2)); + return map; + } + + getFundsClaimed(): boolean { + return this.value0; + } + + getTallyVerified(): boolean { + return this.value1; + } + + getTallyResult(): BigInt { + return this.value2; + } +} + export class FundingRound extends ethereum.SmartContract { static bind(address: Address): FundingRound { return new FundingRound("FundingRound", address); } + MESSAGE_DATA_LENGTH(): i32 { + let result = super.call( + "MESSAGE_DATA_LENGTH", + "MESSAGE_DATA_LENGTH():(uint8)", + [], + ); + + return result[0].toI32(); + } + + try_MESSAGE_DATA_LENGTH(): ethereum.CallResult { + let result = super.tryCall( + "MESSAGE_DATA_LENGTH", + "MESSAGE_DATA_LENGTH():(uint8)", + [], + ); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toI32()); + } + + TREE_ARITY(): BigInt { + let result = super.call("TREE_ARITY", "TREE_ARITY():(uint256)", []); + + return result[0].toBigInt(); + } + + try_TREE_ARITY(): ethereum.CallResult { + let result = super.tryCall("TREE_ARITY", "TREE_ARITY():(uint256)", []); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toBigInt()); + } + + alpha(): BigInt { + let result = super.call("alpha", "alpha():(uint256)", []); + + return result[0].toBigInt(); + } + + try_alpha(): ethereum.CallResult { + let result = super.tryCall("alpha", "alpha():(uint256)", []); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toBigInt()); + } + + calcAlpha( + _budget: BigInt, + _totalVotesSquares: BigInt, + _totalSpent: BigInt, + ): BigInt { + let result = super.call( + "calcAlpha", + "calcAlpha(uint256,uint256,uint256):(uint256)", + [ + ethereum.Value.fromUnsignedBigInt(_budget), + ethereum.Value.fromUnsignedBigInt(_totalVotesSquares), + ethereum.Value.fromUnsignedBigInt(_totalSpent), + ], + ); + + return result[0].toBigInt(); + } + + try_calcAlpha( + _budget: BigInt, + _totalVotesSquares: BigInt, + _totalSpent: BigInt, + ): ethereum.CallResult { + let result = super.tryCall( + "calcAlpha", + "calcAlpha(uint256,uint256,uint256):(uint256)", + [ + ethereum.Value.fromUnsignedBigInt(_budget), + ethereum.Value.fromUnsignedBigInt(_totalVotesSquares), + ethereum.Value.fromUnsignedBigInt(_totalSpent), + ], + ); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toBigInt()); + } + contributorCount(): BigInt { let result = super.call( "contributorCount", "contributorCount():(uint256)", - [] + [], ); return result[0].toBigInt(); @@ -153,7 +360,7 @@ export class FundingRound extends ethereum.SmartContract { let result = super.tryCall( "contributorCount", "contributorCount():(uint256)", - [] + [], ); if (result.reverted) { return new ethereum.CallResult(); @@ -162,6 +369,39 @@ export class FundingRound extends ethereum.SmartContract { return ethereum.CallResult.fromValue(value[0].toBigInt()); } + contributors(param0: Address): FundingRound__contributorsResult { + let result = super.call( + "contributors", + "contributors(address):(uint256,bool)", + [ethereum.Value.fromAddress(param0)], + ); + + return new FundingRound__contributorsResult( + result[0].toBigInt(), + result[1].toBoolean(), + ); + } + + try_contributors( + param0: Address, + ): ethereum.CallResult { + let result = super.tryCall( + "contributors", + "contributors(address):(uint256,bool)", + [ethereum.Value.fromAddress(param0)], + ); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue( + new FundingRound__contributorsResult( + value[0].toBigInt(), + value[1].toBoolean(), + ), + ); + } + coordinator(): Address { let result = super.call("coordinator", "coordinator():(address)", []); @@ -183,8 +423,8 @@ export class FundingRound extends ethereum.SmartContract { "getAllocatedAmount(uint256,uint256):(uint256)", [ ethereum.Value.fromUnsignedBigInt(_tallyResult), - ethereum.Value.fromUnsignedBigInt(_spent) - ] + ethereum.Value.fromUnsignedBigInt(_spent), + ], ); return result[0].toBigInt(); @@ -192,15 +432,15 @@ export class FundingRound extends ethereum.SmartContract { try_getAllocatedAmount( _tallyResult: BigInt, - _spent: BigInt + _spent: BigInt, ): ethereum.CallResult { let result = super.tryCall( "getAllocatedAmount", "getAllocatedAmount(uint256,uint256):(uint256)", [ ethereum.Value.fromUnsignedBigInt(_tallyResult), - ethereum.Value.fromUnsignedBigInt(_spent) - ] + ethereum.Value.fromUnsignedBigInt(_spent), + ], ); if (result.reverted) { return new ethereum.CallResult(); @@ -213,7 +453,7 @@ export class FundingRound extends ethereum.SmartContract { let result = super.call( "getVoiceCredits", "getVoiceCredits(address,bytes):(uint256)", - [ethereum.Value.fromAddress(param0), ethereum.Value.fromBytes(_data)] + [ethereum.Value.fromAddress(param0), ethereum.Value.fromBytes(_data)], ); return result[0].toBigInt(); @@ -221,12 +461,12 @@ export class FundingRound extends ethereum.SmartContract { try_getVoiceCredits( param0: Address, - _data: Bytes + _data: Bytes, ): ethereum.CallResult { let result = super.tryCall( "getVoiceCredits", "getVoiceCredits(address,bytes):(uint256)", - [ethereum.Value.fromAddress(param0), ethereum.Value.fromBytes(_data)] + [ethereum.Value.fromAddress(param0), ethereum.Value.fromBytes(_data)], ); if (result.reverted) { return new ethereum.CallResult(); @@ -235,6 +475,27 @@ export class FundingRound extends ethereum.SmartContract { return ethereum.CallResult.fromValue(value[0].toBigInt()); } + isAddressZero(addressValue: Address): boolean { + let result = super.call("isAddressZero", "isAddressZero(address):(bool)", [ + ethereum.Value.fromAddress(addressValue), + ]); + + return result[0].toBoolean(); + } + + try_isAddressZero(addressValue: Address): ethereum.CallResult { + let result = super.tryCall( + "isAddressZero", + "isAddressZero(address):(bool)", + [ethereum.Value.fromAddress(addressValue)], + ); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toBoolean()); + } + isCancelled(): boolean { let result = super.call("isCancelled", "isCancelled():(bool)", []); @@ -284,7 +545,7 @@ export class FundingRound extends ethereum.SmartContract { let result = super.call( "matchingPoolSize", "matchingPoolSize():(uint256)", - [] + [], ); return result[0].toBigInt(); @@ -294,7 +555,7 @@ export class FundingRound extends ethereum.SmartContract { let result = super.tryCall( "matchingPoolSize", "matchingPoolSize():(uint256)", - [] + [], ); if (result.reverted) { return new ethereum.CallResult(); @@ -333,11 +594,41 @@ export class FundingRound extends ethereum.SmartContract { return ethereum.CallResult.fromValue(value[0].toAddress()); } + poll(): Address { + let result = super.call("poll", "poll():(address)", []); + + return result[0].toAddress(); + } + + try_poll(): ethereum.CallResult
{ + let result = super.tryCall("poll", "poll():(address)", []); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toAddress()); + } + + pollId(): BigInt { + let result = super.call("pollId", "pollId():(uint256)", []); + + return result[0].toBigInt(); + } + + try_pollId(): ethereum.CallResult { + let result = super.tryCall("pollId", "pollId():(uint256)", []); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toBigInt()); + } + recipientRegistry(): Address { let result = super.call( "recipientRegistry", "recipientRegistry():(address)", - [] + [], ); return result[0].toAddress(); @@ -347,12 +638,62 @@ export class FundingRound extends ethereum.SmartContract { let result = super.tryCall( "recipientRegistry", "recipientRegistry():(address)", - [] + [], + ); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toAddress()); + } + + recipients(param0: BigInt): FundingRound__recipientsResult { + let result = super.call( + "recipients", + "recipients(uint256):(bool,bool,uint256)", + [ethereum.Value.fromUnsignedBigInt(param0)], + ); + + return new FundingRound__recipientsResult( + result[0].toBoolean(), + result[1].toBoolean(), + result[2].toBigInt(), + ); + } + + try_recipients( + param0: BigInt, + ): ethereum.CallResult { + let result = super.tryCall( + "recipients", + "recipients(uint256):(bool,bool,uint256)", + [ethereum.Value.fromUnsignedBigInt(param0)], ); if (result.reverted) { return new ethereum.CallResult(); } let value = result.value; + return ethereum.CallResult.fromValue( + new FundingRound__recipientsResult( + value[0].toBoolean(), + value[1].toBoolean(), + value[2].toBigInt(), + ), + ); + } + + tally(): Address { + let result = super.call("tally", "tally():(address)", []); + + return result[0].toAddress(); + } + + try_tally(): ethereum.CallResult
{ + let result = super.tryCall("tally", "tally():(address)", []); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; return ethereum.CallResult.fromValue(value[0].toAddress()); } @@ -371,6 +712,21 @@ export class FundingRound extends ethereum.SmartContract { return ethereum.CallResult.fromValue(value[0].toString()); } + topupToken(): Address { + let result = super.call("topupToken", "topupToken():(address)", []); + + return result[0].toAddress(); + } + + try_topupToken(): ethereum.CallResult
{ + let result = super.tryCall("topupToken", "topupToken():(address)", []); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toAddress()); + } + totalSpent(): BigInt { let result = super.call("totalSpent", "totalSpent():(uint256)", []); @@ -386,6 +742,29 @@ export class FundingRound extends ethereum.SmartContract { return ethereum.CallResult.fromValue(value[0].toBigInt()); } + totalTallyResults(): BigInt { + let result = super.call( + "totalTallyResults", + "totalTallyResults():(uint256)", + [], + ); + + return result[0].toBigInt(); + } + + try_totalTallyResults(): ethereum.CallResult { + let result = super.tryCall( + "totalTallyResults", + "totalTallyResults():(uint256)", + [], + ); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toBigInt()); + } + totalVotes(): BigInt { let result = super.call("totalVotes", "totalVotes():(uint256)", []); @@ -401,6 +780,29 @@ export class FundingRound extends ethereum.SmartContract { return ethereum.CallResult.fromValue(value[0].toBigInt()); } + totalVotesSquares(): BigInt { + let result = super.call( + "totalVotesSquares", + "totalVotesSquares():(uint256)", + [], + ); + + return result[0].toBigInt(); + } + + try_totalVotesSquares(): ethereum.CallResult { + let result = super.tryCall( + "totalVotesSquares", + "totalVotesSquares():(uint256)", + [], + ); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toBigInt()); + } + userRegistry(): Address { let result = super.call("userRegistry", "userRegistry():(address)", []); @@ -420,7 +822,7 @@ export class FundingRound extends ethereum.SmartContract { let result = super.call( "voiceCreditFactor", "voiceCreditFactor():(uint256)", - [] + [], ); return result[0].toBigInt(); @@ -430,7 +832,7 @@ export class FundingRound extends ethereum.SmartContract { let result = super.tryCall( "voiceCreditFactor", "voiceCreditFactor():(uint256)", - [] + [], ); if (result.reverted) { return new ethereum.CallResult(); @@ -438,6 +840,31 @@ export class FundingRound extends ethereum.SmartContract { let value = result.value; return ethereum.CallResult.fromValue(value[0].toBigInt()); } + + withdrawContributions(_contributors: Array
): Array { + let result = super.call( + "withdrawContributions", + "withdrawContributions(address[]):(bool[])", + [ethereum.Value.fromAddressArray(_contributors)], + ); + + return result[0].toBooleanArray(); + } + + try_withdrawContributions( + _contributors: Array
, + ): ethereum.CallResult> { + let result = super.tryCall( + "withdrawContributions", + "withdrawContributions(address[]):(bool[])", + [ethereum.Value.fromAddressArray(_contributors)], + ); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toBooleanArray()); + } } export class ConstructorCall extends ethereum.Call { @@ -508,6 +935,56 @@ export class CancelCall__Outputs { } } +export class ClaimFundsCall extends ethereum.Call { + get inputs(): ClaimFundsCall__Inputs { + return new ClaimFundsCall__Inputs(this); + } + + get outputs(): ClaimFundsCall__Outputs { + return new ClaimFundsCall__Outputs(this); + } +} + +export class ClaimFundsCall__Inputs { + _call: ClaimFundsCall; + + constructor(call: ClaimFundsCall) { + this._call = call; + } + + get _voteOptionIndex(): BigInt { + return this._call.inputValues[0].value.toBigInt(); + } + + get _spent(): BigInt { + return this._call.inputValues[1].value.toBigInt(); + } + + get _spentProof(): Array> { + return this._call.inputValues[2].value.toBigIntMatrix(); + } + + get _spentSalt(): BigInt { + return this._call.inputValues[3].value.toBigInt(); + } + + get _resultsCommitment(): BigInt { + return this._call.inputValues[4].value.toBigInt(); + } + + get _spentVoiceCreditsCommitment(): BigInt { + return this._call.inputValues[5].value.toBigInt(); + } +} + +export class ClaimFundsCall__Outputs { + _call: ClaimFundsCall; + + constructor(call: ClaimFundsCall) { + this._call = call; + } +} + export class ContributeCall extends ethereum.Call { get inputs(): ContributeCall__Inputs { return new ContributeCall__Inputs(this); @@ -527,7 +1004,7 @@ export class ContributeCall__Inputs { get pubKey(): ContributeCallPubKeyStruct { return changetype( - this._call.inputValues[0].value.toTuple() + this._call.inputValues[0].value.toTuple(), ); } @@ -578,6 +1055,14 @@ export class FinalizeCall__Inputs { get _totalSpentSalt(): BigInt { return this._call.inputValues[1].value.toBigInt(); } + + get _newResultCommitment(): BigInt { + return this._call.inputValues[2].value.toBigInt(); + } + + get _perVOSpentVoiceCreditsHash(): BigInt { + return this._call.inputValues[3].value.toBigInt(); + } } export class FinalizeCall__Outputs { @@ -678,6 +1163,32 @@ export class RenounceOwnershipCall__Outputs { } } +export class ResetTallyCall extends ethereum.Call { + get inputs(): ResetTallyCall__Inputs { + return new ResetTallyCall__Inputs(this); + } + + get outputs(): ResetTallyCall__Outputs { + return new ResetTallyCall__Outputs(this); + } +} + +export class ResetTallyCall__Inputs { + _call: ResetTallyCall; + + constructor(call: ResetTallyCall) { + this._call = call; + } +} + +export class ResetTallyCall__Outputs { + _call: ResetTallyCall; + + constructor(call: ResetTallyCall) { + this._call = call; + } +} + export class SetMaciCall extends ethereum.Call { get inputs(): SetMaciCall__Inputs { return new SetMaciCall__Inputs(this); @@ -698,6 +1209,12 @@ export class SetMaciCall__Inputs { get _maci(): Address { return this._call.inputValues[0].value.toAddress(); } + + get _pollContracts(): SetMaciCall_pollContractsStruct { + return changetype( + this._call.inputValues[1].value.toTuple(), + ); + } } export class SetMaciCall__Outputs { @@ -708,61 +1225,51 @@ export class SetMaciCall__Outputs { } } -export class SubmitMessageBatchCall extends ethereum.Call { - get inputs(): SubmitMessageBatchCall__Inputs { - return new SubmitMessageBatchCall__Inputs(this); +export class SetMaciCall_pollContractsStruct extends ethereum.Tuple { + get poll(): Address { + return this[0].toAddress(); } - get outputs(): SubmitMessageBatchCall__Outputs { - return new SubmitMessageBatchCall__Outputs(this); + get messageProcessor(): Address { + return this[1].toAddress(); } -} -export class SubmitMessageBatchCall__Inputs { - _call: SubmitMessageBatchCall; + get tally(): Address { + return this[2].toAddress(); + } - constructor(call: SubmitMessageBatchCall) { - this._call = call; + get subsidy(): Address { + return this[3].toAddress(); } +} - get _messages(): Array { - return this._call.inputValues[0].value.toTupleArray< - SubmitMessageBatchCall_messagesStruct - >(); +export class SetMaciInstanceCall extends ethereum.Call { + get inputs(): SetMaciInstanceCall__Inputs { + return new SetMaciInstanceCall__Inputs(this); } - get _encPubKeys(): Array { - return this._call.inputValues[1].value.toTupleArray< - SubmitMessageBatchCall_encPubKeysStruct - >(); + get outputs(): SetMaciInstanceCall__Outputs { + return new SetMaciInstanceCall__Outputs(this); } } -export class SubmitMessageBatchCall__Outputs { - _call: SubmitMessageBatchCall; +export class SetMaciInstanceCall__Inputs { + _call: SetMaciInstanceCall; - constructor(call: SubmitMessageBatchCall) { + constructor(call: SetMaciInstanceCall) { this._call = call; } -} -export class SubmitMessageBatchCall_messagesStruct extends ethereum.Tuple { - get iv(): BigInt { - return this[0].toBigInt(); - } - - get data(): Array { - return this[1].toBigIntArray(); + get _maci(): Address { + return this._call.inputValues[0].value.toAddress(); } } -export class SubmitMessageBatchCall_encPubKeysStruct extends ethereum.Tuple { - get x(): BigInt { - return this[0].toBigInt(); - } +export class SetMaciInstanceCall__Outputs { + _call: SetMaciInstanceCall; - get y(): BigInt { - return this[1].toBigInt(); + constructor(call: SetMaciInstanceCall) { + this._call = call; } } @@ -812,16 +1319,46 @@ export class WithdrawContributionCall__Inputs { constructor(call: WithdrawContributionCall) { this._call = call; } +} + +export class WithdrawContributionCall__Outputs { + _call: WithdrawContributionCall; + + constructor(call: WithdrawContributionCall) { + this._call = call; + } +} + +export class WithdrawContributionsCall extends ethereum.Call { + get inputs(): WithdrawContributionsCall__Inputs { + return new WithdrawContributionsCall__Inputs(this); + } + + get outputs(): WithdrawContributionsCall__Outputs { + return new WithdrawContributionsCall__Outputs(this); + } +} + +export class WithdrawContributionsCall__Inputs { + _call: WithdrawContributionsCall; + + constructor(call: WithdrawContributionsCall) { + this._call = call; + } get _contributors(): Array
{ return this._call.inputValues[0].value.toAddressArray(); } } -export class WithdrawContributionCall__Outputs { - _call: WithdrawContributionCall; +export class WithdrawContributionsCall__Outputs { + _call: WithdrawContributionsCall; - constructor(call: WithdrawContributionCall) { + constructor(call: WithdrawContributionsCall) { this._call = call; } + + get result(): Array { + return this._call.outputValues[0].value.toBooleanArray(); + } } diff --git a/subgraph/generated/templates/MACI/MACI.ts b/subgraph/generated/templates/MACI/MACI.ts index 34c923d6f..b1b8238e1 100644 --- a/subgraph/generated/templates/MACI/MACI.ts +++ b/subgraph/generated/templates/MACI/MACI.ts @@ -7,52 +7,78 @@ import { Entity, Bytes, Address, - BigInt + BigInt, } from "@graphprotocol/graph-ts"; -export class PublishMessage extends ethereum.Event { - get params(): PublishMessage__Params { - return new PublishMessage__Params(this); +export class DeployPoll extends ethereum.Event { + get params(): DeployPoll__Params { + return new DeployPoll__Params(this); } } -export class PublishMessage__Params { - _event: PublishMessage; +export class DeployPoll__Params { + _event: DeployPoll; - constructor(event: PublishMessage) { + constructor(event: DeployPoll) { this._event = event; } - get _message(): PublishMessage_messageStruct { - return changetype( - this._event.parameters[0].value.toTuple() - ); + get _pollId(): BigInt { + return this._event.parameters[0].value.toBigInt(); + } + + get _coordinatorPubKeyX(): BigInt { + return this._event.parameters[1].value.toBigInt(); } - get _encPubKey(): PublishMessage_encPubKeyStruct { - return changetype( - this._event.parameters[1].value.toTuple() + get _coordinatorPubKeyY(): BigInt { + return this._event.parameters[2].value.toBigInt(); + } + + get pollAddr(): DeployPollPollAddrStruct { + return changetype( + this._event.parameters[3].value.toTuple(), ); } } -export class PublishMessage_messageStruct extends ethereum.Tuple { - get iv(): BigInt { - return this[0].toBigInt(); +export class DeployPollPollAddrStruct extends ethereum.Tuple { + get poll(): Address { + return this[0].toAddress(); } - get data(): Array { - return this[1].toBigIntArray(); + get messageProcessor(): Address { + return this[1].toAddress(); + } + + get tally(): Address { + return this[2].toAddress(); + } + + get subsidy(): Address { + return this[3].toAddress(); } } -export class PublishMessage_encPubKeyStruct extends ethereum.Tuple { - get x(): BigInt { - return this[0].toBigInt(); +export class OwnershipTransferred extends ethereum.Event { + get params(): OwnershipTransferred__Params { + return new OwnershipTransferred__Params(this); } +} - get y(): BigInt { - return this[1].toBigInt(); +export class OwnershipTransferred__Params { + _event: OwnershipTransferred; + + constructor(event: OwnershipTransferred) { + this._event = event; + } + + get previousOwner(): Address { + return this._event.parameters[0].value.toAddress(); + } + + get newOwner(): Address { + return this._event.parameters[1].value.toAddress(); } } @@ -69,57 +95,64 @@ export class SignUp__Params { this._event = event; } - get _userPubKey(): SignUp_userPubKeyStruct { - return changetype( - this._event.parameters[0].value.toTuple() - ); + get _stateIndex(): BigInt { + return this._event.parameters[0].value.toBigInt(); } - get _stateIndex(): BigInt { + get _userPubKeyX(): BigInt { return this._event.parameters[1].value.toBigInt(); } - get _voiceCreditBalance(): BigInt { + get _userPubKeyY(): BigInt { return this._event.parameters[2].value.toBigInt(); } -} -export class SignUp_userPubKeyStruct extends ethereum.Tuple { - get x(): BigInt { - return this[0].toBigInt(); + get _voiceCreditBalance(): BigInt { + return this._event.parameters[3].value.toBigInt(); } - get y(): BigInt { - return this[1].toBigInt(); + get _timestamp(): BigInt { + return this._event.parameters[4].value.toBigInt(); } } -export class MACI__coordinatorPubKeyResult { - value0: BigInt; - value1: BigInt; +export class MACI__deployPollResultPollAddrStruct extends ethereum.Tuple { + get poll(): Address { + return this[0].toAddress(); + } - constructor(value0: BigInt, value1: BigInt) { - this.value0 = value0; - this.value1 = value1; + get messageProcessor(): Address { + return this[1].toAddress(); } - toMap(): TypedMap { - let map = new TypedMap(); - map.set("value0", ethereum.Value.fromUnsignedBigInt(this.value0)); - map.set("value1", ethereum.Value.fromUnsignedBigInt(this.value1)); - return map; + get tally(): Address { + return this[2].toAddress(); } - getX(): BigInt { - return this.value0; + get subsidy(): Address { + return this[3].toAddress(); } +} - getY(): BigInt { - return this.value1; +export class MACI__deployPollInput_treeDepthsStruct extends ethereum.Tuple { + get intStateTreeDepth(): i32 { + return this[0].toI32(); + } + + get messageTreeSubDepth(): i32 { + return this[1].toI32(); + } + + get messageTreeDepth(): i32 { + return this[2].toI32(); + } + + get voteOptionTreeDepth(): i32 { + return this[3].toI32(); } } -export class MACI__genBatchUstPublicSignalsInput_ecdhPubKeysStruct extends ethereum.Tuple { +export class MACI__deployPollInput_coordinatorPubKeyStruct extends ethereum.Tuple { get x(): BigInt { return this[0].toBigInt(); } @@ -129,8 +162,8 @@ export class MACI__genBatchUstPublicSignalsInput_ecdhPubKeysStruct extends ether } } -export class MACI__hashMessageInput_messageStruct extends ethereum.Tuple { - get iv(): BigInt { +export class MACI__hashMessageAndEncPubKeyInput_messageStruct extends ethereum.Tuple { + get msgType(): BigInt { return this[0].toBigInt(); } @@ -139,27 +172,53 @@ export class MACI__hashMessageInput_messageStruct extends ethereum.Tuple { } } +export class MACI__hashMessageAndEncPubKeyInput_encPubKeyStruct extends ethereum.Tuple { + get x(): BigInt { + return this[0].toBigInt(); + } + + get y(): BigInt { + return this[1].toBigInt(); + } +} + export class MACI__hashStateLeafInput_stateLeafStruct extends ethereum.Tuple { get pubKey(): MACI__hashStateLeafInput_stateLeafPubKeyStruct { return changetype( - this[0].toTuple() + this[0].toTuple(), ); } - get voteOptionTreeRoot(): BigInt { + get voiceCreditBalance(): BigInt { return this[1].toBigInt(); } - get voiceCreditBalance(): BigInt { + get timestamp(): BigInt { return this[2].toBigInt(); } +} - get nonce(): BigInt { - return this[3].toBigInt(); +export class MACI__hashStateLeafInput_stateLeafPubKeyStruct extends ethereum.Tuple { + get x(): BigInt { + return this[0].toBigInt(); + } + + get y(): BigInt { + return this[1].toBigInt(); } } -export class MACI__hashStateLeafInput_stateLeafPubKeyStruct extends ethereum.Tuple { +export class MACI__padAndHashMessageResultMessageStruct extends ethereum.Tuple { + get msgType(): BigInt { + return this[0].toBigInt(); + } + + get data(): Array { + return this[1].toBigIntArray(); + } +} + +export class MACI__padAndHashMessageResultPadKeyStruct extends ethereum.Tuple { get x(): BigInt { return this[0].toBigInt(); } @@ -169,12 +228,16 @@ export class MACI__hashStateLeafInput_stateLeafPubKeyStruct extends ethereum.Tup } } -export class MACI__treeDepthsResult { - value0: i32; - value1: i32; - value2: i32; +export class MACI__padAndHashMessageResult { + value0: MACI__padAndHashMessageResultMessageStruct; + value1: MACI__padAndHashMessageResultPadKeyStruct; + value2: BigInt; - constructor(value0: i32, value1: i32, value2: i32) { + constructor( + value0: MACI__padAndHashMessageResultMessageStruct, + value1: MACI__padAndHashMessageResultPadKeyStruct, + value2: BigInt, + ) { this.value0 = value0; this.value1 = value1; this.value2 = value2; @@ -182,30 +245,21 @@ export class MACI__treeDepthsResult { toMap(): TypedMap { let map = new TypedMap(); - map.set( - "value0", - ethereum.Value.fromUnsignedBigInt(BigInt.fromI32(this.value0)) - ); - map.set( - "value1", - ethereum.Value.fromUnsignedBigInt(BigInt.fromI32(this.value1)) - ); - map.set( - "value2", - ethereum.Value.fromUnsignedBigInt(BigInt.fromI32(this.value2)) - ); + map.set("value0", ethereum.Value.fromTuple(this.value0)); + map.set("value1", ethereum.Value.fromTuple(this.value1)); + map.set("value2", ethereum.Value.fromUnsignedBigInt(this.value2)); return map; } - getStateTreeDepth(): i32 { + getMessage(): MACI__padAndHashMessageResultMessageStruct { return this.value0; } - getMessageTreeDepth(): i32 { + getPadKey(): MACI__padAndHashMessageResultPadKeyStruct { return this.value1; } - getVoteOptionTreeDepth(): i32 { + getMsgHash(): BigInt { return this.value2; } } @@ -215,323 +269,114 @@ export class MACI extends ethereum.SmartContract { return new MACI("MACI", address); } - calcEmptyVoteOptionTreeRoot(_levels: i32): BigInt { - let result = super.call( - "calcEmptyVoteOptionTreeRoot", - "calcEmptyVoteOptionTreeRoot(uint8):(uint256)", - [ethereum.Value.fromUnsignedBigInt(BigInt.fromI32(_levels))] - ); - - return result[0].toBigInt(); - } - - try_calcEmptyVoteOptionTreeRoot(_levels: i32): ethereum.CallResult { - let result = super.tryCall( - "calcEmptyVoteOptionTreeRoot", - "calcEmptyVoteOptionTreeRoot(uint8):(uint256)", - [ethereum.Value.fromUnsignedBigInt(BigInt.fromI32(_levels))] - ); - if (result.reverted) { - return new ethereum.CallResult(); - } - let value = result.value; - return ethereum.CallResult.fromValue(value[0].toBigInt()); - } - - calcSignUpDeadline(): BigInt { - let result = super.call( - "calcSignUpDeadline", - "calcSignUpDeadline():(uint256)", - [] - ); - - return result[0].toBigInt(); - } - - try_calcSignUpDeadline(): ethereum.CallResult { - let result = super.tryCall( - "calcSignUpDeadline", - "calcSignUpDeadline():(uint256)", - [] - ); - if (result.reverted) { - return new ethereum.CallResult(); - } - let value = result.value; - return ethereum.CallResult.fromValue(value[0].toBigInt()); - } - - calcVotingDeadline(): BigInt { + MESSAGE_DATA_LENGTH(): i32 { let result = super.call( - "calcVotingDeadline", - "calcVotingDeadline():(uint256)", - [] + "MESSAGE_DATA_LENGTH", + "MESSAGE_DATA_LENGTH():(uint8)", + [], ); - return result[0].toBigInt(); + return result[0].toI32(); } - try_calcVotingDeadline(): ethereum.CallResult { + try_MESSAGE_DATA_LENGTH(): ethereum.CallResult { let result = super.tryCall( - "calcVotingDeadline", - "calcVotingDeadline():(uint256)", - [] + "MESSAGE_DATA_LENGTH", + "MESSAGE_DATA_LENGTH():(uint8)", + [], ); if (result.reverted) { return new ethereum.CallResult(); } let value = result.value; - return ethereum.CallResult.fromValue(value[0].toBigInt()); + return ethereum.CallResult.fromValue(value[0].toI32()); } - computeEmptyQuinRoot(_treeLevels: i32, _zeroValue: BigInt): BigInt { + deployPoll( + _duration: BigInt, + _treeDepths: MACI__deployPollInput_treeDepthsStruct, + _coordinatorPubKey: MACI__deployPollInput_coordinatorPubKeyStruct, + _verifier: Address, + _vkRegistry: Address, + useSubsidy: boolean, + ): MACI__deployPollResultPollAddrStruct { let result = super.call( - "computeEmptyQuinRoot", - "computeEmptyQuinRoot(uint8,uint256):(uint256)", + "deployPoll", + "deployPoll(uint256,(uint8,uint8,uint8,uint8),(uint256,uint256),address,address,bool):((address,address,address,address))", [ - ethereum.Value.fromUnsignedBigInt(BigInt.fromI32(_treeLevels)), - ethereum.Value.fromUnsignedBigInt(_zeroValue) - ] + ethereum.Value.fromUnsignedBigInt(_duration), + ethereum.Value.fromTuple(_treeDepths), + ethereum.Value.fromTuple(_coordinatorPubKey), + ethereum.Value.fromAddress(_verifier), + ethereum.Value.fromAddress(_vkRegistry), + ethereum.Value.fromBoolean(useSubsidy), + ], ); - return result[0].toBigInt(); - } - - try_computeEmptyQuinRoot( - _treeLevels: i32, - _zeroValue: BigInt - ): ethereum.CallResult { - let result = super.tryCall( - "computeEmptyQuinRoot", - "computeEmptyQuinRoot(uint8,uint256):(uint256)", - [ - ethereum.Value.fromUnsignedBigInt(BigInt.fromI32(_treeLevels)), - ethereum.Value.fromUnsignedBigInt(_zeroValue) - ] + return changetype( + result[0].toTuple(), ); - if (result.reverted) { - return new ethereum.CallResult(); - } - let value = result.value; - return ethereum.CallResult.fromValue(value[0].toBigInt()); } - computeEmptyRoot(_treeLevels: i32, _zeroValue: BigInt): BigInt { - let result = super.call( - "computeEmptyRoot", - "computeEmptyRoot(uint8,uint256):(uint256)", - [ - ethereum.Value.fromUnsignedBigInt(BigInt.fromI32(_treeLevels)), - ethereum.Value.fromUnsignedBigInt(_zeroValue) - ] - ); - - return result[0].toBigInt(); - } - - try_computeEmptyRoot( - _treeLevels: i32, - _zeroValue: BigInt - ): ethereum.CallResult { + try_deployPoll( + _duration: BigInt, + _treeDepths: MACI__deployPollInput_treeDepthsStruct, + _coordinatorPubKey: MACI__deployPollInput_coordinatorPubKeyStruct, + _verifier: Address, + _vkRegistry: Address, + useSubsidy: boolean, + ): ethereum.CallResult { let result = super.tryCall( - "computeEmptyRoot", - "computeEmptyRoot(uint8,uint256):(uint256)", + "deployPoll", + "deployPoll(uint256,(uint8,uint8,uint8,uint8),(uint256,uint256),address,address,bool):((address,address,address,address))", [ - ethereum.Value.fromUnsignedBigInt(BigInt.fromI32(_treeLevels)), - ethereum.Value.fromUnsignedBigInt(_zeroValue) - ] - ); - if (result.reverted) { - return new ethereum.CallResult(); - } - let value = result.value; - return ethereum.CallResult.fromValue(value[0].toBigInt()); - } - - coordinatorAddress(): Address { - let result = super.call( - "coordinatorAddress", - "coordinatorAddress():(address)", - [] - ); - - return result[0].toAddress(); - } - - try_coordinatorAddress(): ethereum.CallResult
{ - let result = super.tryCall( - "coordinatorAddress", - "coordinatorAddress():(address)", - [] - ); - if (result.reverted) { - return new ethereum.CallResult(); - } - let value = result.value; - return ethereum.CallResult.fromValue(value[0].toAddress()); - } - - coordinatorPubKey(): MACI__coordinatorPubKeyResult { - let result = super.call( - "coordinatorPubKey", - "coordinatorPubKey():(uint256,uint256)", - [] - ); - - return new MACI__coordinatorPubKeyResult( - result[0].toBigInt(), - result[1].toBigInt() - ); - } - - try_coordinatorPubKey(): ethereum.CallResult { - let result = super.tryCall( - "coordinatorPubKey", - "coordinatorPubKey():(uint256,uint256)", - [] + ethereum.Value.fromUnsignedBigInt(_duration), + ethereum.Value.fromTuple(_treeDepths), + ethereum.Value.fromTuple(_coordinatorPubKey), + ethereum.Value.fromAddress(_verifier), + ethereum.Value.fromAddress(_vkRegistry), + ethereum.Value.fromBoolean(useSubsidy), + ], ); if (result.reverted) { return new ethereum.CallResult(); } let value = result.value; return ethereum.CallResult.fromValue( - new MACI__coordinatorPubKeyResult( - value[0].toBigInt(), - value[1].toBigInt() - ) - ); - } - - currentMessageBatchIndex(): BigInt { - let result = super.call( - "currentMessageBatchIndex", - "currentMessageBatchIndex():(uint256)", - [] - ); - - return result[0].toBigInt(); - } - - try_currentMessageBatchIndex(): ethereum.CallResult { - let result = super.tryCall( - "currentMessageBatchIndex", - "currentMessageBatchIndex():(uint256)", - [] - ); - if (result.reverted) { - return new ethereum.CallResult(); - } - let value = result.value; - return ethereum.CallResult.fromValue(value[0].toBigInt()); - } - - currentPerVOSpentVoiceCreditsCommitment(): BigInt { - let result = super.call( - "currentPerVOSpentVoiceCreditsCommitment", - "currentPerVOSpentVoiceCreditsCommitment():(uint256)", - [] + changetype(value[0].toTuple()), ); - - return result[0].toBigInt(); - } - - try_currentPerVOSpentVoiceCreditsCommitment(): ethereum.CallResult { - let result = super.tryCall( - "currentPerVOSpentVoiceCreditsCommitment", - "currentPerVOSpentVoiceCreditsCommitment():(uint256)", - [] - ); - if (result.reverted) { - return new ethereum.CallResult(); - } - let value = result.value; - return ethereum.CallResult.fromValue(value[0].toBigInt()); } - currentQvtBatchNum(): BigInt { - let result = super.call( - "currentQvtBatchNum", - "currentQvtBatchNum():(uint256)", - [] - ); - - return result[0].toBigInt(); - } - - try_currentQvtBatchNum(): ethereum.CallResult { - let result = super.tryCall( - "currentQvtBatchNum", - "currentQvtBatchNum():(uint256)", - [] - ); - if (result.reverted) { - return new ethereum.CallResult(); - } - let value = result.value; - return ethereum.CallResult.fromValue(value[0].toBigInt()); - } - - currentResultsCommitment(): BigInt { - let result = super.call( - "currentResultsCommitment", - "currentResultsCommitment():(uint256)", - [] - ); - - return result[0].toBigInt(); - } - - try_currentResultsCommitment(): ethereum.CallResult { - let result = super.tryCall( - "currentResultsCommitment", - "currentResultsCommitment():(uint256)", - [] - ); - if (result.reverted) { - return new ethereum.CallResult(); - } - let value = result.value; - return ethereum.CallResult.fromValue(value[0].toBigInt()); - } - - currentSpentVoiceCreditsCommitment(): BigInt { - let result = super.call( - "currentSpentVoiceCreditsCommitment", - "currentSpentVoiceCreditsCommitment():(uint256)", - [] - ); + getPoll(_pollId: BigInt): Address { + let result = super.call("getPoll", "getPoll(uint256):(address)", [ + ethereum.Value.fromUnsignedBigInt(_pollId), + ]); - return result[0].toBigInt(); + return result[0].toAddress(); } - try_currentSpentVoiceCreditsCommitment(): ethereum.CallResult { - let result = super.tryCall( - "currentSpentVoiceCreditsCommitment", - "currentSpentVoiceCreditsCommitment():(uint256)", - [] - ); + try_getPoll(_pollId: BigInt): ethereum.CallResult
{ + let result = super.tryCall("getPoll", "getPoll(uint256):(address)", [ + ethereum.Value.fromUnsignedBigInt(_pollId), + ]); if (result.reverted) { return new ethereum.CallResult(); } let value = result.value; - return ethereum.CallResult.fromValue(value[0].toBigInt()); + return ethereum.CallResult.fromValue(value[0].toAddress()); } - emptyVoteOptionTreeRoot(): BigInt { - let result = super.call( - "emptyVoteOptionTreeRoot", - "emptyVoteOptionTreeRoot():(uint256)", - [] - ); + getStateAqRoot(): BigInt { + let result = super.call("getStateAqRoot", "getStateAqRoot():(uint256)", []); return result[0].toBigInt(); } - try_emptyVoteOptionTreeRoot(): ethereum.CallResult { + try_getStateAqRoot(): ethereum.CallResult { let result = super.tryCall( - "emptyVoteOptionTreeRoot", - "emptyVoteOptionTreeRoot():(uint256)", - [] + "getStateAqRoot", + "getStateAqRoot():(uint256)", + [], ); if (result.reverted) { return new ethereum.CallResult(); @@ -540,104 +385,18 @@ export class MACI extends ethereum.SmartContract { return ethereum.CallResult.fromValue(value[0].toBigInt()); } - genBatchUstPublicSignals( - _newStateRoot: BigInt, - _ecdhPubKeys: Array - ): Array { - let result = super.call( - "genBatchUstPublicSignals", - "genBatchUstPublicSignals(uint256,(uint256,uint256)[]):(uint256[])", - [ - ethereum.Value.fromUnsignedBigInt(_newStateRoot), - ethereum.Value.fromTupleArray(_ecdhPubKeys) - ] - ); - - return result[0].toBigIntArray(); - } - - try_genBatchUstPublicSignals( - _newStateRoot: BigInt, - _ecdhPubKeys: Array - ): ethereum.CallResult> { - let result = super.tryCall( - "genBatchUstPublicSignals", - "genBatchUstPublicSignals(uint256,(uint256,uint256)[]):(uint256[])", - [ - ethereum.Value.fromUnsignedBigInt(_newStateRoot), - ethereum.Value.fromTupleArray(_ecdhPubKeys) - ] - ); - if (result.reverted) { - return new ethereum.CallResult(); - } - let value = result.value; - return ethereum.CallResult.fromValue(value[0].toBigIntArray()); - } - - genQvtPublicSignals( - _intermediateStateRoot: BigInt, - _newResultsCommitment: BigInt, - _newSpentVoiceCreditsCommitment: BigInt, - _newPerVOSpentVoiceCreditsCommitment: BigInt, - _totalVotes: BigInt - ): Array { - let result = super.call( - "genQvtPublicSignals", - "genQvtPublicSignals(uint256,uint256,uint256,uint256,uint256):(uint256[])", - [ - ethereum.Value.fromUnsignedBigInt(_intermediateStateRoot), - ethereum.Value.fromUnsignedBigInt(_newResultsCommitment), - ethereum.Value.fromUnsignedBigInt(_newSpentVoiceCreditsCommitment), - ethereum.Value.fromUnsignedBigInt(_newPerVOSpentVoiceCreditsCommitment), - ethereum.Value.fromUnsignedBigInt(_totalVotes) - ] - ); - - return result[0].toBigIntArray(); - } - - try_genQvtPublicSignals( - _intermediateStateRoot: BigInt, - _newResultsCommitment: BigInt, - _newSpentVoiceCreditsCommitment: BigInt, - _newPerVOSpentVoiceCreditsCommitment: BigInt, - _totalVotes: BigInt - ): ethereum.CallResult> { - let result = super.tryCall( - "genQvtPublicSignals", - "genQvtPublicSignals(uint256,uint256,uint256,uint256,uint256):(uint256[])", - [ - ethereum.Value.fromUnsignedBigInt(_intermediateStateRoot), - ethereum.Value.fromUnsignedBigInt(_newResultsCommitment), - ethereum.Value.fromUnsignedBigInt(_newSpentVoiceCreditsCommitment), - ethereum.Value.fromUnsignedBigInt(_newPerVOSpentVoiceCreditsCommitment), - ethereum.Value.fromUnsignedBigInt(_totalVotes) - ] - ); - if (result.reverted) { - return new ethereum.CallResult(); - } - let value = result.value; - return ethereum.CallResult.fromValue(value[0].toBigIntArray()); - } - - getMessageTreeRoot(): BigInt { - let result = super.call( - "getMessageTreeRoot", - "getMessageTreeRoot():(uint256)", - [] - ); + hash2(array: Array): BigInt { + let result = super.call("hash2", "hash2(uint256[2]):(uint256)", [ + ethereum.Value.fromUnsignedBigIntArray(array), + ]); return result[0].toBigInt(); } - try_getMessageTreeRoot(): ethereum.CallResult { - let result = super.tryCall( - "getMessageTreeRoot", - "getMessageTreeRoot():(uint256)", - [] - ); + try_hash2(array: Array): ethereum.CallResult { + let result = super.tryCall("hash2", "hash2(uint256[2]):(uint256)", [ + ethereum.Value.fromUnsignedBigIntArray(array), + ]); if (result.reverted) { return new ethereum.CallResult(); } @@ -645,22 +404,18 @@ export class MACI extends ethereum.SmartContract { return ethereum.CallResult.fromValue(value[0].toBigInt()); } - getStateTreeRoot(): BigInt { - let result = super.call( - "getStateTreeRoot", - "getStateTreeRoot():(uint256)", - [] - ); + hash3(array: Array): BigInt { + let result = super.call("hash3", "hash3(uint256[3]):(uint256)", [ + ethereum.Value.fromUnsignedBigIntArray(array), + ]); return result[0].toBigInt(); } - try_getStateTreeRoot(): ethereum.CallResult { - let result = super.tryCall( - "getStateTreeRoot", - "getStateTreeRoot():(uint256)", - [] - ); + try_hash3(array: Array): ethereum.CallResult { + let result = super.tryCall("hash3", "hash3(uint256[3]):(uint256)", [ + ethereum.Value.fromUnsignedBigIntArray(array), + ]); if (result.reverted) { return new ethereum.CallResult(); } @@ -668,63 +423,17 @@ export class MACI extends ethereum.SmartContract { return ethereum.CallResult.fromValue(value[0].toBigInt()); } - hasUnprocessedMessages(): boolean { - let result = super.call( - "hasUnprocessedMessages", - "hasUnprocessedMessages():(bool)", - [] - ); - - return result[0].toBoolean(); - } - - try_hasUnprocessedMessages(): ethereum.CallResult { - let result = super.tryCall( - "hasUnprocessedMessages", - "hasUnprocessedMessages():(bool)", - [] - ); - if (result.reverted) { - return new ethereum.CallResult(); - } - let value = result.value; - return ethereum.CallResult.fromValue(value[0].toBoolean()); - } - - hasUntalliedStateLeaves(): boolean { - let result = super.call( - "hasUntalliedStateLeaves", - "hasUntalliedStateLeaves():(bool)", - [] - ); - - return result[0].toBoolean(); - } - - try_hasUntalliedStateLeaves(): ethereum.CallResult { - let result = super.tryCall( - "hasUntalliedStateLeaves", - "hasUntalliedStateLeaves():(bool)", - [] - ); - if (result.reverted) { - return new ethereum.CallResult(); - } - let value = result.value; - return ethereum.CallResult.fromValue(value[0].toBoolean()); - } - - hash11(array: Array): BigInt { - let result = super.call("hash11", "hash11(uint256[]):(uint256)", [ - ethereum.Value.fromUnsignedBigIntArray(array) + hash4(array: Array): BigInt { + let result = super.call("hash4", "hash4(uint256[4]):(uint256)", [ + ethereum.Value.fromUnsignedBigIntArray(array), ]); return result[0].toBigInt(); } - try_hash11(array: Array): ethereum.CallResult { - let result = super.tryCall("hash11", "hash11(uint256[]):(uint256)", [ - ethereum.Value.fromUnsignedBigIntArray(array) + try_hash4(array: Array): ethereum.CallResult { + let result = super.tryCall("hash4", "hash4(uint256[4]):(uint256)", [ + ethereum.Value.fromUnsignedBigIntArray(array), ]); if (result.reverted) { return new ethereum.CallResult(); @@ -735,7 +444,7 @@ export class MACI extends ethereum.SmartContract { hash5(array: Array): BigInt { let result = super.call("hash5", "hash5(uint256[5]):(uint256)", [ - ethereum.Value.fromUnsignedBigIntArray(array) + ethereum.Value.fromUnsignedBigIntArray(array), ]); return result[0].toBigInt(); @@ -743,7 +452,7 @@ export class MACI extends ethereum.SmartContract { try_hash5(array: Array): ethereum.CallResult { let result = super.tryCall("hash5", "hash5(uint256[5]):(uint256)", [ - ethereum.Value.fromUnsignedBigIntArray(array) + ethereum.Value.fromUnsignedBigIntArray(array), ]); if (result.reverted) { return new ethereum.CallResult(); @@ -752,55 +461,27 @@ export class MACI extends ethereum.SmartContract { return ethereum.CallResult.fromValue(value[0].toBigInt()); } - hashLeftRight(_left: BigInt, _right: BigInt): BigInt { + hashLeftRight(left: BigInt, right: BigInt): BigInt { let result = super.call( "hashLeftRight", "hashLeftRight(uint256,uint256):(uint256)", [ - ethereum.Value.fromUnsignedBigInt(_left), - ethereum.Value.fromUnsignedBigInt(_right) - ] + ethereum.Value.fromUnsignedBigInt(left), + ethereum.Value.fromUnsignedBigInt(right), + ], ); return result[0].toBigInt(); } - try_hashLeftRight( - _left: BigInt, - _right: BigInt - ): ethereum.CallResult { - let result = super.tryCall( - "hashLeftRight", - "hashLeftRight(uint256,uint256):(uint256)", - [ - ethereum.Value.fromUnsignedBigInt(_left), - ethereum.Value.fromUnsignedBigInt(_right) - ] - ); - if (result.reverted) { - return new ethereum.CallResult(); - } - let value = result.value; - return ethereum.CallResult.fromValue(value[0].toBigInt()); - } - - hashMessage(_message: MACI__hashMessageInput_messageStruct): BigInt { - let result = super.call( - "hashMessage", - "hashMessage((uint256,uint256[10])):(uint256)", - [ethereum.Value.fromTuple(_message)] - ); - - return result[0].toBigInt(); - } - - try_hashMessage( - _message: MACI__hashMessageInput_messageStruct - ): ethereum.CallResult { + try_hashLeftRight(left: BigInt, right: BigInt): ethereum.CallResult { let result = super.tryCall( - "hashMessage", - "hashMessage((uint256,uint256[10])):(uint256)", - [ethereum.Value.fromTuple(_message)] + "hashLeftRight", + "hashLeftRight(uint256,uint256):(uint256)", + [ + ethereum.Value.fromUnsignedBigInt(left), + ethereum.Value.fromUnsignedBigInt(right), + ], ); if (result.reverted) { return new ethereum.CallResult(); @@ -809,23 +490,33 @@ export class MACI extends ethereum.SmartContract { return ethereum.CallResult.fromValue(value[0].toBigInt()); } - hashStateLeaf(_stateLeaf: MACI__hashStateLeafInput_stateLeafStruct): BigInt { + hashMessageAndEncPubKey( + _message: MACI__hashMessageAndEncPubKeyInput_messageStruct, + _encPubKey: MACI__hashMessageAndEncPubKeyInput_encPubKeyStruct, + ): BigInt { let result = super.call( - "hashStateLeaf", - "hashStateLeaf(((uint256,uint256),uint256,uint256,uint256)):(uint256)", - [ethereum.Value.fromTuple(_stateLeaf)] + "hashMessageAndEncPubKey", + "hashMessageAndEncPubKey((uint256,uint256[10]),(uint256,uint256)):(uint256)", + [ + ethereum.Value.fromTuple(_message), + ethereum.Value.fromTuple(_encPubKey), + ], ); return result[0].toBigInt(); } - try_hashStateLeaf( - _stateLeaf: MACI__hashStateLeafInput_stateLeafStruct + try_hashMessageAndEncPubKey( + _message: MACI__hashMessageAndEncPubKeyInput_messageStruct, + _encPubKey: MACI__hashMessageAndEncPubKeyInput_encPubKeyStruct, ): ethereum.CallResult { let result = super.tryCall( - "hashStateLeaf", - "hashStateLeaf(((uint256,uint256),uint256,uint256,uint256)):(uint256)", - [ethereum.Value.fromTuple(_stateLeaf)] + "hashMessageAndEncPubKey", + "hashMessageAndEncPubKey((uint256,uint256[10]),(uint256,uint256)):(uint256)", + [ + ethereum.Value.fromTuple(_message), + ethereum.Value.fromTuple(_encPubKey), + ], ); if (result.reverted) { return new ethereum.CallResult(); @@ -834,21 +525,23 @@ export class MACI extends ethereum.SmartContract { return ethereum.CallResult.fromValue(value[0].toBigInt()); } - hashedBlankStateLeaf(): BigInt { + hashStateLeaf(_stateLeaf: MACI__hashStateLeafInput_stateLeafStruct): BigInt { let result = super.call( - "hashedBlankStateLeaf", - "hashedBlankStateLeaf():(uint256)", - [] + "hashStateLeaf", + "hashStateLeaf(((uint256,uint256),uint256,uint256)):(uint256)", + [ethereum.Value.fromTuple(_stateLeaf)], ); return result[0].toBigInt(); } - try_hashedBlankStateLeaf(): ethereum.CallResult { + try_hashStateLeaf( + _stateLeaf: MACI__hashStateLeafInput_stateLeafStruct, + ): ethereum.CallResult { let result = super.tryCall( - "hashedBlankStateLeaf", - "hashedBlankStateLeaf():(uint256)", - [] + "hashStateLeaf", + "hashStateLeaf(((uint256,uint256),uint256,uint256)):(uint256)", + [ethereum.Value.fromTuple(_stateLeaf)], ); if (result.reverted) { return new ethereum.CallResult(); @@ -861,7 +554,7 @@ export class MACI extends ethereum.SmartContract { let result = super.call( "initialVoiceCreditProxy", "initialVoiceCreditProxy():(address)", - [] + [], ); return result[0].toAddress(); @@ -871,7 +564,7 @@ export class MACI extends ethereum.SmartContract { let result = super.tryCall( "initialVoiceCreditProxy", "initialVoiceCreditProxy():(address)", - [] + [], ); if (result.reverted) { return new ethereum.CallResult(); @@ -880,105 +573,58 @@ export class MACI extends ethereum.SmartContract { return ethereum.CallResult.fromValue(value[0].toAddress()); } - maxMessages(): BigInt { - let result = super.call("maxMessages", "maxMessages():(uint256)", []); - - return result[0].toBigInt(); - } - - try_maxMessages(): ethereum.CallResult { - let result = super.tryCall("maxMessages", "maxMessages():(uint256)", []); - if (result.reverted) { - return new ethereum.CallResult(); - } - let value = result.value; - return ethereum.CallResult.fromValue(value[0].toBigInt()); - } - - maxUsers(): BigInt { - let result = super.call("maxUsers", "maxUsers():(uint256)", []); + mergeStateAq(_pollId: BigInt): BigInt { + let result = super.call("mergeStateAq", "mergeStateAq(uint256):(uint256)", [ + ethereum.Value.fromUnsignedBigInt(_pollId), + ]); return result[0].toBigInt(); } - try_maxUsers(): ethereum.CallResult { - let result = super.tryCall("maxUsers", "maxUsers():(uint256)", []); - if (result.reverted) { - return new ethereum.CallResult(); - } - let value = result.value; - return ethereum.CallResult.fromValue(value[0].toBigInt()); - } - - messageBatchSize(): i32 { - let result = super.call( - "messageBatchSize", - "messageBatchSize():(uint8)", - [] - ); - - return result[0].toI32(); - } - - try_messageBatchSize(): ethereum.CallResult { + try_mergeStateAq(_pollId: BigInt): ethereum.CallResult { let result = super.tryCall( - "messageBatchSize", - "messageBatchSize():(uint8)", - [] + "mergeStateAq", + "mergeStateAq(uint256):(uint256)", + [ethereum.Value.fromUnsignedBigInt(_pollId)], ); if (result.reverted) { return new ethereum.CallResult(); } let value = result.value; - return ethereum.CallResult.fromValue(value[0].toI32()); - } - - messageTree(): Address { - let result = super.call("messageTree", "messageTree():(address)", []); - - return result[0].toAddress(); - } - - try_messageTree(): ethereum.CallResult
{ - let result = super.tryCall("messageTree", "messageTree():(address)", []); - if (result.reverted) { - return new ethereum.CallResult(); - } - let value = result.value; - return ethereum.CallResult.fromValue(value[0].toAddress()); + return ethereum.CallResult.fromValue(value[0].toBigInt()); } - messageTreeMaxLeafIndex(): BigInt { + messageProcessorFactory(): Address { let result = super.call( - "messageTreeMaxLeafIndex", - "messageTreeMaxLeafIndex():(uint256)", - [] + "messageProcessorFactory", + "messageProcessorFactory():(address)", + [], ); - return result[0].toBigInt(); + return result[0].toAddress(); } - try_messageTreeMaxLeafIndex(): ethereum.CallResult { + try_messageProcessorFactory(): ethereum.CallResult
{ let result = super.tryCall( - "messageTreeMaxLeafIndex", - "messageTreeMaxLeafIndex():(uint256)", - [] + "messageProcessorFactory", + "messageProcessorFactory():(address)", + [], ); if (result.reverted) { return new ethereum.CallResult(); } let value = result.value; - return ethereum.CallResult.fromValue(value[0].toBigInt()); + return ethereum.CallResult.fromValue(value[0].toAddress()); } - numMessages(): BigInt { - let result = super.call("numMessages", "numMessages():(uint256)", []); + nextPollId(): BigInt { + let result = super.call("nextPollId", "nextPollId():(uint256)", []); return result[0].toBigInt(); } - try_numMessages(): ethereum.CallResult { - let result = super.tryCall("numMessages", "numMessages():(uint256)", []); + try_nextPollId(): ethereum.CallResult { + let result = super.tryCall("nextPollId", "nextPollId():(uint256)", []); if (result.reverted) { return new ethereum.CallResult(); } @@ -1001,91 +647,105 @@ export class MACI extends ethereum.SmartContract { return ethereum.CallResult.fromValue(value[0].toBigInt()); } - originalCurrentResultsCommitment(): BigInt { - let result = super.call( - "originalCurrentResultsCommitment", - "originalCurrentResultsCommitment():(uint256)", - [] - ); + owner(): Address { + let result = super.call("owner", "owner():(address)", []); - return result[0].toBigInt(); + return result[0].toAddress(); } - try_originalCurrentResultsCommitment(): ethereum.CallResult { - let result = super.tryCall( - "originalCurrentResultsCommitment", - "originalCurrentResultsCommitment():(uint256)", - [] - ); + try_owner(): ethereum.CallResult
{ + let result = super.tryCall("owner", "owner():(address)", []); if (result.reverted) { return new ethereum.CallResult(); } let value = result.value; - return ethereum.CallResult.fromValue(value[0].toBigInt()); + return ethereum.CallResult.fromValue(value[0].toAddress()); } - originalSpentVoiceCreditsCommitment(): BigInt { + padAndHashMessage( + dataToPad: Array, + msgType: BigInt, + ): MACI__padAndHashMessageResult { let result = super.call( - "originalSpentVoiceCreditsCommitment", - "originalSpentVoiceCreditsCommitment():(uint256)", - [] + "padAndHashMessage", + "padAndHashMessage(uint256[2],uint256):((uint256,uint256[10]),(uint256,uint256),uint256)", + [ + ethereum.Value.fromUnsignedBigIntArray(dataToPad), + ethereum.Value.fromUnsignedBigInt(msgType), + ], ); - return result[0].toBigInt(); + return changetype( + new MACI__padAndHashMessageResult( + changetype( + result[0].toTuple(), + ), + changetype( + result[1].toTuple(), + ), + result[2].toBigInt(), + ), + ); } - try_originalSpentVoiceCreditsCommitment(): ethereum.CallResult { + try_padAndHashMessage( + dataToPad: Array, + msgType: BigInt, + ): ethereum.CallResult { let result = super.tryCall( - "originalSpentVoiceCreditsCommitment", - "originalSpentVoiceCreditsCommitment():(uint256)", - [] + "padAndHashMessage", + "padAndHashMessage(uint256[2],uint256):((uint256,uint256[10]),(uint256,uint256),uint256)", + [ + ethereum.Value.fromUnsignedBigIntArray(dataToPad), + ethereum.Value.fromUnsignedBigInt(msgType), + ], ); if (result.reverted) { return new ethereum.CallResult(); } let value = result.value; - return ethereum.CallResult.fromValue(value[0].toBigInt()); + return ethereum.CallResult.fromValue( + changetype( + new MACI__padAndHashMessageResult( + changetype( + value[0].toTuple(), + ), + changetype( + value[1].toTuple(), + ), + value[2].toBigInt(), + ), + ), + ); } - signUpDurationSeconds(): BigInt { - let result = super.call( - "signUpDurationSeconds", - "signUpDurationSeconds():(uint256)", - [] - ); + pollFactory(): Address { + let result = super.call("pollFactory", "pollFactory():(address)", []); - return result[0].toBigInt(); + return result[0].toAddress(); } - try_signUpDurationSeconds(): ethereum.CallResult { - let result = super.tryCall( - "signUpDurationSeconds", - "signUpDurationSeconds():(uint256)", - [] - ); + try_pollFactory(): ethereum.CallResult
{ + let result = super.tryCall("pollFactory", "pollFactory():(address)", []); if (result.reverted) { return new ethereum.CallResult(); } let value = result.value; - return ethereum.CallResult.fromValue(value[0].toBigInt()); + return ethereum.CallResult.fromValue(value[0].toAddress()); } - signUpGatekeeper(): Address { - let result = super.call( - "signUpGatekeeper", - "signUpGatekeeper():(address)", - [] - ); + polls(param0: BigInt): Address { + let result = super.call("polls", "polls(uint256):(address)", [ + ethereum.Value.fromUnsignedBigInt(param0), + ]); return result[0].toAddress(); } - try_signUpGatekeeper(): ethereum.CallResult
{ - let result = super.tryCall( - "signUpGatekeeper", - "signUpGatekeeper():(address)", - [] - ); + try_polls(param0: BigInt): ethereum.CallResult
{ + let result = super.tryCall("polls", "polls(uint256):(address)", [ + ethereum.Value.fromUnsignedBigInt(param0), + ]); if (result.reverted) { return new ethereum.CallResult(); } @@ -1093,21 +753,19 @@ export class MACI extends ethereum.SmartContract { return ethereum.CallResult.fromValue(value[0].toAddress()); } - signUpTimestamp(): BigInt { - let result = super.call( - "signUpTimestamp", - "signUpTimestamp():(uint256)", - [] - ); + sha256Hash(array: Array): BigInt { + let result = super.call("sha256Hash", "sha256Hash(uint256[]):(uint256)", [ + ethereum.Value.fromUnsignedBigIntArray(array), + ]); return result[0].toBigInt(); } - try_signUpTimestamp(): ethereum.CallResult { + try_sha256Hash(array: Array): ethereum.CallResult { let result = super.tryCall( - "signUpTimestamp", - "signUpTimestamp():(uint256)", - [] + "sha256Hash", + "sha256Hash(uint256[]):(uint256)", + [ethereum.Value.fromUnsignedBigIntArray(array)], ); if (result.reverted) { return new ethereum.CallResult(); @@ -1116,52 +774,37 @@ export class MACI extends ethereum.SmartContract { return ethereum.CallResult.fromValue(value[0].toBigInt()); } - stateRoot(): BigInt { - let result = super.call("stateRoot", "stateRoot():(uint256)", []); - - return result[0].toBigInt(); - } - - try_stateRoot(): ethereum.CallResult { - let result = super.tryCall("stateRoot", "stateRoot():(uint256)", []); - if (result.reverted) { - return new ethereum.CallResult(); - } - let value = result.value; - return ethereum.CallResult.fromValue(value[0].toBigInt()); - } - - stateRootBeforeProcessing(): BigInt { + signUpGatekeeper(): Address { let result = super.call( - "stateRootBeforeProcessing", - "stateRootBeforeProcessing():(uint256)", - [] + "signUpGatekeeper", + "signUpGatekeeper():(address)", + [], ); - return result[0].toBigInt(); + return result[0].toAddress(); } - try_stateRootBeforeProcessing(): ethereum.CallResult { + try_signUpGatekeeper(): ethereum.CallResult
{ let result = super.tryCall( - "stateRootBeforeProcessing", - "stateRootBeforeProcessing():(uint256)", - [] + "signUpGatekeeper", + "signUpGatekeeper():(address)", + [], ); if (result.reverted) { return new ethereum.CallResult(); } let value = result.value; - return ethereum.CallResult.fromValue(value[0].toBigInt()); + return ethereum.CallResult.fromValue(value[0].toAddress()); } - stateTree(): Address { - let result = super.call("stateTree", "stateTree():(address)", []); + stateAq(): Address { + let result = super.call("stateAq", "stateAq():(address)", []); return result[0].toAddress(); } - try_stateTree(): ethereum.CallResult
{ - let result = super.tryCall("stateTree", "stateTree():(address)", []); + try_stateAq(): ethereum.CallResult
{ + let result = super.tryCall("stateAq", "stateAq():(address)", []); if (result.reverted) { return new ethereum.CallResult(); } @@ -1169,17 +812,17 @@ export class MACI extends ethereum.SmartContract { return ethereum.CallResult.fromValue(value[0].toAddress()); } - tallyBatchSize(): i32 { - let result = super.call("tallyBatchSize", "tallyBatchSize():(uint8)", []); + stateTreeDepth(): i32 { + let result = super.call("stateTreeDepth", "stateTreeDepth():(uint8)", []); return result[0].toI32(); } - try_tallyBatchSize(): ethereum.CallResult { + try_stateTreeDepth(): ethereum.CallResult { let result = super.tryCall( - "tallyBatchSize", - "tallyBatchSize():(uint8)", - [] + "stateTreeDepth", + "stateTreeDepth():(uint8)", + [], ); if (result.reverted) { return new ethereum.CallResult(); @@ -1188,79 +831,33 @@ export class MACI extends ethereum.SmartContract { return ethereum.CallResult.fromValue(value[0].toI32()); } - totalVotes(): BigInt { - let result = super.call("totalVotes", "totalVotes():(uint256)", []); - - return result[0].toBigInt(); - } - - try_totalVotes(): ethereum.CallResult { - let result = super.tryCall("totalVotes", "totalVotes():(uint256)", []); - if (result.reverted) { - return new ethereum.CallResult(); - } - let value = result.value; - return ethereum.CallResult.fromValue(value[0].toBigInt()); - } - - treeDepths(): MACI__treeDepthsResult { - let result = super.call( - "treeDepths", - "treeDepths():(uint8,uint8,uint8)", - [] - ); + subsidyFactory(): Address { + let result = super.call("subsidyFactory", "subsidyFactory():(address)", []); - return new MACI__treeDepthsResult( - result[0].toI32(), - result[1].toI32(), - result[2].toI32() - ); + return result[0].toAddress(); } - try_treeDepths(): ethereum.CallResult { + try_subsidyFactory(): ethereum.CallResult
{ let result = super.tryCall( - "treeDepths", - "treeDepths():(uint8,uint8,uint8)", - [] + "subsidyFactory", + "subsidyFactory():(address)", + [], ); if (result.reverted) { return new ethereum.CallResult(); } let value = result.value; - return ethereum.CallResult.fromValue( - new MACI__treeDepthsResult( - value[0].toI32(), - value[1].toI32(), - value[2].toI32() - ) - ); + return ethereum.CallResult.fromValue(value[0].toAddress()); } - verifySpentVoiceCredits(_spent: BigInt, _salt: BigInt): boolean { - let result = super.call( - "verifySpentVoiceCredits", - "verifySpentVoiceCredits(uint256,uint256):(bool)", - [ - ethereum.Value.fromUnsignedBigInt(_spent), - ethereum.Value.fromUnsignedBigInt(_salt) - ] - ); + subtreesMerged(): boolean { + let result = super.call("subtreesMerged", "subtreesMerged():(bool)", []); return result[0].toBoolean(); } - try_verifySpentVoiceCredits( - _spent: BigInt, - _salt: BigInt - ): ethereum.CallResult { - let result = super.tryCall( - "verifySpentVoiceCredits", - "verifySpentVoiceCredits(uint256,uint256):(bool)", - [ - ethereum.Value.fromUnsignedBigInt(_spent), - ethereum.Value.fromUnsignedBigInt(_salt) - ] - ); + try_subtreesMerged(): ethereum.CallResult { + let result = super.tryCall("subtreesMerged", "subtreesMerged():(bool)", []); if (result.reverted) { return new ethereum.CallResult(); } @@ -1268,50 +865,34 @@ export class MACI extends ethereum.SmartContract { return ethereum.CallResult.fromValue(value[0].toBoolean()); } - voteOptionsMaxLeafIndex(): BigInt { - let result = super.call( - "voteOptionsMaxLeafIndex", - "voteOptionsMaxLeafIndex():(uint256)", - [] - ); + tallyFactory(): Address { + let result = super.call("tallyFactory", "tallyFactory():(address)", []); - return result[0].toBigInt(); + return result[0].toAddress(); } - try_voteOptionsMaxLeafIndex(): ethereum.CallResult { - let result = super.tryCall( - "voteOptionsMaxLeafIndex", - "voteOptionsMaxLeafIndex():(uint256)", - [] - ); + try_tallyFactory(): ethereum.CallResult
{ + let result = super.tryCall("tallyFactory", "tallyFactory():(address)", []); if (result.reverted) { return new ethereum.CallResult(); } let value = result.value; - return ethereum.CallResult.fromValue(value[0].toBigInt()); + return ethereum.CallResult.fromValue(value[0].toAddress()); } - votingDurationSeconds(): BigInt { - let result = super.call( - "votingDurationSeconds", - "votingDurationSeconds():(uint256)", - [] - ); + topupCredit(): Address { + let result = super.call("topupCredit", "topupCredit():(address)", []); - return result[0].toBigInt(); + return result[0].toAddress(); } - try_votingDurationSeconds(): ethereum.CallResult { - let result = super.tryCall( - "votingDurationSeconds", - "votingDurationSeconds():(uint256)", - [] - ); + try_topupCredit(): ethereum.CallResult
{ + let result = super.tryCall("topupCredit", "topupCredit():(address)", []); if (result.reverted) { return new ethereum.CallResult(); } let value = result.value; - return ethereum.CallResult.fromValue(value[0].toBigInt()); + return ethereum.CallResult.fromValue(value[0].toAddress()); } } @@ -1332,56 +913,36 @@ export class ConstructorCall__Inputs { this._call = call; } - get _treeDepths(): ConstructorCall_treeDepthsStruct { - return changetype( - this._call.inputValues[0].value.toTuple() - ); + get _pollFactory(): Address { + return this._call.inputValues[0].value.toAddress(); } - get _batchSizes(): ConstructorCall_batchSizesStruct { - return changetype( - this._call.inputValues[1].value.toTuple() - ); + get _messageProcessorFactory(): Address { + return this._call.inputValues[1].value.toAddress(); } - get _maxValues(): ConstructorCall_maxValuesStruct { - return changetype( - this._call.inputValues[2].value.toTuple() - ); + get _tallyFactory(): Address { + return this._call.inputValues[2].value.toAddress(); } - get _signUpGatekeeper(): Address { + get _subsidyFactory(): Address { return this._call.inputValues[3].value.toAddress(); } - get _batchUstVerifier(): Address { + get _signUpGatekeeper(): Address { return this._call.inputValues[4].value.toAddress(); } - get _qvtVerifier(): Address { - return this._call.inputValues[5].value.toAddress(); - } - - get _signUpDurationSeconds(): BigInt { - return this._call.inputValues[6].value.toBigInt(); - } - - get _votingDurationSeconds(): BigInt { - return this._call.inputValues[7].value.toBigInt(); - } - get _initialVoiceCreditProxy(): Address { - return this._call.inputValues[8].value.toAddress(); + return this._call.inputValues[5].value.toAddress(); } - get _coordinatorPubKey(): ConstructorCall_coordinatorPubKeyStruct { - return changetype( - this._call.inputValues[9].value.toTuple() - ); + get _topupCredit(): Address { + return this._call.inputValues[6].value.toAddress(); } - get _coordinatorAddress(): Address { - return this._call.inputValues[10].value.toAddress(); + get _stateTreeDepth(): i32 { + return this._call.inputValues[7].value.toI32(); } } @@ -1393,95 +954,85 @@ export class ConstructorCall__Outputs { } } -export class ConstructorCall_treeDepthsStruct extends ethereum.Tuple { - get stateTreeDepth(): i32 { - return this[0].toI32(); - } - - get messageTreeDepth(): i32 { - return this[1].toI32(); +export class DeployPollCall extends ethereum.Call { + get inputs(): DeployPollCall__Inputs { + return new DeployPollCall__Inputs(this); } - get voteOptionTreeDepth(): i32 { - return this[2].toI32(); + get outputs(): DeployPollCall__Outputs { + return new DeployPollCall__Outputs(this); } } -export class ConstructorCall_batchSizesStruct extends ethereum.Tuple { - get tallyBatchSize(): i32 { - return this[0].toI32(); - } - - get messageBatchSize(): i32 { - return this[1].toI32(); - } -} +export class DeployPollCall__Inputs { + _call: DeployPollCall; -export class ConstructorCall_maxValuesStruct extends ethereum.Tuple { - get maxUsers(): BigInt { - return this[0].toBigInt(); + constructor(call: DeployPollCall) { + this._call = call; } - get maxMessages(): BigInt { - return this[1].toBigInt(); + get _duration(): BigInt { + return this._call.inputValues[0].value.toBigInt(); } - get maxVoteOptions(): BigInt { - return this[2].toBigInt(); + get _treeDepths(): DeployPollCall_treeDepthsStruct { + return changetype( + this._call.inputValues[1].value.toTuple(), + ); } -} -export class ConstructorCall_coordinatorPubKeyStruct extends ethereum.Tuple { - get x(): BigInt { - return this[0].toBigInt(); + get _coordinatorPubKey(): DeployPollCall_coordinatorPubKeyStruct { + return changetype( + this._call.inputValues[2].value.toTuple(), + ); } - get y(): BigInt { - return this[1].toBigInt(); + get _verifier(): Address { + return this._call.inputValues[3].value.toAddress(); } -} -export class BatchProcessMessageCall extends ethereum.Call { - get inputs(): BatchProcessMessageCall__Inputs { - return new BatchProcessMessageCall__Inputs(this); + get _vkRegistry(): Address { + return this._call.inputValues[4].value.toAddress(); } - get outputs(): BatchProcessMessageCall__Outputs { - return new BatchProcessMessageCall__Outputs(this); + get useSubsidy(): boolean { + return this._call.inputValues[5].value.toBoolean(); } } -export class BatchProcessMessageCall__Inputs { - _call: BatchProcessMessageCall; +export class DeployPollCall__Outputs { + _call: DeployPollCall; - constructor(call: BatchProcessMessageCall) { + constructor(call: DeployPollCall) { this._call = call; } - get _newStateRoot(): BigInt { - return this._call.inputValues[0].value.toBigInt(); + get pollAddr(): DeployPollCallPollAddrStruct { + return changetype( + this._call.outputValues[0].value.toTuple(), + ); } +} - get _ecdhPubKeys(): Array { - return this._call.inputValues[1].value.toTupleArray< - BatchProcessMessageCall_ecdhPubKeysStruct - >(); +export class DeployPollCall_treeDepthsStruct extends ethereum.Tuple { + get intStateTreeDepth(): i32 { + return this[0].toI32(); } - get _proof(): Array { - return this._call.inputValues[2].value.toBigIntArray(); + get messageTreeSubDepth(): i32 { + return this[1].toI32(); } -} -export class BatchProcessMessageCall__Outputs { - _call: BatchProcessMessageCall; + get messageTreeDepth(): i32 { + return this[2].toI32(); + } - constructor(call: BatchProcessMessageCall) { - this._call = call; + get voteOptionTreeDepth(): i32 { + return this[3].toI32(); } } -export class BatchProcessMessageCall_ecdhPubKeysStruct extends ethereum.Tuple { +export class DeployPollCall_coordinatorPubKeyStruct extends ethereum.Tuple { get x(): BigInt { return this[0].toBigInt(); } @@ -1491,137 +1042,115 @@ export class BatchProcessMessageCall_ecdhPubKeysStruct extends ethereum.Tuple { } } -export class CoordinatorResetCall extends ethereum.Call { - get inputs(): CoordinatorResetCall__Inputs { - return new CoordinatorResetCall__Inputs(this); +export class DeployPollCallPollAddrStruct extends ethereum.Tuple { + get poll(): Address { + return this[0].toAddress(); } - get outputs(): CoordinatorResetCall__Outputs { - return new CoordinatorResetCall__Outputs(this); + get messageProcessor(): Address { + return this[1].toAddress(); } -} - -export class CoordinatorResetCall__Inputs { - _call: CoordinatorResetCall; - constructor(call: CoordinatorResetCall) { - this._call = call; + get tally(): Address { + return this[2].toAddress(); } -} -export class CoordinatorResetCall__Outputs { - _call: CoordinatorResetCall; - - constructor(call: CoordinatorResetCall) { - this._call = call; + get subsidy(): Address { + return this[3].toAddress(); } } -export class ProveVoteTallyBatchCall extends ethereum.Call { - get inputs(): ProveVoteTallyBatchCall__Inputs { - return new ProveVoteTallyBatchCall__Inputs(this); +export class MergeStateAqCall extends ethereum.Call { + get inputs(): MergeStateAqCall__Inputs { + return new MergeStateAqCall__Inputs(this); } - get outputs(): ProveVoteTallyBatchCall__Outputs { - return new ProveVoteTallyBatchCall__Outputs(this); + get outputs(): MergeStateAqCall__Outputs { + return new MergeStateAqCall__Outputs(this); } } -export class ProveVoteTallyBatchCall__Inputs { - _call: ProveVoteTallyBatchCall; +export class MergeStateAqCall__Inputs { + _call: MergeStateAqCall; - constructor(call: ProveVoteTallyBatchCall) { + constructor(call: MergeStateAqCall) { this._call = call; } - get _intermediateStateRoot(): BigInt { + get _pollId(): BigInt { return this._call.inputValues[0].value.toBigInt(); } +} - get _newResultsCommitment(): BigInt { - return this._call.inputValues[1].value.toBigInt(); - } +export class MergeStateAqCall__Outputs { + _call: MergeStateAqCall; - get _newSpentVoiceCreditsCommitment(): BigInt { - return this._call.inputValues[2].value.toBigInt(); + constructor(call: MergeStateAqCall) { + this._call = call; } - get _newPerVOSpentVoiceCreditsCommitment(): BigInt { - return this._call.inputValues[3].value.toBigInt(); + get root(): BigInt { + return this._call.outputValues[0].value.toBigInt(); } +} - get _totalVotes(): BigInt { - return this._call.inputValues[4].value.toBigInt(); +export class MergeStateAqSubRootsCall extends ethereum.Call { + get inputs(): MergeStateAqSubRootsCall__Inputs { + return new MergeStateAqSubRootsCall__Inputs(this); } - get _proof(): Array { - return this._call.inputValues[5].value.toBigIntArray(); + get outputs(): MergeStateAqSubRootsCall__Outputs { + return new MergeStateAqSubRootsCall__Outputs(this); } } -export class ProveVoteTallyBatchCall__Outputs { - _call: ProveVoteTallyBatchCall; +export class MergeStateAqSubRootsCall__Inputs { + _call: MergeStateAqSubRootsCall; - constructor(call: ProveVoteTallyBatchCall) { + constructor(call: MergeStateAqSubRootsCall) { this._call = call; } -} -export class PublishMessageCall extends ethereum.Call { - get inputs(): PublishMessageCall__Inputs { - return new PublishMessageCall__Inputs(this); + get _numSrQueueOps(): BigInt { + return this._call.inputValues[0].value.toBigInt(); } - get outputs(): PublishMessageCall__Outputs { - return new PublishMessageCall__Outputs(this); + get _pollId(): BigInt { + return this._call.inputValues[1].value.toBigInt(); } } -export class PublishMessageCall__Inputs { - _call: PublishMessageCall; +export class MergeStateAqSubRootsCall__Outputs { + _call: MergeStateAqSubRootsCall; - constructor(call: PublishMessageCall) { + constructor(call: MergeStateAqSubRootsCall) { this._call = call; } +} - get _message(): PublishMessageCall_messageStruct { - return changetype( - this._call.inputValues[0].value.toTuple() - ); +export class RenounceOwnershipCall extends ethereum.Call { + get inputs(): RenounceOwnershipCall__Inputs { + return new RenounceOwnershipCall__Inputs(this); } - get _encPubKey(): PublishMessageCall_encPubKeyStruct { - return changetype( - this._call.inputValues[1].value.toTuple() - ); + get outputs(): RenounceOwnershipCall__Outputs { + return new RenounceOwnershipCall__Outputs(this); } } -export class PublishMessageCall__Outputs { - _call: PublishMessageCall; +export class RenounceOwnershipCall__Inputs { + _call: RenounceOwnershipCall; - constructor(call: PublishMessageCall) { + constructor(call: RenounceOwnershipCall) { this._call = call; } } -export class PublishMessageCall_messageStruct extends ethereum.Tuple { - get iv(): BigInt { - return this[0].toBigInt(); - } - - get data(): Array { - return this[1].toBigIntArray(); - } -} - -export class PublishMessageCall_encPubKeyStruct extends ethereum.Tuple { - get x(): BigInt { - return this[0].toBigInt(); - } +export class RenounceOwnershipCall__Outputs { + _call: RenounceOwnershipCall; - get y(): BigInt { - return this[1].toBigInt(); + constructor(call: RenounceOwnershipCall) { + this._call = call; } } @@ -1642,9 +1171,9 @@ export class SignUpCall__Inputs { this._call = call; } - get _userPubKey(): SignUpCall_userPubKeyStruct { - return changetype( - this._call.inputValues[0].value.toTuple() + get _pubKey(): SignUpCall_pubKeyStruct { + return changetype( + this._call.inputValues[0].value.toTuple(), ); } @@ -1665,7 +1194,7 @@ export class SignUpCall__Outputs { } } -export class SignUpCall_userPubKeyStruct extends ethereum.Tuple { +export class SignUpCall_pubKeyStruct extends ethereum.Tuple { get x(): BigInt { return this[0].toBigInt(); } @@ -1674,3 +1203,33 @@ export class SignUpCall_userPubKeyStruct extends ethereum.Tuple { return this[1].toBigInt(); } } + +export class TransferOwnershipCall extends ethereum.Call { + get inputs(): TransferOwnershipCall__Inputs { + return new TransferOwnershipCall__Inputs(this); + } + + get outputs(): TransferOwnershipCall__Outputs { + return new TransferOwnershipCall__Outputs(this); + } +} + +export class TransferOwnershipCall__Inputs { + _call: TransferOwnershipCall; + + constructor(call: TransferOwnershipCall) { + this._call = call; + } + + get newOwner(): Address { + return this._call.inputValues[0].value.toAddress(); + } +} + +export class TransferOwnershipCall__Outputs { + _call: TransferOwnershipCall; + + constructor(call: TransferOwnershipCall) { + this._call = call; + } +} diff --git a/subgraph/generated/templates/OptimisticRecipientRegistry/OptimisticRecipientRegistry.ts b/subgraph/generated/templates/OptimisticRecipientRegistry/OptimisticRecipientRegistry.ts index 20d805ce5..80ec65e55 100644 --- a/subgraph/generated/templates/OptimisticRecipientRegistry/OptimisticRecipientRegistry.ts +++ b/subgraph/generated/templates/OptimisticRecipientRegistry/OptimisticRecipientRegistry.ts @@ -7,7 +7,7 @@ import { Entity, Bytes, Address, - BigInt + BigInt, } from "@graphprotocol/graph-ts"; export class OwnershipTransferred extends ethereum.Event { @@ -104,7 +104,7 @@ export class OptimisticRecipientRegistry extends ethereum.SmartContract { static bind(address: Address): OptimisticRecipientRegistry { return new OptimisticRecipientRegistry( "OptimisticRecipientRegistry", - address + address, ); } @@ -127,7 +127,7 @@ export class OptimisticRecipientRegistry extends ethereum.SmartContract { let result = super.call( "challengePeriodDuration", "challengePeriodDuration():(uint256)", - [] + [], ); return result[0].toBigInt(); @@ -137,7 +137,7 @@ export class OptimisticRecipientRegistry extends ethereum.SmartContract { let result = super.tryCall( "challengePeriodDuration", "challengePeriodDuration():(uint256)", - [] + [], ); if (result.reverted) { return new ethereum.CallResult(); @@ -152,8 +152,8 @@ export class OptimisticRecipientRegistry extends ethereum.SmartContract { "challengeRequest(bytes32,address):(bool)", [ ethereum.Value.fromFixedBytes(_recipientId), - ethereum.Value.fromAddress(_beneficiary) - ] + ethereum.Value.fromAddress(_beneficiary), + ], ); return result[0].toBoolean(); @@ -161,15 +161,15 @@ export class OptimisticRecipientRegistry extends ethereum.SmartContract { try_challengeRequest( _recipientId: Bytes, - _beneficiary: Address + _beneficiary: Address, ): ethereum.CallResult { let result = super.tryCall( "challengeRequest", "challengeRequest(bytes32,address):(bool)", [ ethereum.Value.fromFixedBytes(_recipientId), - ethereum.Value.fromAddress(_beneficiary) - ] + ethereum.Value.fromAddress(_beneficiary), + ], ); if (result.reverted) { return new ethereum.CallResult(); @@ -197,7 +197,7 @@ export class OptimisticRecipientRegistry extends ethereum.SmartContract { let result = super.call( "executeRequest", "executeRequest(bytes32):(bool)", - [ethereum.Value.fromFixedBytes(_recipientId)] + [ethereum.Value.fromFixedBytes(_recipientId)], ); return result[0].toBoolean(); @@ -207,7 +207,7 @@ export class OptimisticRecipientRegistry extends ethereum.SmartContract { let result = super.tryCall( "executeRequest", "executeRequest(bytes32):(bool)", - [ethereum.Value.fromFixedBytes(_recipientId)] + [ethereum.Value.fromFixedBytes(_recipientId)], ); if (result.reverted) { return new ethereum.CallResult(); @@ -219,7 +219,7 @@ export class OptimisticRecipientRegistry extends ethereum.SmartContract { getRecipientAddress( _index: BigInt, _startTime: BigInt, - _endTime: BigInt + _endTime: BigInt, ): Address { let result = super.call( "getRecipientAddress", @@ -227,8 +227,8 @@ export class OptimisticRecipientRegistry extends ethereum.SmartContract { [ ethereum.Value.fromUnsignedBigInt(_index), ethereum.Value.fromUnsignedBigInt(_startTime), - ethereum.Value.fromUnsignedBigInt(_endTime) - ] + ethereum.Value.fromUnsignedBigInt(_endTime), + ], ); return result[0].toAddress(); @@ -237,7 +237,7 @@ export class OptimisticRecipientRegistry extends ethereum.SmartContract { try_getRecipientAddress( _index: BigInt, _startTime: BigInt, - _endTime: BigInt + _endTime: BigInt, ): ethereum.CallResult
{ let result = super.tryCall( "getRecipientAddress", @@ -245,8 +245,8 @@ export class OptimisticRecipientRegistry extends ethereum.SmartContract { [ ethereum.Value.fromUnsignedBigInt(_index), ethereum.Value.fromUnsignedBigInt(_startTime), - ethereum.Value.fromUnsignedBigInt(_endTime) - ] + ethereum.Value.fromUnsignedBigInt(_endTime), + ], ); if (result.reverted) { return new ethereum.CallResult(); @@ -255,6 +255,29 @@ export class OptimisticRecipientRegistry extends ethereum.SmartContract { return ethereum.CallResult.fromValue(value[0].toAddress()); } + getRecipientCount(): BigInt { + let result = super.call( + "getRecipientCount", + "getRecipientCount():(uint256)", + [], + ); + + return result[0].toBigInt(); + } + + try_getRecipientCount(): ethereum.CallResult { + let result = super.tryCall( + "getRecipientCount", + "getRecipientCount():(uint256)", + [], + ); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toBigInt()); + } + maxRecipients(): BigInt { let result = super.call("maxRecipients", "maxRecipients():(uint256)", []); @@ -265,7 +288,7 @@ export class OptimisticRecipientRegistry extends ethereum.SmartContract { let result = super.tryCall( "maxRecipients", "maxRecipients():(uint256)", - [] + [], ); if (result.reverted) { return new ethereum.CallResult(); @@ -293,7 +316,7 @@ export class OptimisticRecipientRegistry extends ethereum.SmartContract { let result = super.call( "setMaxRecipients", "setMaxRecipients(uint256):(bool)", - [ethereum.Value.fromUnsignedBigInt(_maxRecipients)] + [ethereum.Value.fromUnsignedBigInt(_maxRecipients)], ); return result[0].toBoolean(); @@ -303,7 +326,7 @@ export class OptimisticRecipientRegistry extends ethereum.SmartContract { let result = super.tryCall( "setMaxRecipients", "setMaxRecipients(uint256):(bool)", - [ethereum.Value.fromUnsignedBigInt(_maxRecipients)] + [ethereum.Value.fromUnsignedBigInt(_maxRecipients)], ); if (result.reverted) { return new ethereum.CallResult(); diff --git a/subgraph/generated/templates/Poll/FundingRound.ts b/subgraph/generated/templates/Poll/FundingRound.ts new file mode 100644 index 000000000..32be22df9 --- /dev/null +++ b/subgraph/generated/templates/Poll/FundingRound.ts @@ -0,0 +1,1364 @@ +// THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. + +import { + ethereum, + JSONValue, + TypedMap, + Entity, + Bytes, + Address, + BigInt, +} from "@graphprotocol/graph-ts"; + +export class Contribution extends ethereum.Event { + get params(): Contribution__Params { + return new Contribution__Params(this); + } +} + +export class Contribution__Params { + _event: Contribution; + + constructor(event: Contribution) { + this._event = event; + } + + get _sender(): Address { + return this._event.parameters[0].value.toAddress(); + } + + get _amount(): BigInt { + return this._event.parameters[1].value.toBigInt(); + } +} + +export class ContributionWithdrawn extends ethereum.Event { + get params(): ContributionWithdrawn__Params { + return new ContributionWithdrawn__Params(this); + } +} + +export class ContributionWithdrawn__Params { + _event: ContributionWithdrawn; + + constructor(event: ContributionWithdrawn) { + this._event = event; + } + + get _contributor(): Address { + return this._event.parameters[0].value.toAddress(); + } +} + +export class FundsClaimed extends ethereum.Event { + get params(): FundsClaimed__Params { + return new FundsClaimed__Params(this); + } +} + +export class FundsClaimed__Params { + _event: FundsClaimed; + + constructor(event: FundsClaimed) { + this._event = event; + } + + get _voteOptionIndex(): BigInt { + return this._event.parameters[0].value.toBigInt(); + } + + get _recipient(): Address { + return this._event.parameters[1].value.toAddress(); + } + + get _amount(): BigInt { + return this._event.parameters[2].value.toBigInt(); + } +} + +export class OwnershipTransferred extends ethereum.Event { + get params(): OwnershipTransferred__Params { + return new OwnershipTransferred__Params(this); + } +} + +export class OwnershipTransferred__Params { + _event: OwnershipTransferred; + + constructor(event: OwnershipTransferred) { + this._event = event; + } + + get previousOwner(): Address { + return this._event.parameters[0].value.toAddress(); + } + + get newOwner(): Address { + return this._event.parameters[1].value.toAddress(); + } +} + +export class PollSet extends ethereum.Event { + get params(): PollSet__Params { + return new PollSet__Params(this); + } +} + +export class PollSet__Params { + _event: PollSet; + + constructor(event: PollSet) { + this._event = event; + } + + get _poll(): Address { + return this._event.parameters[0].value.toAddress(); + } +} + +export class TallyPublished extends ethereum.Event { + get params(): TallyPublished__Params { + return new TallyPublished__Params(this); + } +} + +export class TallyPublished__Params { + _event: TallyPublished; + + constructor(event: TallyPublished) { + this._event = event; + } + + get _tallyHash(): string { + return this._event.parameters[0].value.toString(); + } +} + +export class TallyResultsAdded extends ethereum.Event { + get params(): TallyResultsAdded__Params { + return new TallyResultsAdded__Params(this); + } +} + +export class TallyResultsAdded__Params { + _event: TallyResultsAdded; + + constructor(event: TallyResultsAdded) { + this._event = event; + } + + get _voteOptionIndex(): BigInt { + return this._event.parameters[0].value.toBigInt(); + } + + get _tally(): BigInt { + return this._event.parameters[1].value.toBigInt(); + } +} + +export class TallySet extends ethereum.Event { + get params(): TallySet__Params { + return new TallySet__Params(this); + } +} + +export class TallySet__Params { + _event: TallySet; + + constructor(event: TallySet) { + this._event = event; + } + + get _tally(): Address { + return this._event.parameters[0].value.toAddress(); + } +} + +export class Voted extends ethereum.Event { + get params(): Voted__Params { + return new Voted__Params(this); + } +} + +export class Voted__Params { + _event: Voted; + + constructor(event: Voted) { + this._event = event; + } + + get _contributor(): Address { + return this._event.parameters[0].value.toAddress(); + } +} + +export class FundingRound__contributorsResult { + value0: BigInt; + value1: boolean; + + constructor(value0: BigInt, value1: boolean) { + this.value0 = value0; + this.value1 = value1; + } + + toMap(): TypedMap { + let map = new TypedMap(); + map.set("value0", ethereum.Value.fromUnsignedBigInt(this.value0)); + map.set("value1", ethereum.Value.fromBoolean(this.value1)); + return map; + } + + getVoiceCredits(): BigInt { + return this.value0; + } + + getIsRegistered(): boolean { + return this.value1; + } +} + +export class FundingRound__recipientsResult { + value0: boolean; + value1: boolean; + value2: BigInt; + + constructor(value0: boolean, value1: boolean, value2: BigInt) { + this.value0 = value0; + this.value1 = value1; + this.value2 = value2; + } + + toMap(): TypedMap { + let map = new TypedMap(); + map.set("value0", ethereum.Value.fromBoolean(this.value0)); + map.set("value1", ethereum.Value.fromBoolean(this.value1)); + map.set("value2", ethereum.Value.fromUnsignedBigInt(this.value2)); + return map; + } + + getFundsClaimed(): boolean { + return this.value0; + } + + getTallyVerified(): boolean { + return this.value1; + } + + getTallyResult(): BigInt { + return this.value2; + } +} + +export class FundingRound extends ethereum.SmartContract { + static bind(address: Address): FundingRound { + return new FundingRound("FundingRound", address); + } + + MESSAGE_DATA_LENGTH(): i32 { + let result = super.call( + "MESSAGE_DATA_LENGTH", + "MESSAGE_DATA_LENGTH():(uint8)", + [], + ); + + return result[0].toI32(); + } + + try_MESSAGE_DATA_LENGTH(): ethereum.CallResult { + let result = super.tryCall( + "MESSAGE_DATA_LENGTH", + "MESSAGE_DATA_LENGTH():(uint8)", + [], + ); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toI32()); + } + + TREE_ARITY(): BigInt { + let result = super.call("TREE_ARITY", "TREE_ARITY():(uint256)", []); + + return result[0].toBigInt(); + } + + try_TREE_ARITY(): ethereum.CallResult { + let result = super.tryCall("TREE_ARITY", "TREE_ARITY():(uint256)", []); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toBigInt()); + } + + alpha(): BigInt { + let result = super.call("alpha", "alpha():(uint256)", []); + + return result[0].toBigInt(); + } + + try_alpha(): ethereum.CallResult { + let result = super.tryCall("alpha", "alpha():(uint256)", []); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toBigInt()); + } + + calcAlpha( + _budget: BigInt, + _totalVotesSquares: BigInt, + _totalSpent: BigInt, + ): BigInt { + let result = super.call( + "calcAlpha", + "calcAlpha(uint256,uint256,uint256):(uint256)", + [ + ethereum.Value.fromUnsignedBigInt(_budget), + ethereum.Value.fromUnsignedBigInt(_totalVotesSquares), + ethereum.Value.fromUnsignedBigInt(_totalSpent), + ], + ); + + return result[0].toBigInt(); + } + + try_calcAlpha( + _budget: BigInt, + _totalVotesSquares: BigInt, + _totalSpent: BigInt, + ): ethereum.CallResult { + let result = super.tryCall( + "calcAlpha", + "calcAlpha(uint256,uint256,uint256):(uint256)", + [ + ethereum.Value.fromUnsignedBigInt(_budget), + ethereum.Value.fromUnsignedBigInt(_totalVotesSquares), + ethereum.Value.fromUnsignedBigInt(_totalSpent), + ], + ); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toBigInt()); + } + + contributorCount(): BigInt { + let result = super.call( + "contributorCount", + "contributorCount():(uint256)", + [], + ); + + return result[0].toBigInt(); + } + + try_contributorCount(): ethereum.CallResult { + let result = super.tryCall( + "contributorCount", + "contributorCount():(uint256)", + [], + ); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toBigInt()); + } + + contributors(param0: Address): FundingRound__contributorsResult { + let result = super.call( + "contributors", + "contributors(address):(uint256,bool)", + [ethereum.Value.fromAddress(param0)], + ); + + return new FundingRound__contributorsResult( + result[0].toBigInt(), + result[1].toBoolean(), + ); + } + + try_contributors( + param0: Address, + ): ethereum.CallResult { + let result = super.tryCall( + "contributors", + "contributors(address):(uint256,bool)", + [ethereum.Value.fromAddress(param0)], + ); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue( + new FundingRound__contributorsResult( + value[0].toBigInt(), + value[1].toBoolean(), + ), + ); + } + + coordinator(): Address { + let result = super.call("coordinator", "coordinator():(address)", []); + + return result[0].toAddress(); + } + + try_coordinator(): ethereum.CallResult
{ + let result = super.tryCall("coordinator", "coordinator():(address)", []); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toAddress()); + } + + getAllocatedAmount(_tallyResult: BigInt, _spent: BigInt): BigInt { + let result = super.call( + "getAllocatedAmount", + "getAllocatedAmount(uint256,uint256):(uint256)", + [ + ethereum.Value.fromUnsignedBigInt(_tallyResult), + ethereum.Value.fromUnsignedBigInt(_spent), + ], + ); + + return result[0].toBigInt(); + } + + try_getAllocatedAmount( + _tallyResult: BigInt, + _spent: BigInt, + ): ethereum.CallResult { + let result = super.tryCall( + "getAllocatedAmount", + "getAllocatedAmount(uint256,uint256):(uint256)", + [ + ethereum.Value.fromUnsignedBigInt(_tallyResult), + ethereum.Value.fromUnsignedBigInt(_spent), + ], + ); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toBigInt()); + } + + getVoiceCredits(param0: Address, _data: Bytes): BigInt { + let result = super.call( + "getVoiceCredits", + "getVoiceCredits(address,bytes):(uint256)", + [ethereum.Value.fromAddress(param0), ethereum.Value.fromBytes(_data)], + ); + + return result[0].toBigInt(); + } + + try_getVoiceCredits( + param0: Address, + _data: Bytes, + ): ethereum.CallResult { + let result = super.tryCall( + "getVoiceCredits", + "getVoiceCredits(address,bytes):(uint256)", + [ethereum.Value.fromAddress(param0), ethereum.Value.fromBytes(_data)], + ); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toBigInt()); + } + + isAddressZero(addressValue: Address): boolean { + let result = super.call("isAddressZero", "isAddressZero(address):(bool)", [ + ethereum.Value.fromAddress(addressValue), + ]); + + return result[0].toBoolean(); + } + + try_isAddressZero(addressValue: Address): ethereum.CallResult { + let result = super.tryCall( + "isAddressZero", + "isAddressZero(address):(bool)", + [ethereum.Value.fromAddress(addressValue)], + ); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toBoolean()); + } + + isCancelled(): boolean { + let result = super.call("isCancelled", "isCancelled():(bool)", []); + + return result[0].toBoolean(); + } + + try_isCancelled(): ethereum.CallResult { + let result = super.tryCall("isCancelled", "isCancelled():(bool)", []); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toBoolean()); + } + + isFinalized(): boolean { + let result = super.call("isFinalized", "isFinalized():(bool)", []); + + return result[0].toBoolean(); + } + + try_isFinalized(): ethereum.CallResult { + let result = super.tryCall("isFinalized", "isFinalized():(bool)", []); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toBoolean()); + } + + maci(): Address { + let result = super.call("maci", "maci():(address)", []); + + return result[0].toAddress(); + } + + try_maci(): ethereum.CallResult
{ + let result = super.tryCall("maci", "maci():(address)", []); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toAddress()); + } + + matchingPoolSize(): BigInt { + let result = super.call( + "matchingPoolSize", + "matchingPoolSize():(uint256)", + [], + ); + + return result[0].toBigInt(); + } + + try_matchingPoolSize(): ethereum.CallResult { + let result = super.tryCall( + "matchingPoolSize", + "matchingPoolSize():(uint256)", + [], + ); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toBigInt()); + } + + nativeToken(): Address { + let result = super.call("nativeToken", "nativeToken():(address)", []); + + return result[0].toAddress(); + } + + try_nativeToken(): ethereum.CallResult
{ + let result = super.tryCall("nativeToken", "nativeToken():(address)", []); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toAddress()); + } + + owner(): Address { + let result = super.call("owner", "owner():(address)", []); + + return result[0].toAddress(); + } + + try_owner(): ethereum.CallResult
{ + let result = super.tryCall("owner", "owner():(address)", []); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toAddress()); + } + + poll(): Address { + let result = super.call("poll", "poll():(address)", []); + + return result[0].toAddress(); + } + + try_poll(): ethereum.CallResult
{ + let result = super.tryCall("poll", "poll():(address)", []); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toAddress()); + } + + pollId(): BigInt { + let result = super.call("pollId", "pollId():(uint256)", []); + + return result[0].toBigInt(); + } + + try_pollId(): ethereum.CallResult { + let result = super.tryCall("pollId", "pollId():(uint256)", []); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toBigInt()); + } + + recipientRegistry(): Address { + let result = super.call( + "recipientRegistry", + "recipientRegistry():(address)", + [], + ); + + return result[0].toAddress(); + } + + try_recipientRegistry(): ethereum.CallResult
{ + let result = super.tryCall( + "recipientRegistry", + "recipientRegistry():(address)", + [], + ); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toAddress()); + } + + recipients(param0: BigInt): FundingRound__recipientsResult { + let result = super.call( + "recipients", + "recipients(uint256):(bool,bool,uint256)", + [ethereum.Value.fromUnsignedBigInt(param0)], + ); + + return new FundingRound__recipientsResult( + result[0].toBoolean(), + result[1].toBoolean(), + result[2].toBigInt(), + ); + } + + try_recipients( + param0: BigInt, + ): ethereum.CallResult { + let result = super.tryCall( + "recipients", + "recipients(uint256):(bool,bool,uint256)", + [ethereum.Value.fromUnsignedBigInt(param0)], + ); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue( + new FundingRound__recipientsResult( + value[0].toBoolean(), + value[1].toBoolean(), + value[2].toBigInt(), + ), + ); + } + + tally(): Address { + let result = super.call("tally", "tally():(address)", []); + + return result[0].toAddress(); + } + + try_tally(): ethereum.CallResult
{ + let result = super.tryCall("tally", "tally():(address)", []); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toAddress()); + } + + tallyHash(): string { + let result = super.call("tallyHash", "tallyHash():(string)", []); + + return result[0].toString(); + } + + try_tallyHash(): ethereum.CallResult { + let result = super.tryCall("tallyHash", "tallyHash():(string)", []); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toString()); + } + + topupToken(): Address { + let result = super.call("topupToken", "topupToken():(address)", []); + + return result[0].toAddress(); + } + + try_topupToken(): ethereum.CallResult
{ + let result = super.tryCall("topupToken", "topupToken():(address)", []); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toAddress()); + } + + totalSpent(): BigInt { + let result = super.call("totalSpent", "totalSpent():(uint256)", []); + + return result[0].toBigInt(); + } + + try_totalSpent(): ethereum.CallResult { + let result = super.tryCall("totalSpent", "totalSpent():(uint256)", []); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toBigInt()); + } + + totalTallyResults(): BigInt { + let result = super.call( + "totalTallyResults", + "totalTallyResults():(uint256)", + [], + ); + + return result[0].toBigInt(); + } + + try_totalTallyResults(): ethereum.CallResult { + let result = super.tryCall( + "totalTallyResults", + "totalTallyResults():(uint256)", + [], + ); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toBigInt()); + } + + totalVotes(): BigInt { + let result = super.call("totalVotes", "totalVotes():(uint256)", []); + + return result[0].toBigInt(); + } + + try_totalVotes(): ethereum.CallResult { + let result = super.tryCall("totalVotes", "totalVotes():(uint256)", []); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toBigInt()); + } + + totalVotesSquares(): BigInt { + let result = super.call( + "totalVotesSquares", + "totalVotesSquares():(uint256)", + [], + ); + + return result[0].toBigInt(); + } + + try_totalVotesSquares(): ethereum.CallResult { + let result = super.tryCall( + "totalVotesSquares", + "totalVotesSquares():(uint256)", + [], + ); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toBigInt()); + } + + userRegistry(): Address { + let result = super.call("userRegistry", "userRegistry():(address)", []); + + return result[0].toAddress(); + } + + try_userRegistry(): ethereum.CallResult
{ + let result = super.tryCall("userRegistry", "userRegistry():(address)", []); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toAddress()); + } + + voiceCreditFactor(): BigInt { + let result = super.call( + "voiceCreditFactor", + "voiceCreditFactor():(uint256)", + [], + ); + + return result[0].toBigInt(); + } + + try_voiceCreditFactor(): ethereum.CallResult { + let result = super.tryCall( + "voiceCreditFactor", + "voiceCreditFactor():(uint256)", + [], + ); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toBigInt()); + } + + withdrawContributions(_contributors: Array
): Array { + let result = super.call( + "withdrawContributions", + "withdrawContributions(address[]):(bool[])", + [ethereum.Value.fromAddressArray(_contributors)], + ); + + return result[0].toBooleanArray(); + } + + try_withdrawContributions( + _contributors: Array
, + ): ethereum.CallResult> { + let result = super.tryCall( + "withdrawContributions", + "withdrawContributions(address[]):(bool[])", + [ethereum.Value.fromAddressArray(_contributors)], + ); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toBooleanArray()); + } +} + +export class ConstructorCall extends ethereum.Call { + get inputs(): ConstructorCall__Inputs { + return new ConstructorCall__Inputs(this); + } + + get outputs(): ConstructorCall__Outputs { + return new ConstructorCall__Outputs(this); + } +} + +export class ConstructorCall__Inputs { + _call: ConstructorCall; + + constructor(call: ConstructorCall) { + this._call = call; + } + + get _nativeToken(): Address { + return this._call.inputValues[0].value.toAddress(); + } + + get _userRegistry(): Address { + return this._call.inputValues[1].value.toAddress(); + } + + get _recipientRegistry(): Address { + return this._call.inputValues[2].value.toAddress(); + } + + get _coordinator(): Address { + return this._call.inputValues[3].value.toAddress(); + } +} + +export class ConstructorCall__Outputs { + _call: ConstructorCall; + + constructor(call: ConstructorCall) { + this._call = call; + } +} + +export class CancelCall extends ethereum.Call { + get inputs(): CancelCall__Inputs { + return new CancelCall__Inputs(this); + } + + get outputs(): CancelCall__Outputs { + return new CancelCall__Outputs(this); + } +} + +export class CancelCall__Inputs { + _call: CancelCall; + + constructor(call: CancelCall) { + this._call = call; + } +} + +export class CancelCall__Outputs { + _call: CancelCall; + + constructor(call: CancelCall) { + this._call = call; + } +} + +export class ClaimFundsCall extends ethereum.Call { + get inputs(): ClaimFundsCall__Inputs { + return new ClaimFundsCall__Inputs(this); + } + + get outputs(): ClaimFundsCall__Outputs { + return new ClaimFundsCall__Outputs(this); + } +} + +export class ClaimFundsCall__Inputs { + _call: ClaimFundsCall; + + constructor(call: ClaimFundsCall) { + this._call = call; + } + + get _voteOptionIndex(): BigInt { + return this._call.inputValues[0].value.toBigInt(); + } + + get _spent(): BigInt { + return this._call.inputValues[1].value.toBigInt(); + } + + get _spentProof(): Array> { + return this._call.inputValues[2].value.toBigIntMatrix(); + } + + get _spentSalt(): BigInt { + return this._call.inputValues[3].value.toBigInt(); + } + + get _resultsCommitment(): BigInt { + return this._call.inputValues[4].value.toBigInt(); + } + + get _spentVoiceCreditsCommitment(): BigInt { + return this._call.inputValues[5].value.toBigInt(); + } +} + +export class ClaimFundsCall__Outputs { + _call: ClaimFundsCall; + + constructor(call: ClaimFundsCall) { + this._call = call; + } +} + +export class ContributeCall extends ethereum.Call { + get inputs(): ContributeCall__Inputs { + return new ContributeCall__Inputs(this); + } + + get outputs(): ContributeCall__Outputs { + return new ContributeCall__Outputs(this); + } +} + +export class ContributeCall__Inputs { + _call: ContributeCall; + + constructor(call: ContributeCall) { + this._call = call; + } + + get pubKey(): ContributeCallPubKeyStruct { + return changetype( + this._call.inputValues[0].value.toTuple(), + ); + } + + get amount(): BigInt { + return this._call.inputValues[1].value.toBigInt(); + } +} + +export class ContributeCall__Outputs { + _call: ContributeCall; + + constructor(call: ContributeCall) { + this._call = call; + } +} + +export class ContributeCallPubKeyStruct extends ethereum.Tuple { + get x(): BigInt { + return this[0].toBigInt(); + } + + get y(): BigInt { + return this[1].toBigInt(); + } +} + +export class FinalizeCall extends ethereum.Call { + get inputs(): FinalizeCall__Inputs { + return new FinalizeCall__Inputs(this); + } + + get outputs(): FinalizeCall__Outputs { + return new FinalizeCall__Outputs(this); + } +} + +export class FinalizeCall__Inputs { + _call: FinalizeCall; + + constructor(call: FinalizeCall) { + this._call = call; + } + + get _totalSpent(): BigInt { + return this._call.inputValues[0].value.toBigInt(); + } + + get _totalSpentSalt(): BigInt { + return this._call.inputValues[1].value.toBigInt(); + } + + get _newResultCommitment(): BigInt { + return this._call.inputValues[2].value.toBigInt(); + } + + get _perVOSpentVoiceCreditsHash(): BigInt { + return this._call.inputValues[3].value.toBigInt(); + } +} + +export class FinalizeCall__Outputs { + _call: FinalizeCall; + + constructor(call: FinalizeCall) { + this._call = call; + } +} + +export class PublishTallyHashCall extends ethereum.Call { + get inputs(): PublishTallyHashCall__Inputs { + return new PublishTallyHashCall__Inputs(this); + } + + get outputs(): PublishTallyHashCall__Outputs { + return new PublishTallyHashCall__Outputs(this); + } +} + +export class PublishTallyHashCall__Inputs { + _call: PublishTallyHashCall; + + constructor(call: PublishTallyHashCall) { + this._call = call; + } + + get _tallyHash(): string { + return this._call.inputValues[0].value.toString(); + } +} + +export class PublishTallyHashCall__Outputs { + _call: PublishTallyHashCall; + + constructor(call: PublishTallyHashCall) { + this._call = call; + } +} + +export class RegisterCall extends ethereum.Call { + get inputs(): RegisterCall__Inputs { + return new RegisterCall__Inputs(this); + } + + get outputs(): RegisterCall__Outputs { + return new RegisterCall__Outputs(this); + } +} + +export class RegisterCall__Inputs { + _call: RegisterCall; + + constructor(call: RegisterCall) { + this._call = call; + } + + get value0(): Address { + return this._call.inputValues[0].value.toAddress(); + } + + get _data(): Bytes { + return this._call.inputValues[1].value.toBytes(); + } +} + +export class RegisterCall__Outputs { + _call: RegisterCall; + + constructor(call: RegisterCall) { + this._call = call; + } +} + +export class RenounceOwnershipCall extends ethereum.Call { + get inputs(): RenounceOwnershipCall__Inputs { + return new RenounceOwnershipCall__Inputs(this); + } + + get outputs(): RenounceOwnershipCall__Outputs { + return new RenounceOwnershipCall__Outputs(this); + } +} + +export class RenounceOwnershipCall__Inputs { + _call: RenounceOwnershipCall; + + constructor(call: RenounceOwnershipCall) { + this._call = call; + } +} + +export class RenounceOwnershipCall__Outputs { + _call: RenounceOwnershipCall; + + constructor(call: RenounceOwnershipCall) { + this._call = call; + } +} + +export class ResetTallyCall extends ethereum.Call { + get inputs(): ResetTallyCall__Inputs { + return new ResetTallyCall__Inputs(this); + } + + get outputs(): ResetTallyCall__Outputs { + return new ResetTallyCall__Outputs(this); + } +} + +export class ResetTallyCall__Inputs { + _call: ResetTallyCall; + + constructor(call: ResetTallyCall) { + this._call = call; + } +} + +export class ResetTallyCall__Outputs { + _call: ResetTallyCall; + + constructor(call: ResetTallyCall) { + this._call = call; + } +} + +export class SetMaciCall extends ethereum.Call { + get inputs(): SetMaciCall__Inputs { + return new SetMaciCall__Inputs(this); + } + + get outputs(): SetMaciCall__Outputs { + return new SetMaciCall__Outputs(this); + } +} + +export class SetMaciCall__Inputs { + _call: SetMaciCall; + + constructor(call: SetMaciCall) { + this._call = call; + } + + get _maci(): Address { + return this._call.inputValues[0].value.toAddress(); + } + + get _pollContracts(): SetMaciCall_pollContractsStruct { + return changetype( + this._call.inputValues[1].value.toTuple(), + ); + } +} + +export class SetMaciCall__Outputs { + _call: SetMaciCall; + + constructor(call: SetMaciCall) { + this._call = call; + } +} + +export class SetMaciCall_pollContractsStruct extends ethereum.Tuple { + get poll(): Address { + return this[0].toAddress(); + } + + get messageProcessor(): Address { + return this[1].toAddress(); + } + + get tally(): Address { + return this[2].toAddress(); + } + + get subsidy(): Address { + return this[3].toAddress(); + } +} + +export class SetMaciInstanceCall extends ethereum.Call { + get inputs(): SetMaciInstanceCall__Inputs { + return new SetMaciInstanceCall__Inputs(this); + } + + get outputs(): SetMaciInstanceCall__Outputs { + return new SetMaciInstanceCall__Outputs(this); + } +} + +export class SetMaciInstanceCall__Inputs { + _call: SetMaciInstanceCall; + + constructor(call: SetMaciInstanceCall) { + this._call = call; + } + + get _maci(): Address { + return this._call.inputValues[0].value.toAddress(); + } +} + +export class SetMaciInstanceCall__Outputs { + _call: SetMaciInstanceCall; + + constructor(call: SetMaciInstanceCall) { + this._call = call; + } +} + +export class TransferOwnershipCall extends ethereum.Call { + get inputs(): TransferOwnershipCall__Inputs { + return new TransferOwnershipCall__Inputs(this); + } + + get outputs(): TransferOwnershipCall__Outputs { + return new TransferOwnershipCall__Outputs(this); + } +} + +export class TransferOwnershipCall__Inputs { + _call: TransferOwnershipCall; + + constructor(call: TransferOwnershipCall) { + this._call = call; + } + + get newOwner(): Address { + return this._call.inputValues[0].value.toAddress(); + } +} + +export class TransferOwnershipCall__Outputs { + _call: TransferOwnershipCall; + + constructor(call: TransferOwnershipCall) { + this._call = call; + } +} + +export class WithdrawContributionCall extends ethereum.Call { + get inputs(): WithdrawContributionCall__Inputs { + return new WithdrawContributionCall__Inputs(this); + } + + get outputs(): WithdrawContributionCall__Outputs { + return new WithdrawContributionCall__Outputs(this); + } +} + +export class WithdrawContributionCall__Inputs { + _call: WithdrawContributionCall; + + constructor(call: WithdrawContributionCall) { + this._call = call; + } +} + +export class WithdrawContributionCall__Outputs { + _call: WithdrawContributionCall; + + constructor(call: WithdrawContributionCall) { + this._call = call; + } +} + +export class WithdrawContributionsCall extends ethereum.Call { + get inputs(): WithdrawContributionsCall__Inputs { + return new WithdrawContributionsCall__Inputs(this); + } + + get outputs(): WithdrawContributionsCall__Outputs { + return new WithdrawContributionsCall__Outputs(this); + } +} + +export class WithdrawContributionsCall__Inputs { + _call: WithdrawContributionsCall; + + constructor(call: WithdrawContributionsCall) { + this._call = call; + } + + get _contributors(): Array
{ + return this._call.inputValues[0].value.toAddressArray(); + } +} + +export class WithdrawContributionsCall__Outputs { + _call: WithdrawContributionsCall; + + constructor(call: WithdrawContributionsCall) { + this._call = call; + } + + get result(): Array { + return this._call.outputValues[0].value.toBooleanArray(); + } +} diff --git a/subgraph/generated/templates/Poll/Poll.ts b/subgraph/generated/templates/Poll/Poll.ts new file mode 100644 index 000000000..f8e20dff2 --- /dev/null +++ b/subgraph/generated/templates/Poll/Poll.ts @@ -0,0 +1,1510 @@ +// THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. + +import { + ethereum, + JSONValue, + TypedMap, + Entity, + Bytes, + Address, + BigInt, +} from "@graphprotocol/graph-ts"; + +export class MergeMaciStateAq extends ethereum.Event { + get params(): MergeMaciStateAq__Params { + return new MergeMaciStateAq__Params(this); + } +} + +export class MergeMaciStateAq__Params { + _event: MergeMaciStateAq; + + constructor(event: MergeMaciStateAq) { + this._event = event; + } + + get _stateRoot(): BigInt { + return this._event.parameters[0].value.toBigInt(); + } + + get _numSignups(): BigInt { + return this._event.parameters[1].value.toBigInt(); + } +} + +export class MergeMaciStateAqSubRoots extends ethereum.Event { + get params(): MergeMaciStateAqSubRoots__Params { + return new MergeMaciStateAqSubRoots__Params(this); + } +} + +export class MergeMaciStateAqSubRoots__Params { + _event: MergeMaciStateAqSubRoots; + + constructor(event: MergeMaciStateAqSubRoots) { + this._event = event; + } + + get _numSrQueueOps(): BigInt { + return this._event.parameters[0].value.toBigInt(); + } +} + +export class MergeMessageAq extends ethereum.Event { + get params(): MergeMessageAq__Params { + return new MergeMessageAq__Params(this); + } +} + +export class MergeMessageAq__Params { + _event: MergeMessageAq; + + constructor(event: MergeMessageAq) { + this._event = event; + } + + get _messageRoot(): BigInt { + return this._event.parameters[0].value.toBigInt(); + } +} + +export class MergeMessageAqSubRoots extends ethereum.Event { + get params(): MergeMessageAqSubRoots__Params { + return new MergeMessageAqSubRoots__Params(this); + } +} + +export class MergeMessageAqSubRoots__Params { + _event: MergeMessageAqSubRoots; + + constructor(event: MergeMessageAqSubRoots) { + this._event = event; + } + + get _numSrQueueOps(): BigInt { + return this._event.parameters[0].value.toBigInt(); + } +} + +export class OwnershipTransferred extends ethereum.Event { + get params(): OwnershipTransferred__Params { + return new OwnershipTransferred__Params(this); + } +} + +export class OwnershipTransferred__Params { + _event: OwnershipTransferred; + + constructor(event: OwnershipTransferred) { + this._event = event; + } + + get previousOwner(): Address { + return this._event.parameters[0].value.toAddress(); + } + + get newOwner(): Address { + return this._event.parameters[1].value.toAddress(); + } +} + +export class PublishMessage extends ethereum.Event { + get params(): PublishMessage__Params { + return new PublishMessage__Params(this); + } +} + +export class PublishMessage__Params { + _event: PublishMessage; + + constructor(event: PublishMessage) { + this._event = event; + } + + get _message(): PublishMessage_messageStruct { + return changetype( + this._event.parameters[0].value.toTuple(), + ); + } + + get _encPubKey(): PublishMessage_encPubKeyStruct { + return changetype( + this._event.parameters[1].value.toTuple(), + ); + } +} + +export class PublishMessage_messageStruct extends ethereum.Tuple { + get msgType(): BigInt { + return this[0].toBigInt(); + } + + get data(): Array { + return this[1].toBigIntArray(); + } +} + +export class PublishMessage_encPubKeyStruct extends ethereum.Tuple { + get x(): BigInt { + return this[0].toBigInt(); + } + + get y(): BigInt { + return this[1].toBigInt(); + } +} + +export class TopupMessage extends ethereum.Event { + get params(): TopupMessage__Params { + return new TopupMessage__Params(this); + } +} + +export class TopupMessage__Params { + _event: TopupMessage; + + constructor(event: TopupMessage) { + this._event = event; + } + + get _message(): TopupMessage_messageStruct { + return changetype( + this._event.parameters[0].value.toTuple(), + ); + } +} + +export class TopupMessage_messageStruct extends ethereum.Tuple { + get msgType(): BigInt { + return this[0].toBigInt(); + } + + get data(): Array { + return this[1].toBigIntArray(); + } +} + +export class Poll__coordinatorPubKeyResult { + value0: BigInt; + value1: BigInt; + + constructor(value0: BigInt, value1: BigInt) { + this.value0 = value0; + this.value1 = value1; + } + + toMap(): TypedMap { + let map = new TypedMap(); + map.set("value0", ethereum.Value.fromUnsignedBigInt(this.value0)); + map.set("value1", ethereum.Value.fromUnsignedBigInt(this.value1)); + return map; + } + + getX(): BigInt { + return this.value0; + } + + getY(): BigInt { + return this.value1; + } +} + +export class Poll__extContractsResult { + value0: Address; + value1: Address; + value2: Address; + + constructor(value0: Address, value1: Address, value2: Address) { + this.value0 = value0; + this.value1 = value1; + this.value2 = value2; + } + + toMap(): TypedMap { + let map = new TypedMap(); + map.set("value0", ethereum.Value.fromAddress(this.value0)); + map.set("value1", ethereum.Value.fromAddress(this.value1)); + map.set("value2", ethereum.Value.fromAddress(this.value2)); + return map; + } + + getMaci(): Address { + return this.value0; + } + + getMessageAq(): Address { + return this.value1; + } + + getTopupCredit(): Address { + return this.value2; + } +} + +export class Poll__getDeployTimeAndDurationResult { + value0: BigInt; + value1: BigInt; + + constructor(value0: BigInt, value1: BigInt) { + this.value0 = value0; + this.value1 = value1; + } + + toMap(): TypedMap { + let map = new TypedMap(); + map.set("value0", ethereum.Value.fromUnsignedBigInt(this.value0)); + map.set("value1", ethereum.Value.fromUnsignedBigInt(this.value1)); + return map; + } + + getPollDeployTime(): BigInt { + return this.value0; + } + + getPollDuration(): BigInt { + return this.value1; + } +} + +export class Poll__hashMessageAndEncPubKeyInput_messageStruct extends ethereum.Tuple { + get msgType(): BigInt { + return this[0].toBigInt(); + } + + get data(): Array { + return this[1].toBigIntArray(); + } +} + +export class Poll__hashMessageAndEncPubKeyInput_encPubKeyStruct extends ethereum.Tuple { + get x(): BigInt { + return this[0].toBigInt(); + } + + get y(): BigInt { + return this[1].toBigInt(); + } +} + +export class Poll__hashStateLeafInput_stateLeafStruct extends ethereum.Tuple { + get pubKey(): Poll__hashStateLeafInput_stateLeafPubKeyStruct { + return changetype( + this[0].toTuple(), + ); + } + + get voiceCreditBalance(): BigInt { + return this[1].toBigInt(); + } + + get timestamp(): BigInt { + return this[2].toBigInt(); + } +} + +export class Poll__hashStateLeafInput_stateLeafPubKeyStruct extends ethereum.Tuple { + get x(): BigInt { + return this[0].toBigInt(); + } + + get y(): BigInt { + return this[1].toBigInt(); + } +} + +export class Poll__maxValuesResult { + value0: BigInt; + value1: BigInt; + + constructor(value0: BigInt, value1: BigInt) { + this.value0 = value0; + this.value1 = value1; + } + + toMap(): TypedMap { + let map = new TypedMap(); + map.set("value0", ethereum.Value.fromUnsignedBigInt(this.value0)); + map.set("value1", ethereum.Value.fromUnsignedBigInt(this.value1)); + return map; + } + + getMaxMessages(): BigInt { + return this.value0; + } + + getMaxVoteOptions(): BigInt { + return this.value1; + } +} + +export class Poll__numSignUpsAndMessagesResult { + value0: BigInt; + value1: BigInt; + + constructor(value0: BigInt, value1: BigInt) { + this.value0 = value0; + this.value1 = value1; + } + + toMap(): TypedMap { + let map = new TypedMap(); + map.set("value0", ethereum.Value.fromUnsignedBigInt(this.value0)); + map.set("value1", ethereum.Value.fromUnsignedBigInt(this.value1)); + return map; + } + + getNumSUps(): BigInt { + return this.value0; + } + + getNumMsgs(): BigInt { + return this.value1; + } +} + +export class Poll__padAndHashMessageResultMessageStruct extends ethereum.Tuple { + get msgType(): BigInt { + return this[0].toBigInt(); + } + + get data(): Array { + return this[1].toBigIntArray(); + } +} + +export class Poll__padAndHashMessageResultPadKeyStruct extends ethereum.Tuple { + get x(): BigInt { + return this[0].toBigInt(); + } + + get y(): BigInt { + return this[1].toBigInt(); + } +} + +export class Poll__padAndHashMessageResult { + value0: Poll__padAndHashMessageResultMessageStruct; + value1: Poll__padAndHashMessageResultPadKeyStruct; + value2: BigInt; + + constructor( + value0: Poll__padAndHashMessageResultMessageStruct, + value1: Poll__padAndHashMessageResultPadKeyStruct, + value2: BigInt, + ) { + this.value0 = value0; + this.value1 = value1; + this.value2 = value2; + } + + toMap(): TypedMap { + let map = new TypedMap(); + map.set("value0", ethereum.Value.fromTuple(this.value0)); + map.set("value1", ethereum.Value.fromTuple(this.value1)); + map.set("value2", ethereum.Value.fromUnsignedBigInt(this.value2)); + return map; + } + + getMessage(): Poll__padAndHashMessageResultMessageStruct { + return this.value0; + } + + getPadKey(): Poll__padAndHashMessageResultPadKeyStruct { + return this.value1; + } + + getMsgHash(): BigInt { + return this.value2; + } +} + +export class Poll__treeDepthsResult { + value0: i32; + value1: i32; + value2: i32; + value3: i32; + + constructor(value0: i32, value1: i32, value2: i32, value3: i32) { + this.value0 = value0; + this.value1 = value1; + this.value2 = value2; + this.value3 = value3; + } + + toMap(): TypedMap { + let map = new TypedMap(); + map.set( + "value0", + ethereum.Value.fromUnsignedBigInt(BigInt.fromI32(this.value0)), + ); + map.set( + "value1", + ethereum.Value.fromUnsignedBigInt(BigInt.fromI32(this.value1)), + ); + map.set( + "value2", + ethereum.Value.fromUnsignedBigInt(BigInt.fromI32(this.value2)), + ); + map.set( + "value3", + ethereum.Value.fromUnsignedBigInt(BigInt.fromI32(this.value3)), + ); + return map; + } + + getIntStateTreeDepth(): i32 { + return this.value0; + } + + getMessageTreeSubDepth(): i32 { + return this.value1; + } + + getMessageTreeDepth(): i32 { + return this.value2; + } + + getVoteOptionTreeDepth(): i32 { + return this.value3; + } +} + +export class Poll extends ethereum.SmartContract { + static bind(address: Address): Poll { + return new Poll("Poll", address); + } + + MESSAGE_DATA_LENGTH(): i32 { + let result = super.call( + "MESSAGE_DATA_LENGTH", + "MESSAGE_DATA_LENGTH():(uint8)", + [], + ); + + return result[0].toI32(); + } + + try_MESSAGE_DATA_LENGTH(): ethereum.CallResult { + let result = super.tryCall( + "MESSAGE_DATA_LENGTH", + "MESSAGE_DATA_LENGTH():(uint8)", + [], + ); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toI32()); + } + + coordinatorPubKey(): Poll__coordinatorPubKeyResult { + let result = super.call( + "coordinatorPubKey", + "coordinatorPubKey():(uint256,uint256)", + [], + ); + + return new Poll__coordinatorPubKeyResult( + result[0].toBigInt(), + result[1].toBigInt(), + ); + } + + try_coordinatorPubKey(): ethereum.CallResult { + let result = super.tryCall( + "coordinatorPubKey", + "coordinatorPubKey():(uint256,uint256)", + [], + ); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue( + new Poll__coordinatorPubKeyResult( + value[0].toBigInt(), + value[1].toBigInt(), + ), + ); + } + + coordinatorPubKeyHash(): BigInt { + let result = super.call( + "coordinatorPubKeyHash", + "coordinatorPubKeyHash():(uint256)", + [], + ); + + return result[0].toBigInt(); + } + + try_coordinatorPubKeyHash(): ethereum.CallResult { + let result = super.tryCall( + "coordinatorPubKeyHash", + "coordinatorPubKeyHash():(uint256)", + [], + ); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toBigInt()); + } + + currentSbCommitment(): BigInt { + let result = super.call( + "currentSbCommitment", + "currentSbCommitment():(uint256)", + [], + ); + + return result[0].toBigInt(); + } + + try_currentSbCommitment(): ethereum.CallResult { + let result = super.tryCall( + "currentSbCommitment", + "currentSbCommitment():(uint256)", + [], + ); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toBigInt()); + } + + extContracts(): Poll__extContractsResult { + let result = super.call( + "extContracts", + "extContracts():(address,address,address)", + [], + ); + + return new Poll__extContractsResult( + result[0].toAddress(), + result[1].toAddress(), + result[2].toAddress(), + ); + } + + try_extContracts(): ethereum.CallResult { + let result = super.tryCall( + "extContracts", + "extContracts():(address,address,address)", + [], + ); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue( + new Poll__extContractsResult( + value[0].toAddress(), + value[1].toAddress(), + value[2].toAddress(), + ), + ); + } + + getDeployTimeAndDuration(): Poll__getDeployTimeAndDurationResult { + let result = super.call( + "getDeployTimeAndDuration", + "getDeployTimeAndDuration():(uint256,uint256)", + [], + ); + + return new Poll__getDeployTimeAndDurationResult( + result[0].toBigInt(), + result[1].toBigInt(), + ); + } + + try_getDeployTimeAndDuration(): ethereum.CallResult { + let result = super.tryCall( + "getDeployTimeAndDuration", + "getDeployTimeAndDuration():(uint256,uint256)", + [], + ); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue( + new Poll__getDeployTimeAndDurationResult( + value[0].toBigInt(), + value[1].toBigInt(), + ), + ); + } + + hash2(array: Array): BigInt { + let result = super.call("hash2", "hash2(uint256[2]):(uint256)", [ + ethereum.Value.fromUnsignedBigIntArray(array), + ]); + + return result[0].toBigInt(); + } + + try_hash2(array: Array): ethereum.CallResult { + let result = super.tryCall("hash2", "hash2(uint256[2]):(uint256)", [ + ethereum.Value.fromUnsignedBigIntArray(array), + ]); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toBigInt()); + } + + hash3(array: Array): BigInt { + let result = super.call("hash3", "hash3(uint256[3]):(uint256)", [ + ethereum.Value.fromUnsignedBigIntArray(array), + ]); + + return result[0].toBigInt(); + } + + try_hash3(array: Array): ethereum.CallResult { + let result = super.tryCall("hash3", "hash3(uint256[3]):(uint256)", [ + ethereum.Value.fromUnsignedBigIntArray(array), + ]); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toBigInt()); + } + + hash4(array: Array): BigInt { + let result = super.call("hash4", "hash4(uint256[4]):(uint256)", [ + ethereum.Value.fromUnsignedBigIntArray(array), + ]); + + return result[0].toBigInt(); + } + + try_hash4(array: Array): ethereum.CallResult { + let result = super.tryCall("hash4", "hash4(uint256[4]):(uint256)", [ + ethereum.Value.fromUnsignedBigIntArray(array), + ]); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toBigInt()); + } + + hash5(array: Array): BigInt { + let result = super.call("hash5", "hash5(uint256[5]):(uint256)", [ + ethereum.Value.fromUnsignedBigIntArray(array), + ]); + + return result[0].toBigInt(); + } + + try_hash5(array: Array): ethereum.CallResult { + let result = super.tryCall("hash5", "hash5(uint256[5]):(uint256)", [ + ethereum.Value.fromUnsignedBigIntArray(array), + ]); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toBigInt()); + } + + hashLeftRight(left: BigInt, right: BigInt): BigInt { + let result = super.call( + "hashLeftRight", + "hashLeftRight(uint256,uint256):(uint256)", + [ + ethereum.Value.fromUnsignedBigInt(left), + ethereum.Value.fromUnsignedBigInt(right), + ], + ); + + return result[0].toBigInt(); + } + + try_hashLeftRight(left: BigInt, right: BigInt): ethereum.CallResult { + let result = super.tryCall( + "hashLeftRight", + "hashLeftRight(uint256,uint256):(uint256)", + [ + ethereum.Value.fromUnsignedBigInt(left), + ethereum.Value.fromUnsignedBigInt(right), + ], + ); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toBigInt()); + } + + hashMessageAndEncPubKey( + _message: Poll__hashMessageAndEncPubKeyInput_messageStruct, + _encPubKey: Poll__hashMessageAndEncPubKeyInput_encPubKeyStruct, + ): BigInt { + let result = super.call( + "hashMessageAndEncPubKey", + "hashMessageAndEncPubKey((uint256,uint256[10]),(uint256,uint256)):(uint256)", + [ + ethereum.Value.fromTuple(_message), + ethereum.Value.fromTuple(_encPubKey), + ], + ); + + return result[0].toBigInt(); + } + + try_hashMessageAndEncPubKey( + _message: Poll__hashMessageAndEncPubKeyInput_messageStruct, + _encPubKey: Poll__hashMessageAndEncPubKeyInput_encPubKeyStruct, + ): ethereum.CallResult { + let result = super.tryCall( + "hashMessageAndEncPubKey", + "hashMessageAndEncPubKey((uint256,uint256[10]),(uint256,uint256)):(uint256)", + [ + ethereum.Value.fromTuple(_message), + ethereum.Value.fromTuple(_encPubKey), + ], + ); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toBigInt()); + } + + hashStateLeaf(_stateLeaf: Poll__hashStateLeafInput_stateLeafStruct): BigInt { + let result = super.call( + "hashStateLeaf", + "hashStateLeaf(((uint256,uint256),uint256,uint256)):(uint256)", + [ethereum.Value.fromTuple(_stateLeaf)], + ); + + return result[0].toBigInt(); + } + + try_hashStateLeaf( + _stateLeaf: Poll__hashStateLeafInput_stateLeafStruct, + ): ethereum.CallResult { + let result = super.tryCall( + "hashStateLeaf", + "hashStateLeaf(((uint256,uint256),uint256,uint256)):(uint256)", + [ethereum.Value.fromTuple(_stateLeaf)], + ); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toBigInt()); + } + + maxValues(): Poll__maxValuesResult { + let result = super.call("maxValues", "maxValues():(uint256,uint256)", []); + + return new Poll__maxValuesResult( + result[0].toBigInt(), + result[1].toBigInt(), + ); + } + + try_maxValues(): ethereum.CallResult { + let result = super.tryCall( + "maxValues", + "maxValues():(uint256,uint256)", + [], + ); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue( + new Poll__maxValuesResult(value[0].toBigInt(), value[1].toBigInt()), + ); + } + + mergedStateRoot(): BigInt { + let result = super.call( + "mergedStateRoot", + "mergedStateRoot():(uint256)", + [], + ); + + return result[0].toBigInt(); + } + + try_mergedStateRoot(): ethereum.CallResult { + let result = super.tryCall( + "mergedStateRoot", + "mergedStateRoot():(uint256)", + [], + ); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toBigInt()); + } + + numMessages(): BigInt { + let result = super.call("numMessages", "numMessages():(uint256)", []); + + return result[0].toBigInt(); + } + + try_numMessages(): ethereum.CallResult { + let result = super.tryCall("numMessages", "numMessages():(uint256)", []); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toBigInt()); + } + + numSignUpsAndMessages(): Poll__numSignUpsAndMessagesResult { + let result = super.call( + "numSignUpsAndMessages", + "numSignUpsAndMessages():(uint256,uint256)", + [], + ); + + return new Poll__numSignUpsAndMessagesResult( + result[0].toBigInt(), + result[1].toBigInt(), + ); + } + + try_numSignUpsAndMessages(): ethereum.CallResult { + let result = super.tryCall( + "numSignUpsAndMessages", + "numSignUpsAndMessages():(uint256,uint256)", + [], + ); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue( + new Poll__numSignUpsAndMessagesResult( + value[0].toBigInt(), + value[1].toBigInt(), + ), + ); + } + + numSignups(): BigInt { + let result = super.call("numSignups", "numSignups():(uint256)", []); + + return result[0].toBigInt(); + } + + try_numSignups(): ethereum.CallResult { + let result = super.tryCall("numSignups", "numSignups():(uint256)", []); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toBigInt()); + } + + owner(): Address { + let result = super.call("owner", "owner():(address)", []); + + return result[0].toAddress(); + } + + try_owner(): ethereum.CallResult
{ + let result = super.tryCall("owner", "owner():(address)", []); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toAddress()); + } + + padAndHashMessage( + dataToPad: Array, + msgType: BigInt, + ): Poll__padAndHashMessageResult { + let result = super.call( + "padAndHashMessage", + "padAndHashMessage(uint256[2],uint256):((uint256,uint256[10]),(uint256,uint256),uint256)", + [ + ethereum.Value.fromUnsignedBigIntArray(dataToPad), + ethereum.Value.fromUnsignedBigInt(msgType), + ], + ); + + return changetype( + new Poll__padAndHashMessageResult( + changetype( + result[0].toTuple(), + ), + changetype( + result[1].toTuple(), + ), + result[2].toBigInt(), + ), + ); + } + + try_padAndHashMessage( + dataToPad: Array, + msgType: BigInt, + ): ethereum.CallResult { + let result = super.tryCall( + "padAndHashMessage", + "padAndHashMessage(uint256[2],uint256):((uint256,uint256[10]),(uint256,uint256),uint256)", + [ + ethereum.Value.fromUnsignedBigIntArray(dataToPad), + ethereum.Value.fromUnsignedBigInt(msgType), + ], + ); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue( + changetype( + new Poll__padAndHashMessageResult( + changetype( + value[0].toTuple(), + ), + changetype( + value[1].toTuple(), + ), + value[2].toBigInt(), + ), + ), + ); + } + + sha256Hash(array: Array): BigInt { + let result = super.call("sha256Hash", "sha256Hash(uint256[]):(uint256)", [ + ethereum.Value.fromUnsignedBigIntArray(array), + ]); + + return result[0].toBigInt(); + } + + try_sha256Hash(array: Array): ethereum.CallResult { + let result = super.tryCall( + "sha256Hash", + "sha256Hash(uint256[]):(uint256)", + [ethereum.Value.fromUnsignedBigIntArray(array)], + ); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toBigInt()); + } + + stateAqMerged(): boolean { + let result = super.call("stateAqMerged", "stateAqMerged():(bool)", []); + + return result[0].toBoolean(); + } + + try_stateAqMerged(): ethereum.CallResult { + let result = super.tryCall("stateAqMerged", "stateAqMerged():(bool)", []); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue(value[0].toBoolean()); + } + + treeDepths(): Poll__treeDepthsResult { + let result = super.call( + "treeDepths", + "treeDepths():(uint8,uint8,uint8,uint8)", + [], + ); + + return new Poll__treeDepthsResult( + result[0].toI32(), + result[1].toI32(), + result[2].toI32(), + result[3].toI32(), + ); + } + + try_treeDepths(): ethereum.CallResult { + let result = super.tryCall( + "treeDepths", + "treeDepths():(uint8,uint8,uint8,uint8)", + [], + ); + if (result.reverted) { + return new ethereum.CallResult(); + } + let value = result.value; + return ethereum.CallResult.fromValue( + new Poll__treeDepthsResult( + value[0].toI32(), + value[1].toI32(), + value[2].toI32(), + value[3].toI32(), + ), + ); + } +} + +export class ConstructorCall extends ethereum.Call { + get inputs(): ConstructorCall__Inputs { + return new ConstructorCall__Inputs(this); + } + + get outputs(): ConstructorCall__Outputs { + return new ConstructorCall__Outputs(this); + } +} + +export class ConstructorCall__Inputs { + _call: ConstructorCall; + + constructor(call: ConstructorCall) { + this._call = call; + } + + get _duration(): BigInt { + return this._call.inputValues[0].value.toBigInt(); + } + + get _maxValues(): ConstructorCall_maxValuesStruct { + return changetype( + this._call.inputValues[1].value.toTuple(), + ); + } + + get _treeDepths(): ConstructorCall_treeDepthsStruct { + return changetype( + this._call.inputValues[2].value.toTuple(), + ); + } + + get _coordinatorPubKey(): ConstructorCall_coordinatorPubKeyStruct { + return changetype( + this._call.inputValues[3].value.toTuple(), + ); + } + + get _extContracts(): ConstructorCall_extContractsStruct { + return changetype( + this._call.inputValues[4].value.toTuple(), + ); + } +} + +export class ConstructorCall__Outputs { + _call: ConstructorCall; + + constructor(call: ConstructorCall) { + this._call = call; + } +} + +export class ConstructorCall_maxValuesStruct extends ethereum.Tuple { + get maxMessages(): BigInt { + return this[0].toBigInt(); + } + + get maxVoteOptions(): BigInt { + return this[1].toBigInt(); + } +} + +export class ConstructorCall_treeDepthsStruct extends ethereum.Tuple { + get intStateTreeDepth(): i32 { + return this[0].toI32(); + } + + get messageTreeSubDepth(): i32 { + return this[1].toI32(); + } + + get messageTreeDepth(): i32 { + return this[2].toI32(); + } + + get voteOptionTreeDepth(): i32 { + return this[3].toI32(); + } +} + +export class ConstructorCall_coordinatorPubKeyStruct extends ethereum.Tuple { + get x(): BigInt { + return this[0].toBigInt(); + } + + get y(): BigInt { + return this[1].toBigInt(); + } +} + +export class ConstructorCall_extContractsStruct extends ethereum.Tuple { + get maci(): Address { + return this[0].toAddress(); + } + + get messageAq(): Address { + return this[1].toAddress(); + } + + get topupCredit(): Address { + return this[2].toAddress(); + } +} + +export class InitCall extends ethereum.Call { + get inputs(): InitCall__Inputs { + return new InitCall__Inputs(this); + } + + get outputs(): InitCall__Outputs { + return new InitCall__Outputs(this); + } +} + +export class InitCall__Inputs { + _call: InitCall; + + constructor(call: InitCall) { + this._call = call; + } +} + +export class InitCall__Outputs { + _call: InitCall; + + constructor(call: InitCall) { + this._call = call; + } +} + +export class MergeMaciStateAqCall extends ethereum.Call { + get inputs(): MergeMaciStateAqCall__Inputs { + return new MergeMaciStateAqCall__Inputs(this); + } + + get outputs(): MergeMaciStateAqCall__Outputs { + return new MergeMaciStateAqCall__Outputs(this); + } +} + +export class MergeMaciStateAqCall__Inputs { + _call: MergeMaciStateAqCall; + + constructor(call: MergeMaciStateAqCall) { + this._call = call; + } + + get _pollId(): BigInt { + return this._call.inputValues[0].value.toBigInt(); + } +} + +export class MergeMaciStateAqCall__Outputs { + _call: MergeMaciStateAqCall; + + constructor(call: MergeMaciStateAqCall) { + this._call = call; + } +} + +export class MergeMaciStateAqSubRootsCall extends ethereum.Call { + get inputs(): MergeMaciStateAqSubRootsCall__Inputs { + return new MergeMaciStateAqSubRootsCall__Inputs(this); + } + + get outputs(): MergeMaciStateAqSubRootsCall__Outputs { + return new MergeMaciStateAqSubRootsCall__Outputs(this); + } +} + +export class MergeMaciStateAqSubRootsCall__Inputs { + _call: MergeMaciStateAqSubRootsCall; + + constructor(call: MergeMaciStateAqSubRootsCall) { + this._call = call; + } + + get _numSrQueueOps(): BigInt { + return this._call.inputValues[0].value.toBigInt(); + } + + get _pollId(): BigInt { + return this._call.inputValues[1].value.toBigInt(); + } +} + +export class MergeMaciStateAqSubRootsCall__Outputs { + _call: MergeMaciStateAqSubRootsCall; + + constructor(call: MergeMaciStateAqSubRootsCall) { + this._call = call; + } +} + +export class MergeMessageAqCall extends ethereum.Call { + get inputs(): MergeMessageAqCall__Inputs { + return new MergeMessageAqCall__Inputs(this); + } + + get outputs(): MergeMessageAqCall__Outputs { + return new MergeMessageAqCall__Outputs(this); + } +} + +export class MergeMessageAqCall__Inputs { + _call: MergeMessageAqCall; + + constructor(call: MergeMessageAqCall) { + this._call = call; + } +} + +export class MergeMessageAqCall__Outputs { + _call: MergeMessageAqCall; + + constructor(call: MergeMessageAqCall) { + this._call = call; + } +} + +export class MergeMessageAqSubRootsCall extends ethereum.Call { + get inputs(): MergeMessageAqSubRootsCall__Inputs { + return new MergeMessageAqSubRootsCall__Inputs(this); + } + + get outputs(): MergeMessageAqSubRootsCall__Outputs { + return new MergeMessageAqSubRootsCall__Outputs(this); + } +} + +export class MergeMessageAqSubRootsCall__Inputs { + _call: MergeMessageAqSubRootsCall; + + constructor(call: MergeMessageAqSubRootsCall) { + this._call = call; + } + + get _numSrQueueOps(): BigInt { + return this._call.inputValues[0].value.toBigInt(); + } +} + +export class MergeMessageAqSubRootsCall__Outputs { + _call: MergeMessageAqSubRootsCall; + + constructor(call: MergeMessageAqSubRootsCall) { + this._call = call; + } +} + +export class PublishMessageCall extends ethereum.Call { + get inputs(): PublishMessageCall__Inputs { + return new PublishMessageCall__Inputs(this); + } + + get outputs(): PublishMessageCall__Outputs { + return new PublishMessageCall__Outputs(this); + } +} + +export class PublishMessageCall__Inputs { + _call: PublishMessageCall; + + constructor(call: PublishMessageCall) { + this._call = call; + } + + get _message(): PublishMessageCall_messageStruct { + return changetype( + this._call.inputValues[0].value.toTuple(), + ); + } + + get _encPubKey(): PublishMessageCall_encPubKeyStruct { + return changetype( + this._call.inputValues[1].value.toTuple(), + ); + } +} + +export class PublishMessageCall__Outputs { + _call: PublishMessageCall; + + constructor(call: PublishMessageCall) { + this._call = call; + } +} + +export class PublishMessageCall_messageStruct extends ethereum.Tuple { + get msgType(): BigInt { + return this[0].toBigInt(); + } + + get data(): Array { + return this[1].toBigIntArray(); + } +} + +export class PublishMessageCall_encPubKeyStruct extends ethereum.Tuple { + get x(): BigInt { + return this[0].toBigInt(); + } + + get y(): BigInt { + return this[1].toBigInt(); + } +} + +export class PublishMessageBatchCall extends ethereum.Call { + get inputs(): PublishMessageBatchCall__Inputs { + return new PublishMessageBatchCall__Inputs(this); + } + + get outputs(): PublishMessageBatchCall__Outputs { + return new PublishMessageBatchCall__Outputs(this); + } +} + +export class PublishMessageBatchCall__Inputs { + _call: PublishMessageBatchCall; + + constructor(call: PublishMessageBatchCall) { + this._call = call; + } + + get _messages(): Array { + return this._call.inputValues[0].value.toTupleArray(); + } + + get _encPubKeys(): Array { + return this._call.inputValues[1].value.toTupleArray(); + } +} + +export class PublishMessageBatchCall__Outputs { + _call: PublishMessageBatchCall; + + constructor(call: PublishMessageBatchCall) { + this._call = call; + } +} + +export class PublishMessageBatchCall_messagesStruct extends ethereum.Tuple { + get msgType(): BigInt { + return this[0].toBigInt(); + } + + get data(): Array { + return this[1].toBigIntArray(); + } +} + +export class PublishMessageBatchCall_encPubKeysStruct extends ethereum.Tuple { + get x(): BigInt { + return this[0].toBigInt(); + } + + get y(): BigInt { + return this[1].toBigInt(); + } +} + +export class RenounceOwnershipCall extends ethereum.Call { + get inputs(): RenounceOwnershipCall__Inputs { + return new RenounceOwnershipCall__Inputs(this); + } + + get outputs(): RenounceOwnershipCall__Outputs { + return new RenounceOwnershipCall__Outputs(this); + } +} + +export class RenounceOwnershipCall__Inputs { + _call: RenounceOwnershipCall; + + constructor(call: RenounceOwnershipCall) { + this._call = call; + } +} + +export class RenounceOwnershipCall__Outputs { + _call: RenounceOwnershipCall; + + constructor(call: RenounceOwnershipCall) { + this._call = call; + } +} + +export class TopupCall extends ethereum.Call { + get inputs(): TopupCall__Inputs { + return new TopupCall__Inputs(this); + } + + get outputs(): TopupCall__Outputs { + return new TopupCall__Outputs(this); + } +} + +export class TopupCall__Inputs { + _call: TopupCall; + + constructor(call: TopupCall) { + this._call = call; + } + + get stateIndex(): BigInt { + return this._call.inputValues[0].value.toBigInt(); + } + + get amount(): BigInt { + return this._call.inputValues[1].value.toBigInt(); + } +} + +export class TopupCall__Outputs { + _call: TopupCall; + + constructor(call: TopupCall) { + this._call = call; + } +} + +export class TransferOwnershipCall extends ethereum.Call { + get inputs(): TransferOwnershipCall__Inputs { + return new TransferOwnershipCall__Inputs(this); + } + + get outputs(): TransferOwnershipCall__Outputs { + return new TransferOwnershipCall__Outputs(this); + } +} + +export class TransferOwnershipCall__Inputs { + _call: TransferOwnershipCall; + + constructor(call: TransferOwnershipCall) { + this._call = call; + } + + get newOwner(): Address { + return this._call.inputValues[0].value.toAddress(); + } +} + +export class TransferOwnershipCall__Outputs { + _call: TransferOwnershipCall; + + constructor(call: TransferOwnershipCall) { + this._call = call; + } +} diff --git a/subgraph/graph-node/.gitignore b/subgraph/graph-node/.gitignore new file mode 100644 index 000000000..1269488f7 --- /dev/null +++ b/subgraph/graph-node/.gitignore @@ -0,0 +1 @@ +data diff --git a/subgraph/graph-node/README.md b/subgraph/graph-node/README.md new file mode 100644 index 000000000..e08120a10 --- /dev/null +++ b/subgraph/graph-node/README.md @@ -0,0 +1,9 @@ +# Graph Node Docker Image + +Preconfigured Docker image for running a Graph Node. + +To start a graph node for development of clrfund. Make sure to start a local hardhat node first (`yarn start:node` from the root folder). + +```sh +docker compose up -d +``` diff --git a/subgraph/graph-node/docker-compose.yml b/subgraph/graph-node/docker-compose.yml new file mode 100644 index 000000000..2265944ab --- /dev/null +++ b/subgraph/graph-node/docker-compose.yml @@ -0,0 +1,50 @@ +version: '3' +services: + graph-node: + image: graphprotocol/graph-node + ports: + - '8000:8000' + - '8001:8001' + - '8020:8020' + - '8030:8030' + - '8040:8040' + depends_on: + - ipfs + - postgres + extra_hosts: + - host.docker.internal:host-gateway + environment: + postgres_host: postgres + postgres_user: graph-node + postgres_pass: let-me-in + postgres_db: graph-node + ipfs: 'ipfs:5001' + ethereum: 'hardhat:http://host.docker.internal:18545' + GRAPH_LOG: info + ipfs: + image: ipfs/kubo:v0.14.0 + ports: + - '5001:5001' + volumes: + - ./data/ipfs:/data/ipfs + postgres: + image: postgres:14 + ports: + - '5432:5432' + command: + [ + "postgres", + "-cshared_preload_libraries=pg_stat_statements", + "-cmax_connections=200" + ] + environment: + POSTGRES_USER: graph-node + POSTGRES_PASSWORD: let-me-in + POSTGRES_DB: graph-node + # FIXME: remove this env. var. which we shouldn't need. Introduced by + # , maybe as a + # workaround for https://github.com/docker/for-mac/issues/6270? + PGDATA: "/var/lib/postgresql/data" + POSTGRES_INITDB_ARGS: "-E UTF8 --locale=C" + volumes: + - ./data/postgres:/var/lib/postgresql/data diff --git a/subgraph/package.json b/subgraph/package.json index f71fcfdc3..e764fefc9 100644 --- a/subgraph/package.json +++ b/subgraph/package.json @@ -1,6 +1,6 @@ { "name": "@clrfund/subgraph", - "version": "4.3.1", + "version": "5.1.1", "repository": "https://github.com/clrfund/monorepo/subgraph", "keywords": [ "clr.fund", @@ -26,12 +26,12 @@ "deploy": "graph deploy --node https://api.thegraph.com/deploy/ --ipfs https://api.thegraph.com/ipfs/ clrfund/clrfund", "create-local": "graph create --node http://localhost:8020/ clrfund/clrfund", "remove-local": "graph remove --node http://localhost:8020/ clrfund/clrfund", - "deploy-local": "graph deploy --node http://localhost:8020/ --ipfs http://localhost:5001 clrfund/clrfund", + "deploy-local": "graph deploy --node http://localhost:8020/ --ipfs http://localhost:5001 clrfund/clrfund --version-label=v0.0.1", "gen-uml": "graphqlviz https://api.thegraph.com/subgraphs/name/clrfund/clrfund | dot -Tpng -o subgraphUML.png" }, "dependencies": { - "@graphprotocol/graph-cli": "^0.46.1", - "@graphprotocol/graph-ts": "^0.29.3" + "@graphprotocol/graph-cli": "^0.68.1", + "@graphprotocol/graph-ts": "^0.33.0" }, "devDependencies": { "@typescript-eslint/eslint-plugin": "^5.44.0", diff --git a/subgraph/schema.graphql b/subgraph/schema.graphql index 4236432fd..147b3225f 100644 --- a/subgraph/schema.graphql +++ b/subgraph/schema.graphql @@ -1,4 +1,4 @@ -type FundingRoundFactory @entity { +type ClrFund @entity { id: ID! owner: Bytes coordinator: Bytes @@ -15,18 +15,8 @@ type FundingRoundFactory @entity { stateTreeDepth: BigInt messageTreeDepth: BigInt voteOptionTreeDepth: BigInt - tallyBatchSize: BigInt - messageBatchSize: BigInt - batchUstVerifier: Bytes - qvtVerifier: Bytes - signUpDuration: BigInt - votingDuration: BigInt - maxUsers: BigInt - maxMessages: BigInt - maxVoteOptions: BigInt - - fundingRounds: [FundingRound!] @derivedFrom(field: "fundingRoundFactory") + fundingRounds: [FundingRound!] @derivedFrom(field: "clrFund") createdAt: String lastUpdatedAt: String @@ -35,9 +25,10 @@ type FundingRoundFactory @entity { type Message @entity { id: ID! data: [BigInt!] - iv: BigInt! + msgType: BigInt! publicKey: PublicKey - fundingRound: FundingRound + fundingRound: FundingRound + poll: Poll submittedBy: Bytes timestamp: String blockNumber: BigInt! @@ -54,10 +45,19 @@ type PublicKey @entity { voiceCreditBalance: BigInt } +type Poll @entity { + id: ID! + fundingRound: FundingRound! + messages: [Message!] @derivedFrom(field: "poll") +} + type FundingRound @entity { id: ID! - fundingRoundFactory: FundingRoundFactory + clrFund: ClrFund maci: Bytes + maciTxHash: Bytes + pollId: BigInt + pollAddress: Bytes messages: [Message!] @derivedFrom(field: "fundingRound") recipientRegistry: RecipientRegistry recipientRegistryAddress: Bytes @@ -69,6 +69,12 @@ type FundingRound @entity { signUpDeadline: BigInt votingDeadline: BigInt + stateTreeDepth: Int + messageTreeDepth: Int + voteOptionTreeDepth: Int + + coordinatorPubKeyX: BigInt + coordinatorPubKeyY: BigInt coordinator: Bytes voiceCreditFactor: BigInt @@ -84,14 +90,13 @@ type FundingRound @entity { recipients: [Recipient!] @derivedFrom(field: "fundingRounds") contributors: [Contributor!] @derivedFrom(field: "fundingRounds") contributions: [Contribution!] @derivedFrom(field: "fundingRound") - votes: [Vote!] @derivedFrom(field: "fundingRound") createdAt: String lastUpdatedAt: String } type RecipientRegistry @entity { id: ID! - fundingRoundFactory: FundingRoundFactory + clrFund: ClrFund baseDeposit: BigInt challengePeriodDuration: BigInt controller: Bytes @@ -127,7 +132,7 @@ type Recipient @entity { type ContributorRegistry @entity { id: ID! - fundingRoundFactory: FundingRoundFactory! + clrFund: ClrFund! context: String owner: Bytes contributors: [Contributor!] @derivedFrom(field: "contributorRegistry") @@ -139,7 +144,6 @@ type ContributorRegistry @entity { type Contributor @entity { id: ID! contributorRegistry: ContributorRegistry! - votes: [Vote!] @derivedFrom(field: "contributor") verifiedTimeStamp: String # sponsors: [Bytes] @@ -154,7 +158,6 @@ type Contributor @entity { type Coordinator @entity { id: ID! - # fundingRoundFactory: FundingRoundFactory! contact: String createdAt: String @@ -171,15 +174,6 @@ type Contribution @entity { createdAt: String } -type Vote @entity { - id: ID! - contributor: Contributor - fundingRound: FundingRound - voterAddress: Bytes - secret: Boolean - -} - type Donation @entity { id: ID! recipient: Bytes diff --git a/subgraph/schema.template.graphql b/subgraph/schema.template.graphql new file mode 100644 index 000000000..af4e1689d --- /dev/null +++ b/subgraph/schema.template.graphql @@ -0,0 +1,207 @@ +{{#clrFundDeployerAddress}} +type ClrFundDeployer @entity { + id: ID! + clrFunds: [ClrFund!] @derivedFrom(field: "clrFundDeployer") + createdAt: String + lastUpdatedAt: String +} + +{{/clrFundDeployerAddress}} +type ClrFund @entity { + id: ID! + owner: Bytes + {{#clrFundDeployerAddress}} + clrFundDeployer: ClrFundDeployer! + {{/clrFundDeployerAddress}} + coordinator: Bytes + nativeToken: Bytes + nativeTokenInfo: Token + contributorRegistry: ContributorRegistry + contributorRegistryAddress: Bytes + recipientRegistry: RecipientRegistry + recipientRegistryAddress: Bytes + currentRound: FundingRound + + maciFactory: Bytes + coordinatorPubKey: String + stateTreeDepth: BigInt + messageTreeDepth: BigInt + voteOptionTreeDepth: BigInt + + fundingRounds: [FundingRound!] @derivedFrom(field: "clrFund") + + createdAt: String + lastUpdatedAt: String +} + +type Message @entity { + id: ID! + data: [BigInt!] + msgType: BigInt! + publicKey: PublicKey + fundingRound: FundingRound + poll: Poll + submittedBy: Bytes + timestamp: String + blockNumber: BigInt! + transactionIndex: BigInt! +} + +type PublicKey @entity { + id: ID! + fundingRound: FundingRound + messages: [Message!] @derivedFrom(field: "publicKey") + x: BigInt! + y: BigInt! + stateIndex: BigInt + voiceCreditBalance: BigInt +} + +type Poll @entity { + id: ID! + fundingRound: FundingRound! + messages: [Message!] @derivedFrom(field: "poll") +} + +type FundingRound @entity { + id: ID! + clrFund: ClrFund + maci: Bytes + maciTxHash: Bytes + pollId: BigInt + pollAddress: Bytes + messages: [Message!] @derivedFrom(field: "fundingRound") + recipientRegistry: RecipientRegistry + recipientRegistryAddress: Bytes + contributorRegistry: ContributorRegistry + contributorRegistryAddress: Bytes + nativeToken: Bytes + nativeTokenInfo: Token + startTime: BigInt + signUpDeadline: BigInt + votingDeadline: BigInt + + stateTreeDepth: Int + messageTreeDepth: Int + voteOptionTreeDepth: Int + + coordinatorPubKeyX: BigInt + coordinatorPubKeyY: BigInt + coordinator: Bytes + + voiceCreditFactor: BigInt + contributorCount: BigInt! + recipientCount: BigInt! + matchingPoolSize: BigInt + totalSpent: BigInt + totalVotes: BigInt + isFinalized: Boolean + isCancelled: Boolean + tallyHash: String + + recipients: [Recipient!] @derivedFrom(field: "fundingRounds") + contributors: [Contributor!] @derivedFrom(field: "fundingRounds") + contributions: [Contribution!] @derivedFrom(field: "fundingRound") + createdAt: String + lastUpdatedAt: String +} + +type RecipientRegistry @entity { + id: ID! + clrFund: ClrFund + baseDeposit: BigInt + challengePeriodDuration: BigInt + controller: Bytes + maxRecipients: BigInt + owner: Bytes + recipients: [Recipient!] @derivedFrom(field: "recipientRegistry") + createdAt: String + lastUpdatedAt: String +} + +type Recipient @entity { + id: ID! + recipientRegistry: RecipientRegistry + + recipientIndex: BigInt + requestType: String + requester: String + submissionTime: String + deposit: BigInt + recipientAddress: Bytes + recipientMetadata: String + rejected: Boolean + verified: Boolean + voteOptionIndex: BigInt + requestResolvedHash: Bytes + requestSubmittedHash: Bytes + + fundingRounds: [FundingRound!] + + createdAt: String + lastUpdatedAt: String +} + +type ContributorRegistry @entity { + id: ID! + clrFund: ClrFund! + context: String + owner: Bytes + contributors: [Contributor!] @derivedFrom(field: "contributorRegistry") + + createdAt: String + lastUpdatedAt: String +} + +type Contributor @entity { + id: ID! + contributorRegistry: ContributorRegistry! + + verifiedTimeStamp: String + # sponsors: [Bytes] + contributorAddress: Bytes + + fundingRounds: [FundingRound!] + contributions: [Contribution!] @derivedFrom(field: "contributor") + + createdAt: String + lastUpdatedAt: String +} + +type Coordinator @entity { + id: ID! + contact: String + + createdAt: String + lastUpdatedAt: String +} + +type Contribution @entity { + id: ID! + contributor: Contributor + fundingRound: FundingRound + amount: BigInt + voiceCredits: BigInt + + createdAt: String +} + +type Donation @entity { + id: ID! + recipient: Bytes + fundingRound: FundingRound + amount: BigInt + voteOptionIndex: BigInt + + createdAt: String +} + +type Token @entity { + id: ID! + tokenAddress: Bytes + symbol: String + decimals: BigInt + createdAt: String + lastUpdatedAt: String +} + diff --git a/subgraph/src/ClrFundDeployerMapping.ts b/subgraph/src/ClrFundDeployerMapping.ts new file mode 100644 index 000000000..c04392dac --- /dev/null +++ b/subgraph/src/ClrFundDeployerMapping.ts @@ -0,0 +1,27 @@ +import { log } from '@graphprotocol/graph-ts' +import { NewInstance } from '../generated/ClrFundDeployer/ClrFundDeployer' + +import { ClrFundDeployer, ClrFund } from '../generated/schema' +import { ClrFund as ClrFundTemplate } from '../generated/templates' + +export function handleNewInstance(event: NewInstance): void { + let clrfundDeployerAddress = event.transaction.to! + let clrfundDeployerId = clrfundDeployerAddress.toHex() + + let clrFundDeployer = ClrFundDeployer.load(clrfundDeployerId) + if (!clrFundDeployer) { + clrFundDeployer = new ClrFundDeployer(clrfundDeployerId) + clrFundDeployer.createdAt = event.block.timestamp.toString() + } + + ClrFundTemplate.create(event.params.clrfund) + let clrFundAddress = event.params.clrfund + let clrFundId = clrFundAddress.toHexString() + let clrFund = new ClrFund(clrFundId) + clrFund.clrFundDeployer = clrfundDeployerId + clrFund.save() + + clrFundDeployer.lastUpdatedAt = event.block.timestamp.toString() + clrFundDeployer.save() + log.info('NewInstance {}', [clrFundId]) +} diff --git a/subgraph/src/FundingRoundFactoryMapping.ts b/subgraph/src/ClrFundMapping.ts similarity index 55% rename from subgraph/src/FundingRoundFactoryMapping.ts rename to subgraph/src/ClrFundMapping.ts index 6a081c229..f26e32586 100644 --- a/subgraph/src/FundingRoundFactoryMapping.ts +++ b/subgraph/src/ClrFundMapping.ts @@ -7,38 +7,44 @@ import { RoundFinalized, RoundStarted, TokenChanged, - FundingRoundFactory as FundingRoundFactoryContract, -} from '../generated/FundingRoundFactory/FundingRoundFactory' + UserRegistryChanged, + RecipientRegistryChanged, + ClrFund as ClrFundContract, +} from '../generated/ClrFund/ClrFund' -import { Token as TokenContract } from '../generated/FundingRoundFactory/Token' +import { Token as TokenContract } from '../generated/ClrFund/Token' +import { Poll as PollContract } from '../generated/ClrFund/Poll' +import { MACI as MACIContract } from '../generated/ClrFund/MACI' -import { MACIFactory as MACIFactoryContract } from '../generated/FundingRoundFactory/MACIFactory' -import { FundingRound as FundingRoundContract } from '../generated/FundingRoundFactory/FundingRound' +import { MACIFactory as MACIFactoryContract } from '../generated/ClrFund/MACIFactory' +import { FundingRound as FundingRoundContract } from '../generated/ClrFund/FundingRound' -import { OptimisticRecipientRegistry as RecipientRegistryContract } from '../generated/FundingRoundFactory/OptimisticRecipientRegistry' -import { BrightIdUserRegistry as BrightIdUserRegistryContract } from '../generated/FundingRoundFactory/BrightIdUserRegistry' +import { OptimisticRecipientRegistry as RecipientRegistryContract } from '../generated/ClrFund/OptimisticRecipientRegistry' +import { BrightIdUserRegistry as BrightIdUserRegistryContract } from '../generated/ClrFund/BrightIdUserRegistry' import { createRecipientRegistry } from './RecipientRegistry' import { FundingRound as FundingRoundTemplate, OptimisticRecipientRegistry as recipientRegistryTemplate, MACI as MACITemplate, + Poll as PollTemplate, } from '../generated/templates' import { - FundingRoundFactory, + ClrFund, FundingRound, RecipientRegistry, ContributorRegistry, Token, + Poll, } from '../generated/schema' function createContributorRegistry( - fundingRoundFactoryAddress: Address, + clrFundAddress: Address, contributorRegistryAddress: Address ): ContributorRegistry { log.info('New contributorRegistry', []) - let owner = fundingRoundFactoryAddress + let owner = clrFundAddress let contributorRegistryId = contributorRegistryAddress.toHexString() let brightIdUserRegistryContract = BrightIdUserRegistryContract.bind( @@ -50,8 +56,7 @@ function createContributorRegistry( ? 'BrightId user registry' : 'simple user registry' contributorRegistry.owner = owner - contributorRegistry.fundingRoundFactory = - fundingRoundFactoryAddress.toHexString() + contributorRegistry.clrFund = clrFundAddress.toHexString() contributorRegistry.save() return contributorRegistry @@ -82,108 +87,82 @@ function createToken(tokenAddress: Address, blockTimestamp: BigInt): Token { return token } -function createOrUpdateFundingRoundFactory( - fundingRoundFactoryAddress: Address, +function createOrUpdateClrFund( + clrFundAddress: Address, timestamp: BigInt -): FundingRoundFactory { - let fundingRoundFactoryId = fundingRoundFactoryAddress.toHexString() +): ClrFund { + let clrFundId = clrFundAddress.toHexString() - let fundingRoundFactoryContract = FundingRoundFactoryContract.bind( - fundingRoundFactoryAddress - ) + let clrFundContract = ClrFundContract.bind(clrFundAddress) - let loadedFactory = FundingRoundFactory.load(fundingRoundFactoryId) - let fundingRoundFactory = loadedFactory - ? loadedFactory - : new FundingRoundFactory(fundingRoundFactoryId) + let loadedClrFund = ClrFund.load(clrFundId) + let clrFund = loadedClrFund ? loadedClrFund : new ClrFund(clrFundId) - let maciFactoryAddressCall = fundingRoundFactoryContract.try_maciFactory() + let maciFactoryAddressCall = clrFundContract.try_maciFactory() if (maciFactoryAddressCall.reverted) { log.info('TRY maciFactoryAddress Failed', []) } else { let maciFactoryAddress = maciFactoryAddressCall.value let maciFactoryContract = MACIFactoryContract.bind(maciFactoryAddress) - let batchUstVerifier = maciFactoryContract.batchUstVerifier() - let qvtVerifier = maciFactoryContract.qvtVerifier() - let votingDuration = maciFactoryContract.votingDuration() - let signUpDuration = maciFactoryContract.signUpDuration() - - let tallyBatchSize = maciFactoryContract.batchSizes().value0 - let messageBatchSize = maciFactoryContract.batchSizes().value1 - let stateTreeDepth = maciFactoryContract.treeDepths().value0 - let messageTreeDepth = maciFactoryContract.treeDepths().value1 - let voteOptionTreeDepth = maciFactoryContract.treeDepths().value2 - let maxUsers = maciFactoryContract.maxValues().value0 - let maxMessages = maciFactoryContract.maxValues().value1 - let maxVoteOptions = maciFactoryContract.maxValues().value2 - - fundingRoundFactory.maciFactory = maciFactoryAddress - fundingRoundFactory.batchUstVerifier = batchUstVerifier - fundingRoundFactory.qvtVerifier = qvtVerifier - fundingRoundFactory.votingDuration = votingDuration - fundingRoundFactory.signUpDuration = signUpDuration - fundingRoundFactory.tallyBatchSize = BigInt.fromI32(tallyBatchSize) - fundingRoundFactory.messageBatchSize = BigInt.fromI32(messageBatchSize) - fundingRoundFactory.messageTreeDepth = BigInt.fromI32(messageTreeDepth) - fundingRoundFactory.stateTreeDepth = BigInt.fromI32(stateTreeDepth) - fundingRoundFactory.voteOptionTreeDepth = - BigInt.fromI32(voteOptionTreeDepth) - fundingRoundFactory.maxUsers = maxUsers - fundingRoundFactory.maxMessages = maxMessages - fundingRoundFactory.maxVoteOptions = maxVoteOptions + + let stateTreeDepth = maciFactoryContract.stateTreeDepth() + let messageTreeDepth = maciFactoryContract.treeDepths().value2 + let voteOptionTreeDepth = maciFactoryContract.treeDepths().value3 + + clrFund.maciFactory = maciFactoryAddress + clrFund.messageTreeDepth = BigInt.fromI32(messageTreeDepth) + clrFund.stateTreeDepth = BigInt.fromI32(stateTreeDepth) + clrFund.voteOptionTreeDepth = BigInt.fromI32(voteOptionTreeDepth) log.info('New maciFactoryAddress', []) } - let nativeToken = fundingRoundFactoryContract.nativeToken() + let nativeToken = clrFundContract.nativeToken() let nativeTokenId = nativeToken.toHexString() let nativeTokenEntity = Token.load(nativeTokenId) if (!nativeTokenEntity) { createToken(nativeToken, timestamp) } - let coordinator = fundingRoundFactoryContract.coordinator() - let owner = fundingRoundFactoryContract.owner() + let coordinator = clrFundContract.coordinator() + let owner = clrFundContract.owner() //Check if these registries already exist/are being tracked - let recipientRegistryAddress = fundingRoundFactoryContract.recipientRegistry() + let recipientRegistryAddress = clrFundContract.recipientRegistry() let recipientRegistryId = recipientRegistryAddress.toHexString() let recipientRegistry = RecipientRegistry.load(recipientRegistryId) if (!recipientRegistry) { - createRecipientRegistry(fundingRoundFactoryId, recipientRegistryAddress) + createRecipientRegistry(clrFundId, recipientRegistryAddress) } - let contributorRegistryAddress = fundingRoundFactoryContract.userRegistry() + let contributorRegistryAddress = clrFundContract.userRegistry() let contributorRegistryId = contributorRegistryAddress.toHexString() let contributorRegistry = ContributorRegistry.load(contributorRegistryId) if (!contributorRegistry) { - createContributorRegistry( - fundingRoundFactoryAddress, - contributorRegistryAddress - ) + createContributorRegistry(clrFundAddress, contributorRegistryAddress) } - fundingRoundFactory.contributorRegistry = contributorRegistryId - fundingRoundFactory.recipientRegistry = recipientRegistryId - fundingRoundFactory.contributorRegistryAddress = contributorRegistryAddress - fundingRoundFactory.recipientRegistryAddress = recipientRegistryAddress - fundingRoundFactory.nativeToken = nativeToken - fundingRoundFactory.nativeTokenInfo = nativeTokenId - fundingRoundFactory.coordinator = coordinator - fundingRoundFactory.owner = owner - - fundingRoundFactory.save() - return fundingRoundFactory + clrFund.contributorRegistry = contributorRegistryId + clrFund.recipientRegistry = recipientRegistryId + clrFund.contributorRegistryAddress = contributorRegistryAddress + clrFund.recipientRegistryAddress = recipientRegistryAddress + clrFund.nativeToken = nativeToken + clrFund.nativeTokenInfo = nativeTokenId + clrFund.coordinator = coordinator + clrFund.owner = owner + + clrFund.save() + return clrFund } export function handleCoordinatorChanged(event: CoordinatorChanged): void { log.info('handleCoordinatorChanged', []) - createOrUpdateFundingRoundFactory(event.address, event.block.timestamp) + createOrUpdateClrFund(event.address, event.block.timestamp) } export function handleFundingSourceAdded(event: FundingSourceAdded): void { log.info('handleFundingSourceAdded', []) - createOrUpdateFundingRoundFactory(event.address, event.block.timestamp) + createOrUpdateClrFund(event.address, event.block.timestamp) } export function handleFundingSourceRemoved(event: FundingSourceRemoved): void { @@ -192,7 +171,7 @@ export function handleFundingSourceRemoved(event: FundingSourceRemoved): void { export function handleOwnershipTransferred(event: OwnershipTransferred): void { log.info('handleOwnershipTransferred', [event.params.newOwner.toHexString()]) - createOrUpdateFundingRoundFactory(event.address, event.block.timestamp) + createOrUpdateClrFund(event.address, event.block.timestamp) } export function handleRoundFinalized(event: RoundFinalized): void { @@ -224,22 +203,14 @@ export function handleRoundFinalized(event: RoundFinalized): void { export function handleRoundStarted(event: RoundStarted): void { log.info('handleRoundStarted!!!', []) - let fundingRoundFactoryId = event.address.toHexString() + let clrFundId = event.address.toHexString() let fundingRoundId = event.params._round.toHexString() - let fundingRoundFactory = createOrUpdateFundingRoundFactory( - event.address, - event.block.timestamp - ) + let clrFund = createOrUpdateClrFund(event.address, event.block.timestamp) FundingRoundTemplate.create(event.params._round) - let fundingRoundFactoryContract = FundingRoundFactoryContract.bind( - event.address - ) let fundingRoundAddress = event.params._round - let fundingRoundContract = FundingRoundContract.bind(fundingRoundAddress) - let fundingRound = new FundingRound(fundingRoundId) log.info('Get all the things', []) @@ -257,51 +228,83 @@ export function handleRoundStarted(event: RoundStarted): void { MACITemplate.create(maci) - fundingRound.fundingRoundFactory = fundingRoundFactoryId + fundingRound.clrFund = clrFundId fundingRound.nativeToken = nativeToken fundingRound.nativeTokenInfo = nativeTokenId fundingRound.coordinator = coordinator fundingRound.maci = maci + fundingRound.maciTxHash = event.transaction.hash fundingRound.voiceCreditFactor = voiceCreditFactor fundingRound.contributorCount = contributorCount fundingRound.matchingPoolSize = matchingPoolSize + fundingRound.startTime = event.block.timestamp - let recipientRegistryId = fundingRoundFactory.recipientRegistry - let recipientRegistryAddress = fundingRoundFactory.recipientRegistryAddress - - let contributorRegistryId = fundingRoundFactory.contributorRegistry - let contributorRegistryAddress = - fundingRoundFactory.contributorRegistryAddress + let recipientRegistryId = clrFund.recipientRegistry + let recipientRegistryAddress = clrFund.recipientRegistryAddress - log.info('TRY maciFactoryAddress', []) - let maciFactoryAddressCall = fundingRoundFactoryContract.try_maciFactory() + let contributorRegistryId = clrFund.contributorRegistry + let contributorRegistryAddress = clrFund.contributorRegistryAddress - if (maciFactoryAddressCall.reverted) { - log.info('TRY maciFactoryAddress Failed', []) - } else { - let maciFactoryAddress = maciFactoryAddressCall.value - let maciFactoryContract = MACIFactoryContract.bind(maciFactoryAddress) - let votingDuration = maciFactoryContract.votingDuration() - let signUpDuration = maciFactoryContract.signUpDuration() + let maciContract = MACIContract.bind(maci) + let stateTreeDepth = maciContract.try_stateTreeDepth() + if (!stateTreeDepth.reverted) { + fundingRound.stateTreeDepth = stateTreeDepth.value + } - fundingRound.signUpDeadline = event.block.timestamp.plus(signUpDuration) - fundingRound.votingDeadline = event.block.timestamp - .plus(signUpDuration) - .plus(votingDuration) + log.info('TRY pollAddress', []) + let pollIdCall = fundingRoundContract.try_pollId() + if (!pollIdCall.reverted) { + fundingRound.pollId = pollIdCall.value + } - log.info('New maciFactoryAddress', []) + let pollAddressCall = fundingRoundContract.try_poll() + if (pollAddressCall.reverted) { + log.info('TRY pollAddress Failed', []) + } else { + let pollAddress = pollAddressCall.value + fundingRound.pollAddress = pollAddress + PollTemplate.create(pollAddress) + + let pollEntityId = pollAddress.toHexString() + let pollEntity = new Poll(pollEntityId) + pollEntity.fundingRound = fundingRoundId + pollEntity.save() + + let pollContract = PollContract.bind(pollAddress) + let deployTimeAndDuration = pollContract.try_getDeployTimeAndDuration() + if (!deployTimeAndDuration.reverted) { + let deployTime = deployTimeAndDuration.value.value0 + let duration = deployTimeAndDuration.value.value1 + // MACI's signup deadline is the same as the voting deadline + fundingRound.signUpDeadline = deployTime.plus(duration) + fundingRound.votingDeadline = fundingRound.signUpDeadline + fundingRound.startTime = deployTime + + log.info('New pollAddress', []) + } + + let treeDepths = pollContract.try_treeDepths() + if (!treeDepths.reverted) { + fundingRound.messageTreeDepth = treeDepths.value.value2 + fundingRound.voteOptionTreeDepth = treeDepths.value.value3 + } + + let coordinatorPubKey = pollContract.try_coordinatorPubKey() + if (!coordinatorPubKey.reverted) { + fundingRound.coordinatorPubKeyX = coordinatorPubKey.value.value0 + fundingRound.coordinatorPubKeyY = coordinatorPubKey.value.value1 + } } - fundingRoundFactory.currentRound = fundingRoundId + clrFund.currentRound = fundingRoundId - fundingRoundFactory.save() + clrFund.save() //NOTE: Set the registries for the round fundingRound.contributorRegistry = contributorRegistryId fundingRound.recipientRegistry = recipientRegistryId fundingRound.contributorRegistryAddress = contributorRegistryAddress fundingRound.recipientRegistryAddress = recipientRegistryAddress - fundingRound.startTime = event.block.timestamp fundingRound.recipientCount = BigInt.fromString('0') fundingRound.save() @@ -309,5 +312,21 @@ export function handleRoundStarted(event: RoundStarted): void { export function handleTokenChanged(event: TokenChanged): void { log.info('handleTokenChanged {}', [event.params._token.toHexString()]) - createOrUpdateFundingRoundFactory(event.address, event.block.timestamp) + createOrUpdateClrFund(event.address, event.block.timestamp) +} + +export function handleRecipientRegistryChanged( + event: RecipientRegistryChanged +): void { + log.info('handleRecipientRegistryChanged {}', [ + event.params._recipientRegistry.toHexString(), + ]) + createOrUpdateClrFund(event.address, event.block.timestamp) +} + +export function handleUserRegistryChanged(event: UserRegistryChanged): void { + log.info('handleUserRegistryChanged {}', [ + event.params._userRegistry.toHexString(), + ]) + createOrUpdateClrFund(event.address, event.block.timestamp) } diff --git a/subgraph/src/FundingRoundMapping.ts b/subgraph/src/FundingRoundMapping.ts index 6cd951ed2..2a5feffa7 100644 --- a/subgraph/src/FundingRoundMapping.ts +++ b/subgraph/src/FundingRoundMapping.ts @@ -6,7 +6,6 @@ import { OwnershipTransferred, TallyPublished, RegisterCall, - Voted, FundingRound as FundingRoundContract, } from '../generated/templates/FundingRound/FundingRound' import { OptimisticRecipientRegistry as RecipientRegistryContract } from '../generated/templates/FundingRound/OptimisticRecipientRegistry' @@ -17,7 +16,6 @@ import { Contribution as FundingRoundContribution, Donation, FundingRound, - Vote, } from '../generated/schema' // The following functions can then be called on this contract to access // state variables and other data: @@ -194,32 +192,3 @@ export function handleTallyPublished(event: TallyPublished): void { export function handleOwnershipTransferred(event: OwnershipTransferred): void { log.info('handleOwnershipTransferred- Funding Round', []) } - -export function handleVoted(event: Voted): void { - log.info('handleVoted', []) - - let fundingRoundId = event.address.toHexString() - let fundingRound = FundingRound.load(fundingRoundId) - if (fundingRound == null) { - log.error('Error: handleContribution failed', []) - return - } - - //NOTE: voterAddress != contributor address is possible. This logic isn't necessarily correct since anyone can submit the encrypted message, we should give the option to vote annonymously from the UI by asking them to submi the message batch from another address - let voterAddress = event.params._contributor - let voterId = voterAddress.toHexString() - let voter = Contributor.load(voterId) - let voteId = fundingRoundId.concat('-vote-').concat(voterId) - let vote = new Vote(voteId) - - //NOTE: If the contracts aren't being tracked initialize them - if (voter == null) { - vote.voterAddress = voterAddress - vote.secret = true - } else { - vote.voterAddress = voterAddress - vote.contributor = voterId - vote.secret = false - } - vote.save() -} diff --git a/subgraph/src/MACIMapping.ts b/subgraph/src/MACIMapping.ts index fb9876957..75da4929b 100644 --- a/subgraph/src/MACIMapping.ts +++ b/subgraph/src/MACIMapping.ts @@ -1,7 +1,8 @@ -import { log, ByteArray, crypto, BigInt } from '@graphprotocol/graph-ts' -import { PublishMessage, SignUp } from '../generated/templates/MACI/MACI' +import { log } from '@graphprotocol/graph-ts' +import { SignUp } from '../generated/templates/MACI/MACI' -import { FundingRound, Message, PublicKey } from '../generated/schema' +import { FundingRound, PublicKey } from '../generated/schema' +import { makePublicKeyId } from './PublicKey' // It is also possible to access smart contracts from mappings. For // example, the contract that has emitted the event can be connected to @@ -19,73 +20,14 @@ import { FundingRound, Message, PublicKey } from '../generated/schema' // - contract.verifications(...) // - contract.verifier(...) -function makePubKeyId(x: BigInt, y: BigInt): string { - let pubKeyX = x.toString() - let pubKeyY = y.toString() - let pubKeyXY = ByteArray.fromUTF8(pubKeyX + '.' + pubKeyY) - let publicKeyId = crypto.keccak256(pubKeyXY).toHexString() - return publicKeyId -} - -export function handlePublishMessage(event: PublishMessage): void { - if (!event.transaction.to) { - log.error( - 'Error: handlePublishMessage failed fundingRound not registered', - [] - ) - return - } - - let fundingRoundId = event.transaction.to!.toHex() - let fundingRound = FundingRound.load(fundingRoundId) - if (fundingRound == null) { - log.error( - 'Error: handlePublishMessage failed fundingRound not registered', - [] - ) - return - } - - let messageID = - event.transaction.hash.toHexString() + - '-' + - event.transactionLogIndex.toString() - - let timestamp = event.block.timestamp.toString() - let message = new Message(messageID) - message.data = event.params._message.data - message.iv = event.params._message.iv - message.blockNumber = event.block.number - message.transactionIndex = event.transaction.index - message.submittedBy = event.transaction.from - - let publicKeyId = makePubKeyId( - event.params._encPubKey.x, - event.params._encPubKey.y - ) - let publicKey = PublicKey.load(publicKeyId) - - //NOTE: If the public keys aren't being tracked initialize them - if (publicKey == null) { - let publicKey = new PublicKey(publicKeyId) - publicKey.x = event.params._encPubKey.x - publicKey.y = event.params._encPubKey.y - publicKey.fundingRound = fundingRoundId - - publicKey.save() - } - - message.publicKey = publicKeyId - message.timestamp = timestamp - message.fundingRound = fundingRoundId - message.save() - log.info('handlePublishMessage', []) -} - export function handleSignUp(event: SignUp): void { - let publicKeyId = makePubKeyId( - event.params._userPubKey.x, - event.params._userPubKey.y + let fundingRoundAddress = event.transaction.to! + let fundingRoundId = fundingRoundAddress.toHex() + + let publicKeyId = makePublicKeyId( + fundingRoundId, + event.params._userPubKeyX, + event.params._userPubKeyY ) let publicKey = PublicKey.load(publicKeyId) @@ -93,14 +35,11 @@ export function handleSignUp(event: SignUp): void { if (publicKey == null) { publicKey = new PublicKey(publicKeyId) } - publicKey.x = event.params._userPubKey.x - publicKey.y = event.params._userPubKey.y + publicKey.x = event.params._userPubKeyX + publicKey.y = event.params._userPubKeyY publicKey.stateIndex = event.params._stateIndex - publicKey.voiceCreditBalance = event.params._voiceCreditBalance - let fundingRoundAddress = event.transaction.to! - let fundingRoundId = fundingRoundAddress.toHex() let fundingRound = FundingRound.load(fundingRoundId) if (fundingRound == null) { log.error('Error: handleSignUp failed, fundingRound not registered', []) diff --git a/subgraph/src/PollMapping.ts b/subgraph/src/PollMapping.ts new file mode 100644 index 000000000..99aa537fb --- /dev/null +++ b/subgraph/src/PollMapping.ts @@ -0,0 +1,71 @@ +import { log } from '@graphprotocol/graph-ts' +import { PublishMessage } from '../generated/templates/Poll/Poll' + +import { FundingRound, Poll, Message, PublicKey } from '../generated/schema' +import { makePublicKeyId } from './PublicKey' + +export function handlePublishMessage(event: PublishMessage): void { + if (!event.transaction.to) { + log.error( + 'Error: handlePublishMessage failed fundingRound not registered', + [] + ) + return + } + + let pollEntityId = event.transaction.to!.toHex() + let poll = Poll.load(pollEntityId) + if (poll == null) { + log.error('Error: handlePublishMessage failed poll not found {}', [ + pollEntityId, + ]) + return + } + + let fundingRoundId = poll.fundingRound + if (!fundingRoundId) { + log.error( + 'Error: handlePublishMessage failed poll {} missing funding round', + [pollEntityId] + ) + return + } + + let messageID = + event.transaction.hash.toHexString() + + '-' + + event.transactionLogIndex.toString() + + let timestamp = event.block.timestamp.toString() + let message = new Message(messageID) + message.data = event.params._message.data + message.msgType = event.params._message.msgType + message.blockNumber = event.block.number + message.transactionIndex = event.transaction.index + message.submittedBy = event.transaction.from + + let publicKeyId = makePublicKeyId( + fundingRoundId, + event.params._encPubKey.x, + event.params._encPubKey.y + ) + let publicKey = PublicKey.load(publicKeyId) + + //NOTE: If the public keys aren't being tracked initialize them + if (publicKey == null) { + let publicKey = new PublicKey(publicKeyId) + publicKey.x = event.params._encPubKey.x + publicKey.y = event.params._encPubKey.y + publicKey.fundingRound = fundingRoundId + + publicKey.save() + } + + message.publicKey = publicKeyId + message.timestamp = timestamp + + message.poll = pollEntityId + message.fundingRound = fundingRoundId + message.save() + log.info('handlePublishMessage', []) +} diff --git a/subgraph/src/PublicKey.ts b/subgraph/src/PublicKey.ts new file mode 100644 index 000000000..d34f33706 --- /dev/null +++ b/subgraph/src/PublicKey.ts @@ -0,0 +1,17 @@ +import { ByteArray, crypto, BigInt } from '@graphprotocol/graph-ts' + +// Create the PublicKey entity id used in subgraph +// using MACI public key x and y values +export function makePublicKeyId( + fundingRoundId: string, + x: BigInt, + y: BigInt +): string { + let publicKeyX = x.toString() + let publicKeyY = y.toString() + let publicKeyXY = ByteArray.fromUTF8( + fundingRoundId + '.' + publicKeyX + '.' + publicKeyY + ) + let publicKeyId = crypto.keccak256(publicKeyXY).toHexString() + return publicKeyId +} diff --git a/subgraph/src/RecipientRegistry.ts b/subgraph/src/RecipientRegistry.ts index f809b70f6..a9af36950 100644 --- a/subgraph/src/RecipientRegistry.ts +++ b/subgraph/src/RecipientRegistry.ts @@ -1,14 +1,14 @@ import { Address, BigInt } from '@graphprotocol/graph-ts' import { OptimisticRecipientRegistry as RecipientRegistryContract } from '../generated/OptimisticRecipientRegistry/OptimisticRecipientRegistry' -import { RecipientRegistry, FundingRoundFactory } from '../generated/schema' +import { RecipientRegistry, ClrFund } from '../generated/schema' import { OptimisticRecipientRegistry as RecipientRegistryTemplate } from '../generated/templates' /* * Create the recipient registry entity */ export function createRecipientRegistry( - fundingRoundFactoryId: string, + clrFundId: string, recipientRegistryAddress: Address ): RecipientRegistry { let recipientRegistryId = recipientRegistryAddress.toHexString() @@ -41,7 +41,7 @@ export function createRecipientRegistry( if (!owner.reverted) { recipientRegistry.owner = owner.value } - recipientRegistry.fundingRoundFactory = fundingRoundFactoryId + recipientRegistry.clrFund = clrFundId recipientRegistry.save() return recipientRegistry @@ -59,17 +59,17 @@ export function loadRecipientRegistry( let recipientRegistryContract = RecipientRegistryContract.bind(address) let controller = recipientRegistryContract.try_controller() if (!controller.reverted) { - // Recipient registry's controller must be the factory - let factoryId = controller.value.toHexString() - let factory = FundingRoundFactory.load(factoryId) - if (factory) { + // Recipient registry's controller must be the ClrFund contract + let clrFundId = controller.value.toHexString() + let clrFund = ClrFund.load(clrFundId) + if (clrFund) { /* This is our registry, create it */ - recipientRegistry = createRecipientRegistry(factory.id, address) + recipientRegistry = createRecipientRegistry(clrFund.id, address) // update factory - factory.recipientRegistry = recipientRegistryId - factory.recipientRegistryAddress = address - factory.save() + clrFund.recipientRegistry = recipientRegistryId + clrFund.recipientRegistryAddress = address + clrFund.save() } } } diff --git a/subgraph/subgraph-deployer.template.yaml b/subgraph/subgraph-deployer.template.yaml new file mode 100644 index 000000000..12eab9f70 --- /dev/null +++ b/subgraph/subgraph-deployer.template.yaml @@ -0,0 +1,226 @@ +specVersion: 0.0.4 +description: clr.fund +repository: https://github.com/clrfund/monorepo +schema: + file: ./schema-deployer.graphql +dataSources: + - kind: ethereum/contract + name: ClrFundDeployer + network: {{network}} + source: + address: '{{address}}' + abi: ClrFundDeployer + startBlock: {{startBlock}} + mapping: + kind: ethereum/events + apiVersion: 0.0.7 + language: wasm/assemblyscript + entities: + - ClrFundDeployer + - ClrFund + abis: + - name: ClrFund + file: ./abis/ClrFund.json + - name: ClrFundDeployer + file: ./abis/ClrFundDeployer.json + eventHandlers: + - event: NewInstance(indexed address) + handler: handleNewInstance + file: ./src/ClrFundDeployerMapping.ts + - kind: ethereum/contract + name: OptimisticRecipientRegistry + network: {{network}} + source: + abi: OptimisticRecipientRegistry + startBlock: {{startBlock}} + mapping: + kind: ethereum/events + apiVersion: 0.0.7 + language: wasm/assemblyscript + entities: + - RecipientRegistry + - Recipient + abis: + - name: OptimisticRecipientRegistry + file: ./abis/OptimisticRecipientRegistry.json + eventHandlers: + - event: OwnershipTransferred(indexed address,indexed address) + handler: handleOwnershipTransferred + - event: RequestResolved(indexed bytes32,indexed uint8,indexed bool,uint256,uint256) + handler: handleRequestResolved + - event: RequestSubmitted(indexed bytes32,indexed uint8,address,string,uint256) + handler: handleRequestSubmitted + file: ./src/OptimisticRecipientRegistryMapping.ts +templates: + - name: ClrFund + kind: ethereum/contract + network: {{network}} + source: + abi: ClrFund + mapping: + kind: ethereum/events + apiVersion: 0.0.7 + language: wasm/assemblyscript + entities: + - ClrFund + - RecipientRegistry + - ContributorRegistry + - FundingRound + - Token + abis: + - name: ClrFund + file: ./abis/ClrFund.json + - name: FundingRound + file: ./abis/FundingRound.json + - name: MACIFactory + file: ./abis/MACIFactory.json + - name: OptimisticRecipientRegistry + file: ./abis/OptimisticRecipientRegistry.json + - name: BrightIdUserRegistry + file: ./abis/BrightIdUserRegistry.json + - name: Token + file: ./abis/Token.json + - name: Poll + file: ./abis/Poll.json + - name: MACI + file: ./abis/MACI.json + eventHandlers: + - event: CoordinatorChanged(address) + handler: handleCoordinatorChanged + - event: FundingSourceAdded(address) + handler: handleFundingSourceAdded + - event: FundingSourceRemoved(address) + handler: handleFundingSourceRemoved + - event: OwnershipTransferred(indexed address,indexed address) + handler: handleOwnershipTransferred + - event: RoundFinalized(address) + handler: handleRoundFinalized + - event: RoundStarted(address) + handler: handleRoundStarted + - event: TokenChanged(address) + handler: handleTokenChanged + - event: UserRegistryChanged(address) + handler: handleUserRegistryChanged + - event: RecipientRegistryChanged(address) + handler: handleRecipientRegistryChanged + file: ./src/ClrFundMapping.ts + - name: FundingRound + kind: ethereum/contract + network: {{network}} + source: + abi: FundingRound + mapping: + kind: ethereum/events + apiVersion: 0.0.7 + language: wasm/assemblyscript + entities: + - FundingRound + - Contribution + - Donation + - Recipient + - Contributor + abis: + - name: FundingRound + file: ./abis/FundingRound.json + - name: OptimisticRecipientRegistry + file: ./abis/OptimisticRecipientRegistry.json + - name: BrightIdUserRegistry + file: ./abis/BrightIdUserRegistry.json + eventHandlers: + - event: Contribution(indexed address,uint256) + handler: handleContribution + - event: ContributionWithdrawn(indexed address) + handler: handleContributionWithdrawn + - event: FundsClaimed(indexed uint256,indexed address,uint256) + handler: handleFundsClaimed + - event: OwnershipTransferred(indexed address,indexed address) + handler: handleOwnershipTransferred + - event: TallyPublished(string) + handler: handleTallyPublished + file: ./src/FundingRoundMapping.ts + - name: OptimisticRecipientRegistry + kind: ethereum/contract + network: {{network}} + source: + abi: OptimisticRecipientRegistry + mapping: + kind: ethereum/events + apiVersion: 0.0.7 + language: wasm/assemblyscript + entities: + - RecipientRegistry + - Recipient + abis: + - name: OptimisticRecipientRegistry + file: ./abis/OptimisticRecipientRegistry.json + eventHandlers: + - event: OwnershipTransferred(indexed address,indexed address) + handler: handleOwnershipTransferred + - event: RequestResolved(indexed bytes32,indexed uint8,indexed bool,uint256,uint256) + handler: handleRequestResolved + - event: RequestSubmitted(indexed bytes32,indexed uint8,address,string,uint256) + handler: handleRequestSubmitted + file: ./src/OptimisticRecipientRegistryMapping.ts + - name: BrightIdUserRegistry + kind: ethereum/contract + network: {{network}} + source: + abi: BrightIdUserRegistry + mapping: + kind: ethereum/events + apiVersion: 0.0.7 + language: wasm/assemblyscript + entities: + - ContributorRegistry + - Contributor + abis: + - name: BrightIdUserRegistry + file: ./abis/BrightIdUserRegistry.json + eventHandlers: + - event: OwnershipTransferred(indexed address,indexed address) + handler: handleOwnershipTransferred + - event: SetBrightIdSettings(bytes32,address) + handler: handleSetBrightIdSettings + file: ./src/BrightIdUserRegistryMapping.ts + - name: MACI + kind: ethereum/contract + network: {{network}} + source: + abi: MACI + mapping: + kind: ethereum/events + apiVersion: 0.0.7 + language: wasm/assemblyscript + entities: + - MACI + - FundingRound + abis: + - name: MACI + file: ./abis/MACI.json + - name: FundingRound + file: ./abis/FundingRound.json + eventHandlers: + - event: SignUp(uint256,indexed uint256,indexed uint256,uint256,uint256) + handler: handleSignUp + file: ./src/MACIMapping.ts + - name: Poll + kind: ethereum/contract + network: {{network}} + source: + abi: Poll + mapping: + kind: ethereum/events + apiVersion: 0.0.7 + language: wasm/assemblyscript + entities: + - Poll + - FundingRound + abis: + - name: Poll + file: ./abis/Poll.json + - name: FundingRound + file: ./abis/FundingRound.json + eventHandlers: + - event: PublishMessage((uint256,uint256[10]),(uint256,uint256)) + handler: handlePublishMessage + file: ./src/PollMapping.ts diff --git a/subgraph/subgraph.template.yaml b/subgraph/subgraph.template.yaml index 219c4aa13..09916998e 100644 --- a/subgraph/subgraph.template.yaml +++ b/subgraph/subgraph.template.yaml @@ -4,26 +4,52 @@ repository: https://github.com/clrfund/monorepo schema: file: ./schema.graphql dataSources: +{{#clrFundDeployerAddress}} - kind: ethereum/contract - name: FundingRoundFactory + name: ClrFundDeployer network: {{network}} source: - address: '{{address}}' - abi: FundingRoundFactory - startBlock: {{factoryStartBlock}} + address: '{{clrFundDeployerAddress}}' + abi: ClrFundDeployer + startBlock: {{clrFundDeployerStartBlock}} mapping: kind: ethereum/events apiVersion: 0.0.7 language: wasm/assemblyscript entities: - - FundingRoundFactory + - ClrFundDeployer + - ClrFund + abis: + - name: ClrFund + file: ./abis/ClrFund.json + - name: ClrFundDeployer + file: ./abis/ClrFundDeployer.json + eventHandlers: + - event: NewInstance(indexed address) + handler: handleNewInstance + file: ./src/ClrFundDeployerMapping.ts +{{/clrFundDeployerAddress}} +{{#clrFundAddress}} + - kind: ethereum/contract + name: ClrFund + network: {{network}} + source: + address: '{{clrFundAddress}}' + abi: ClrFund + startBlock: {{clrFundStartBlock}} + mapping: + kind: ethereum/events + apiVersion: 0.0.7 + language: wasm/assemblyscript + entities: + - ClrFund - RecipientRegistry - ContributorRegistry - FundingRound - Token abis: - - name: FundingRoundFactory - file: ./abis/FundingRoundFactory.json + - name: ClrFund + file: ./abis/ClrFund.json - name: FundingRound file: ./abis/FundingRound.json - name: MACIFactory @@ -34,6 +60,10 @@ dataSources: file: ./abis/BrightIdUserRegistry.json - name: Token file: ./abis/Token.json + - name: Poll + file: ./abis/Poll.json + - name: MACI + file: ./abis/MACI.json eventHandlers: - event: CoordinatorChanged(address) handler: handleCoordinatorChanged @@ -49,7 +79,12 @@ dataSources: handler: handleRoundStarted - event: TokenChanged(address) handler: handleTokenChanged - file: ./src/FundingRoundFactoryMapping.ts + - event: UserRegistryChanged(address) + handler: handleUserRegistryChanged + - event: RecipientRegistryChanged(address) + handler: handleRecipientRegistryChanged + file: ./src/ClrFundMapping.ts + {{/clrFundAddress}} - kind: ethereum/contract name: OptimisticRecipientRegistry network: {{network}} @@ -75,6 +110,60 @@ dataSources: handler: handleRequestSubmitted file: ./src/OptimisticRecipientRegistryMapping.ts templates: +{{#clrFundDeployerAddress}} + - name: ClrFund + kind: ethereum/contract + network: {{network}} + source: + abi: ClrFund + mapping: + kind: ethereum/events + apiVersion: 0.0.7 + language: wasm/assemblyscript + entities: + - ClrFund + - RecipientRegistry + - ContributorRegistry + - FundingRound + - Token + abis: + - name: ClrFund + file: ./abis/ClrFund.json + - name: FundingRound + file: ./abis/FundingRound.json + - name: MACIFactory + file: ./abis/MACIFactory.json + - name: OptimisticRecipientRegistry + file: ./abis/OptimisticRecipientRegistry.json + - name: BrightIdUserRegistry + file: ./abis/BrightIdUserRegistry.json + - name: Token + file: ./abis/Token.json + - name: Poll + file: ./abis/Poll.json + - name: MACI + file: ./abis/MACI.json + eventHandlers: + - event: CoordinatorChanged(address) + handler: handleCoordinatorChanged + - event: FundingSourceAdded(address) + handler: handleFundingSourceAdded + - event: FundingSourceRemoved(address) + handler: handleFundingSourceRemoved + - event: OwnershipTransferred(indexed address,indexed address) + handler: handleOwnershipTransferred + - event: RoundFinalized(address) + handler: handleRoundFinalized + - event: RoundStarted(address) + handler: handleRoundStarted + - event: TokenChanged(address) + handler: handleTokenChanged + - event: UserRegistryChanged(address) + handler: handleUserRegistryChanged + - event: RecipientRegistryChanged(address) + handler: handleRecipientRegistryChanged + file: ./src/ClrFundMapping.ts +{{/clrFundDeployerAddress}} - name: FundingRound kind: ethereum/contract network: {{network}} @@ -108,8 +197,6 @@ templates: handler: handleOwnershipTransferred - event: TallyPublished(string) handler: handleTallyPublished - - event: Voted(indexed address) - handler: handleVoted file: ./src/FundingRoundMapping.ts - name: OptimisticRecipientRegistry kind: ethereum/contract @@ -173,8 +260,27 @@ templates: - name: FundingRound file: ./abis/FundingRound.json eventHandlers: - - event: PublishMessage((uint256,uint256[10]),(uint256,uint256)) - handler: handlePublishMessage - - event: SignUp((uint256,uint256),uint256,uint256) + - event: SignUp(uint256,indexed uint256,indexed uint256,uint256,uint256) handler: handleSignUp file: ./src/MACIMapping.ts + - name: Poll + kind: ethereum/contract + network: {{network}} + source: + abi: Poll + mapping: + kind: ethereum/events + apiVersion: 0.0.7 + language: wasm/assemblyscript + entities: + - Poll + - FundingRound + abis: + - name: Poll + file: ./abis/Poll.json + - name: FundingRound + file: ./abis/FundingRound.json + eventHandlers: + - event: PublishMessage((uint256,uint256[10]),(uint256,uint256)) + handler: handlePublishMessage + file: ./src/PollMapping.ts diff --git a/subgraph/subgraph.yaml b/subgraph/subgraph.yaml index e5019a71d..20f0ab44d 100644 --- a/subgraph/subgraph.yaml +++ b/subgraph/subgraph.yaml @@ -5,25 +5,25 @@ schema: file: ./schema.graphql dataSources: - kind: ethereum/contract - name: FundingRoundFactory + name: ClrFund network: xdai source: address: '0x4ede8f30d9c2dc96a9d6787e9c4a478424fb960a' - abi: FundingRoundFactory + abi: ClrFund startBlock: 15217676 mapping: kind: ethereum/events apiVersion: 0.0.7 language: wasm/assemblyscript entities: - - FundingRoundFactory + - ClrFund - RecipientRegistry - ContributorRegistry - FundingRound - Token abis: - - name: FundingRoundFactory - file: ./abis/FundingRoundFactory.json + - name: ClrFund + file: ./abis/ClrFund.json - name: FundingRound file: ./abis/FundingRound.json - name: MACIFactory @@ -34,6 +34,10 @@ dataSources: file: ./abis/BrightIdUserRegistry.json - name: Token file: ./abis/Token.json + - name: Poll + file: ./abis/Poll.json + - name: MACI + file: ./abis/MACI.json eventHandlers: - event: CoordinatorChanged(address) handler: handleCoordinatorChanged @@ -49,7 +53,11 @@ dataSources: handler: handleRoundStarted - event: TokenChanged(address) handler: handleTokenChanged - file: ./src/FundingRoundFactoryMapping.ts + - event: UserRegistryChanged(address) + handler: handleUserRegistryChanged + - event: RecipientRegistryChanged(address) + handler: handleRecipientRegistryChanged + file: ./src/ClrFundMapping.ts - kind: ethereum/contract name: OptimisticRecipientRegistry network: xdai @@ -108,8 +116,6 @@ templates: handler: handleOwnershipTransferred - event: TallyPublished(string) handler: handleTallyPublished - - event: Voted(indexed address) - handler: handleVoted file: ./src/FundingRoundMapping.ts - name: OptimisticRecipientRegistry kind: ethereum/contract @@ -173,8 +179,27 @@ templates: - name: FundingRound file: ./abis/FundingRound.json eventHandlers: - - event: PublishMessage((uint256,uint256[10]),(uint256,uint256)) - handler: handlePublishMessage - - event: SignUp((uint256,uint256),uint256,uint256) + - event: SignUp(uint256,indexed uint256,indexed uint256,uint256,uint256) handler: handleSignUp file: ./src/MACIMapping.ts + - name: Poll + kind: ethereum/contract + network: xdai + source: + abi: Poll + mapping: + kind: ethereum/events + apiVersion: 0.0.7 + language: wasm/assemblyscript + entities: + - Poll + - FundingRound + abis: + - name: Poll + file: ./abis/Poll.json + - name: FundingRound + file: ./abis/FundingRound.json + eventHandlers: + - event: PublishMessage((uint256,uint256[10]),(uint256,uint256)) + handler: handlePublishMessage + file: ./src/PollMapping.ts diff --git a/vue-app/.env.example b/vue-app/.env.example index 238134534..b7a9357e4 100644 --- a/vue-app/.env.example +++ b/vue-app/.env.example @@ -19,7 +19,7 @@ VITE_IPFS_SECRET_API_KEY= VITE_SUBGRAPH_URL=http://localhost:8000/subgraphs/name/clrfund/clrfund -VITE_CLRFUND_FACTORY_ADDRESS=0x5FC8d32690cc91D4c39d9d3abcBD16989F875707 +VITE_CLRFUND_ADDRESS=0x0DCd1Bf9A1b36cE34237eEaFef220932846BCD82 # Supported values: simple, brightid, snapshot, merkle VITE_USER_REGISTRY_TYPE=simple @@ -51,7 +51,7 @@ VITE_BRIGHTID_CONTEXT=clrfund-goerli VITE_MATCHING_POOL_ADDRESS= # Supported values: simple, optimistic, kleros -VITE_RECIPIENT_REGISTRY_TYPE=optimistic +VITE_RECIPIENT_REGISTRY_TYPE=simple VITE_RECIPIENT_REGISTRY_POLICY=QmeygKjvrpidJeFHv6ywjUrj718nwtFQgCCPPR4r5nL87R diff --git a/vue-app/package.json b/vue-app/package.json index 657577912..1c7267fbd 100644 --- a/vue-app/package.json +++ b/vue-app/package.json @@ -1,12 +1,13 @@ { "name": "@clrfund/vue-app", - "version": "4.3.1", + "version": "5.1.1", "private": true, "license": "GPL-3.0", + "type": "module", "scripts": { "preview": "vite preview", "build": "rm -rf dist/ && vite build && yarn build:lambda", - "build:lambda": "netlify-lambda build src/lambda", + "build:lambda": "netlify functions:build --functions dist/lambda --src src/lambda", "serve": "vite", "test": "yarn test:lint-i18n && vitest --run", "lint": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --fix --ignore-path .gitignore", @@ -22,8 +23,9 @@ ] }, "dependencies": { - "@clrfund/maci-utils": "^0.0.1", + "@clrfund/common": "^0.0.1", "@kleros/gtcr-encoder": "1.4.0", + "@netlify/functions": "^2.5.1", "@openfonts/inter_all": "^1.0.2", "@vuelidate/core": "^2.0.0", "@vuelidate/validators": "^2.0.0", @@ -32,20 +34,19 @@ "@walletconnect/modal": "^2.6.0", "crypto-js": "^4.1.1", "ethereum-blockies-base64": "^1.0.2", - "ethers": "^5.7.2", + "ethers": "^6.11.1", "floating-vue": "^2.0.0-beta.20", "google-spreadsheet": "^3.3.0", "graphql": "^16.6.0", "graphql-request": "5.1.0", "graphql-tag": "^2.12.6", "humanize-duration": "^3.27.3", - "is-ipfs": "^7.0.3", "luxon": "^3.1.1", "markdown-it": "^13.0.1", "markdown-it-link-attributes": "^4.0.1", - "node-stdlib-browser": "^1.2.0", "pinia": "^2.0.26", "qrcode": "^1.5.1", + "tweetnacl": "^1.0.3", "vue": "^3.2.45", "vue-final-modal": "^4.3.0", "vue-i18n": "9", @@ -58,7 +59,6 @@ "@graphql-codegen/typescript-graphql-request": "^4.5.9", "@graphql-codegen/typescript-operations": "^3.0.3", "@intlify/unplugin-vue-i18n": "^0.8.1", - "@rollup/plugin-inject": "^5.0.2", "@rushstack/eslint-patch": "^1.2.0", "@types/humanize-duration": "^3.27.1", "@types/luxon": "^3.1.0", @@ -70,19 +70,20 @@ "@vue/eslint-config-typescript": "^11.0.2", "@vue/tsconfig": "^0.1.3", "autoprefixer": "^10.4.13", - "eslint": "^8.28.0", - "eslint-config-prettier": "^8.5.0", + "eslint": "8.48.0", + "eslint-config-prettier": "9.0.0", "eslint-plugin-vue": "^9.8.0", "jsdom": "^20.0.3", - "netlify-lambda": "^2.0.16", + "netlify-cli": "^17.15.7", "postcss": "^8.4.19", - "prettier": "^2.8.6", + "prettier": "3.0.3", "sass": "^1.56.1", "tailwindcss": "^3.2.4", "typescript": "^4.9.3", "unplugin-auto-import": "^0.11.5", "unplugin-vue-components": "^0.22.11", - "vite": "3.2.4", + "vite": "4.5.0", + "vite-plugin-node-polyfills": "0.15.0", "vitest": "^0.26.2", "vue-i18n-extract": "^2.0.7", "vue-tsc": "^1.0.13" diff --git a/vue-app/src/App.vue b/vue-app/src/App.vue index 93fcc83b1..3c7ad9b98 100644 --- a/vue-app/src/App.vue +++ b/vue-app/src/App.vue @@ -4,25 +4,12 @@
- -
+
-
- - -
-
- -
+ +
@@ -32,32 +19,23 @@ diff --git a/vue-app/src/components/TransactionModal.vue b/vue-app/src/components/TransactionModal.vue index be3e4918c..c26b1e75a 100644 --- a/vue-app/src/components/TransactionModal.vue +++ b/vue-app/src/components/TransactionModal.vue @@ -1,5 +1,5 @@ diff --git a/vue-app/src/graphql/API.ts b/vue-app/src/graphql/API.ts index c007dd1dc..fc61e9d4f 100644 --- a/vue-app/src/graphql/API.ts +++ b/vue-app/src/graphql/API.ts @@ -19,6 +19,11 @@ export type Scalars = { Int8: any; }; +export enum Aggregation_Interval { + Day = 'day', + Hour = 'hour' +} + export type BlockChangedFilter = { number_gte: Scalars['Int']; }; @@ -29,358 +34,52 @@ export type Block_Height = { number_gte: InputMaybe; }; -export type Contribution = { - __typename?: 'Contribution'; - amount: Maybe; - contributor: Maybe; - createdAt: Maybe; - fundingRound: Maybe; - id: Scalars['ID']; - voiceCredits: Maybe; -}; - -export type Contribution_Filter = { - /** Filter for the block changed event. */ - _change_block: InputMaybe; - amount: InputMaybe; - amount_gt: InputMaybe; - amount_gte: InputMaybe; - amount_in: InputMaybe>; - amount_lt: InputMaybe; - amount_lte: InputMaybe; - amount_not: InputMaybe; - amount_not_in: InputMaybe>; - and: InputMaybe>>; - contributor: InputMaybe; - contributor_: InputMaybe; - contributor_contains: InputMaybe; - contributor_contains_nocase: InputMaybe; - contributor_ends_with: InputMaybe; - contributor_ends_with_nocase: InputMaybe; - contributor_gt: InputMaybe; - contributor_gte: InputMaybe; - contributor_in: InputMaybe>; - contributor_lt: InputMaybe; - contributor_lte: InputMaybe; - contributor_not: InputMaybe; - contributor_not_contains: InputMaybe; - contributor_not_contains_nocase: InputMaybe; - contributor_not_ends_with: InputMaybe; - contributor_not_ends_with_nocase: InputMaybe; - contributor_not_in: InputMaybe>; - contributor_not_starts_with: InputMaybe; - contributor_not_starts_with_nocase: InputMaybe; - contributor_starts_with: InputMaybe; - contributor_starts_with_nocase: InputMaybe; - createdAt: InputMaybe; - createdAt_contains: InputMaybe; - createdAt_contains_nocase: InputMaybe; - createdAt_ends_with: InputMaybe; - createdAt_ends_with_nocase: InputMaybe; - createdAt_gt: InputMaybe; - createdAt_gte: InputMaybe; - createdAt_in: InputMaybe>; - createdAt_lt: InputMaybe; - createdAt_lte: InputMaybe; - createdAt_not: InputMaybe; - createdAt_not_contains: InputMaybe; - createdAt_not_contains_nocase: InputMaybe; - createdAt_not_ends_with: InputMaybe; - createdAt_not_ends_with_nocase: InputMaybe; - createdAt_not_in: InputMaybe>; - createdAt_not_starts_with: InputMaybe; - createdAt_not_starts_with_nocase: InputMaybe; - createdAt_starts_with: InputMaybe; - createdAt_starts_with_nocase: InputMaybe; - fundingRound: InputMaybe; - fundingRound_: InputMaybe; - fundingRound_contains: InputMaybe; - fundingRound_contains_nocase: InputMaybe; - fundingRound_ends_with: InputMaybe; - fundingRound_ends_with_nocase: InputMaybe; - fundingRound_gt: InputMaybe; - fundingRound_gte: InputMaybe; - fundingRound_in: InputMaybe>; - fundingRound_lt: InputMaybe; - fundingRound_lte: InputMaybe; - fundingRound_not: InputMaybe; - fundingRound_not_contains: InputMaybe; - fundingRound_not_contains_nocase: InputMaybe; - fundingRound_not_ends_with: InputMaybe; - fundingRound_not_ends_with_nocase: InputMaybe; - fundingRound_not_in: InputMaybe>; - fundingRound_not_starts_with: InputMaybe; - fundingRound_not_starts_with_nocase: InputMaybe; - fundingRound_starts_with: InputMaybe; - fundingRound_starts_with_nocase: InputMaybe; - id: InputMaybe; - id_gt: InputMaybe; - id_gte: InputMaybe; - id_in: InputMaybe>; - id_lt: InputMaybe; - id_lte: InputMaybe; - id_not: InputMaybe; - id_not_in: InputMaybe>; - or: InputMaybe>>; - voiceCredits: InputMaybe; - voiceCredits_gt: InputMaybe; - voiceCredits_gte: InputMaybe; - voiceCredits_in: InputMaybe>; - voiceCredits_lt: InputMaybe; - voiceCredits_lte: InputMaybe; - voiceCredits_not: InputMaybe; - voiceCredits_not_in: InputMaybe>; -}; - -export enum Contribution_OrderBy { - Amount = 'amount', - Contributor = 'contributor', - ContributorContributorAddress = 'contributor__contributorAddress', - ContributorCreatedAt = 'contributor__createdAt', - ContributorId = 'contributor__id', - ContributorLastUpdatedAt = 'contributor__lastUpdatedAt', - ContributorVerifiedTimeStamp = 'contributor__verifiedTimeStamp', - CreatedAt = 'createdAt', - FundingRound = 'fundingRound', - FundingRoundContributorCount = 'fundingRound__contributorCount', - FundingRoundContributorRegistryAddress = 'fundingRound__contributorRegistryAddress', - FundingRoundCoordinator = 'fundingRound__coordinator', - FundingRoundCreatedAt = 'fundingRound__createdAt', - FundingRoundId = 'fundingRound__id', - FundingRoundIsCancelled = 'fundingRound__isCancelled', - FundingRoundIsFinalized = 'fundingRound__isFinalized', - FundingRoundLastUpdatedAt = 'fundingRound__lastUpdatedAt', - FundingRoundMaci = 'fundingRound__maci', - FundingRoundMatchingPoolSize = 'fundingRound__matchingPoolSize', - FundingRoundNativeToken = 'fundingRound__nativeToken', - FundingRoundRecipientCount = 'fundingRound__recipientCount', - FundingRoundRecipientRegistryAddress = 'fundingRound__recipientRegistryAddress', - FundingRoundSignUpDeadline = 'fundingRound__signUpDeadline', - FundingRoundStartTime = 'fundingRound__startTime', - FundingRoundTallyHash = 'fundingRound__tallyHash', - FundingRoundTotalSpent = 'fundingRound__totalSpent', - FundingRoundTotalVotes = 'fundingRound__totalVotes', - FundingRoundVoiceCreditFactor = 'fundingRound__voiceCreditFactor', - FundingRoundVotingDeadline = 'fundingRound__votingDeadline', - Id = 'id', - VoiceCredits = 'voiceCredits' -} - -export type Contributor = { - __typename?: 'Contributor'; - contributions: Maybe>; - contributorAddress: Maybe; - contributorRegistry: ContributorRegistry; +export type ClrFund = { + __typename?: 'ClrFund'; + contributorRegistry: Maybe; + contributorRegistryAddress: Maybe; + coordinator: Maybe; + coordinatorPubKey: Maybe; createdAt: Maybe; + currentRound: Maybe; fundingRounds: Maybe>; id: Scalars['ID']; lastUpdatedAt: Maybe; - verifiedTimeStamp: Maybe; - votes: Maybe>; -}; - - -export type ContributorContributionsArgs = { - first?: InputMaybe; - orderBy: InputMaybe; - orderDirection: InputMaybe; - skip?: InputMaybe; - where: InputMaybe; -}; - - -export type ContributorFundingRoundsArgs = { - first?: InputMaybe; - orderBy: InputMaybe; - orderDirection: InputMaybe; - skip?: InputMaybe; - where: InputMaybe; -}; - - -export type ContributorVotesArgs = { - first?: InputMaybe; - orderBy: InputMaybe; - orderDirection: InputMaybe; - skip?: InputMaybe; - where: InputMaybe; -}; - -export type ContributorRegistry = { - __typename?: 'ContributorRegistry'; - context: Maybe; - contributors: Maybe>; - createdAt: Maybe; - fundingRoundFactory: FundingRoundFactory; - id: Scalars['ID']; - lastUpdatedAt: Maybe; - owner: Maybe; -}; - - -export type ContributorRegistryContributorsArgs = { - first?: InputMaybe; - orderBy: InputMaybe; - orderDirection: InputMaybe; - skip?: InputMaybe; - where: InputMaybe; -}; - -export type ContributorRegistry_Filter = { - /** Filter for the block changed event. */ - _change_block: InputMaybe; - and: InputMaybe>>; - context: InputMaybe; - context_contains: InputMaybe; - context_contains_nocase: InputMaybe; - context_ends_with: InputMaybe; - context_ends_with_nocase: InputMaybe; - context_gt: InputMaybe; - context_gte: InputMaybe; - context_in: InputMaybe>; - context_lt: InputMaybe; - context_lte: InputMaybe; - context_not: InputMaybe; - context_not_contains: InputMaybe; - context_not_contains_nocase: InputMaybe; - context_not_ends_with: InputMaybe; - context_not_ends_with_nocase: InputMaybe; - context_not_in: InputMaybe>; - context_not_starts_with: InputMaybe; - context_not_starts_with_nocase: InputMaybe; - context_starts_with: InputMaybe; - context_starts_with_nocase: InputMaybe; - contributors_: InputMaybe; - createdAt: InputMaybe; - createdAt_contains: InputMaybe; - createdAt_contains_nocase: InputMaybe; - createdAt_ends_with: InputMaybe; - createdAt_ends_with_nocase: InputMaybe; - createdAt_gt: InputMaybe; - createdAt_gte: InputMaybe; - createdAt_in: InputMaybe>; - createdAt_lt: InputMaybe; - createdAt_lte: InputMaybe; - createdAt_not: InputMaybe; - createdAt_not_contains: InputMaybe; - createdAt_not_contains_nocase: InputMaybe; - createdAt_not_ends_with: InputMaybe; - createdAt_not_ends_with_nocase: InputMaybe; - createdAt_not_in: InputMaybe>; - createdAt_not_starts_with: InputMaybe; - createdAt_not_starts_with_nocase: InputMaybe; - createdAt_starts_with: InputMaybe; - createdAt_starts_with_nocase: InputMaybe; - fundingRoundFactory: InputMaybe; - fundingRoundFactory_: InputMaybe; - fundingRoundFactory_contains: InputMaybe; - fundingRoundFactory_contains_nocase: InputMaybe; - fundingRoundFactory_ends_with: InputMaybe; - fundingRoundFactory_ends_with_nocase: InputMaybe; - fundingRoundFactory_gt: InputMaybe; - fundingRoundFactory_gte: InputMaybe; - fundingRoundFactory_in: InputMaybe>; - fundingRoundFactory_lt: InputMaybe; - fundingRoundFactory_lte: InputMaybe; - fundingRoundFactory_not: InputMaybe; - fundingRoundFactory_not_contains: InputMaybe; - fundingRoundFactory_not_contains_nocase: InputMaybe; - fundingRoundFactory_not_ends_with: InputMaybe; - fundingRoundFactory_not_ends_with_nocase: InputMaybe; - fundingRoundFactory_not_in: InputMaybe>; - fundingRoundFactory_not_starts_with: InputMaybe; - fundingRoundFactory_not_starts_with_nocase: InputMaybe; - fundingRoundFactory_starts_with: InputMaybe; - fundingRoundFactory_starts_with_nocase: InputMaybe; - id: InputMaybe; - id_gt: InputMaybe; - id_gte: InputMaybe; - id_in: InputMaybe>; - id_lt: InputMaybe; - id_lte: InputMaybe; - id_not: InputMaybe; - id_not_in: InputMaybe>; - lastUpdatedAt: InputMaybe; - lastUpdatedAt_contains: InputMaybe; - lastUpdatedAt_contains_nocase: InputMaybe; - lastUpdatedAt_ends_with: InputMaybe; - lastUpdatedAt_ends_with_nocase: InputMaybe; - lastUpdatedAt_gt: InputMaybe; - lastUpdatedAt_gte: InputMaybe; - lastUpdatedAt_in: InputMaybe>; - lastUpdatedAt_lt: InputMaybe; - lastUpdatedAt_lte: InputMaybe; - lastUpdatedAt_not: InputMaybe; - lastUpdatedAt_not_contains: InputMaybe; - lastUpdatedAt_not_contains_nocase: InputMaybe; - lastUpdatedAt_not_ends_with: InputMaybe; - lastUpdatedAt_not_ends_with_nocase: InputMaybe; - lastUpdatedAt_not_in: InputMaybe>; - lastUpdatedAt_not_starts_with: InputMaybe; - lastUpdatedAt_not_starts_with_nocase: InputMaybe; - lastUpdatedAt_starts_with: InputMaybe; - lastUpdatedAt_starts_with_nocase: InputMaybe; - or: InputMaybe>>; - owner: InputMaybe; - owner_contains: InputMaybe; - owner_gt: InputMaybe; - owner_gte: InputMaybe; - owner_in: InputMaybe>; - owner_lt: InputMaybe; - owner_lte: InputMaybe; - owner_not: InputMaybe; - owner_not_contains: InputMaybe; - owner_not_in: InputMaybe>; + maciFactory: Maybe; + messageTreeDepth: Maybe; + nativeToken: Maybe; + nativeTokenInfo: Maybe; + owner: Maybe; + recipientRegistry: Maybe; + recipientRegistryAddress: Maybe; + stateTreeDepth: Maybe; + voteOptionTreeDepth: Maybe; }; -export enum ContributorRegistry_OrderBy { - Context = 'context', - Contributors = 'contributors', - CreatedAt = 'createdAt', - FundingRoundFactory = 'fundingRoundFactory', - FundingRoundFactoryBatchUstVerifier = 'fundingRoundFactory__batchUstVerifier', - FundingRoundFactoryContributorRegistryAddress = 'fundingRoundFactory__contributorRegistryAddress', - FundingRoundFactoryCoordinator = 'fundingRoundFactory__coordinator', - FundingRoundFactoryCoordinatorPubKey = 'fundingRoundFactory__coordinatorPubKey', - FundingRoundFactoryCreatedAt = 'fundingRoundFactory__createdAt', - FundingRoundFactoryId = 'fundingRoundFactory__id', - FundingRoundFactoryLastUpdatedAt = 'fundingRoundFactory__lastUpdatedAt', - FundingRoundFactoryMaciFactory = 'fundingRoundFactory__maciFactory', - FundingRoundFactoryMaxMessages = 'fundingRoundFactory__maxMessages', - FundingRoundFactoryMaxUsers = 'fundingRoundFactory__maxUsers', - FundingRoundFactoryMaxVoteOptions = 'fundingRoundFactory__maxVoteOptions', - FundingRoundFactoryMessageBatchSize = 'fundingRoundFactory__messageBatchSize', - FundingRoundFactoryMessageTreeDepth = 'fundingRoundFactory__messageTreeDepth', - FundingRoundFactoryNativeToken = 'fundingRoundFactory__nativeToken', - FundingRoundFactoryOwner = 'fundingRoundFactory__owner', - FundingRoundFactoryQvtVerifier = 'fundingRoundFactory__qvtVerifier', - FundingRoundFactoryRecipientRegistryAddress = 'fundingRoundFactory__recipientRegistryAddress', - FundingRoundFactorySignUpDuration = 'fundingRoundFactory__signUpDuration', - FundingRoundFactoryStateTreeDepth = 'fundingRoundFactory__stateTreeDepth', - FundingRoundFactoryTallyBatchSize = 'fundingRoundFactory__tallyBatchSize', - FundingRoundFactoryVoteOptionTreeDepth = 'fundingRoundFactory__voteOptionTreeDepth', - FundingRoundFactoryVotingDuration = 'fundingRoundFactory__votingDuration', - Id = 'id', - LastUpdatedAt = 'lastUpdatedAt', - Owner = 'owner' -} -export type Contributor_Filter = { +export type ClrFundFundingRoundsArgs = { + first?: InputMaybe; + orderBy: InputMaybe; + orderDirection: InputMaybe; + skip?: InputMaybe; + where: InputMaybe; +}; + +export type ClrFund_Filter = { /** Filter for the block changed event. */ _change_block: InputMaybe; - and: InputMaybe>>; - contributions_: InputMaybe; - contributorAddress: InputMaybe; - contributorAddress_contains: InputMaybe; - contributorAddress_gt: InputMaybe; - contributorAddress_gte: InputMaybe; - contributorAddress_in: InputMaybe>; - contributorAddress_lt: InputMaybe; - contributorAddress_lte: InputMaybe; - contributorAddress_not: InputMaybe; - contributorAddress_not_contains: InputMaybe; - contributorAddress_not_in: InputMaybe>; + and: InputMaybe>>; contributorRegistry: InputMaybe; + contributorRegistryAddress: InputMaybe; + contributorRegistryAddress_contains: InputMaybe; + contributorRegistryAddress_gt: InputMaybe; + contributorRegistryAddress_gte: InputMaybe; + contributorRegistryAddress_in: InputMaybe>; + contributorRegistryAddress_lt: InputMaybe; + contributorRegistryAddress_lte: InputMaybe; + contributorRegistryAddress_not: InputMaybe; + contributorRegistryAddress_not_contains: InputMaybe; + contributorRegistryAddress_not_in: InputMaybe>; contributorRegistry_: InputMaybe; contributorRegistry_contains: InputMaybe; contributorRegistry_contains_nocase: InputMaybe; @@ -401,6 +100,36 @@ export type Contributor_Filter = { contributorRegistry_not_starts_with_nocase: InputMaybe; contributorRegistry_starts_with: InputMaybe; contributorRegistry_starts_with_nocase: InputMaybe; + coordinator: InputMaybe; + coordinatorPubKey: InputMaybe; + coordinatorPubKey_contains: InputMaybe; + coordinatorPubKey_contains_nocase: InputMaybe; + coordinatorPubKey_ends_with: InputMaybe; + coordinatorPubKey_ends_with_nocase: InputMaybe; + coordinatorPubKey_gt: InputMaybe; + coordinatorPubKey_gte: InputMaybe; + coordinatorPubKey_in: InputMaybe>; + coordinatorPubKey_lt: InputMaybe; + coordinatorPubKey_lte: InputMaybe; + coordinatorPubKey_not: InputMaybe; + coordinatorPubKey_not_contains: InputMaybe; + coordinatorPubKey_not_contains_nocase: InputMaybe; + coordinatorPubKey_not_ends_with: InputMaybe; + coordinatorPubKey_not_ends_with_nocase: InputMaybe; + coordinatorPubKey_not_in: InputMaybe>; + coordinatorPubKey_not_starts_with: InputMaybe; + coordinatorPubKey_not_starts_with_nocase: InputMaybe; + coordinatorPubKey_starts_with: InputMaybe; + coordinatorPubKey_starts_with_nocase: InputMaybe; + coordinator_contains: InputMaybe; + coordinator_gt: InputMaybe; + coordinator_gte: InputMaybe; + coordinator_in: InputMaybe>; + coordinator_lt: InputMaybe; + coordinator_lte: InputMaybe; + coordinator_not: InputMaybe; + coordinator_not_contains: InputMaybe; + coordinator_not_in: InputMaybe>; createdAt: InputMaybe; createdAt_contains: InputMaybe; createdAt_contains_nocase: InputMaybe; @@ -421,134 +150,28 @@ export type Contributor_Filter = { createdAt_not_starts_with_nocase: InputMaybe; createdAt_starts_with: InputMaybe; createdAt_starts_with_nocase: InputMaybe; - fundingRounds: InputMaybe>; + currentRound: InputMaybe; + currentRound_: InputMaybe; + currentRound_contains: InputMaybe; + currentRound_contains_nocase: InputMaybe; + currentRound_ends_with: InputMaybe; + currentRound_ends_with_nocase: InputMaybe; + currentRound_gt: InputMaybe; + currentRound_gte: InputMaybe; + currentRound_in: InputMaybe>; + currentRound_lt: InputMaybe; + currentRound_lte: InputMaybe; + currentRound_not: InputMaybe; + currentRound_not_contains: InputMaybe; + currentRound_not_contains_nocase: InputMaybe; + currentRound_not_ends_with: InputMaybe; + currentRound_not_ends_with_nocase: InputMaybe; + currentRound_not_in: InputMaybe>; + currentRound_not_starts_with: InputMaybe; + currentRound_not_starts_with_nocase: InputMaybe; + currentRound_starts_with: InputMaybe; + currentRound_starts_with_nocase: InputMaybe; fundingRounds_: InputMaybe; - fundingRounds_contains: InputMaybe>; - fundingRounds_contains_nocase: InputMaybe>; - fundingRounds_not: InputMaybe>; - fundingRounds_not_contains: InputMaybe>; - fundingRounds_not_contains_nocase: InputMaybe>; - id: InputMaybe; - id_gt: InputMaybe; - id_gte: InputMaybe; - id_in: InputMaybe>; - id_lt: InputMaybe; - id_lte: InputMaybe; - id_not: InputMaybe; - id_not_in: InputMaybe>; - lastUpdatedAt: InputMaybe; - lastUpdatedAt_contains: InputMaybe; - lastUpdatedAt_contains_nocase: InputMaybe; - lastUpdatedAt_ends_with: InputMaybe; - lastUpdatedAt_ends_with_nocase: InputMaybe; - lastUpdatedAt_gt: InputMaybe; - lastUpdatedAt_gte: InputMaybe; - lastUpdatedAt_in: InputMaybe>; - lastUpdatedAt_lt: InputMaybe; - lastUpdatedAt_lte: InputMaybe; - lastUpdatedAt_not: InputMaybe; - lastUpdatedAt_not_contains: InputMaybe; - lastUpdatedAt_not_contains_nocase: InputMaybe; - lastUpdatedAt_not_ends_with: InputMaybe; - lastUpdatedAt_not_ends_with_nocase: InputMaybe; - lastUpdatedAt_not_in: InputMaybe>; - lastUpdatedAt_not_starts_with: InputMaybe; - lastUpdatedAt_not_starts_with_nocase: InputMaybe; - lastUpdatedAt_starts_with: InputMaybe; - lastUpdatedAt_starts_with_nocase: InputMaybe; - or: InputMaybe>>; - verifiedTimeStamp: InputMaybe; - verifiedTimeStamp_contains: InputMaybe; - verifiedTimeStamp_contains_nocase: InputMaybe; - verifiedTimeStamp_ends_with: InputMaybe; - verifiedTimeStamp_ends_with_nocase: InputMaybe; - verifiedTimeStamp_gt: InputMaybe; - verifiedTimeStamp_gte: InputMaybe; - verifiedTimeStamp_in: InputMaybe>; - verifiedTimeStamp_lt: InputMaybe; - verifiedTimeStamp_lte: InputMaybe; - verifiedTimeStamp_not: InputMaybe; - verifiedTimeStamp_not_contains: InputMaybe; - verifiedTimeStamp_not_contains_nocase: InputMaybe; - verifiedTimeStamp_not_ends_with: InputMaybe; - verifiedTimeStamp_not_ends_with_nocase: InputMaybe; - verifiedTimeStamp_not_in: InputMaybe>; - verifiedTimeStamp_not_starts_with: InputMaybe; - verifiedTimeStamp_not_starts_with_nocase: InputMaybe; - verifiedTimeStamp_starts_with: InputMaybe; - verifiedTimeStamp_starts_with_nocase: InputMaybe; - votes_: InputMaybe; -}; - -export enum Contributor_OrderBy { - Contributions = 'contributions', - ContributorAddress = 'contributorAddress', - ContributorRegistry = 'contributorRegistry', - ContributorRegistryContext = 'contributorRegistry__context', - ContributorRegistryCreatedAt = 'contributorRegistry__createdAt', - ContributorRegistryId = 'contributorRegistry__id', - ContributorRegistryLastUpdatedAt = 'contributorRegistry__lastUpdatedAt', - ContributorRegistryOwner = 'contributorRegistry__owner', - CreatedAt = 'createdAt', - FundingRounds = 'fundingRounds', - Id = 'id', - LastUpdatedAt = 'lastUpdatedAt', - VerifiedTimeStamp = 'verifiedTimeStamp', - Votes = 'votes' -} - -export type Coordinator = { - __typename?: 'Coordinator'; - contact: Maybe; - createdAt: Maybe; - id: Scalars['ID']; - lastUpdatedAt: Maybe; -}; - -export type Coordinator_Filter = { - /** Filter for the block changed event. */ - _change_block: InputMaybe; - and: InputMaybe>>; - contact: InputMaybe; - contact_contains: InputMaybe; - contact_contains_nocase: InputMaybe; - contact_ends_with: InputMaybe; - contact_ends_with_nocase: InputMaybe; - contact_gt: InputMaybe; - contact_gte: InputMaybe; - contact_in: InputMaybe>; - contact_lt: InputMaybe; - contact_lte: InputMaybe; - contact_not: InputMaybe; - contact_not_contains: InputMaybe; - contact_not_contains_nocase: InputMaybe; - contact_not_ends_with: InputMaybe; - contact_not_ends_with_nocase: InputMaybe; - contact_not_in: InputMaybe>; - contact_not_starts_with: InputMaybe; - contact_not_starts_with_nocase: InputMaybe; - contact_starts_with: InputMaybe; - contact_starts_with_nocase: InputMaybe; - createdAt: InputMaybe; - createdAt_contains: InputMaybe; - createdAt_contains_nocase: InputMaybe; - createdAt_ends_with: InputMaybe; - createdAt_ends_with_nocase: InputMaybe; - createdAt_gt: InputMaybe; - createdAt_gte: InputMaybe; - createdAt_in: InputMaybe>; - createdAt_lt: InputMaybe; - createdAt_lte: InputMaybe; - createdAt_not: InputMaybe; - createdAt_not_contains: InputMaybe; - createdAt_not_contains_nocase: InputMaybe; - createdAt_not_ends_with: InputMaybe; - createdAt_not_ends_with_nocase: InputMaybe; - createdAt_not_in: InputMaybe>; - createdAt_not_starts_with: InputMaybe; - createdAt_not_starts_with_nocase: InputMaybe; - createdAt_starts_with: InputMaybe; - createdAt_starts_with_nocase: InputMaybe; id: InputMaybe; id_gt: InputMaybe; id_gte: InputMaybe; @@ -577,27 +200,194 @@ export type Coordinator_Filter = { lastUpdatedAt_not_starts_with_nocase: InputMaybe; lastUpdatedAt_starts_with: InputMaybe; lastUpdatedAt_starts_with_nocase: InputMaybe; - or: InputMaybe>>; + maciFactory: InputMaybe; + maciFactory_contains: InputMaybe; + maciFactory_gt: InputMaybe; + maciFactory_gte: InputMaybe; + maciFactory_in: InputMaybe>; + maciFactory_lt: InputMaybe; + maciFactory_lte: InputMaybe; + maciFactory_not: InputMaybe; + maciFactory_not_contains: InputMaybe; + maciFactory_not_in: InputMaybe>; + messageTreeDepth: InputMaybe; + messageTreeDepth_gt: InputMaybe; + messageTreeDepth_gte: InputMaybe; + messageTreeDepth_in: InputMaybe>; + messageTreeDepth_lt: InputMaybe; + messageTreeDepth_lte: InputMaybe; + messageTreeDepth_not: InputMaybe; + messageTreeDepth_not_in: InputMaybe>; + nativeToken: InputMaybe; + nativeTokenInfo: InputMaybe; + nativeTokenInfo_: InputMaybe; + nativeTokenInfo_contains: InputMaybe; + nativeTokenInfo_contains_nocase: InputMaybe; + nativeTokenInfo_ends_with: InputMaybe; + nativeTokenInfo_ends_with_nocase: InputMaybe; + nativeTokenInfo_gt: InputMaybe; + nativeTokenInfo_gte: InputMaybe; + nativeTokenInfo_in: InputMaybe>; + nativeTokenInfo_lt: InputMaybe; + nativeTokenInfo_lte: InputMaybe; + nativeTokenInfo_not: InputMaybe; + nativeTokenInfo_not_contains: InputMaybe; + nativeTokenInfo_not_contains_nocase: InputMaybe; + nativeTokenInfo_not_ends_with: InputMaybe; + nativeTokenInfo_not_ends_with_nocase: InputMaybe; + nativeTokenInfo_not_in: InputMaybe>; + nativeTokenInfo_not_starts_with: InputMaybe; + nativeTokenInfo_not_starts_with_nocase: InputMaybe; + nativeTokenInfo_starts_with: InputMaybe; + nativeTokenInfo_starts_with_nocase: InputMaybe; + nativeToken_contains: InputMaybe; + nativeToken_gt: InputMaybe; + nativeToken_gte: InputMaybe; + nativeToken_in: InputMaybe>; + nativeToken_lt: InputMaybe; + nativeToken_lte: InputMaybe; + nativeToken_not: InputMaybe; + nativeToken_not_contains: InputMaybe; + nativeToken_not_in: InputMaybe>; + or: InputMaybe>>; + owner: InputMaybe; + owner_contains: InputMaybe; + owner_gt: InputMaybe; + owner_gte: InputMaybe; + owner_in: InputMaybe>; + owner_lt: InputMaybe; + owner_lte: InputMaybe; + owner_not: InputMaybe; + owner_not_contains: InputMaybe; + owner_not_in: InputMaybe>; + recipientRegistry: InputMaybe; + recipientRegistryAddress: InputMaybe; + recipientRegistryAddress_contains: InputMaybe; + recipientRegistryAddress_gt: InputMaybe; + recipientRegistryAddress_gte: InputMaybe; + recipientRegistryAddress_in: InputMaybe>; + recipientRegistryAddress_lt: InputMaybe; + recipientRegistryAddress_lte: InputMaybe; + recipientRegistryAddress_not: InputMaybe; + recipientRegistryAddress_not_contains: InputMaybe; + recipientRegistryAddress_not_in: InputMaybe>; + recipientRegistry_: InputMaybe; + recipientRegistry_contains: InputMaybe; + recipientRegistry_contains_nocase: InputMaybe; + recipientRegistry_ends_with: InputMaybe; + recipientRegistry_ends_with_nocase: InputMaybe; + recipientRegistry_gt: InputMaybe; + recipientRegistry_gte: InputMaybe; + recipientRegistry_in: InputMaybe>; + recipientRegistry_lt: InputMaybe; + recipientRegistry_lte: InputMaybe; + recipientRegistry_not: InputMaybe; + recipientRegistry_not_contains: InputMaybe; + recipientRegistry_not_contains_nocase: InputMaybe; + recipientRegistry_not_ends_with: InputMaybe; + recipientRegistry_not_ends_with_nocase: InputMaybe; + recipientRegistry_not_in: InputMaybe>; + recipientRegistry_not_starts_with: InputMaybe; + recipientRegistry_not_starts_with_nocase: InputMaybe; + recipientRegistry_starts_with: InputMaybe; + recipientRegistry_starts_with_nocase: InputMaybe; + stateTreeDepth: InputMaybe; + stateTreeDepth_gt: InputMaybe; + stateTreeDepth_gte: InputMaybe; + stateTreeDepth_in: InputMaybe>; + stateTreeDepth_lt: InputMaybe; + stateTreeDepth_lte: InputMaybe; + stateTreeDepth_not: InputMaybe; + stateTreeDepth_not_in: InputMaybe>; + voteOptionTreeDepth: InputMaybe; + voteOptionTreeDepth_gt: InputMaybe; + voteOptionTreeDepth_gte: InputMaybe; + voteOptionTreeDepth_in: InputMaybe>; + voteOptionTreeDepth_lt: InputMaybe; + voteOptionTreeDepth_lte: InputMaybe; + voteOptionTreeDepth_not: InputMaybe; + voteOptionTreeDepth_not_in: InputMaybe>; }; -export enum Coordinator_OrderBy { - Contact = 'contact', +export enum ClrFund_OrderBy { + ContributorRegistry = 'contributorRegistry', + ContributorRegistryAddress = 'contributorRegistryAddress', + ContributorRegistryContext = 'contributorRegistry__context', + ContributorRegistryCreatedAt = 'contributorRegistry__createdAt', + ContributorRegistryId = 'contributorRegistry__id', + ContributorRegistryLastUpdatedAt = 'contributorRegistry__lastUpdatedAt', + ContributorRegistryOwner = 'contributorRegistry__owner', + Coordinator = 'coordinator', + CoordinatorPubKey = 'coordinatorPubKey', CreatedAt = 'createdAt', + CurrentRound = 'currentRound', + CurrentRoundContributorCount = 'currentRound__contributorCount', + CurrentRoundContributorRegistryAddress = 'currentRound__contributorRegistryAddress', + CurrentRoundCoordinator = 'currentRound__coordinator', + CurrentRoundCoordinatorPubKeyX = 'currentRound__coordinatorPubKeyX', + CurrentRoundCoordinatorPubKeyY = 'currentRound__coordinatorPubKeyY', + CurrentRoundCreatedAt = 'currentRound__createdAt', + CurrentRoundId = 'currentRound__id', + CurrentRoundIsCancelled = 'currentRound__isCancelled', + CurrentRoundIsFinalized = 'currentRound__isFinalized', + CurrentRoundLastUpdatedAt = 'currentRound__lastUpdatedAt', + CurrentRoundMaci = 'currentRound__maci', + CurrentRoundMaciTxHash = 'currentRound__maciTxHash', + CurrentRoundMatchingPoolSize = 'currentRound__matchingPoolSize', + CurrentRoundMessageTreeDepth = 'currentRound__messageTreeDepth', + CurrentRoundNativeToken = 'currentRound__nativeToken', + CurrentRoundPollAddress = 'currentRound__pollAddress', + CurrentRoundPollId = 'currentRound__pollId', + CurrentRoundRecipientCount = 'currentRound__recipientCount', + CurrentRoundRecipientRegistryAddress = 'currentRound__recipientRegistryAddress', + CurrentRoundSignUpDeadline = 'currentRound__signUpDeadline', + CurrentRoundStartTime = 'currentRound__startTime', + CurrentRoundStateTreeDepth = 'currentRound__stateTreeDepth', + CurrentRoundTallyHash = 'currentRound__tallyHash', + CurrentRoundTotalSpent = 'currentRound__totalSpent', + CurrentRoundTotalVotes = 'currentRound__totalVotes', + CurrentRoundVoiceCreditFactor = 'currentRound__voiceCreditFactor', + CurrentRoundVoteOptionTreeDepth = 'currentRound__voteOptionTreeDepth', + CurrentRoundVotingDeadline = 'currentRound__votingDeadline', + FundingRounds = 'fundingRounds', Id = 'id', - LastUpdatedAt = 'lastUpdatedAt' + LastUpdatedAt = 'lastUpdatedAt', + MaciFactory = 'maciFactory', + MessageTreeDepth = 'messageTreeDepth', + NativeToken = 'nativeToken', + NativeTokenInfo = 'nativeTokenInfo', + NativeTokenInfoCreatedAt = 'nativeTokenInfo__createdAt', + NativeTokenInfoDecimals = 'nativeTokenInfo__decimals', + NativeTokenInfoId = 'nativeTokenInfo__id', + NativeTokenInfoLastUpdatedAt = 'nativeTokenInfo__lastUpdatedAt', + NativeTokenInfoSymbol = 'nativeTokenInfo__symbol', + NativeTokenInfoTokenAddress = 'nativeTokenInfo__tokenAddress', + Owner = 'owner', + RecipientRegistry = 'recipientRegistry', + RecipientRegistryAddress = 'recipientRegistryAddress', + RecipientRegistryBaseDeposit = 'recipientRegistry__baseDeposit', + RecipientRegistryChallengePeriodDuration = 'recipientRegistry__challengePeriodDuration', + RecipientRegistryController = 'recipientRegistry__controller', + RecipientRegistryCreatedAt = 'recipientRegistry__createdAt', + RecipientRegistryId = 'recipientRegistry__id', + RecipientRegistryLastUpdatedAt = 'recipientRegistry__lastUpdatedAt', + RecipientRegistryMaxRecipients = 'recipientRegistry__maxRecipients', + RecipientRegistryOwner = 'recipientRegistry__owner', + StateTreeDepth = 'stateTreeDepth', + VoteOptionTreeDepth = 'voteOptionTreeDepth' } -export type Donation = { - __typename?: 'Donation'; +export type Contribution = { + __typename?: 'Contribution'; amount: Maybe; + contributor: Maybe; createdAt: Maybe; fundingRound: Maybe; id: Scalars['ID']; - recipient: Maybe; - voteOptionIndex: Maybe; + voiceCredits: Maybe; }; -export type Donation_Filter = { +export type Contribution_Filter = { /** Filter for the block changed event. */ _change_block: InputMaybe; amount: InputMaybe; @@ -608,7 +398,28 @@ export type Donation_Filter = { amount_lte: InputMaybe; amount_not: InputMaybe; amount_not_in: InputMaybe>; - and: InputMaybe>>; + and: InputMaybe>>; + contributor: InputMaybe; + contributor_: InputMaybe; + contributor_contains: InputMaybe; + contributor_contains_nocase: InputMaybe; + contributor_ends_with: InputMaybe; + contributor_ends_with_nocase: InputMaybe; + contributor_gt: InputMaybe; + contributor_gte: InputMaybe; + contributor_in: InputMaybe>; + contributor_lt: InputMaybe; + contributor_lte: InputMaybe; + contributor_not: InputMaybe; + contributor_not_contains: InputMaybe; + contributor_not_contains_nocase: InputMaybe; + contributor_not_ends_with: InputMaybe; + contributor_not_ends_with_nocase: InputMaybe; + contributor_not_in: InputMaybe>; + contributor_not_starts_with: InputMaybe; + contributor_not_starts_with_nocase: InputMaybe; + contributor_starts_with: InputMaybe; + contributor_starts_with_nocase: InputMaybe; createdAt: InputMaybe; createdAt_contains: InputMaybe; createdAt_contains_nocase: InputMaybe; @@ -658,199 +469,255 @@ export type Donation_Filter = { id_lte: InputMaybe; id_not: InputMaybe; id_not_in: InputMaybe>; - or: InputMaybe>>; - recipient: InputMaybe; - recipient_contains: InputMaybe; - recipient_gt: InputMaybe; - recipient_gte: InputMaybe; - recipient_in: InputMaybe>; - recipient_lt: InputMaybe; - recipient_lte: InputMaybe; - recipient_not: InputMaybe; - recipient_not_contains: InputMaybe; - recipient_not_in: InputMaybe>; - voteOptionIndex: InputMaybe; - voteOptionIndex_gt: InputMaybe; - voteOptionIndex_gte: InputMaybe; - voteOptionIndex_in: InputMaybe>; - voteOptionIndex_lt: InputMaybe; - voteOptionIndex_lte: InputMaybe; - voteOptionIndex_not: InputMaybe; - voteOptionIndex_not_in: InputMaybe>; + or: InputMaybe>>; + voiceCredits: InputMaybe; + voiceCredits_gt: InputMaybe; + voiceCredits_gte: InputMaybe; + voiceCredits_in: InputMaybe>; + voiceCredits_lt: InputMaybe; + voiceCredits_lte: InputMaybe; + voiceCredits_not: InputMaybe; + voiceCredits_not_in: InputMaybe>; }; -export enum Donation_OrderBy { +export enum Contribution_OrderBy { Amount = 'amount', + Contributor = 'contributor', + ContributorContributorAddress = 'contributor__contributorAddress', + ContributorCreatedAt = 'contributor__createdAt', + ContributorId = 'contributor__id', + ContributorLastUpdatedAt = 'contributor__lastUpdatedAt', + ContributorVerifiedTimeStamp = 'contributor__verifiedTimeStamp', CreatedAt = 'createdAt', FundingRound = 'fundingRound', FundingRoundContributorCount = 'fundingRound__contributorCount', FundingRoundContributorRegistryAddress = 'fundingRound__contributorRegistryAddress', FundingRoundCoordinator = 'fundingRound__coordinator', + FundingRoundCoordinatorPubKeyX = 'fundingRound__coordinatorPubKeyX', + FundingRoundCoordinatorPubKeyY = 'fundingRound__coordinatorPubKeyY', FundingRoundCreatedAt = 'fundingRound__createdAt', FundingRoundId = 'fundingRound__id', FundingRoundIsCancelled = 'fundingRound__isCancelled', FundingRoundIsFinalized = 'fundingRound__isFinalized', FundingRoundLastUpdatedAt = 'fundingRound__lastUpdatedAt', FundingRoundMaci = 'fundingRound__maci', + FundingRoundMaciTxHash = 'fundingRound__maciTxHash', FundingRoundMatchingPoolSize = 'fundingRound__matchingPoolSize', + FundingRoundMessageTreeDepth = 'fundingRound__messageTreeDepth', FundingRoundNativeToken = 'fundingRound__nativeToken', + FundingRoundPollAddress = 'fundingRound__pollAddress', + FundingRoundPollId = 'fundingRound__pollId', FundingRoundRecipientCount = 'fundingRound__recipientCount', FundingRoundRecipientRegistryAddress = 'fundingRound__recipientRegistryAddress', FundingRoundSignUpDeadline = 'fundingRound__signUpDeadline', FundingRoundStartTime = 'fundingRound__startTime', + FundingRoundStateTreeDepth = 'fundingRound__stateTreeDepth', FundingRoundTallyHash = 'fundingRound__tallyHash', FundingRoundTotalSpent = 'fundingRound__totalSpent', FundingRoundTotalVotes = 'fundingRound__totalVotes', FundingRoundVoiceCreditFactor = 'fundingRound__voiceCreditFactor', + FundingRoundVoteOptionTreeDepth = 'fundingRound__voteOptionTreeDepth', FundingRoundVotingDeadline = 'fundingRound__votingDeadline', Id = 'id', - Recipient = 'recipient', - VoteOptionIndex = 'voteOptionIndex' -} - -export type FundingRound = { - __typename?: 'FundingRound'; - contributions: Maybe>; - contributorCount: Scalars['BigInt']; - contributorRegistry: Maybe; - contributorRegistryAddress: Maybe; - contributors: Maybe>; - coordinator: Maybe; - createdAt: Maybe; - fundingRoundFactory: Maybe; - id: Scalars['ID']; - isCancelled: Maybe; - isFinalized: Maybe; - lastUpdatedAt: Maybe; - maci: Maybe; - matchingPoolSize: Maybe; - messages: Maybe>; - nativeToken: Maybe; - nativeTokenInfo: Maybe; - recipientCount: Scalars['BigInt']; - recipientRegistry: Maybe; - recipientRegistryAddress: Maybe; - recipients: Maybe>; - signUpDeadline: Maybe; - startTime: Maybe; - tallyHash: Maybe; - totalSpent: Maybe; - totalVotes: Maybe; - voiceCreditFactor: Maybe; - votes: Maybe>; - votingDeadline: Maybe; -}; - - -export type FundingRoundContributionsArgs = { - first?: InputMaybe; - orderBy: InputMaybe; - orderDirection: InputMaybe; - skip?: InputMaybe; - where: InputMaybe; -}; - - -export type FundingRoundContributorsArgs = { - first?: InputMaybe; - orderBy: InputMaybe; - orderDirection: InputMaybe; - skip?: InputMaybe; - where: InputMaybe; -}; - - -export type FundingRoundMessagesArgs = { - first?: InputMaybe; - orderBy: InputMaybe; - orderDirection: InputMaybe; - skip?: InputMaybe; - where: InputMaybe; + VoiceCredits = 'voiceCredits' +} + +export type Contributor = { + __typename?: 'Contributor'; + contributions: Maybe>; + contributorAddress: Maybe; + contributorRegistry: ContributorRegistry; + createdAt: Maybe; + fundingRounds: Maybe>; + id: Scalars['ID']; + lastUpdatedAt: Maybe; + verifiedTimeStamp: Maybe; }; -export type FundingRoundRecipientsArgs = { +export type ContributorContributionsArgs = { first?: InputMaybe; - orderBy: InputMaybe; + orderBy: InputMaybe; orderDirection: InputMaybe; skip?: InputMaybe; - where: InputMaybe; + where: InputMaybe; }; -export type FundingRoundVotesArgs = { +export type ContributorFundingRoundsArgs = { first?: InputMaybe; - orderBy: InputMaybe; + orderBy: InputMaybe; orderDirection: InputMaybe; skip?: InputMaybe; - where: InputMaybe; + where: InputMaybe; }; -export type FundingRoundFactory = { - __typename?: 'FundingRoundFactory'; - batchUstVerifier: Maybe; - contributorRegistry: Maybe; - contributorRegistryAddress: Maybe; - coordinator: Maybe; - coordinatorPubKey: Maybe; +export type ContributorRegistry = { + __typename?: 'ContributorRegistry'; + clrFund: ClrFund; + context: Maybe; + contributors: Maybe>; createdAt: Maybe; - currentRound: Maybe; - fundingRounds: Maybe>; id: Scalars['ID']; lastUpdatedAt: Maybe; - maciFactory: Maybe; - maxMessages: Maybe; - maxUsers: Maybe; - maxVoteOptions: Maybe; - messageBatchSize: Maybe; - messageTreeDepth: Maybe; - nativeToken: Maybe; - nativeTokenInfo: Maybe; owner: Maybe; - qvtVerifier: Maybe; - recipientRegistry: Maybe; - recipientRegistryAddress: Maybe; - signUpDuration: Maybe; - stateTreeDepth: Maybe; - tallyBatchSize: Maybe; - voteOptionTreeDepth: Maybe; - votingDuration: Maybe; }; -export type FundingRoundFactoryFundingRoundsArgs = { +export type ContributorRegistryContributorsArgs = { first?: InputMaybe; - orderBy: InputMaybe; + orderBy: InputMaybe; orderDirection: InputMaybe; skip?: InputMaybe; - where: InputMaybe; + where: InputMaybe; +}; + +export type ContributorRegistry_Filter = { + /** Filter for the block changed event. */ + _change_block: InputMaybe; + and: InputMaybe>>; + clrFund: InputMaybe; + clrFund_: InputMaybe; + clrFund_contains: InputMaybe; + clrFund_contains_nocase: InputMaybe; + clrFund_ends_with: InputMaybe; + clrFund_ends_with_nocase: InputMaybe; + clrFund_gt: InputMaybe; + clrFund_gte: InputMaybe; + clrFund_in: InputMaybe>; + clrFund_lt: InputMaybe; + clrFund_lte: InputMaybe; + clrFund_not: InputMaybe; + clrFund_not_contains: InputMaybe; + clrFund_not_contains_nocase: InputMaybe; + clrFund_not_ends_with: InputMaybe; + clrFund_not_ends_with_nocase: InputMaybe; + clrFund_not_in: InputMaybe>; + clrFund_not_starts_with: InputMaybe; + clrFund_not_starts_with_nocase: InputMaybe; + clrFund_starts_with: InputMaybe; + clrFund_starts_with_nocase: InputMaybe; + context: InputMaybe; + context_contains: InputMaybe; + context_contains_nocase: InputMaybe; + context_ends_with: InputMaybe; + context_ends_with_nocase: InputMaybe; + context_gt: InputMaybe; + context_gte: InputMaybe; + context_in: InputMaybe>; + context_lt: InputMaybe; + context_lte: InputMaybe; + context_not: InputMaybe; + context_not_contains: InputMaybe; + context_not_contains_nocase: InputMaybe; + context_not_ends_with: InputMaybe; + context_not_ends_with_nocase: InputMaybe; + context_not_in: InputMaybe>; + context_not_starts_with: InputMaybe; + context_not_starts_with_nocase: InputMaybe; + context_starts_with: InputMaybe; + context_starts_with_nocase: InputMaybe; + contributors_: InputMaybe; + createdAt: InputMaybe; + createdAt_contains: InputMaybe; + createdAt_contains_nocase: InputMaybe; + createdAt_ends_with: InputMaybe; + createdAt_ends_with_nocase: InputMaybe; + createdAt_gt: InputMaybe; + createdAt_gte: InputMaybe; + createdAt_in: InputMaybe>; + createdAt_lt: InputMaybe; + createdAt_lte: InputMaybe; + createdAt_not: InputMaybe; + createdAt_not_contains: InputMaybe; + createdAt_not_contains_nocase: InputMaybe; + createdAt_not_ends_with: InputMaybe; + createdAt_not_ends_with_nocase: InputMaybe; + createdAt_not_in: InputMaybe>; + createdAt_not_starts_with: InputMaybe; + createdAt_not_starts_with_nocase: InputMaybe; + createdAt_starts_with: InputMaybe; + createdAt_starts_with_nocase: InputMaybe; + id: InputMaybe; + id_gt: InputMaybe; + id_gte: InputMaybe; + id_in: InputMaybe>; + id_lt: InputMaybe; + id_lte: InputMaybe; + id_not: InputMaybe; + id_not_in: InputMaybe>; + lastUpdatedAt: InputMaybe; + lastUpdatedAt_contains: InputMaybe; + lastUpdatedAt_contains_nocase: InputMaybe; + lastUpdatedAt_ends_with: InputMaybe; + lastUpdatedAt_ends_with_nocase: InputMaybe; + lastUpdatedAt_gt: InputMaybe; + lastUpdatedAt_gte: InputMaybe; + lastUpdatedAt_in: InputMaybe>; + lastUpdatedAt_lt: InputMaybe; + lastUpdatedAt_lte: InputMaybe; + lastUpdatedAt_not: InputMaybe; + lastUpdatedAt_not_contains: InputMaybe; + lastUpdatedAt_not_contains_nocase: InputMaybe; + lastUpdatedAt_not_ends_with: InputMaybe; + lastUpdatedAt_not_ends_with_nocase: InputMaybe; + lastUpdatedAt_not_in: InputMaybe>; + lastUpdatedAt_not_starts_with: InputMaybe; + lastUpdatedAt_not_starts_with_nocase: InputMaybe; + lastUpdatedAt_starts_with: InputMaybe; + lastUpdatedAt_starts_with_nocase: InputMaybe; + or: InputMaybe>>; + owner: InputMaybe; + owner_contains: InputMaybe; + owner_gt: InputMaybe; + owner_gte: InputMaybe; + owner_in: InputMaybe>; + owner_lt: InputMaybe; + owner_lte: InputMaybe; + owner_not: InputMaybe; + owner_not_contains: InputMaybe; + owner_not_in: InputMaybe>; }; -export type FundingRoundFactory_Filter = { +export enum ContributorRegistry_OrderBy { + ClrFund = 'clrFund', + ClrFundContributorRegistryAddress = 'clrFund__contributorRegistryAddress', + ClrFundCoordinator = 'clrFund__coordinator', + ClrFundCoordinatorPubKey = 'clrFund__coordinatorPubKey', + ClrFundCreatedAt = 'clrFund__createdAt', + ClrFundId = 'clrFund__id', + ClrFundLastUpdatedAt = 'clrFund__lastUpdatedAt', + ClrFundMaciFactory = 'clrFund__maciFactory', + ClrFundMessageTreeDepth = 'clrFund__messageTreeDepth', + ClrFundNativeToken = 'clrFund__nativeToken', + ClrFundOwner = 'clrFund__owner', + ClrFundRecipientRegistryAddress = 'clrFund__recipientRegistryAddress', + ClrFundStateTreeDepth = 'clrFund__stateTreeDepth', + ClrFundVoteOptionTreeDepth = 'clrFund__voteOptionTreeDepth', + Context = 'context', + Contributors = 'contributors', + CreatedAt = 'createdAt', + Id = 'id', + LastUpdatedAt = 'lastUpdatedAt', + Owner = 'owner' +} + +export type Contributor_Filter = { /** Filter for the block changed event. */ _change_block: InputMaybe; - and: InputMaybe>>; - batchUstVerifier: InputMaybe; - batchUstVerifier_contains: InputMaybe; - batchUstVerifier_gt: InputMaybe; - batchUstVerifier_gte: InputMaybe; - batchUstVerifier_in: InputMaybe>; - batchUstVerifier_lt: InputMaybe; - batchUstVerifier_lte: InputMaybe; - batchUstVerifier_not: InputMaybe; - batchUstVerifier_not_contains: InputMaybe; - batchUstVerifier_not_in: InputMaybe>; + and: InputMaybe>>; + contributions_: InputMaybe; + contributorAddress: InputMaybe; + contributorAddress_contains: InputMaybe; + contributorAddress_gt: InputMaybe; + contributorAddress_gte: InputMaybe; + contributorAddress_in: InputMaybe>; + contributorAddress_lt: InputMaybe; + contributorAddress_lte: InputMaybe; + contributorAddress_not: InputMaybe; + contributorAddress_not_contains: InputMaybe; + contributorAddress_not_in: InputMaybe>; contributorRegistry: InputMaybe; - contributorRegistryAddress: InputMaybe; - contributorRegistryAddress_contains: InputMaybe; - contributorRegistryAddress_gt: InputMaybe; - contributorRegistryAddress_gte: InputMaybe; - contributorRegistryAddress_in: InputMaybe>; - contributorRegistryAddress_lt: InputMaybe; - contributorRegistryAddress_lte: InputMaybe; - contributorRegistryAddress_not: InputMaybe; - contributorRegistryAddress_not_contains: InputMaybe; - contributorRegistryAddress_not_in: InputMaybe>; contributorRegistry_: InputMaybe; contributorRegistry_contains: InputMaybe; contributorRegistry_contains_nocase: InputMaybe; @@ -871,36 +738,6 @@ export type FundingRoundFactory_Filter = { contributorRegistry_not_starts_with_nocase: InputMaybe; contributorRegistry_starts_with: InputMaybe; contributorRegistry_starts_with_nocase: InputMaybe; - coordinator: InputMaybe; - coordinatorPubKey: InputMaybe; - coordinatorPubKey_contains: InputMaybe; - coordinatorPubKey_contains_nocase: InputMaybe; - coordinatorPubKey_ends_with: InputMaybe; - coordinatorPubKey_ends_with_nocase: InputMaybe; - coordinatorPubKey_gt: InputMaybe; - coordinatorPubKey_gte: InputMaybe; - coordinatorPubKey_in: InputMaybe>; - coordinatorPubKey_lt: InputMaybe; - coordinatorPubKey_lte: InputMaybe; - coordinatorPubKey_not: InputMaybe; - coordinatorPubKey_not_contains: InputMaybe; - coordinatorPubKey_not_contains_nocase: InputMaybe; - coordinatorPubKey_not_ends_with: InputMaybe; - coordinatorPubKey_not_ends_with_nocase: InputMaybe; - coordinatorPubKey_not_in: InputMaybe>; - coordinatorPubKey_not_starts_with: InputMaybe; - coordinatorPubKey_not_starts_with_nocase: InputMaybe; - coordinatorPubKey_starts_with: InputMaybe; - coordinatorPubKey_starts_with_nocase: InputMaybe; - coordinator_contains: InputMaybe; - coordinator_gt: InputMaybe; - coordinator_gte: InputMaybe; - coordinator_in: InputMaybe>; - coordinator_lt: InputMaybe; - coordinator_lte: InputMaybe; - coordinator_not: InputMaybe; - coordinator_not_contains: InputMaybe; - coordinator_not_in: InputMaybe>; createdAt: InputMaybe; createdAt_contains: InputMaybe; createdAt_contains_nocase: InputMaybe; @@ -921,28 +758,132 @@ export type FundingRoundFactory_Filter = { createdAt_not_starts_with_nocase: InputMaybe; createdAt_starts_with: InputMaybe; createdAt_starts_with_nocase: InputMaybe; - currentRound: InputMaybe; - currentRound_: InputMaybe; - currentRound_contains: InputMaybe; - currentRound_contains_nocase: InputMaybe; - currentRound_ends_with: InputMaybe; - currentRound_ends_with_nocase: InputMaybe; - currentRound_gt: InputMaybe; - currentRound_gte: InputMaybe; - currentRound_in: InputMaybe>; - currentRound_lt: InputMaybe; - currentRound_lte: InputMaybe; - currentRound_not: InputMaybe; - currentRound_not_contains: InputMaybe; - currentRound_not_contains_nocase: InputMaybe; - currentRound_not_ends_with: InputMaybe; - currentRound_not_ends_with_nocase: InputMaybe; - currentRound_not_in: InputMaybe>; - currentRound_not_starts_with: InputMaybe; - currentRound_not_starts_with_nocase: InputMaybe; - currentRound_starts_with: InputMaybe; - currentRound_starts_with_nocase: InputMaybe; - fundingRounds_: InputMaybe; + fundingRounds: InputMaybe>; + fundingRounds_: InputMaybe; + fundingRounds_contains: InputMaybe>; + fundingRounds_contains_nocase: InputMaybe>; + fundingRounds_not: InputMaybe>; + fundingRounds_not_contains: InputMaybe>; + fundingRounds_not_contains_nocase: InputMaybe>; + id: InputMaybe; + id_gt: InputMaybe; + id_gte: InputMaybe; + id_in: InputMaybe>; + id_lt: InputMaybe; + id_lte: InputMaybe; + id_not: InputMaybe; + id_not_in: InputMaybe>; + lastUpdatedAt: InputMaybe; + lastUpdatedAt_contains: InputMaybe; + lastUpdatedAt_contains_nocase: InputMaybe; + lastUpdatedAt_ends_with: InputMaybe; + lastUpdatedAt_ends_with_nocase: InputMaybe; + lastUpdatedAt_gt: InputMaybe; + lastUpdatedAt_gte: InputMaybe; + lastUpdatedAt_in: InputMaybe>; + lastUpdatedAt_lt: InputMaybe; + lastUpdatedAt_lte: InputMaybe; + lastUpdatedAt_not: InputMaybe; + lastUpdatedAt_not_contains: InputMaybe; + lastUpdatedAt_not_contains_nocase: InputMaybe; + lastUpdatedAt_not_ends_with: InputMaybe; + lastUpdatedAt_not_ends_with_nocase: InputMaybe; + lastUpdatedAt_not_in: InputMaybe>; + lastUpdatedAt_not_starts_with: InputMaybe; + lastUpdatedAt_not_starts_with_nocase: InputMaybe; + lastUpdatedAt_starts_with: InputMaybe; + lastUpdatedAt_starts_with_nocase: InputMaybe; + or: InputMaybe>>; + verifiedTimeStamp: InputMaybe; + verifiedTimeStamp_contains: InputMaybe; + verifiedTimeStamp_contains_nocase: InputMaybe; + verifiedTimeStamp_ends_with: InputMaybe; + verifiedTimeStamp_ends_with_nocase: InputMaybe; + verifiedTimeStamp_gt: InputMaybe; + verifiedTimeStamp_gte: InputMaybe; + verifiedTimeStamp_in: InputMaybe>; + verifiedTimeStamp_lt: InputMaybe; + verifiedTimeStamp_lte: InputMaybe; + verifiedTimeStamp_not: InputMaybe; + verifiedTimeStamp_not_contains: InputMaybe; + verifiedTimeStamp_not_contains_nocase: InputMaybe; + verifiedTimeStamp_not_ends_with: InputMaybe; + verifiedTimeStamp_not_ends_with_nocase: InputMaybe; + verifiedTimeStamp_not_in: InputMaybe>; + verifiedTimeStamp_not_starts_with: InputMaybe; + verifiedTimeStamp_not_starts_with_nocase: InputMaybe; + verifiedTimeStamp_starts_with: InputMaybe; + verifiedTimeStamp_starts_with_nocase: InputMaybe; +}; + +export enum Contributor_OrderBy { + Contributions = 'contributions', + ContributorAddress = 'contributorAddress', + ContributorRegistry = 'contributorRegistry', + ContributorRegistryContext = 'contributorRegistry__context', + ContributorRegistryCreatedAt = 'contributorRegistry__createdAt', + ContributorRegistryId = 'contributorRegistry__id', + ContributorRegistryLastUpdatedAt = 'contributorRegistry__lastUpdatedAt', + ContributorRegistryOwner = 'contributorRegistry__owner', + CreatedAt = 'createdAt', + FundingRounds = 'fundingRounds', + Id = 'id', + LastUpdatedAt = 'lastUpdatedAt', + VerifiedTimeStamp = 'verifiedTimeStamp' +} + +export type Coordinator = { + __typename?: 'Coordinator'; + contact: Maybe; + createdAt: Maybe; + id: Scalars['ID']; + lastUpdatedAt: Maybe; +}; + +export type Coordinator_Filter = { + /** Filter for the block changed event. */ + _change_block: InputMaybe; + and: InputMaybe>>; + contact: InputMaybe; + contact_contains: InputMaybe; + contact_contains_nocase: InputMaybe; + contact_ends_with: InputMaybe; + contact_ends_with_nocase: InputMaybe; + contact_gt: InputMaybe; + contact_gte: InputMaybe; + contact_in: InputMaybe>; + contact_lt: InputMaybe; + contact_lte: InputMaybe; + contact_not: InputMaybe; + contact_not_contains: InputMaybe; + contact_not_contains_nocase: InputMaybe; + contact_not_ends_with: InputMaybe; + contact_not_ends_with_nocase: InputMaybe; + contact_not_in: InputMaybe>; + contact_not_starts_with: InputMaybe; + contact_not_starts_with_nocase: InputMaybe; + contact_starts_with: InputMaybe; + contact_starts_with_nocase: InputMaybe; + createdAt: InputMaybe; + createdAt_contains: InputMaybe; + createdAt_contains_nocase: InputMaybe; + createdAt_ends_with: InputMaybe; + createdAt_ends_with_nocase: InputMaybe; + createdAt_gt: InputMaybe; + createdAt_gte: InputMaybe; + createdAt_in: InputMaybe>; + createdAt_lt: InputMaybe; + createdAt_lte: InputMaybe; + createdAt_not: InputMaybe; + createdAt_not_contains: InputMaybe; + createdAt_not_contains_nocase: InputMaybe; + createdAt_not_ends_with: InputMaybe; + createdAt_not_ends_with_nocase: InputMaybe; + createdAt_not_in: InputMaybe>; + createdAt_not_starts_with: InputMaybe; + createdAt_not_starts_with_nocase: InputMaybe; + createdAt_starts_with: InputMaybe; + createdAt_starts_with_nocase: InputMaybe; id: InputMaybe; id_gt: InputMaybe; id_gte: InputMaybe; @@ -971,254 +912,246 @@ export type FundingRoundFactory_Filter = { lastUpdatedAt_not_starts_with_nocase: InputMaybe; lastUpdatedAt_starts_with: InputMaybe; lastUpdatedAt_starts_with_nocase: InputMaybe; - maciFactory: InputMaybe; - maciFactory_contains: InputMaybe; - maciFactory_gt: InputMaybe; - maciFactory_gte: InputMaybe; - maciFactory_in: InputMaybe>; - maciFactory_lt: InputMaybe; - maciFactory_lte: InputMaybe; - maciFactory_not: InputMaybe; - maciFactory_not_contains: InputMaybe; - maciFactory_not_in: InputMaybe>; - maxMessages: InputMaybe; - maxMessages_gt: InputMaybe; - maxMessages_gte: InputMaybe; - maxMessages_in: InputMaybe>; - maxMessages_lt: InputMaybe; - maxMessages_lte: InputMaybe; - maxMessages_not: InputMaybe; - maxMessages_not_in: InputMaybe>; - maxUsers: InputMaybe; - maxUsers_gt: InputMaybe; - maxUsers_gte: InputMaybe; - maxUsers_in: InputMaybe>; - maxUsers_lt: InputMaybe; - maxUsers_lte: InputMaybe; - maxUsers_not: InputMaybe; - maxUsers_not_in: InputMaybe>; - maxVoteOptions: InputMaybe; - maxVoteOptions_gt: InputMaybe; - maxVoteOptions_gte: InputMaybe; - maxVoteOptions_in: InputMaybe>; - maxVoteOptions_lt: InputMaybe; - maxVoteOptions_lte: InputMaybe; - maxVoteOptions_not: InputMaybe; - maxVoteOptions_not_in: InputMaybe>; - messageBatchSize: InputMaybe; - messageBatchSize_gt: InputMaybe; - messageBatchSize_gte: InputMaybe; - messageBatchSize_in: InputMaybe>; - messageBatchSize_lt: InputMaybe; - messageBatchSize_lte: InputMaybe; - messageBatchSize_not: InputMaybe; - messageBatchSize_not_in: InputMaybe>; - messageTreeDepth: InputMaybe; - messageTreeDepth_gt: InputMaybe; - messageTreeDepth_gte: InputMaybe; - messageTreeDepth_in: InputMaybe>; - messageTreeDepth_lt: InputMaybe; - messageTreeDepth_lte: InputMaybe; - messageTreeDepth_not: InputMaybe; - messageTreeDepth_not_in: InputMaybe>; - nativeToken: InputMaybe; - nativeTokenInfo: InputMaybe; - nativeTokenInfo_: InputMaybe; - nativeTokenInfo_contains: InputMaybe; - nativeTokenInfo_contains_nocase: InputMaybe; - nativeTokenInfo_ends_with: InputMaybe; - nativeTokenInfo_ends_with_nocase: InputMaybe; - nativeTokenInfo_gt: InputMaybe; - nativeTokenInfo_gte: InputMaybe; - nativeTokenInfo_in: InputMaybe>; - nativeTokenInfo_lt: InputMaybe; - nativeTokenInfo_lte: InputMaybe; - nativeTokenInfo_not: InputMaybe; - nativeTokenInfo_not_contains: InputMaybe; - nativeTokenInfo_not_contains_nocase: InputMaybe; - nativeTokenInfo_not_ends_with: InputMaybe; - nativeTokenInfo_not_ends_with_nocase: InputMaybe; - nativeTokenInfo_not_in: InputMaybe>; - nativeTokenInfo_not_starts_with: InputMaybe; - nativeTokenInfo_not_starts_with_nocase: InputMaybe; - nativeTokenInfo_starts_with: InputMaybe; - nativeTokenInfo_starts_with_nocase: InputMaybe; - nativeToken_contains: InputMaybe; - nativeToken_gt: InputMaybe; - nativeToken_gte: InputMaybe; - nativeToken_in: InputMaybe>; - nativeToken_lt: InputMaybe; - nativeToken_lte: InputMaybe; - nativeToken_not: InputMaybe; - nativeToken_not_contains: InputMaybe; - nativeToken_not_in: InputMaybe>; - or: InputMaybe>>; - owner: InputMaybe; - owner_contains: InputMaybe; - owner_gt: InputMaybe; - owner_gte: InputMaybe; - owner_in: InputMaybe>; - owner_lt: InputMaybe; - owner_lte: InputMaybe; - owner_not: InputMaybe; - owner_not_contains: InputMaybe; - owner_not_in: InputMaybe>; - qvtVerifier: InputMaybe; - qvtVerifier_contains: InputMaybe; - qvtVerifier_gt: InputMaybe; - qvtVerifier_gte: InputMaybe; - qvtVerifier_in: InputMaybe>; - qvtVerifier_lt: InputMaybe; - qvtVerifier_lte: InputMaybe; - qvtVerifier_not: InputMaybe; - qvtVerifier_not_contains: InputMaybe; - qvtVerifier_not_in: InputMaybe>; - recipientRegistry: InputMaybe; - recipientRegistryAddress: InputMaybe; - recipientRegistryAddress_contains: InputMaybe; - recipientRegistryAddress_gt: InputMaybe; - recipientRegistryAddress_gte: InputMaybe; - recipientRegistryAddress_in: InputMaybe>; - recipientRegistryAddress_lt: InputMaybe; - recipientRegistryAddress_lte: InputMaybe; - recipientRegistryAddress_not: InputMaybe; - recipientRegistryAddress_not_contains: InputMaybe; - recipientRegistryAddress_not_in: InputMaybe>; - recipientRegistry_: InputMaybe; - recipientRegistry_contains: InputMaybe; - recipientRegistry_contains_nocase: InputMaybe; - recipientRegistry_ends_with: InputMaybe; - recipientRegistry_ends_with_nocase: InputMaybe; - recipientRegistry_gt: InputMaybe; - recipientRegistry_gte: InputMaybe; - recipientRegistry_in: InputMaybe>; - recipientRegistry_lt: InputMaybe; - recipientRegistry_lte: InputMaybe; - recipientRegistry_not: InputMaybe; - recipientRegistry_not_contains: InputMaybe; - recipientRegistry_not_contains_nocase: InputMaybe; - recipientRegistry_not_ends_with: InputMaybe; - recipientRegistry_not_ends_with_nocase: InputMaybe; - recipientRegistry_not_in: InputMaybe>; - recipientRegistry_not_starts_with: InputMaybe; - recipientRegistry_not_starts_with_nocase: InputMaybe; - recipientRegistry_starts_with: InputMaybe; - recipientRegistry_starts_with_nocase: InputMaybe; - signUpDuration: InputMaybe; - signUpDuration_gt: InputMaybe; - signUpDuration_gte: InputMaybe; - signUpDuration_in: InputMaybe>; - signUpDuration_lt: InputMaybe; - signUpDuration_lte: InputMaybe; - signUpDuration_not: InputMaybe; - signUpDuration_not_in: InputMaybe>; - stateTreeDepth: InputMaybe; - stateTreeDepth_gt: InputMaybe; - stateTreeDepth_gte: InputMaybe; - stateTreeDepth_in: InputMaybe>; - stateTreeDepth_lt: InputMaybe; - stateTreeDepth_lte: InputMaybe; - stateTreeDepth_not: InputMaybe; - stateTreeDepth_not_in: InputMaybe>; - tallyBatchSize: InputMaybe; - tallyBatchSize_gt: InputMaybe; - tallyBatchSize_gte: InputMaybe; - tallyBatchSize_in: InputMaybe>; - tallyBatchSize_lt: InputMaybe; - tallyBatchSize_lte: InputMaybe; - tallyBatchSize_not: InputMaybe; - tallyBatchSize_not_in: InputMaybe>; - voteOptionTreeDepth: InputMaybe; - voteOptionTreeDepth_gt: InputMaybe; - voteOptionTreeDepth_gte: InputMaybe; - voteOptionTreeDepth_in: InputMaybe>; - voteOptionTreeDepth_lt: InputMaybe; - voteOptionTreeDepth_lte: InputMaybe; - voteOptionTreeDepth_not: InputMaybe; - voteOptionTreeDepth_not_in: InputMaybe>; - votingDuration: InputMaybe; - votingDuration_gt: InputMaybe; - votingDuration_gte: InputMaybe; - votingDuration_in: InputMaybe>; - votingDuration_lt: InputMaybe; - votingDuration_lte: InputMaybe; - votingDuration_not: InputMaybe; - votingDuration_not_in: InputMaybe>; -}; - -export enum FundingRoundFactory_OrderBy { - BatchUstVerifier = 'batchUstVerifier', - ContributorRegistry = 'contributorRegistry', - ContributorRegistryAddress = 'contributorRegistryAddress', - ContributorRegistryContext = 'contributorRegistry__context', - ContributorRegistryCreatedAt = 'contributorRegistry__createdAt', - ContributorRegistryId = 'contributorRegistry__id', - ContributorRegistryLastUpdatedAt = 'contributorRegistry__lastUpdatedAt', - ContributorRegistryOwner = 'contributorRegistry__owner', - Coordinator = 'coordinator', - CoordinatorPubKey = 'coordinatorPubKey', + or: InputMaybe>>; +}; + +export enum Coordinator_OrderBy { + Contact = 'contact', + CreatedAt = 'createdAt', + Id = 'id', + LastUpdatedAt = 'lastUpdatedAt' +} + +export type Donation = { + __typename?: 'Donation'; + amount: Maybe; + createdAt: Maybe; + fundingRound: Maybe; + id: Scalars['ID']; + recipient: Maybe; + voteOptionIndex: Maybe; +}; + +export type Donation_Filter = { + /** Filter for the block changed event. */ + _change_block: InputMaybe; + amount: InputMaybe; + amount_gt: InputMaybe; + amount_gte: InputMaybe; + amount_in: InputMaybe>; + amount_lt: InputMaybe; + amount_lte: InputMaybe; + amount_not: InputMaybe; + amount_not_in: InputMaybe>; + and: InputMaybe>>; + createdAt: InputMaybe; + createdAt_contains: InputMaybe; + createdAt_contains_nocase: InputMaybe; + createdAt_ends_with: InputMaybe; + createdAt_ends_with_nocase: InputMaybe; + createdAt_gt: InputMaybe; + createdAt_gte: InputMaybe; + createdAt_in: InputMaybe>; + createdAt_lt: InputMaybe; + createdAt_lte: InputMaybe; + createdAt_not: InputMaybe; + createdAt_not_contains: InputMaybe; + createdAt_not_contains_nocase: InputMaybe; + createdAt_not_ends_with: InputMaybe; + createdAt_not_ends_with_nocase: InputMaybe; + createdAt_not_in: InputMaybe>; + createdAt_not_starts_with: InputMaybe; + createdAt_not_starts_with_nocase: InputMaybe; + createdAt_starts_with: InputMaybe; + createdAt_starts_with_nocase: InputMaybe; + fundingRound: InputMaybe; + fundingRound_: InputMaybe; + fundingRound_contains: InputMaybe; + fundingRound_contains_nocase: InputMaybe; + fundingRound_ends_with: InputMaybe; + fundingRound_ends_with_nocase: InputMaybe; + fundingRound_gt: InputMaybe; + fundingRound_gte: InputMaybe; + fundingRound_in: InputMaybe>; + fundingRound_lt: InputMaybe; + fundingRound_lte: InputMaybe; + fundingRound_not: InputMaybe; + fundingRound_not_contains: InputMaybe; + fundingRound_not_contains_nocase: InputMaybe; + fundingRound_not_ends_with: InputMaybe; + fundingRound_not_ends_with_nocase: InputMaybe; + fundingRound_not_in: InputMaybe>; + fundingRound_not_starts_with: InputMaybe; + fundingRound_not_starts_with_nocase: InputMaybe; + fundingRound_starts_with: InputMaybe; + fundingRound_starts_with_nocase: InputMaybe; + id: InputMaybe; + id_gt: InputMaybe; + id_gte: InputMaybe; + id_in: InputMaybe>; + id_lt: InputMaybe; + id_lte: InputMaybe; + id_not: InputMaybe; + id_not_in: InputMaybe>; + or: InputMaybe>>; + recipient: InputMaybe; + recipient_contains: InputMaybe; + recipient_gt: InputMaybe; + recipient_gte: InputMaybe; + recipient_in: InputMaybe>; + recipient_lt: InputMaybe; + recipient_lte: InputMaybe; + recipient_not: InputMaybe; + recipient_not_contains: InputMaybe; + recipient_not_in: InputMaybe>; + voteOptionIndex: InputMaybe; + voteOptionIndex_gt: InputMaybe; + voteOptionIndex_gte: InputMaybe; + voteOptionIndex_in: InputMaybe>; + voteOptionIndex_lt: InputMaybe; + voteOptionIndex_lte: InputMaybe; + voteOptionIndex_not: InputMaybe; + voteOptionIndex_not_in: InputMaybe>; +}; + +export enum Donation_OrderBy { + Amount = 'amount', CreatedAt = 'createdAt', - CurrentRound = 'currentRound', - CurrentRoundContributorCount = 'currentRound__contributorCount', - CurrentRoundContributorRegistryAddress = 'currentRound__contributorRegistryAddress', - CurrentRoundCoordinator = 'currentRound__coordinator', - CurrentRoundCreatedAt = 'currentRound__createdAt', - CurrentRoundId = 'currentRound__id', - CurrentRoundIsCancelled = 'currentRound__isCancelled', - CurrentRoundIsFinalized = 'currentRound__isFinalized', - CurrentRoundLastUpdatedAt = 'currentRound__lastUpdatedAt', - CurrentRoundMaci = 'currentRound__maci', - CurrentRoundMatchingPoolSize = 'currentRound__matchingPoolSize', - CurrentRoundNativeToken = 'currentRound__nativeToken', - CurrentRoundRecipientCount = 'currentRound__recipientCount', - CurrentRoundRecipientRegistryAddress = 'currentRound__recipientRegistryAddress', - CurrentRoundSignUpDeadline = 'currentRound__signUpDeadline', - CurrentRoundStartTime = 'currentRound__startTime', - CurrentRoundTallyHash = 'currentRound__tallyHash', - CurrentRoundTotalSpent = 'currentRound__totalSpent', - CurrentRoundTotalVotes = 'currentRound__totalVotes', - CurrentRoundVoiceCreditFactor = 'currentRound__voiceCreditFactor', - CurrentRoundVotingDeadline = 'currentRound__votingDeadline', - FundingRounds = 'fundingRounds', + FundingRound = 'fundingRound', + FundingRoundContributorCount = 'fundingRound__contributorCount', + FundingRoundContributorRegistryAddress = 'fundingRound__contributorRegistryAddress', + FundingRoundCoordinator = 'fundingRound__coordinator', + FundingRoundCoordinatorPubKeyX = 'fundingRound__coordinatorPubKeyX', + FundingRoundCoordinatorPubKeyY = 'fundingRound__coordinatorPubKeyY', + FundingRoundCreatedAt = 'fundingRound__createdAt', + FundingRoundId = 'fundingRound__id', + FundingRoundIsCancelled = 'fundingRound__isCancelled', + FundingRoundIsFinalized = 'fundingRound__isFinalized', + FundingRoundLastUpdatedAt = 'fundingRound__lastUpdatedAt', + FundingRoundMaci = 'fundingRound__maci', + FundingRoundMaciTxHash = 'fundingRound__maciTxHash', + FundingRoundMatchingPoolSize = 'fundingRound__matchingPoolSize', + FundingRoundMessageTreeDepth = 'fundingRound__messageTreeDepth', + FundingRoundNativeToken = 'fundingRound__nativeToken', + FundingRoundPollAddress = 'fundingRound__pollAddress', + FundingRoundPollId = 'fundingRound__pollId', + FundingRoundRecipientCount = 'fundingRound__recipientCount', + FundingRoundRecipientRegistryAddress = 'fundingRound__recipientRegistryAddress', + FundingRoundSignUpDeadline = 'fundingRound__signUpDeadline', + FundingRoundStartTime = 'fundingRound__startTime', + FundingRoundStateTreeDepth = 'fundingRound__stateTreeDepth', + FundingRoundTallyHash = 'fundingRound__tallyHash', + FundingRoundTotalSpent = 'fundingRound__totalSpent', + FundingRoundTotalVotes = 'fundingRound__totalVotes', + FundingRoundVoiceCreditFactor = 'fundingRound__voiceCreditFactor', + FundingRoundVoteOptionTreeDepth = 'fundingRound__voteOptionTreeDepth', + FundingRoundVotingDeadline = 'fundingRound__votingDeadline', Id = 'id', - LastUpdatedAt = 'lastUpdatedAt', - MaciFactory = 'maciFactory', - MaxMessages = 'maxMessages', - MaxUsers = 'maxUsers', - MaxVoteOptions = 'maxVoteOptions', - MessageBatchSize = 'messageBatchSize', - MessageTreeDepth = 'messageTreeDepth', - NativeToken = 'nativeToken', - NativeTokenInfo = 'nativeTokenInfo', - NativeTokenInfoCreatedAt = 'nativeTokenInfo__createdAt', - NativeTokenInfoDecimals = 'nativeTokenInfo__decimals', - NativeTokenInfoId = 'nativeTokenInfo__id', - NativeTokenInfoLastUpdatedAt = 'nativeTokenInfo__lastUpdatedAt', - NativeTokenInfoSymbol = 'nativeTokenInfo__symbol', - NativeTokenInfoTokenAddress = 'nativeTokenInfo__tokenAddress', - Owner = 'owner', - QvtVerifier = 'qvtVerifier', - RecipientRegistry = 'recipientRegistry', - RecipientRegistryAddress = 'recipientRegistryAddress', - RecipientRegistryBaseDeposit = 'recipientRegistry__baseDeposit', - RecipientRegistryChallengePeriodDuration = 'recipientRegistry__challengePeriodDuration', - RecipientRegistryController = 'recipientRegistry__controller', - RecipientRegistryCreatedAt = 'recipientRegistry__createdAt', - RecipientRegistryId = 'recipientRegistry__id', - RecipientRegistryLastUpdatedAt = 'recipientRegistry__lastUpdatedAt', - RecipientRegistryMaxRecipients = 'recipientRegistry__maxRecipients', - RecipientRegistryOwner = 'recipientRegistry__owner', - SignUpDuration = 'signUpDuration', - StateTreeDepth = 'stateTreeDepth', - TallyBatchSize = 'tallyBatchSize', - VoteOptionTreeDepth = 'voteOptionTreeDepth', - VotingDuration = 'votingDuration' + Recipient = 'recipient', + VoteOptionIndex = 'voteOptionIndex' } +export type FundingRound = { + __typename?: 'FundingRound'; + clrFund: Maybe; + contributions: Maybe>; + contributorCount: Scalars['BigInt']; + contributorRegistry: Maybe; + contributorRegistryAddress: Maybe; + contributors: Maybe>; + coordinator: Maybe; + coordinatorPubKeyX: Maybe; + coordinatorPubKeyY: Maybe; + createdAt: Maybe; + id: Scalars['ID']; + isCancelled: Maybe; + isFinalized: Maybe; + lastUpdatedAt: Maybe; + maci: Maybe; + maciTxHash: Maybe; + matchingPoolSize: Maybe; + messageTreeDepth: Maybe; + messages: Maybe>; + nativeToken: Maybe; + nativeTokenInfo: Maybe; + pollAddress: Maybe; + pollId: Maybe; + recipientCount: Scalars['BigInt']; + recipientRegistry: Maybe; + recipientRegistryAddress: Maybe; + recipients: Maybe>; + signUpDeadline: Maybe; + startTime: Maybe; + stateTreeDepth: Maybe; + tallyHash: Maybe; + totalSpent: Maybe; + totalVotes: Maybe; + voiceCreditFactor: Maybe; + voteOptionTreeDepth: Maybe; + votingDeadline: Maybe; +}; + + +export type FundingRoundContributionsArgs = { + first?: InputMaybe; + orderBy: InputMaybe; + orderDirection: InputMaybe; + skip?: InputMaybe; + where: InputMaybe; +}; + + +export type FundingRoundContributorsArgs = { + first?: InputMaybe; + orderBy: InputMaybe; + orderDirection: InputMaybe; + skip?: InputMaybe; + where: InputMaybe; +}; + + +export type FundingRoundMessagesArgs = { + first?: InputMaybe; + orderBy: InputMaybe; + orderDirection: InputMaybe; + skip?: InputMaybe; + where: InputMaybe; +}; + + +export type FundingRoundRecipientsArgs = { + first?: InputMaybe; + orderBy: InputMaybe; + orderDirection: InputMaybe; + skip?: InputMaybe; + where: InputMaybe; +}; + export type FundingRound_Filter = { /** Filter for the block changed event. */ _change_block: InputMaybe; and: InputMaybe>>; + clrFund: InputMaybe; + clrFund_: InputMaybe; + clrFund_contains: InputMaybe; + clrFund_contains_nocase: InputMaybe; + clrFund_ends_with: InputMaybe; + clrFund_ends_with_nocase: InputMaybe; + clrFund_gt: InputMaybe; + clrFund_gte: InputMaybe; + clrFund_in: InputMaybe>; + clrFund_lt: InputMaybe; + clrFund_lte: InputMaybe; + clrFund_not: InputMaybe; + clrFund_not_contains: InputMaybe; + clrFund_not_contains_nocase: InputMaybe; + clrFund_not_ends_with: InputMaybe; + clrFund_not_ends_with_nocase: InputMaybe; + clrFund_not_in: InputMaybe>; + clrFund_not_starts_with: InputMaybe; + clrFund_not_starts_with_nocase: InputMaybe; + clrFund_starts_with: InputMaybe; + clrFund_starts_with_nocase: InputMaybe; contributions_: InputMaybe; contributorCount: InputMaybe; contributorCount_gt: InputMaybe; @@ -1261,6 +1194,22 @@ export type FundingRound_Filter = { contributorRegistry_starts_with_nocase: InputMaybe; contributors_: InputMaybe; coordinator: InputMaybe; + coordinatorPubKeyX: InputMaybe; + coordinatorPubKeyX_gt: InputMaybe; + coordinatorPubKeyX_gte: InputMaybe; + coordinatorPubKeyX_in: InputMaybe>; + coordinatorPubKeyX_lt: InputMaybe; + coordinatorPubKeyX_lte: InputMaybe; + coordinatorPubKeyX_not: InputMaybe; + coordinatorPubKeyX_not_in: InputMaybe>; + coordinatorPubKeyY: InputMaybe; + coordinatorPubKeyY_gt: InputMaybe; + coordinatorPubKeyY_gte: InputMaybe; + coordinatorPubKeyY_in: InputMaybe>; + coordinatorPubKeyY_lt: InputMaybe; + coordinatorPubKeyY_lte: InputMaybe; + coordinatorPubKeyY_not: InputMaybe; + coordinatorPubKeyY_not_in: InputMaybe>; coordinator_contains: InputMaybe; coordinator_gt: InputMaybe; coordinator_gte: InputMaybe; @@ -1290,27 +1239,6 @@ export type FundingRound_Filter = { createdAt_not_starts_with_nocase: InputMaybe; createdAt_starts_with: InputMaybe; createdAt_starts_with_nocase: InputMaybe; - fundingRoundFactory: InputMaybe; - fundingRoundFactory_: InputMaybe; - fundingRoundFactory_contains: InputMaybe; - fundingRoundFactory_contains_nocase: InputMaybe; - fundingRoundFactory_ends_with: InputMaybe; - fundingRoundFactory_ends_with_nocase: InputMaybe; - fundingRoundFactory_gt: InputMaybe; - fundingRoundFactory_gte: InputMaybe; - fundingRoundFactory_in: InputMaybe>; - fundingRoundFactory_lt: InputMaybe; - fundingRoundFactory_lte: InputMaybe; - fundingRoundFactory_not: InputMaybe; - fundingRoundFactory_not_contains: InputMaybe; - fundingRoundFactory_not_contains_nocase: InputMaybe; - fundingRoundFactory_not_ends_with: InputMaybe; - fundingRoundFactory_not_ends_with_nocase: InputMaybe; - fundingRoundFactory_not_in: InputMaybe>; - fundingRoundFactory_not_starts_with: InputMaybe; - fundingRoundFactory_not_starts_with_nocase: InputMaybe; - fundingRoundFactory_starts_with: InputMaybe; - fundingRoundFactory_starts_with_nocase: InputMaybe; id: InputMaybe; id_gt: InputMaybe; id_gte: InputMaybe; @@ -1348,6 +1276,16 @@ export type FundingRound_Filter = { lastUpdatedAt_starts_with: InputMaybe; lastUpdatedAt_starts_with_nocase: InputMaybe; maci: InputMaybe; + maciTxHash: InputMaybe; + maciTxHash_contains: InputMaybe; + maciTxHash_gt: InputMaybe; + maciTxHash_gte: InputMaybe; + maciTxHash_in: InputMaybe>; + maciTxHash_lt: InputMaybe; + maciTxHash_lte: InputMaybe; + maciTxHash_not: InputMaybe; + maciTxHash_not_contains: InputMaybe; + maciTxHash_not_in: InputMaybe>; maci_contains: InputMaybe; maci_gt: InputMaybe; maci_gte: InputMaybe; @@ -1365,6 +1303,14 @@ export type FundingRound_Filter = { matchingPoolSize_lte: InputMaybe; matchingPoolSize_not: InputMaybe; matchingPoolSize_not_in: InputMaybe>; + messageTreeDepth: InputMaybe; + messageTreeDepth_gt: InputMaybe; + messageTreeDepth_gte: InputMaybe; + messageTreeDepth_in: InputMaybe>; + messageTreeDepth_lt: InputMaybe; + messageTreeDepth_lte: InputMaybe; + messageTreeDepth_not: InputMaybe; + messageTreeDepth_not_in: InputMaybe>; messages_: InputMaybe; nativeToken: InputMaybe; nativeTokenInfo: InputMaybe; @@ -1398,6 +1344,24 @@ export type FundingRound_Filter = { nativeToken_not_contains: InputMaybe; nativeToken_not_in: InputMaybe>; or: InputMaybe>>; + pollAddress: InputMaybe; + pollAddress_contains: InputMaybe; + pollAddress_gt: InputMaybe; + pollAddress_gte: InputMaybe; + pollAddress_in: InputMaybe>; + pollAddress_lt: InputMaybe; + pollAddress_lte: InputMaybe; + pollAddress_not: InputMaybe; + pollAddress_not_contains: InputMaybe; + pollAddress_not_in: InputMaybe>; + pollId: InputMaybe; + pollId_gt: InputMaybe; + pollId_gte: InputMaybe; + pollId_in: InputMaybe>; + pollId_lt: InputMaybe; + pollId_lte: InputMaybe; + pollId_not: InputMaybe; + pollId_not_in: InputMaybe>; recipientCount: InputMaybe; recipientCount_gt: InputMaybe; recipientCount_gte: InputMaybe; @@ -1454,6 +1418,14 @@ export type FundingRound_Filter = { startTime_lte: InputMaybe; startTime_not: InputMaybe; startTime_not_in: InputMaybe>; + stateTreeDepth: InputMaybe; + stateTreeDepth_gt: InputMaybe; + stateTreeDepth_gte: InputMaybe; + stateTreeDepth_in: InputMaybe>; + stateTreeDepth_lt: InputMaybe; + stateTreeDepth_lte: InputMaybe; + stateTreeDepth_not: InputMaybe; + stateTreeDepth_not_in: InputMaybe>; tallyHash: InputMaybe; tallyHash_contains: InputMaybe; tallyHash_contains_nocase: InputMaybe; @@ -1498,7 +1470,14 @@ export type FundingRound_Filter = { voiceCreditFactor_lte: InputMaybe; voiceCreditFactor_not: InputMaybe; voiceCreditFactor_not_in: InputMaybe>; - votes_: InputMaybe; + voteOptionTreeDepth: InputMaybe; + voteOptionTreeDepth_gt: InputMaybe; + voteOptionTreeDepth_gte: InputMaybe; + voteOptionTreeDepth_in: InputMaybe>; + voteOptionTreeDepth_lt: InputMaybe; + voteOptionTreeDepth_lte: InputMaybe; + voteOptionTreeDepth_not: InputMaybe; + voteOptionTreeDepth_not_in: InputMaybe>; votingDeadline: InputMaybe; votingDeadline_gt: InputMaybe; votingDeadline_gte: InputMaybe; @@ -1510,6 +1489,20 @@ export type FundingRound_Filter = { }; export enum FundingRound_OrderBy { + ClrFund = 'clrFund', + ClrFundContributorRegistryAddress = 'clrFund__contributorRegistryAddress', + ClrFundCoordinator = 'clrFund__coordinator', + ClrFundCoordinatorPubKey = 'clrFund__coordinatorPubKey', + ClrFundCreatedAt = 'clrFund__createdAt', + ClrFundId = 'clrFund__id', + ClrFundLastUpdatedAt = 'clrFund__lastUpdatedAt', + ClrFundMaciFactory = 'clrFund__maciFactory', + ClrFundMessageTreeDepth = 'clrFund__messageTreeDepth', + ClrFundNativeToken = 'clrFund__nativeToken', + ClrFundOwner = 'clrFund__owner', + ClrFundRecipientRegistryAddress = 'clrFund__recipientRegistryAddress', + ClrFundStateTreeDepth = 'clrFund__stateTreeDepth', + ClrFundVoteOptionTreeDepth = 'clrFund__voteOptionTreeDepth', Contributions = 'contributions', ContributorCount = 'contributorCount', ContributorRegistry = 'contributorRegistry', @@ -1521,36 +1514,17 @@ export enum FundingRound_OrderBy { ContributorRegistryOwner = 'contributorRegistry__owner', Contributors = 'contributors', Coordinator = 'coordinator', + CoordinatorPubKeyX = 'coordinatorPubKeyX', + CoordinatorPubKeyY = 'coordinatorPubKeyY', CreatedAt = 'createdAt', - FundingRoundFactory = 'fundingRoundFactory', - FundingRoundFactoryBatchUstVerifier = 'fundingRoundFactory__batchUstVerifier', - FundingRoundFactoryContributorRegistryAddress = 'fundingRoundFactory__contributorRegistryAddress', - FundingRoundFactoryCoordinator = 'fundingRoundFactory__coordinator', - FundingRoundFactoryCoordinatorPubKey = 'fundingRoundFactory__coordinatorPubKey', - FundingRoundFactoryCreatedAt = 'fundingRoundFactory__createdAt', - FundingRoundFactoryId = 'fundingRoundFactory__id', - FundingRoundFactoryLastUpdatedAt = 'fundingRoundFactory__lastUpdatedAt', - FundingRoundFactoryMaciFactory = 'fundingRoundFactory__maciFactory', - FundingRoundFactoryMaxMessages = 'fundingRoundFactory__maxMessages', - FundingRoundFactoryMaxUsers = 'fundingRoundFactory__maxUsers', - FundingRoundFactoryMaxVoteOptions = 'fundingRoundFactory__maxVoteOptions', - FundingRoundFactoryMessageBatchSize = 'fundingRoundFactory__messageBatchSize', - FundingRoundFactoryMessageTreeDepth = 'fundingRoundFactory__messageTreeDepth', - FundingRoundFactoryNativeToken = 'fundingRoundFactory__nativeToken', - FundingRoundFactoryOwner = 'fundingRoundFactory__owner', - FundingRoundFactoryQvtVerifier = 'fundingRoundFactory__qvtVerifier', - FundingRoundFactoryRecipientRegistryAddress = 'fundingRoundFactory__recipientRegistryAddress', - FundingRoundFactorySignUpDuration = 'fundingRoundFactory__signUpDuration', - FundingRoundFactoryStateTreeDepth = 'fundingRoundFactory__stateTreeDepth', - FundingRoundFactoryTallyBatchSize = 'fundingRoundFactory__tallyBatchSize', - FundingRoundFactoryVoteOptionTreeDepth = 'fundingRoundFactory__voteOptionTreeDepth', - FundingRoundFactoryVotingDuration = 'fundingRoundFactory__votingDuration', Id = 'id', IsCancelled = 'isCancelled', IsFinalized = 'isFinalized', LastUpdatedAt = 'lastUpdatedAt', Maci = 'maci', + MaciTxHash = 'maciTxHash', MatchingPoolSize = 'matchingPoolSize', + MessageTreeDepth = 'messageTreeDepth', Messages = 'messages', NativeToken = 'nativeToken', NativeTokenInfo = 'nativeTokenInfo', @@ -1560,6 +1534,8 @@ export enum FundingRound_OrderBy { NativeTokenInfoLastUpdatedAt = 'nativeTokenInfo__lastUpdatedAt', NativeTokenInfoSymbol = 'nativeTokenInfo__symbol', NativeTokenInfoTokenAddress = 'nativeTokenInfo__tokenAddress', + PollAddress = 'pollAddress', + PollId = 'pollId', RecipientCount = 'recipientCount', RecipientRegistry = 'recipientRegistry', RecipientRegistryAddress = 'recipientRegistryAddress', @@ -1574,11 +1550,12 @@ export enum FundingRound_OrderBy { Recipients = 'recipients', SignUpDeadline = 'signUpDeadline', StartTime = 'startTime', + StateTreeDepth = 'stateTreeDepth', TallyHash = 'tallyHash', TotalSpent = 'totalSpent', TotalVotes = 'totalVotes', VoiceCreditFactor = 'voiceCreditFactor', - Votes = 'votes', + VoteOptionTreeDepth = 'voteOptionTreeDepth', VotingDeadline = 'votingDeadline' } @@ -1588,7 +1565,8 @@ export type Message = { data: Maybe>; fundingRound: Maybe; id: Scalars['ID']; - iv: Scalars['BigInt']; + msgType: Scalars['BigInt']; + poll: Maybe; publicKey: Maybe; submittedBy: Maybe; timestamp: Maybe; @@ -1642,15 +1620,36 @@ export type Message_Filter = { id_lte: InputMaybe; id_not: InputMaybe; id_not_in: InputMaybe>; - iv: InputMaybe; - iv_gt: InputMaybe; - iv_gte: InputMaybe; - iv_in: InputMaybe>; - iv_lt: InputMaybe; - iv_lte: InputMaybe; - iv_not: InputMaybe; - iv_not_in: InputMaybe>; + msgType: InputMaybe; + msgType_gt: InputMaybe; + msgType_gte: InputMaybe; + msgType_in: InputMaybe>; + msgType_lt: InputMaybe; + msgType_lte: InputMaybe; + msgType_not: InputMaybe; + msgType_not_in: InputMaybe>; or: InputMaybe>>; + poll: InputMaybe; + poll_: InputMaybe; + poll_contains: InputMaybe; + poll_contains_nocase: InputMaybe; + poll_ends_with: InputMaybe; + poll_ends_with_nocase: InputMaybe; + poll_gt: InputMaybe; + poll_gte: InputMaybe; + poll_in: InputMaybe>; + poll_lt: InputMaybe; + poll_lte: InputMaybe; + poll_not: InputMaybe; + poll_not_contains: InputMaybe; + poll_not_contains_nocase: InputMaybe; + poll_not_ends_with: InputMaybe; + poll_not_ends_with_nocase: InputMaybe; + poll_not_in: InputMaybe>; + poll_not_starts_with: InputMaybe; + poll_not_starts_with_nocase: InputMaybe; + poll_starts_with: InputMaybe; + poll_starts_with_nocase: InputMaybe; publicKey: InputMaybe; publicKey_: InputMaybe; publicKey_contains: InputMaybe; @@ -1712,47 +1711,144 @@ export type Message_Filter = { transactionIndex_not_in: InputMaybe>; }; -export enum Message_OrderBy { - BlockNumber = 'blockNumber', - Data = 'data', +export enum Message_OrderBy { + BlockNumber = 'blockNumber', + Data = 'data', + FundingRound = 'fundingRound', + FundingRoundContributorCount = 'fundingRound__contributorCount', + FundingRoundContributorRegistryAddress = 'fundingRound__contributorRegistryAddress', + FundingRoundCoordinator = 'fundingRound__coordinator', + FundingRoundCoordinatorPubKeyX = 'fundingRound__coordinatorPubKeyX', + FundingRoundCoordinatorPubKeyY = 'fundingRound__coordinatorPubKeyY', + FundingRoundCreatedAt = 'fundingRound__createdAt', + FundingRoundId = 'fundingRound__id', + FundingRoundIsCancelled = 'fundingRound__isCancelled', + FundingRoundIsFinalized = 'fundingRound__isFinalized', + FundingRoundLastUpdatedAt = 'fundingRound__lastUpdatedAt', + FundingRoundMaci = 'fundingRound__maci', + FundingRoundMaciTxHash = 'fundingRound__maciTxHash', + FundingRoundMatchingPoolSize = 'fundingRound__matchingPoolSize', + FundingRoundMessageTreeDepth = 'fundingRound__messageTreeDepth', + FundingRoundNativeToken = 'fundingRound__nativeToken', + FundingRoundPollAddress = 'fundingRound__pollAddress', + FundingRoundPollId = 'fundingRound__pollId', + FundingRoundRecipientCount = 'fundingRound__recipientCount', + FundingRoundRecipientRegistryAddress = 'fundingRound__recipientRegistryAddress', + FundingRoundSignUpDeadline = 'fundingRound__signUpDeadline', + FundingRoundStartTime = 'fundingRound__startTime', + FundingRoundStateTreeDepth = 'fundingRound__stateTreeDepth', + FundingRoundTallyHash = 'fundingRound__tallyHash', + FundingRoundTotalSpent = 'fundingRound__totalSpent', + FundingRoundTotalVotes = 'fundingRound__totalVotes', + FundingRoundVoiceCreditFactor = 'fundingRound__voiceCreditFactor', + FundingRoundVoteOptionTreeDepth = 'fundingRound__voteOptionTreeDepth', + FundingRoundVotingDeadline = 'fundingRound__votingDeadline', + Id = 'id', + MsgType = 'msgType', + Poll = 'poll', + PollId = 'poll__id', + PublicKey = 'publicKey', + PublicKeyId = 'publicKey__id', + PublicKeyStateIndex = 'publicKey__stateIndex', + PublicKeyVoiceCreditBalance = 'publicKey__voiceCreditBalance', + PublicKeyX = 'publicKey__x', + PublicKeyY = 'publicKey__y', + SubmittedBy = 'submittedBy', + Timestamp = 'timestamp', + TransactionIndex = 'transactionIndex' +} + +/** Defines the order direction, either ascending or descending */ +export enum OrderDirection { + Asc = 'asc', + Desc = 'desc' +} + +export type Poll = { + __typename?: 'Poll'; + fundingRound: FundingRound; + id: Scalars['ID']; + messages: Maybe>; +}; + + +export type PollMessagesArgs = { + first?: InputMaybe; + orderBy: InputMaybe; + orderDirection: InputMaybe; + skip?: InputMaybe; + where: InputMaybe; +}; + +export type Poll_Filter = { + /** Filter for the block changed event. */ + _change_block: InputMaybe; + and: InputMaybe>>; + fundingRound: InputMaybe; + fundingRound_: InputMaybe; + fundingRound_contains: InputMaybe; + fundingRound_contains_nocase: InputMaybe; + fundingRound_ends_with: InputMaybe; + fundingRound_ends_with_nocase: InputMaybe; + fundingRound_gt: InputMaybe; + fundingRound_gte: InputMaybe; + fundingRound_in: InputMaybe>; + fundingRound_lt: InputMaybe; + fundingRound_lte: InputMaybe; + fundingRound_not: InputMaybe; + fundingRound_not_contains: InputMaybe; + fundingRound_not_contains_nocase: InputMaybe; + fundingRound_not_ends_with: InputMaybe; + fundingRound_not_ends_with_nocase: InputMaybe; + fundingRound_not_in: InputMaybe>; + fundingRound_not_starts_with: InputMaybe; + fundingRound_not_starts_with_nocase: InputMaybe; + fundingRound_starts_with: InputMaybe; + fundingRound_starts_with_nocase: InputMaybe; + id: InputMaybe; + id_gt: InputMaybe; + id_gte: InputMaybe; + id_in: InputMaybe>; + id_lt: InputMaybe; + id_lte: InputMaybe; + id_not: InputMaybe; + id_not_in: InputMaybe>; + messages_: InputMaybe; + or: InputMaybe>>; +}; + +export enum Poll_OrderBy { FundingRound = 'fundingRound', FundingRoundContributorCount = 'fundingRound__contributorCount', FundingRoundContributorRegistryAddress = 'fundingRound__contributorRegistryAddress', FundingRoundCoordinator = 'fundingRound__coordinator', + FundingRoundCoordinatorPubKeyX = 'fundingRound__coordinatorPubKeyX', + FundingRoundCoordinatorPubKeyY = 'fundingRound__coordinatorPubKeyY', FundingRoundCreatedAt = 'fundingRound__createdAt', FundingRoundId = 'fundingRound__id', FundingRoundIsCancelled = 'fundingRound__isCancelled', FundingRoundIsFinalized = 'fundingRound__isFinalized', FundingRoundLastUpdatedAt = 'fundingRound__lastUpdatedAt', FundingRoundMaci = 'fundingRound__maci', + FundingRoundMaciTxHash = 'fundingRound__maciTxHash', FundingRoundMatchingPoolSize = 'fundingRound__matchingPoolSize', + FundingRoundMessageTreeDepth = 'fundingRound__messageTreeDepth', FundingRoundNativeToken = 'fundingRound__nativeToken', + FundingRoundPollAddress = 'fundingRound__pollAddress', + FundingRoundPollId = 'fundingRound__pollId', FundingRoundRecipientCount = 'fundingRound__recipientCount', FundingRoundRecipientRegistryAddress = 'fundingRound__recipientRegistryAddress', FundingRoundSignUpDeadline = 'fundingRound__signUpDeadline', FundingRoundStartTime = 'fundingRound__startTime', + FundingRoundStateTreeDepth = 'fundingRound__stateTreeDepth', FundingRoundTallyHash = 'fundingRound__tallyHash', FundingRoundTotalSpent = 'fundingRound__totalSpent', FundingRoundTotalVotes = 'fundingRound__totalVotes', FundingRoundVoiceCreditFactor = 'fundingRound__voiceCreditFactor', + FundingRoundVoteOptionTreeDepth = 'fundingRound__voteOptionTreeDepth', FundingRoundVotingDeadline = 'fundingRound__votingDeadline', Id = 'id', - Iv = 'iv', - PublicKey = 'publicKey', - PublicKeyId = 'publicKey__id', - PublicKeyStateIndex = 'publicKey__stateIndex', - PublicKeyVoiceCreditBalance = 'publicKey__voiceCreditBalance', - PublicKeyX = 'publicKey__x', - PublicKeyY = 'publicKey__y', - SubmittedBy = 'submittedBy', - Timestamp = 'timestamp', - TransactionIndex = 'transactionIndex' -} - -/** Defines the order direction, either ascending or descending */ -export enum OrderDirection { - Asc = 'asc', - Desc = 'desc' + Messages = 'messages' } export type PublicKey = { @@ -1849,22 +1945,30 @@ export enum PublicKey_OrderBy { FundingRoundContributorCount = 'fundingRound__contributorCount', FundingRoundContributorRegistryAddress = 'fundingRound__contributorRegistryAddress', FundingRoundCoordinator = 'fundingRound__coordinator', + FundingRoundCoordinatorPubKeyX = 'fundingRound__coordinatorPubKeyX', + FundingRoundCoordinatorPubKeyY = 'fundingRound__coordinatorPubKeyY', FundingRoundCreatedAt = 'fundingRound__createdAt', FundingRoundId = 'fundingRound__id', FundingRoundIsCancelled = 'fundingRound__isCancelled', FundingRoundIsFinalized = 'fundingRound__isFinalized', FundingRoundLastUpdatedAt = 'fundingRound__lastUpdatedAt', FundingRoundMaci = 'fundingRound__maci', + FundingRoundMaciTxHash = 'fundingRound__maciTxHash', FundingRoundMatchingPoolSize = 'fundingRound__matchingPoolSize', + FundingRoundMessageTreeDepth = 'fundingRound__messageTreeDepth', FundingRoundNativeToken = 'fundingRound__nativeToken', + FundingRoundPollAddress = 'fundingRound__pollAddress', + FundingRoundPollId = 'fundingRound__pollId', FundingRoundRecipientCount = 'fundingRound__recipientCount', FundingRoundRecipientRegistryAddress = 'fundingRound__recipientRegistryAddress', FundingRoundSignUpDeadline = 'fundingRound__signUpDeadline', FundingRoundStartTime = 'fundingRound__startTime', + FundingRoundStateTreeDepth = 'fundingRound__stateTreeDepth', FundingRoundTallyHash = 'fundingRound__tallyHash', FundingRoundTotalSpent = 'fundingRound__totalSpent', FundingRoundTotalVotes = 'fundingRound__totalVotes', FundingRoundVoiceCreditFactor = 'fundingRound__voiceCreditFactor', + FundingRoundVoteOptionTreeDepth = 'fundingRound__voteOptionTreeDepth', FundingRoundVotingDeadline = 'fundingRound__votingDeadline', Id = 'id', Messages = 'messages', @@ -1878,6 +1982,8 @@ export type Query = { __typename?: 'Query'; /** Access to subgraph metadata */ _meta: Maybe<_Meta_>; + clrFund: Maybe; + clrFunds: Array; contribution: Maybe; contributions: Array; contributor: Maybe; @@ -1889,11 +1995,11 @@ export type Query = { donation: Maybe; donations: Array; fundingRound: Maybe; - fundingRoundFactories: Array; - fundingRoundFactory: Maybe; fundingRounds: Array; message: Maybe; messages: Array; + poll: Maybe; + polls: Array; publicKey: Maybe; publicKeys: Array; recipient: Maybe; @@ -1902,8 +2008,6 @@ export type Query = { recipients: Array; token: Maybe; tokens: Array; - vote: Maybe; - votes: Array; }; @@ -1912,6 +2016,24 @@ export type Query_MetaArgs = { }; +export type QueryClrFundArgs = { + block: InputMaybe; + id: Scalars['ID']; + subgraphError?: _SubgraphErrorPolicy_; +}; + + +export type QueryClrFundsArgs = { + block: InputMaybe; + first?: InputMaybe; + orderBy: InputMaybe; + orderDirection: InputMaybe; + skip?: InputMaybe; + subgraphError?: _SubgraphErrorPolicy_; + where: InputMaybe; +}; + + export type QueryContributionArgs = { block: InputMaybe; id: Scalars['ID']; @@ -2009,50 +2131,50 @@ export type QueryFundingRoundArgs = { }; -export type QueryFundingRoundFactoriesArgs = { +export type QueryFundingRoundsArgs = { block: InputMaybe; first?: InputMaybe; - orderBy: InputMaybe; + orderBy: InputMaybe; orderDirection: InputMaybe; skip?: InputMaybe; subgraphError?: _SubgraphErrorPolicy_; - where: InputMaybe; + where: InputMaybe; }; -export type QueryFundingRoundFactoryArgs = { +export type QueryMessageArgs = { block: InputMaybe; id: Scalars['ID']; subgraphError?: _SubgraphErrorPolicy_; }; -export type QueryFundingRoundsArgs = { +export type QueryMessagesArgs = { block: InputMaybe; first?: InputMaybe; - orderBy: InputMaybe; + orderBy: InputMaybe; orderDirection: InputMaybe; skip?: InputMaybe; subgraphError?: _SubgraphErrorPolicy_; - where: InputMaybe; + where: InputMaybe; }; -export type QueryMessageArgs = { +export type QueryPollArgs = { block: InputMaybe; id: Scalars['ID']; subgraphError?: _SubgraphErrorPolicy_; }; -export type QueryMessagesArgs = { +export type QueryPollsArgs = { block: InputMaybe; first?: InputMaybe; - orderBy: InputMaybe; + orderBy: InputMaybe; orderDirection: InputMaybe; skip?: InputMaybe; subgraphError?: _SubgraphErrorPolicy_; - where: InputMaybe; + where: InputMaybe; }; @@ -2127,24 +2249,6 @@ export type QueryTokensArgs = { where: InputMaybe; }; - -export type QueryVoteArgs = { - block: InputMaybe; - id: Scalars['ID']; - subgraphError?: _SubgraphErrorPolicy_; -}; - - -export type QueryVotesArgs = { - block: InputMaybe; - first?: InputMaybe; - orderBy: InputMaybe; - orderDirection: InputMaybe; - skip?: InputMaybe; - subgraphError?: _SubgraphErrorPolicy_; - where: InputMaybe; -}; - export type Recipient = { __typename?: 'Recipient'; createdAt: Maybe; @@ -2179,9 +2283,9 @@ export type RecipientRegistry = { __typename?: 'RecipientRegistry'; baseDeposit: Maybe; challengePeriodDuration: Maybe; + clrFund: Maybe; controller: Maybe; createdAt: Maybe; - fundingRoundFactory: Maybe; id: Scalars['ID']; lastUpdatedAt: Maybe; maxRecipients: Maybe; @@ -2218,6 +2322,27 @@ export type RecipientRegistry_Filter = { challengePeriodDuration_lte: InputMaybe; challengePeriodDuration_not: InputMaybe; challengePeriodDuration_not_in: InputMaybe>; + clrFund: InputMaybe; + clrFund_: InputMaybe; + clrFund_contains: InputMaybe; + clrFund_contains_nocase: InputMaybe; + clrFund_ends_with: InputMaybe; + clrFund_ends_with_nocase: InputMaybe; + clrFund_gt: InputMaybe; + clrFund_gte: InputMaybe; + clrFund_in: InputMaybe>; + clrFund_lt: InputMaybe; + clrFund_lte: InputMaybe; + clrFund_not: InputMaybe; + clrFund_not_contains: InputMaybe; + clrFund_not_contains_nocase: InputMaybe; + clrFund_not_ends_with: InputMaybe; + clrFund_not_ends_with_nocase: InputMaybe; + clrFund_not_in: InputMaybe>; + clrFund_not_starts_with: InputMaybe; + clrFund_not_starts_with_nocase: InputMaybe; + clrFund_starts_with: InputMaybe; + clrFund_starts_with_nocase: InputMaybe; controller: InputMaybe; controller_contains: InputMaybe; controller_gt: InputMaybe; @@ -2248,27 +2373,6 @@ export type RecipientRegistry_Filter = { createdAt_not_starts_with_nocase: InputMaybe; createdAt_starts_with: InputMaybe; createdAt_starts_with_nocase: InputMaybe; - fundingRoundFactory: InputMaybe; - fundingRoundFactory_: InputMaybe; - fundingRoundFactory_contains: InputMaybe; - fundingRoundFactory_contains_nocase: InputMaybe; - fundingRoundFactory_ends_with: InputMaybe; - fundingRoundFactory_ends_with_nocase: InputMaybe; - fundingRoundFactory_gt: InputMaybe; - fundingRoundFactory_gte: InputMaybe; - fundingRoundFactory_in: InputMaybe>; - fundingRoundFactory_lt: InputMaybe; - fundingRoundFactory_lte: InputMaybe; - fundingRoundFactory_not: InputMaybe; - fundingRoundFactory_not_contains: InputMaybe; - fundingRoundFactory_not_contains_nocase: InputMaybe; - fundingRoundFactory_not_ends_with: InputMaybe; - fundingRoundFactory_not_ends_with_nocase: InputMaybe; - fundingRoundFactory_not_in: InputMaybe>; - fundingRoundFactory_not_starts_with: InputMaybe; - fundingRoundFactory_not_starts_with_nocase: InputMaybe; - fundingRoundFactory_starts_with: InputMaybe; - fundingRoundFactory_starts_with_nocase: InputMaybe; id: InputMaybe; id_gt: InputMaybe; id_gte: InputMaybe; @@ -2322,31 +2426,22 @@ export type RecipientRegistry_Filter = { export enum RecipientRegistry_OrderBy { BaseDeposit = 'baseDeposit', ChallengePeriodDuration = 'challengePeriodDuration', + ClrFund = 'clrFund', + ClrFundContributorRegistryAddress = 'clrFund__contributorRegistryAddress', + ClrFundCoordinator = 'clrFund__coordinator', + ClrFundCoordinatorPubKey = 'clrFund__coordinatorPubKey', + ClrFundCreatedAt = 'clrFund__createdAt', + ClrFundId = 'clrFund__id', + ClrFundLastUpdatedAt = 'clrFund__lastUpdatedAt', + ClrFundMaciFactory = 'clrFund__maciFactory', + ClrFundMessageTreeDepth = 'clrFund__messageTreeDepth', + ClrFundNativeToken = 'clrFund__nativeToken', + ClrFundOwner = 'clrFund__owner', + ClrFundRecipientRegistryAddress = 'clrFund__recipientRegistryAddress', + ClrFundStateTreeDepth = 'clrFund__stateTreeDepth', + ClrFundVoteOptionTreeDepth = 'clrFund__voteOptionTreeDepth', Controller = 'controller', CreatedAt = 'createdAt', - FundingRoundFactory = 'fundingRoundFactory', - FundingRoundFactoryBatchUstVerifier = 'fundingRoundFactory__batchUstVerifier', - FundingRoundFactoryContributorRegistryAddress = 'fundingRoundFactory__contributorRegistryAddress', - FundingRoundFactoryCoordinator = 'fundingRoundFactory__coordinator', - FundingRoundFactoryCoordinatorPubKey = 'fundingRoundFactory__coordinatorPubKey', - FundingRoundFactoryCreatedAt = 'fundingRoundFactory__createdAt', - FundingRoundFactoryId = 'fundingRoundFactory__id', - FundingRoundFactoryLastUpdatedAt = 'fundingRoundFactory__lastUpdatedAt', - FundingRoundFactoryMaciFactory = 'fundingRoundFactory__maciFactory', - FundingRoundFactoryMaxMessages = 'fundingRoundFactory__maxMessages', - FundingRoundFactoryMaxUsers = 'fundingRoundFactory__maxUsers', - FundingRoundFactoryMaxVoteOptions = 'fundingRoundFactory__maxVoteOptions', - FundingRoundFactoryMessageBatchSize = 'fundingRoundFactory__messageBatchSize', - FundingRoundFactoryMessageTreeDepth = 'fundingRoundFactory__messageTreeDepth', - FundingRoundFactoryNativeToken = 'fundingRoundFactory__nativeToken', - FundingRoundFactoryOwner = 'fundingRoundFactory__owner', - FundingRoundFactoryQvtVerifier = 'fundingRoundFactory__qvtVerifier', - FundingRoundFactoryRecipientRegistryAddress = 'fundingRoundFactory__recipientRegistryAddress', - FundingRoundFactorySignUpDuration = 'fundingRoundFactory__signUpDuration', - FundingRoundFactoryStateTreeDepth = 'fundingRoundFactory__stateTreeDepth', - FundingRoundFactoryTallyBatchSize = 'fundingRoundFactory__tallyBatchSize', - FundingRoundFactoryVoteOptionTreeDepth = 'fundingRoundFactory__voteOptionTreeDepth', - FundingRoundFactoryVotingDuration = 'fundingRoundFactory__votingDuration', Id = 'id', LastUpdatedAt = 'lastUpdatedAt', MaxRecipients = 'maxRecipients', @@ -2611,6 +2706,8 @@ export type Subscription = { __typename?: 'Subscription'; /** Access to subgraph metadata */ _meta: Maybe<_Meta_>; + clrFund: Maybe; + clrFunds: Array; contribution: Maybe; contributions: Array; contributor: Maybe; @@ -2622,11 +2719,11 @@ export type Subscription = { donation: Maybe; donations: Array; fundingRound: Maybe; - fundingRoundFactories: Array; - fundingRoundFactory: Maybe; fundingRounds: Array; message: Maybe; messages: Array; + poll: Maybe; + polls: Array; publicKey: Maybe; publicKeys: Array; recipient: Maybe; @@ -2635,8 +2732,6 @@ export type Subscription = { recipients: Array; token: Maybe; tokens: Array; - vote: Maybe; - votes: Array; }; @@ -2645,6 +2740,24 @@ export type Subscription_MetaArgs = { }; +export type SubscriptionClrFundArgs = { + block: InputMaybe; + id: Scalars['ID']; + subgraphError?: _SubgraphErrorPolicy_; +}; + + +export type SubscriptionClrFundsArgs = { + block: InputMaybe; + first?: InputMaybe; + orderBy: InputMaybe; + orderDirection: InputMaybe; + skip?: InputMaybe; + subgraphError?: _SubgraphErrorPolicy_; + where: InputMaybe; +}; + + export type SubscriptionContributionArgs = { block: InputMaybe; id: Scalars['ID']; @@ -2742,50 +2855,50 @@ export type SubscriptionFundingRoundArgs = { }; -export type SubscriptionFundingRoundFactoriesArgs = { +export type SubscriptionFundingRoundsArgs = { block: InputMaybe; first?: InputMaybe; - orderBy: InputMaybe; + orderBy: InputMaybe; orderDirection: InputMaybe; skip?: InputMaybe; subgraphError?: _SubgraphErrorPolicy_; - where: InputMaybe; + where: InputMaybe; }; -export type SubscriptionFundingRoundFactoryArgs = { +export type SubscriptionMessageArgs = { block: InputMaybe; id: Scalars['ID']; subgraphError?: _SubgraphErrorPolicy_; }; -export type SubscriptionFundingRoundsArgs = { +export type SubscriptionMessagesArgs = { block: InputMaybe; first?: InputMaybe; - orderBy: InputMaybe; + orderBy: InputMaybe; orderDirection: InputMaybe; skip?: InputMaybe; subgraphError?: _SubgraphErrorPolicy_; - where: InputMaybe; + where: InputMaybe; }; -export type SubscriptionMessageArgs = { +export type SubscriptionPollArgs = { block: InputMaybe; id: Scalars['ID']; subgraphError?: _SubgraphErrorPolicy_; }; -export type SubscriptionMessagesArgs = { +export type SubscriptionPollsArgs = { block: InputMaybe; first?: InputMaybe; - orderBy: InputMaybe; + orderBy: InputMaybe; orderDirection: InputMaybe; skip?: InputMaybe; subgraphError?: _SubgraphErrorPolicy_; - where: InputMaybe; + where: InputMaybe; }; @@ -2860,24 +2973,6 @@ export type SubscriptionTokensArgs = { where: InputMaybe; }; - -export type SubscriptionVoteArgs = { - block: InputMaybe; - id: Scalars['ID']; - subgraphError?: _SubgraphErrorPolicy_; -}; - - -export type SubscriptionVotesArgs = { - block: InputMaybe; - first?: InputMaybe; - orderBy: InputMaybe; - orderDirection: InputMaybe; - skip?: InputMaybe; - subgraphError?: _SubgraphErrorPolicy_; - where: InputMaybe; -}; - export type Token = { __typename?: 'Token'; createdAt: Maybe; @@ -2990,125 +3085,14 @@ export enum Token_OrderBy { TokenAddress = 'tokenAddress' } -export type Vote = { - __typename?: 'Vote'; - contributor: Maybe; - fundingRound: Maybe; - id: Scalars['ID']; - secret: Maybe; - voterAddress: Maybe; -}; - -export type Vote_Filter = { - /** Filter for the block changed event. */ - _change_block: InputMaybe; - and: InputMaybe>>; - contributor: InputMaybe; - contributor_: InputMaybe; - contributor_contains: InputMaybe; - contributor_contains_nocase: InputMaybe; - contributor_ends_with: InputMaybe; - contributor_ends_with_nocase: InputMaybe; - contributor_gt: InputMaybe; - contributor_gte: InputMaybe; - contributor_in: InputMaybe>; - contributor_lt: InputMaybe; - contributor_lte: InputMaybe; - contributor_not: InputMaybe; - contributor_not_contains: InputMaybe; - contributor_not_contains_nocase: InputMaybe; - contributor_not_ends_with: InputMaybe; - contributor_not_ends_with_nocase: InputMaybe; - contributor_not_in: InputMaybe>; - contributor_not_starts_with: InputMaybe; - contributor_not_starts_with_nocase: InputMaybe; - contributor_starts_with: InputMaybe; - contributor_starts_with_nocase: InputMaybe; - fundingRound: InputMaybe; - fundingRound_: InputMaybe; - fundingRound_contains: InputMaybe; - fundingRound_contains_nocase: InputMaybe; - fundingRound_ends_with: InputMaybe; - fundingRound_ends_with_nocase: InputMaybe; - fundingRound_gt: InputMaybe; - fundingRound_gte: InputMaybe; - fundingRound_in: InputMaybe>; - fundingRound_lt: InputMaybe; - fundingRound_lte: InputMaybe; - fundingRound_not: InputMaybe; - fundingRound_not_contains: InputMaybe; - fundingRound_not_contains_nocase: InputMaybe; - fundingRound_not_ends_with: InputMaybe; - fundingRound_not_ends_with_nocase: InputMaybe; - fundingRound_not_in: InputMaybe>; - fundingRound_not_starts_with: InputMaybe; - fundingRound_not_starts_with_nocase: InputMaybe; - fundingRound_starts_with: InputMaybe; - fundingRound_starts_with_nocase: InputMaybe; - id: InputMaybe; - id_gt: InputMaybe; - id_gte: InputMaybe; - id_in: InputMaybe>; - id_lt: InputMaybe; - id_lte: InputMaybe; - id_not: InputMaybe; - id_not_in: InputMaybe>; - or: InputMaybe>>; - secret: InputMaybe; - secret_in: InputMaybe>; - secret_not: InputMaybe; - secret_not_in: InputMaybe>; - voterAddress: InputMaybe; - voterAddress_contains: InputMaybe; - voterAddress_gt: InputMaybe; - voterAddress_gte: InputMaybe; - voterAddress_in: InputMaybe>; - voterAddress_lt: InputMaybe; - voterAddress_lte: InputMaybe; - voterAddress_not: InputMaybe; - voterAddress_not_contains: InputMaybe; - voterAddress_not_in: InputMaybe>; -}; - -export enum Vote_OrderBy { - Contributor = 'contributor', - ContributorContributorAddress = 'contributor__contributorAddress', - ContributorCreatedAt = 'contributor__createdAt', - ContributorId = 'contributor__id', - ContributorLastUpdatedAt = 'contributor__lastUpdatedAt', - ContributorVerifiedTimeStamp = 'contributor__verifiedTimeStamp', - FundingRound = 'fundingRound', - FundingRoundContributorCount = 'fundingRound__contributorCount', - FundingRoundContributorRegistryAddress = 'fundingRound__contributorRegistryAddress', - FundingRoundCoordinator = 'fundingRound__coordinator', - FundingRoundCreatedAt = 'fundingRound__createdAt', - FundingRoundId = 'fundingRound__id', - FundingRoundIsCancelled = 'fundingRound__isCancelled', - FundingRoundIsFinalized = 'fundingRound__isFinalized', - FundingRoundLastUpdatedAt = 'fundingRound__lastUpdatedAt', - FundingRoundMaci = 'fundingRound__maci', - FundingRoundMatchingPoolSize = 'fundingRound__matchingPoolSize', - FundingRoundNativeToken = 'fundingRound__nativeToken', - FundingRoundRecipientCount = 'fundingRound__recipientCount', - FundingRoundRecipientRegistryAddress = 'fundingRound__recipientRegistryAddress', - FundingRoundSignUpDeadline = 'fundingRound__signUpDeadline', - FundingRoundStartTime = 'fundingRound__startTime', - FundingRoundTallyHash = 'fundingRound__tallyHash', - FundingRoundTotalSpent = 'fundingRound__totalSpent', - FundingRoundTotalVotes = 'fundingRound__totalVotes', - FundingRoundVoiceCreditFactor = 'fundingRound__voiceCreditFactor', - FundingRoundVotingDeadline = 'fundingRound__votingDeadline', - Id = 'id', - Secret = 'secret', - VoterAddress = 'voterAddress' -} - export type _Block_ = { __typename?: '_Block_'; /** The hash of the block */ hash: Maybe; /** The block number */ number: Scalars['Int']; + /** The hash of the parent block */ + parentHash: Maybe; /** Integer representation of the timestamp stored in blocks for the chain */ timestamp: Maybe; }; @@ -3137,6 +3121,13 @@ export enum _SubgraphErrorPolicy_ { Deny = 'deny' } +export type GetClrFundInfoQueryVariables = Exact<{ + clrFundAddress: Scalars['ID']; +}>; + + +export type GetClrFundInfoQuery = { __typename?: 'Query', clrFund: { __typename?: 'ClrFund', contributorRegistryAddress: any | null, recipientRegistryAddress: any | null, nativeTokenInfo: { __typename?: 'Token', tokenAddress: any | null, symbol: string | null, decimals: any | null } | null } | null }; + export type GetContributionsAmountQueryVariables = Exact<{ fundingRoundAddress: Scalars['ID']; contributorAddress: Scalars['ID']; @@ -3160,29 +3151,14 @@ export type GetContributorMessagesQueryVariables = Exact<{ }>; -export type GetContributorMessagesQuery = { __typename?: 'Query', messages: Array<{ __typename?: 'Message', id: string, data: Array | null, iv: any, timestamp: string | null, blockNumber: any, transactionIndex: any }> }; - -export type GetContributorVotesQueryVariables = Exact<{ - fundingRoundAddress: Scalars['ID']; - contributorAddress: Scalars['ID']; -}>; - - -export type GetContributorVotesQuery = { __typename?: 'Query', fundingRound: { __typename?: 'FundingRound', id: string, contributors: Array<{ __typename?: 'Contributor', votes: Array<{ __typename?: 'Vote', id: string }> | null }> | null } | null }; +export type GetContributorMessagesQuery = { __typename?: 'Query', messages: Array<{ __typename?: 'Message', id: string, data: Array | null, msgType: any, timestamp: string | null, blockNumber: any, transactionIndex: any }> }; export type GetCurrentRoundQueryVariables = Exact<{ - fundingRoundFactoryAddress: Scalars['ID']; + clrFundAddress: Scalars['ID']; }>; -export type GetCurrentRoundQuery = { __typename?: 'Query', fundingRoundFactory: { __typename?: 'FundingRoundFactory', currentRound: { __typename?: 'FundingRound', id: string } | null } | null }; - -export type GetFactoryInfoQueryVariables = Exact<{ - factoryAddress: Scalars['ID']; -}>; - - -export type GetFactoryInfoQuery = { __typename?: 'Query', fundingRoundFactory: { __typename?: 'FundingRoundFactory', contributorRegistryAddress: any | null, recipientRegistryAddress: any | null, nativeTokenInfo: { __typename?: 'Token', tokenAddress: any | null, symbol: string | null, decimals: any | null } | null } | null }; +export type GetCurrentRoundQuery = { __typename?: 'Query', clrFund: { __typename?: 'ClrFund', currentRound: { __typename?: 'FundingRound', id: string } | null } | null }; export type GetLatestBlockNumberQueryVariables = Exact<{ [key: string]: never; }>; @@ -3229,11 +3205,11 @@ export type GetRecipientDonationsQueryVariables = Exact<{ export type GetRecipientDonationsQuery = { __typename?: 'Query', donations: Array<{ __typename?: 'Donation', id: string }> }; export type GetRecipientRegistryInfoQueryVariables = Exact<{ - factoryAddress: Scalars['ID']; + clrFundAddress: Scalars['ID']; }>; -export type GetRecipientRegistryInfoQuery = { __typename?: 'Query', fundingRoundFactory: { __typename?: 'FundingRoundFactory', recipientRegistry: { __typename?: 'RecipientRegistry', id: string, owner: any | null, baseDeposit: any | null, challengePeriodDuration: any | null } | null, currentRound: { __typename?: 'FundingRound', id: string, recipientRegistry: { __typename?: 'RecipientRegistry', id: string, owner: any | null, baseDeposit: any | null, challengePeriodDuration: any | null } | null } | null } | null }; +export type GetRecipientRegistryInfoQuery = { __typename?: 'Query', clrFund: { __typename?: 'ClrFund', recipientRegistry: { __typename?: 'RecipientRegistry', id: string, owner: any | null, baseDeposit: any | null, challengePeriodDuration: any | null } | null, currentRound: { __typename?: 'FundingRound', id: string, recipientRegistry: { __typename?: 'RecipientRegistry', id: string, owner: any | null, baseDeposit: any | null, challengePeriodDuration: any | null } | null } | null } | null }; export type GetRecipientsQueryVariables = Exact<{ registryAddress: Scalars['String']; @@ -3247,9 +3223,11 @@ export type GetRoundInfoQueryVariables = Exact<{ }>; -export type GetRoundInfoQuery = { __typename?: 'Query', fundingRound: { __typename?: 'FundingRound', id: string, maci: any | null, recipientRegistryAddress: any | null, contributorRegistryAddress: any | null, voiceCreditFactor: any | null, isFinalized: boolean | null, isCancelled: boolean | null, contributorCount: any, totalSpent: any | null, matchingPoolSize: any | null, nativeTokenInfo: { __typename?: 'Token', tokenAddress: any | null, symbol: string | null, decimals: any | null } | null } | null }; +export type GetRoundInfoQuery = { __typename?: 'Query', fundingRound: { __typename?: 'FundingRound', id: string, maci: any | null, pollId: any | null, pollAddress: any | null, recipientRegistryAddress: any | null, contributorRegistryAddress: any | null, voiceCreditFactor: any | null, isFinalized: boolean | null, isCancelled: boolean | null, contributorCount: any, totalSpent: any | null, matchingPoolSize: any | null, startTime: any | null, signUpDeadline: any | null, votingDeadline: any | null, coordinatorPubKeyX: any | null, coordinatorPubKeyY: any | null, stateTreeDepth: number | null, messageTreeDepth: number | null, voteOptionTreeDepth: number | null, nativeTokenInfo: { __typename?: 'Token', tokenAddress: any | null, symbol: string | null, decimals: any | null } | null } | null }; -export type GetRoundsQueryVariables = Exact<{ [key: string]: never; }>; +export type GetRoundsQueryVariables = Exact<{ + clrFundAddress: Scalars['String']; +}>; export type GetRoundsQuery = { __typename?: 'Query', fundingRounds: Array<{ __typename?: 'FundingRound', id: string, isFinalized: boolean | null, isCancelled: boolean | null, startTime: any | null, votingDeadline: any | null }> }; @@ -3269,6 +3247,19 @@ export type GetTotalContributedQueryVariables = Exact<{ export type GetTotalContributedQuery = { __typename?: 'Query', fundingRound: { __typename?: 'FundingRound', contributorCount: any } | null }; +export const GetClrFundInfoDocument = gql` + query GetClrFundInfo($clrFundAddress: ID!) { + clrFund(id: $clrFundAddress) { + nativeTokenInfo { + tokenAddress + symbol + decimals + } + contributorRegistryAddress + recipientRegistryAddress + } +} + `; export const GetContributionsAmountDocument = gql` query GetContributionsAmount($fundingRoundAddress: ID!, $contributorAddress: ID!) { contributions( @@ -3296,47 +3287,22 @@ export const GetContributorMessagesDocument = gql` ) { id data - iv + msgType timestamp blockNumber transactionIndex } } `; -export const GetContributorVotesDocument = gql` - query GetContributorVotes($fundingRoundAddress: ID!, $contributorAddress: ID!) { - fundingRound(id: $fundingRoundAddress) { - id - contributors(where: {id: $contributorAddress}) { - votes { - id - } - } - } -} - `; export const GetCurrentRoundDocument = gql` - query GetCurrentRound($fundingRoundFactoryAddress: ID!) { - fundingRoundFactory(id: $fundingRoundFactoryAddress) { + query GetCurrentRound($clrFundAddress: ID!) { + clrFund(id: $clrFundAddress) { currentRound { id } } } `; -export const GetFactoryInfoDocument = gql` - query GetFactoryInfo($factoryAddress: ID!) { - fundingRoundFactory(id: $factoryAddress) { - nativeTokenInfo { - tokenAddress - symbol - decimals - } - contributorRegistryAddress - recipientRegistryAddress - } -} - `; export const GetLatestBlockNumberDocument = gql` query GetLatestBlockNumber { _meta { @@ -3408,8 +3374,8 @@ export const GetRecipientDonationsDocument = gql` } `; export const GetRecipientRegistryInfoDocument = gql` - query GetRecipientRegistryInfo($factoryAddress: ID!) { - fundingRoundFactory(id: $factoryAddress) { + query GetRecipientRegistryInfo($clrFundAddress: ID!) { + clrFund(id: $clrFundAddress) { recipientRegistry { id owner @@ -3450,6 +3416,8 @@ export const GetRoundInfoDocument = gql` fundingRound(id: $fundingRoundAddress) { id maci + pollId + pollAddress nativeTokenInfo { tokenAddress symbol @@ -3463,12 +3431,24 @@ export const GetRoundInfoDocument = gql` contributorCount totalSpent matchingPoolSize + startTime + signUpDeadline + votingDeadline + coordinatorPubKeyX + coordinatorPubKeyY + stateTreeDepth + messageTreeDepth + voteOptionTreeDepth } } `; export const GetRoundsDocument = gql` - query GetRounds { - fundingRounds(orderBy: startTime, orderDirection: asc) { + query GetRounds($clrFundAddress: String!) { + fundingRounds( + where: {clrFund: $clrFundAddress} + orderBy: startTime + orderDirection: desc + ) { id isFinalized isCancelled @@ -3503,6 +3483,9 @@ const defaultWrapper: SdkFunctionWrapper = (action, _operationName, _operationTy export function getSdk(client: GraphQLClient, withWrapper: SdkFunctionWrapper = defaultWrapper) { return { + GetClrFundInfo(variables: GetClrFundInfoQueryVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise { + return withWrapper((wrappedRequestHeaders) => client.request(GetClrFundInfoDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'GetClrFundInfo', 'query'); + }, GetContributionsAmount(variables: GetContributionsAmountQueryVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise { return withWrapper((wrappedRequestHeaders) => client.request(GetContributionsAmountDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'GetContributionsAmount', 'query'); }, @@ -3512,15 +3495,9 @@ export function getSdk(client: GraphQLClient, withWrapper: SdkFunctionWrapper = GetContributorMessages(variables: GetContributorMessagesQueryVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise { return withWrapper((wrappedRequestHeaders) => client.request(GetContributorMessagesDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'GetContributorMessages', 'query'); }, - GetContributorVotes(variables: GetContributorVotesQueryVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise { - return withWrapper((wrappedRequestHeaders) => client.request(GetContributorVotesDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'GetContributorVotes', 'query'); - }, GetCurrentRound(variables: GetCurrentRoundQueryVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise { return withWrapper((wrappedRequestHeaders) => client.request(GetCurrentRoundDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'GetCurrentRound', 'query'); }, - GetFactoryInfo(variables: GetFactoryInfoQueryVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise { - return withWrapper((wrappedRequestHeaders) => client.request(GetFactoryInfoDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'GetFactoryInfo', 'query'); - }, GetLatestBlockNumber(variables?: GetLatestBlockNumberQueryVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise { return withWrapper((wrappedRequestHeaders) => client.request(GetLatestBlockNumberDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'GetLatestBlockNumber', 'query'); }, @@ -3548,7 +3525,7 @@ export function getSdk(client: GraphQLClient, withWrapper: SdkFunctionWrapper = GetRoundInfo(variables: GetRoundInfoQueryVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise { return withWrapper((wrappedRequestHeaders) => client.request(GetRoundInfoDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'GetRoundInfo', 'query'); }, - GetRounds(variables?: GetRoundsQueryVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise { + GetRounds(variables: GetRoundsQueryVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise { return withWrapper((wrappedRequestHeaders) => client.request(GetRoundsDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'GetRounds', 'query'); }, GetTokenInfo(variables: GetTokenInfoQueryVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise { diff --git a/vue-app/src/graphql/queries/GetFactoryInfo.graphql b/vue-app/src/graphql/queries/GetClrFundInfo.graphql similarity index 61% rename from vue-app/src/graphql/queries/GetFactoryInfo.graphql rename to vue-app/src/graphql/queries/GetClrFundInfo.graphql index 47459a56a..d59d3049a 100644 --- a/vue-app/src/graphql/queries/GetFactoryInfo.graphql +++ b/vue-app/src/graphql/queries/GetClrFundInfo.graphql @@ -1,5 +1,5 @@ -query GetFactoryInfo($factoryAddress: ID!) { - fundingRoundFactory(id: $factoryAddress) { +query GetClrFundInfo($clrFundAddress: ID!) { + clrFund(id: $clrFundAddress) { nativeTokenInfo { tokenAddress symbol diff --git a/vue-app/src/graphql/queries/GetContributorMessages.graphql b/vue-app/src/graphql/queries/GetContributorMessages.graphql index c50d866db..d163b923b 100644 --- a/vue-app/src/graphql/queries/GetContributorMessages.graphql +++ b/vue-app/src/graphql/queries/GetContributorMessages.graphql @@ -14,7 +14,7 @@ query GetContributorMessages( { id data - iv + msgType timestamp blockNumber transactionIndex diff --git a/vue-app/src/graphql/queries/GetContributorVotes.graphql b/vue-app/src/graphql/queries/GetContributorVotes.graphql deleted file mode 100644 index 0da6ecf6c..000000000 --- a/vue-app/src/graphql/queries/GetContributorVotes.graphql +++ /dev/null @@ -1,10 +0,0 @@ -query GetContributorVotes($fundingRoundAddress: ID!, $contributorAddress: ID!) { - fundingRound(id: $fundingRoundAddress) { - id - contributors(where: { id: $contributorAddress }) { - votes { - id - } - } - } -} diff --git a/vue-app/src/graphql/queries/GetCurrentRound.graphql b/vue-app/src/graphql/queries/GetCurrentRound.graphql index 2d25e39bd..1a5820164 100644 --- a/vue-app/src/graphql/queries/GetCurrentRound.graphql +++ b/vue-app/src/graphql/queries/GetCurrentRound.graphql @@ -1,5 +1,5 @@ -query GetCurrentRound($fundingRoundFactoryAddress: ID!) { - fundingRoundFactory(id: $fundingRoundFactoryAddress) { +query GetCurrentRound($clrFundAddress: ID!) { + clrFund(id: $clrFundAddress) { currentRound { id } diff --git a/vue-app/src/graphql/queries/GetRecipientRegistryInfo.graphql b/vue-app/src/graphql/queries/GetRecipientRegistryInfo.graphql index 6d236fed9..bb2b34713 100644 --- a/vue-app/src/graphql/queries/GetRecipientRegistryInfo.graphql +++ b/vue-app/src/graphql/queries/GetRecipientRegistryInfo.graphql @@ -1,5 +1,5 @@ -query GetRecipientRegistryInfo($factoryAddress: ID!) { - fundingRoundFactory(id: $factoryAddress) { +query GetRecipientRegistryInfo($clrFundAddress: ID!) { + clrFund(id: $clrFundAddress) { recipientRegistry { id owner diff --git a/vue-app/src/graphql/queries/GetRoundInfo.graphql b/vue-app/src/graphql/queries/GetRoundInfo.graphql index cb8ec910d..d5995c8ff 100644 --- a/vue-app/src/graphql/queries/GetRoundInfo.graphql +++ b/vue-app/src/graphql/queries/GetRoundInfo.graphql @@ -2,6 +2,8 @@ query GetRoundInfo($fundingRoundAddress: ID!) { fundingRound(id: $fundingRoundAddress) { id maci + pollId + pollAddress nativeTokenInfo { tokenAddress symbol @@ -15,5 +17,13 @@ query GetRoundInfo($fundingRoundAddress: ID!) { contributorCount totalSpent matchingPoolSize + startTime + signUpDeadline + votingDeadline + coordinatorPubKeyX + coordinatorPubKeyY + stateTreeDepth + messageTreeDepth + voteOptionTreeDepth } } diff --git a/vue-app/src/graphql/queries/GetRounds.graphql b/vue-app/src/graphql/queries/GetRounds.graphql index e13bdceb3..15d768ed4 100644 --- a/vue-app/src/graphql/queries/GetRounds.graphql +++ b/vue-app/src/graphql/queries/GetRounds.graphql @@ -1,5 +1,5 @@ -query GetRounds { - fundingRounds(orderBy: startTime, orderDirection: asc) { +query GetRounds($clrFundAddress: String!) { + fundingRounds(where:{clrFund: $clrFundAddress}, orderBy: startTime, orderDirection: desc) { id isFinalized isCancelled diff --git a/vue-app/src/lambda/recipient.js b/vue-app/src/lambda/recipient.mts similarity index 73% rename from vue-app/src/lambda/recipient.js rename to vue-app/src/lambda/recipient.mts index e3473a715..b949d5cc2 100644 --- a/vue-app/src/lambda/recipient.js +++ b/vue-app/src/lambda/recipient.mts @@ -1,6 +1,7 @@ import { GoogleSpreadsheet } from 'google-spreadsheet' +import type { Handler } from '@netlify/functions' -const GOOGLE_SHEET_NAME = process.env.GOOGLE_SHEET_NAME || 'Raw' +const GOOGLE_SHEET_NAME = process.env.GOOGLE_SHEET_NAME || 'Sheet1' /** * Creates an object row from a RecipientApplicationData. A row is a key-value @@ -36,17 +37,22 @@ function recipientToRow(recipient) { }, {}) } -exports.handler = async function (event) { +export const handler: Handler = async event => { if (!event.body) { return { statusCode: 400, // Bad request + body: JSON.stringify({ error: 'Missing request body' }), } } try { const recipient = JSON.parse(event.body) + const credential = process.env.GOOGLE_APPLICATION_CREDENTIALS + if (!credential) { + throw new Error('Environment variable GOOGLE_APPLICATION_CREDENTIALS not set') + } + const creds = JSON.parse(credential) - const creds = JSON.parse(process.env.GOOGLE_APPLICATION_CREDENTIALS) const doc = new GoogleSpreadsheet(process.env.VITE_GOOGLE_SPREADSHEET_ID) await doc.useServiceAccountAuth(creds) @@ -57,11 +63,13 @@ exports.handler = async function (event) { return { statusCode: 200, + body: JSON.stringify({ status: 'success' }), } } catch (err) { console.log(err) return { statusCode: 500, + body: JSON.stringify({ error: err.message }), } } } diff --git a/vue-app/src/lambda/sponsor.js b/vue-app/src/lambda/sponsor.mts similarity index 70% rename from vue-app/src/lambda/sponsor.js rename to vue-app/src/lambda/sponsor.mts index f935e5007..5d460e17a 100644 --- a/vue-app/src/lambda/sponsor.js +++ b/vue-app/src/lambda/sponsor.mts @@ -1,14 +1,26 @@ -import { utils } from 'ethers' +import { decodeBase64, encodeBase64, toUtf8Bytes } from 'ethers' import nacl from 'tweetnacl' +import type { Handler } from '@netlify/functions' const NODE_URL = process.env.VITE_BRIGHTID_NODE_URL || 'https://app.brightid.org/node/v6' +// these fields must be in alphabetical because +// BrightID nodes use 'fast-json-stable-stringify' that sorts fields +type BrightIDMessage = { + app: string + appUserId: string + name: string + sig?: string + timestamp: number + v: number +} + /** * Returns an error object * @param errorMessage error message * @returns error object */ -function makeError(errorMessage, errorNum) { +function makeError(errorMessage: string, errorNum: number) { const body = JSON.stringify({ error: errorMessage, errorNum }) return { statusCode: 400, body } } @@ -18,7 +30,7 @@ function makeError(errorMessage, errorNum) { * @param result the result * @returns result object */ -function makeResult(result) { +function makeResult(result: any) { const body = JSON.stringify(result) return { statusCode: 200, body } } @@ -29,7 +41,7 @@ function makeResult(result) { * * @returns the number of sponsorships available to the specified `context` */ -async function unusedSponsorships(context) { +async function unusedSponsorships(context: string) { const endpoint = `${NODE_URL}/apps/${context}` const response = await fetch(endpoint) const json = await response.json() @@ -42,16 +54,22 @@ async function unusedSponsorships(context) { return data.unusedSponsorships || 0 } -async function handleSponsorRequest(userAddress) { +async function handleSponsorRequest(userAddress: string) { const endpoint = process.env.VITE_BRIGHTID_SPONSOR_API_URL - const brightIdSponsorKey = process.env.VITE_BRIGHTID_SPONSOR_KEY_FOR_NETLIFY - - const CONTEXT = process.env.VITE_BRIGHTID_CONTEXT + if (!endpoint) { + throw new Error('Environment variable VITE_BRIGHTID_SPONSOR_API_URL not set') + } + const brightIdSponsorKey = process.env.VITE_BRIGHTID_SPONSOR_KEY_FOR_NETLIFY if (!brightIdSponsorKey) { throw new Error('Environment variable VITE_BRIGHTID_SPONSOR_KEY_FOR_NETLIFY not set') } + const CONTEXT = process.env.VITE_BRIGHTID_CONTEXT + if (!CONTEXT) { + throw new Error('Environment variable VITE_BRIGHTID_CONTEXT not set') + } + const sponsorships = await unusedSponsorships(CONTEXT) if (typeof sponsorships === 'number' && sponsorships < 1) { throw new Error('BrightID sponsorships not available') @@ -62,9 +80,7 @@ async function handleSponsorRequest(userAddress) { const timestamp = Date.now() - // these fields must be in alphabetical because - // BrightID nodes use 'fast-json-stable-stringify' that sorts fields - const op = { + const op: BrightIDMessage = { app: CONTEXT, appUserId: userAddress, name: 'Sponsor', @@ -73,10 +89,10 @@ async function handleSponsorRequest(userAddress) { } const message = JSON.stringify(op) - const arrayedMessage = utils.toUtf8Bytes(message) - const arrayedKey = utils.base64.decode(brightIdSponsorKey) + const arrayedMessage = toUtf8Bytes(message) + const arrayedKey = decodeBase64(brightIdSponsorKey) const signature = nacl.sign.detached(arrayedMessage, arrayedKey) - op.sig = utils.base64.encode(signature) + op.sig = encodeBase64(signature) const res = await fetch(endpoint, { method: 'POST', @@ -95,7 +111,7 @@ async function handleSponsorRequest(userAddress) { return makeResult({ hash: json.data.hash }) } - return makeError('Unexpected result from the BrightID sponsorship API.') + return makeError('Unexpected result from the BrightID sponsorship API.', 500) } /** @@ -103,19 +119,19 @@ async function handleSponsorRequest(userAddress) { * @param event contains user address to sponsor * @returns sponsor data or error */ -exports.handler = async function (event) { +export const handler: Handler = async event => { if (!event.body) { - return makeError('Missing request body') + return makeError('Missing request body', 400) } try { const jsonBody = JSON.parse(event.body) if (!jsonBody.userAddress) { - return makeError('Missing userAddress in request body: ' + event.body) + return makeError('Missing userAddress in request body: ' + event.body, 400) } return await handleSponsorRequest(jsonBody.userAddress) } catch (err) { - return makeError(err.message) + return makeError(err.message, 500) } } diff --git a/vue-app/src/locales/cn.json b/vue-app/src/locales/cn.json index 693ba2260..2a15e8262 100644 --- a/vue-app/src/locales/cn.json +++ b/vue-app/src/locales/cn.json @@ -719,6 +719,7 @@ "tooltip2": "{chain} 链上钱包余额", "h2_3": "项目", "div1": "正在审核", + "withdraw_button": "取回 {contribution} {tokenSymbol}", "btn2_1": "预览", "btn2_2": "查看", "div2": "您尚未提交任何项目" @@ -728,10 +729,8 @@ "div1": "您快要参加这筹款活动了。", "li1": "您的项目只需要经过一些最终检查来确保它符合筹款标准。您可以在这里", "link1": "了解更多关于注册流程的信息。", - "li2": "完成后，您的项目页面将上线。", - "li3": " 如果您的项目未通过检查，我们将电邮通知您并退回您的押金。", - "linkProjects": "查看项目", - "link2": "查看项目", + "li2": "完成后，您的项目页面将上线, 我们将退还您的押金。", + "li3": " 如果您的项目未通过检查，我们将退回您的押金。", "link3": "回首页" }, "projectList": { @@ -893,7 +892,6 @@ "div8": "匹配池", "div9": "剩余的将会加入匹配池", "div10": "平均分配 {contribution} {tokenSymbol}", - "button1": "取回 {contribution} {tokenSymbol}", "div11": "不可以", "div11_if2": "重新分配", "div11_if3": "捐赠", diff --git a/vue-app/src/locales/en.json b/vue-app/src/locales/en.json index 89dd5781e..891ec0dd0 100644 --- a/vue-app/src/locales/en.json +++ b/vue-app/src/locales/en.json @@ -719,6 +719,7 @@ "tooltip2": "Balance of wallet on {chain} chain", "h2_3": "Projects", "div1": "Under review", + "withdraw_button": "Withdraw {contribution} {tokenSymbol}", "btn2_1": "Preview", "btn2_2": "View", "div2": "You haven't submitted any projects" @@ -728,10 +729,8 @@ "div1": "You’re almost on board this funding round.", "li1": "Your project just needs to go through some final checks to ensure it meets round criteria. You can", "link1": "learn more about the registration process here.", - "li2": "Once that's complete, your project page will go live.", - "li3": " If your project fails any checks, we'll let you know by email and return your deposit.", - "linkProjects": "View projects", - "link2": "View project", + "li2": "Once that's complete, your project page will go live and we'll refund your deposit.", + "li3": " If your project fails any checks, we'll return your deposit.", "link3": "Go home" }, "projectList": { @@ -893,7 +892,6 @@ "div8": "Matching pool", "div9": "Remaining funds go to matching pool", "div10": "Split {contribution} {tokenSymbol} evenly", - "button1": "Withdraw {contribution} {tokenSymbol}", "div11": "Can't", "div11_if2": "reallocate", "div11_if3": "contribute", diff --git a/vue-app/src/locales/es.json b/vue-app/src/locales/es.json index 54b0f04dc..c0226917f 100644 --- a/vue-app/src/locales/es.json +++ b/vue-app/src/locales/es.json @@ -719,6 +719,7 @@ "tooltip2": "Saldo de la billetera en la cadena {chain}", "h2_3": "Proyectos", "div1": "En revisión", + "withdraw_button": "Retirar {contribution} {tokenSymbol}", "btn2_1": "Vista previa", "btn2_2": "Ver", "div2": "No has enviado ningún proyecto" @@ -728,10 +729,8 @@ "div1": "Estás casi listo para unirte a esta ronda de financiamiento.", "li1": "Tu proyecto solo necesita pasar por algunas verificaciones finales para asegurarse de que cumpla con los criterios de la ronda. Puedes", "link1": "obtener más información sobre el proceso de registro aquí.", - "li2": "Una vez que se complete, la página de tu proyecto se publicará.", - "li3": "Si tu proyecto no pasa alguna verificación, te lo haremos saber por correo electrónico y te devolveremos tu depósito.", - "linkProjects": "Ver proyectos", - "link2": "Ver proyecto", + "li2": "Una vez que se complete, la página de tu proyecto se publicará y te devolveremos tu depósito.", + "li3": "Si tu proyecto no pasa alguna verificación, te devolveremos tu depósito.", "link3": "Ir a inicio" }, "projectList": { @@ -893,7 +892,6 @@ "div8": "Matching pool", "div9": "Los fondos restantes se destinarán al matching pool", "div10": "Distribuir {contribution} {tokenSymbol} de manera uniforme", - "button1": "Retirar {contribution} {tokenSymbol}", "div11": "No puedes", "div11_if2": "reasignar", "div11_if3": "contribuir", diff --git a/vue-app/src/router/index.ts b/vue-app/src/router/index.ts index 6a68c45b9..86a75d5b9 100644 --- a/vue-app/src/router/index.ts +++ b/vue-app/src/router/index.ts @@ -1,6 +1,6 @@ import { createRouter, createWebHashHistory } from 'vue-router' import type { RouteRecordRaw } from 'vue-router' -import { isUserRegistrationRequired, isOptimisticRecipientRegistry } from '@/api/core' +import { isUserRegistrationRequired, isOptimisticRecipientRegistry, isActiveApp } from '@/api/core' const Landing = () => import('@/views/Landing.vue') const JoinLanding = () => import('@/views/JoinLanding.vue') @@ -30,7 +30,7 @@ const TransactionSuccess = () => import('@/views/TransactionSuccess.vue') const Leaderboard = () => import('@/views/Leaderboard.vue') const LeaderboardProject = () => import('@/views/LeaderboardProject.vue') -// TODO: create a new route that takes funding factory address as a param +// TODO: create a new route that takes funding ClrFund address as a param const routes: Array = [ { path: '/', @@ -262,7 +262,7 @@ if (isUserRegistrationRequired) { ) } -if (isOptimisticRecipientRegistry) { +if (isOptimisticRecipientRegistry && isActiveApp) { routes.push({ path: '/recipients', name: 'recipients', diff --git a/vue-app/src/stores/__tests__/store-app.spec.ts b/vue-app/src/stores/__tests__/store-app.spec.ts index 640499b37..731ee6773 100644 --- a/vue-app/src/stores/__tests__/store-app.spec.ts +++ b/vue-app/src/stores/__tests__/store-app.spec.ts @@ -1,4 +1,3 @@ -import { BigNumber } from 'ethers' import { expect } from 'vitest' import { setActivePinia, createPinia } from 'pinia' @@ -96,7 +95,7 @@ describe('Cart mutations', () => { const appStore = useAppStore() const item1 = createItem({ id: '0x1' }) const item2 = createItem({ id: '0x2' }) - appStore.$patch({ cart: [item1, item2], contribution: BigNumber.from(0) }) + appStore.$patch({ cart: [item1, item2], contribution: BigInt(0) }) appStore.removeCartItem(item1) expect(appStore.cart.length).to.equal(1) expect(appStore.cart[0].id).to.equal(item2.id) @@ -105,7 +104,7 @@ describe('Cart mutations', () => { it('does not remove item that is not in cart', () => { const appStore = useAppStore() const item = createItem({ id: '0x1' }) - appStore.$patch({ cart: [item], contribution: BigNumber.from(0) }) + appStore.$patch({ cart: [item], contribution: BigInt(0) }) const newItem = createItem({ id: '0x2' }) expect(() => { appStore.removeCartItem(newItem) @@ -128,7 +127,7 @@ describe('Cart mutations', () => { const appStore = useAppStore() const item1 = createItem({ id: '0x1' }) const item2 = createItem({ id: '0x2' }) - appStore.$patch({ cart: [item1, item2], contribution: BigNumber.from(1) }) + appStore.$patch({ cart: [item1, item2], contribution: BigInt(1) }) appStore.removeCartItem(item1) expect(appStore.cart.length).to.equal(2) expect(appStore.cart[0].amount).to.equal('0') @@ -148,7 +147,7 @@ describe('Cart mutations', () => { const newItem2 = createItem({ id: '92' }) appStore.$patch({ cart: [...items, newItem1, newItem2], - contribution: BigNumber.from(1), + contribution: BigInt(1), }) expect(appStore.cart.length).to.equal(MAX_CART_SIZE + 1) diff --git a/vue-app/src/stores/app.ts b/vue-app/src/stores/app.ts index 459294d27..d977e04b7 100644 --- a/vue-app/src/stores/app.ts +++ b/vue-app/src/stores/app.ts @@ -1,5 +1,4 @@ import { defineStore } from 'pinia' -import { BigNumber } from 'ethers' import { type CartItem, type Contributor, @@ -10,10 +9,10 @@ import { serializeCart, } from '@/api/contributions' import { getCommittedCart } from '@/api/cart' -import { operator, chain, ThemeMode, recipientRegistryType, recipientJoinDeadlineConfig } from '@/api/core' -import { type RoundInfo, RoundStatus, getRoundInfo } from '@/api/round' +import { operator, chain, ThemeMode, recipientRegistryType, recipientJoinDeadlineConfig, isActiveApp } from '@/api/core' +import { type RoundInfo, RoundStatus, getRoundInfo, getLeaderboardRoundInfo } from '@/api/round' import { getTally, type Tally } from '@/api/tally' -import { type Factory, getFactoryInfo } from '@/api/factory' +import { type ClrFund, getClrFundInfo, getMatchingFunds } from '@/api/clrFund' import { getMACIFactoryInfo, type MACIFactory } from '@/api/maci-factory' import { isSameAddress } from '@/utils/accounts' import { storage } from '@/api/storage' @@ -23,7 +22,9 @@ import { useUserStore } from './user' import { getAssetsUrl } from '@/utils/url' import { getTokenLogo } from '@/utils/tokens' import { assert, ASSERT_MISSING_ROUND, ASSERT_MISSING_SIGNATURE, ASSERT_NOT_CONNECTED_WALLET } from '@/utils/assert' -import { Keypair } from '@clrfund/maci-utils' +import { Keypair } from '@clrfund/common' +import { getRounds } from '@/api/rounds' +import { DateTime } from 'luxon' export type AppState = { isAppReady: boolean @@ -31,7 +32,7 @@ export type AppState = { cartEditModeSelected: boolean committedCart: CartItem[] cartLoaded: boolean - contribution: BigNumber | null + contribution: bigint | null contributor: Contributor | null hasVoted: boolean currentRound: RoundInfo | null @@ -39,7 +40,7 @@ export type AppState = { showCartPanel: boolean tally: Tally | null theme: string | null - factory: Factory | null + clrFund: ClrFund | null maciFactory: MACIFactory | null showSimpleLeaderboard: boolean } @@ -59,7 +60,7 @@ export const useAppStore = defineStore('app', { showCartPanel: false, tally: null, theme: null, - factory: null, + clrFund: null, maciFactory: null, showSimpleLeaderboard: true, }), @@ -69,6 +70,11 @@ export const useAppStore = defineStore('app', { return recipientJoinDeadlineConfig } + if (!isActiveApp) { + // when running in static mode, do not allow adding recipients + return DateTime.now() + } + const recipientStore = useRecipientStore() if (!state.currentRound || !recipientStore.recipientRegistryInfo) { return null @@ -114,6 +120,9 @@ export const useAppStore = defineStore('app', { isCurrentRound: state => (roundAddress: string): boolean => { + if (state.currentRoundAddress === null) { + return false + } const currentRoundAddress = state.currentRoundAddress || '' return isSameAddress(roundAddress, currentRoundAddress) }, @@ -147,29 +156,29 @@ export const useAppStore = defineStore('app', { }, hasUserContributed: (state): boolean => { const userStore = useUserStore() - return !!userStore.currentUser && !!state.contribution && !state.contribution.isZero() + return !!userStore.currentUser && !!state.contribution && state.contribution !== BigInt(0) }, operator: (): string => { return operator }, userRegistryAddress: (state): string | undefined => { - const { currentRound, factory } = state + const { currentRound, clrFund } = state if (currentRound) { return currentRound.userRegistryAddress } - if (factory) { - return factory.userRegistryAddress + if (clrFund) { + return clrFund.userRegistryAddress } }, - matchingPool: (state): BigNumber => { - const { currentRound, factory } = state + matchingPool: (state): bigint => { + const { currentRound, clrFund } = state - let matchingPool = BigNumber.from(0) + let matchingPool = BigInt(0) - if (factory) { - matchingPool = factory.matchingPool + if (clrFund) { + matchingPool = clrFund.matchingPool } if (currentRound) { @@ -179,12 +188,12 @@ export const useAppStore = defineStore('app', { return matchingPool }, nativeTokenSymbol: (state): string => { - const { currentRound, factory } = state + const { currentRound, clrFund } = state let nativeTokenSymbol = '' - if (factory) { - nativeTokenSymbol = factory.nativeTokenSymbol + if (clrFund) { + nativeTokenSymbol = clrFund.nativeTokenSymbol } if (currentRound) { @@ -194,12 +203,12 @@ export const useAppStore = defineStore('app', { return nativeTokenSymbol }, nativeTokenDecimals: (state): number | undefined => { - const { currentRound, factory } = state + const { currentRound, clrFund } = state let nativeTokenDecimals - if (factory) { - nativeTokenDecimals = factory.nativeTokenDecimals + if (clrFund) { + nativeTokenDecimals = clrFund.nativeTokenDecimals } if (currentRound) { @@ -209,12 +218,12 @@ export const useAppStore = defineStore('app', { return nativeTokenDecimals }, nativeTokenAddress: (state): string => { - const { currentRound, factory } = state + const { currentRound, clrFund } = state let nativeTokenAddress = '' - if (factory) { - nativeTokenAddress = factory.nativeTokenAddress + if (clrFund) { + nativeTokenAddress = clrFund.nativeTokenAddress } if (currentRound) { @@ -349,7 +358,7 @@ export const useAppStore = defineStore('app', { throw new Error('item is not in the cart') } else if (this.contribution === null) { throw new Error('invalid operation') - } else if (this.contribution.isZero() || this.cart.length > MAX_CART_SIZE) { + } else if (this.contribution === BigInt(0) || this.cart.length > MAX_CART_SIZE) { this.cart.splice(itemIndex, 1) } else { // The number of MACI messages can't go down after initial submission @@ -433,12 +442,13 @@ export const useAppStore = defineStore('app', { if (this.committedCart.length > 0) { // only overwrite the uncommitted cart if there's committed cart this.restoreCommittedCartToLocalCart() + this.setHasVote(true) } }, setContributor(contributor: Contributor | null) { this.contributor = contributor }, - setContribution(contribution: BigNumber | null) { + setContribution(contribution: bigint | null) { this.contribution = contribution }, async loadContributorData() { @@ -460,12 +470,44 @@ export const useAppStore = defineStore('app', { stateIndex, } }, - async loadFactoryInfo() { - const factory = await getFactoryInfo() - this.factory = factory + async loadStaticClrFundInfo() { + const rounds = await getRounds() + // rounds are sorted in reverse order, first one is the newest round + const currentRound = rounds[0] + + let maxRecipients = 0 + if (currentRound) { + const network = currentRound.network || '' + const currentRoundInfo = await getLeaderboardRoundInfo(currentRound.address, network) + if (currentRoundInfo) { + const matchingPool = await getMatchingFunds(currentRoundInfo.nativeTokenAddress) + this.clrFund = { + nativeTokenAddress: currentRoundInfo.nativeTokenAddress, + nativeTokenSymbol: currentRoundInfo.nativeTokenSymbol, + nativeTokenDecimals: currentRoundInfo.nativeTokenDecimals, + userRegistryAddress: currentRoundInfo.userRegistryAddress, + recipientRegistryAddress: currentRoundInfo.recipientRegistryAddress, + matchingPool, + } + this.selectRound(currentRound.address) + this.currentRound = currentRoundInfo + if (currentRoundInfo.tally) { + this.tally = currentRoundInfo.tally + } + maxRecipients = currentRoundInfo.maxRecipients + } + } + if (!this.clrFund) { + this.clrFund = await getClrFundInfo() + } + await this.loadMACIFactoryInfo(maxRecipients) + }, + async loadClrFundInfo() { + const clrFund = await getClrFundInfo() + this.clrFund = clrFund }, - async loadMACIFactoryInfo() { - const factory = await getMACIFactoryInfo() + async loadMACIFactoryInfo(maxRecipients?: number) { + const factory = await getMACIFactoryInfo(maxRecipients) this.maciFactory = factory }, async loadTally() { diff --git a/vue-app/src/stores/recipient.ts b/vue-app/src/stores/recipient.ts index 271258412..e285ee4f8 100644 --- a/vue-app/src/stores/recipient.ts +++ b/vue-app/src/stores/recipient.ts @@ -15,7 +15,7 @@ export type RecipientState = { export const useRecipientStore = defineStore('recipient', { state: (): RecipientState => ({ - recipient: defaultRecipientApplicationData, + recipient: newRecipientApplicationData(), recipientRegistryAddress: null, recipientRegistryInfo: null, }), @@ -37,11 +37,11 @@ export const useRecipientStore = defineStore('recipient', { } }, resetRecipientData() { - this.recipient = defaultRecipientApplicationData + this.recipient = newRecipientApplicationData() }, async loadRecipientRegistryInfo() { const appStore = useAppStore() - //TODO: update call to getRecipientRegistryAddress to take factory address as a parameter + //TODO: update call to getRecipientRegistryAddress to take ClrFund address as a parameter const recipientRegistryAddress = this.recipientRegistryAddress || (await getRecipientRegistryAddress(appStore.currentRoundAddress)) this.recipientRegistryAddress = recipientRegistryAddress @@ -56,35 +56,41 @@ export const useRecipientStore = defineStore('recipient', { }, }) -const defaultRecipientApplicationData: RecipientApplicationData = { - project: { - name: '', - tagline: '', - description: '', - category: '', - problemSpace: '', - }, - fund: { - addressName: '', - resolvedAddress: '', - plans: '', - }, - team: { - name: '', - description: '', - email: '', - }, - links: { - github: '', - radicle: '', - website: '', - twitter: '', - discord: '', - }, - image: { - bannerHash: '', - thumbnailHash: '', - }, - furthestStep: 0, - hasEns: false, +/** + * Create a new copy of recipient application data + * @returns A new copy of an empty recipient application data + */ +function newRecipientApplicationData(): RecipientApplicationData { + return { + project: { + name: '', + tagline: '', + description: '', + category: '', + problemSpace: '', + }, + fund: { + addressName: '', + resolvedAddress: '', + plans: '', + }, + team: { + name: '', + description: '', + email: '', + }, + links: { + github: '', + radicle: '', + website: '', + twitter: '', + discord: '', + }, + image: { + bannerHash: '', + thumbnailHash: '', + }, + furthestStep: 0, + hasEns: false, + } } diff --git a/vue-app/src/stores/user.ts b/vue-app/src/stores/user.ts index 655a18647..4f07b0b6f 100644 --- a/vue-app/src/stores/user.ts +++ b/vue-app/src/stores/user.ts @@ -2,8 +2,7 @@ import { getEtherBalance, getTokenBalance, isVerifiedUser, isRegisteredUser, typ import { defineStore } from 'pinia' import { useAppStore } from '@/stores' import type { WalletUser } from '@/stores' -import { getContributionAmount, hasContributorVoted } from '@/api/contributions' -import type { BigNumber, Signer } from 'ethers' +import { getContributionAmount } from '@/api/contributions' import { ensLookup, isValidSignature } from '@/utils/accounts' import { UserRegistryType, userRegistryType } from '@/api/core' import { getBrightId, type BrightId } from '@/api/bright-id' @@ -19,13 +18,12 @@ export const useUserStore = defineStore('user', { state: (): UserState => ({ currentUser: null, }), - getters: { - signer(): Signer { + getters: {}, + actions: { + async getSigner() { assert(this.currentUser, ASSERT_NOT_CONNECTED_WALLET) return this.currentUser.walletProvider.getSigner() }, - }, - actions: { loginUser(user: WalletUser) { this.currentUser = { walletAddress: user.walletAddress, @@ -43,7 +41,8 @@ export const useUserStore = defineStore('user', { async requestSignature() { assert(this.currentUser, ASSERT_NOT_CONNECTED_WALLET) if (!this.currentUser.encryptionKey) { - const signature = await this.signer.signMessage(LOGIN_MESSAGE) + const signer = await this.currentUser.walletProvider.getSigner() + const signature = await signer.signMessage(LOGIN_MESSAGE) if (!isValidSignature(signature)) { // gnosis safe does not return signature in hex string @@ -62,13 +61,13 @@ export const useUserStore = defineStore('user', { let nativeTokenAddress = '' let userRegistryAddress = '' - let balance: BigNumber | null = null + let balance: bigint | null = null let isRegistered: boolean | undefined = undefined const walletAddress = this.currentUser.walletAddress - if (appStore.factory) { - nativeTokenAddress = appStore.factory.nativeTokenAddress - userRegistryAddress = appStore.factory.userRegistryAddress + if (appStore.clrFund) { + nativeTokenAddress = appStore.clrFund.nativeTokenAddress + userRegistryAddress = appStore.clrFund.userRegistryAddress } if (appStore.currentRound) { @@ -76,12 +75,9 @@ export const useUserStore = defineStore('user', { userRegistryAddress = appStore.currentRound.userRegistryAddress let contribution = appStore.contribution - if (!contribution || contribution.isZero()) { + if (!contribution || contribution === BigInt(0)) { contribution = await getContributionAmount(appStore.currentRound.fundingRoundAddress, walletAddress) - const hasVoted = await hasContributorVoted(appStore.currentRound.fundingRoundAddress, walletAddress) - appStore.contribution = contribution - appStore.hasVoted = hasVoted } isRegistered = await isRegisteredUser(appStore.currentRound.fundingRoundAddress, walletAddress) diff --git a/vue-app/src/stores/wallet/index.ts b/vue-app/src/stores/wallet/index.ts index d0e5d24b9..e64c54f8d 100644 --- a/vue-app/src/stores/wallet/index.ts +++ b/vue-app/src/stores/wallet/index.ts @@ -6,7 +6,7 @@ import { CHAIN_INFO } from '@/utils/chains' import type { Provider } from './types' import { EthereumProvider } from '@walletconnect/ethereum-provider' import { chainId } from '@/api/core' -import { providers } from 'ethers' +import { BrowserProvider } from 'ethers' const CONNECTED_PROVIDER = 'connected-provider' const DISCONNECT_EVENT = 'disconnect' @@ -22,7 +22,7 @@ const connectors: Record = { export type WalletUser = { chainId: number - web3Provider: providers.Web3Provider + web3Provider: BrowserProvider walletAddress: string } @@ -95,7 +95,7 @@ export const useWalletStore = defineStore('wallet', { this.user = { chainId: conn.chainId, walletAddress: account, - web3Provider: markRaw(new providers.Web3Provider(conn.provider)), + web3Provider: markRaw(new BrowserProvider(conn.provider)), } // Emit EIP-1193 events and update plugin values diff --git a/vue-app/src/stores/wallet/types.ts b/vue-app/src/stores/wallet/types.ts index be811a232..fc86be99f 100644 --- a/vue-app/src/stores/wallet/types.ts +++ b/vue-app/src/stores/wallet/types.ts @@ -1,7 +1,7 @@ -import type { ExternalProvider } from '@ethersproject/providers' +import type { Eip1193Provider } from 'ethers' import type WalletConnectProvider from '@walletconnect/web3-provider' -export interface Provider extends ExternalProvider { +export interface Provider extends Eip1193Provider { disconnect?: () => void close?: () => void removeListener?: (event: string, handler: () => void) => void diff --git a/vue-app/src/utils/accounts.ts b/vue-app/src/utils/accounts.ts index 99bb50b09..0edcaa995 100644 --- a/vue-app/src/utils/accounts.ts +++ b/vue-app/src/utils/accounts.ts @@ -1,12 +1,11 @@ -import { utils } from 'ethers' +import { getAddress, isHexString, resolveAddress, isAddress } from 'ethers' import { mainnetProvider } from '@/api/core' -import { isAddress } from '@ethersproject/address' const SIGNATURE_LENGTH = 65 export function isSameAddress(address1: string, address2: string): boolean { // check for empty address to avoid getAddress() from throwing - return !!address1 && !!address2 && utils.getAddress(address1) === utils.getAddress(address2) + return !!address1 && !!address2 && getAddress(address1) === getAddress(address2) } // Looks up possible ENS for given 0x address @@ -24,7 +23,7 @@ export async function resolveEns(name: string): Promise { // Returns true if address is valid ENS or 0x address export async function isValidEthAddress(address: string): Promise { - const resolved = await mainnetProvider.resolveName(address) + const resolved = await resolveAddress(address, mainnetProvider) return !!resolved } @@ -40,5 +39,5 @@ export function renderAddressOrHash(address: string, digitsToShow?: number): str } export function isValidSignature(signature: string): boolean { - return utils.isHexString(signature, SIGNATURE_LENGTH) + return isHexString(signature, SIGNATURE_LENGTH) } diff --git a/vue-app/src/utils/amounts.ts b/vue-app/src/utils/amounts.ts index 10f37ba5e..5df48c010 100644 --- a/vue-app/src/utils/amounts.ts +++ b/vue-app/src/utils/amounts.ts @@ -1,16 +1,14 @@ -import type { BigNumber, BigNumberish } from 'ethers' -import { commify, formatUnits } from '@ethersproject/units' +import { type BigNumberish, formatUnits } from 'ethers' export function formatAmount( - _value: BigNumber | string, + _value: bigint | string, units: BigNumberish = 18, maximumSignificantDigits?: number | null, maxDecimals?: number | null, ): string { // If _value is already in string form, assign to formattedValue // Otherwise, convert BigNumber (really large integers) to whole AOE balance (human readable floats) - const formattedValue: string = - typeof _value === 'string' ? _value : formatUnits(_value as BigNumber, units).toString() + const formattedValue: string = typeof _value === 'string' ? _value : formatUnits(_value as bigint, units).toString() let result: number = parseFloat(formattedValue) // If `maxDecimals` passed, fix/truncate to string and parse back to number if (maxDecimals != null) { @@ -26,7 +24,7 @@ export function formatAmount( try { // Else, return commified result - return commify(result) + return result.toLocaleString() } catch { // return result without comma if failed to add comma return result.toString(10) diff --git a/vue-app/src/utils/chains.ts b/vue-app/src/utils/chains.ts index 83a8f7551..b84942d8b 100644 --- a/vue-app/src/utils/chains.ts +++ b/vue-app/src/utils/chains.ts @@ -5,7 +5,9 @@ export enum ChainId { ARBITRUM_ONE = 42161, ARBITRUM_RINKEBY = 421611, ARBITRUM_GOERLI = 421613, + ARBITRUM_SEPOLIA = 421614, OPTIMISM = 10, + OPTIMISM_SEPOLIA = 11155420, XDAI = 100, POLYGON = 137, } @@ -87,6 +89,17 @@ export const CHAIN_INFO: ChainInfo = { rpcUrl: 'https://goerli-rollup.arbitrum.io/rpc', bridge: 'https://bridge.arbitrum.io', }, + [ChainId.ARBITRUM_SEPOLIA]: { + label: 'Arbitrum Sepolia', + currency: 'AETH', + logo: 'arbitrum.svg', + isLayer2: true, + explorer: 'https://sepolia.arbiscan.io/', + explorerLogo: 'arbitrum.svg', + explorerLabel: 'Arbiscan', + rpcUrl: 'https://sepolia-rollup.arbitrum.io/rpc', + bridge: 'https://bridge.arbitrum.io', + }, [ChainId.OPTIMISM]: { label: 'Optimism', currency: 'OETH', @@ -98,6 +111,17 @@ export const CHAIN_INFO: ChainInfo = { rpcUrl: 'https://mainnet.optimism.io', bridge: 'https://gateway.optimism.io', }, + [ChainId.OPTIMISM_SEPOLIA]: { + label: 'Optimism Sepolia', + currency: 'OETH', + logo: 'optimism.svg', + isLayer2: true, + explorer: 'https://sepolia-optimism.etherscan.io', + explorerLogo: 'optimism.svg', + explorerLabel: 'Etherscan', + rpcUrl: 'https://sepolia.optimism.io', + bridge: 'https://gateway.optimism.io', + }, [ChainId.XDAI]: { label: 'xDai', currency: 'xDai', diff --git a/vue-app/src/utils/contracts.ts b/vue-app/src/utils/contracts.ts index 92a71c594..640152451 100644 --- a/vue-app/src/utils/contracts.ts +++ b/vue-app/src/utils/contracts.ts @@ -1,7 +1,20 @@ -import type { Contract } from 'ethers' -import type { TransactionResponse, TransactionReceipt } from '@ethersproject/abstract-provider' +import type { TransactionResponse, TransactionReceipt, Signer } from 'ethers' +import { Contract } from 'ethers' +import { FundingRound, Poll } from '@/api/abi' import { provider, MAX_WAIT_DEPTH } from '@/api/core' -import { isSameAddress } from '@/utils/accounts' +import { getEventArg } from '@clrfund/common' + +/** + * Return the handle to the Poll contract + * @param fundingRoundAddress The funding round contract address + * @param signer The signer handle + * @returns The Poll contract handle + */ +export async function getPollContract(fundingRoundAddress: string, signer: Signer): Promise { + const fundingRound = new Contract(fundingRoundAddress, FundingRound, signer) + const pollAddress = await fundingRound.poll() + return new Contract(pollAddress, Poll, signer) +} export async function waitForTransaction( pendingTransaction: Promise, @@ -34,62 +47,9 @@ export async function waitForTransaction( return transactionReceipt } -/** - * Wait for transaction to be mined and available on the subgraph - * @param pendingTransaction transaction to wait and check for - * @param checkFn the check function - * @param onTransactionHash callback function with the transaction hash - * @returns transaction receipt - */ -export async function waitForTransactionAndCheck( - pendingTransaction: Promise, - checkFn: (receipt: TransactionReceipt) => Promise, - onTransactionHash?: (hash: string) => void, -): Promise { - const receipt = await waitForTransaction(pendingTransaction, onTransactionHash) - - return new Promise(resolve => { - async function checkAndWait(depth = 0) { - if (await checkFn(receipt)) { - resolve(receipt) - } else { - if (depth > MAX_WAIT_DEPTH) { - throw new Error('Time out waiting for transaction ' + receipt.transactionHash) - } - - const timeoutMs = 2 ** depth * 10 - await new Promise(res => setTimeout(res, timeoutMs)) - checkAndWait(depth + 1) - } - } - - checkAndWait() - }) -} - -export function getEventArg( - transactionReceipt: TransactionReceipt, - contract: Contract, - eventName: string, - argumentName: string, -): any { - // eslint-disable-next-line - for (const log of transactionReceipt.logs || []) { - if (!isSameAddress(log.address, contract.address)) { - continue - } - const event = contract.interface.parseLog(log) - // eslint-disable-next-line - if (event && event.name === eventName) { - return event.args[argumentName] - } - } - throw new Error( - `Event ${eventName} from contract ${contract.address} not found in transaction ${transactionReceipt.transactionHash}`, - ) -} - export async function isTransactionMined(hash: string): Promise { const receipt = await provider.getTransactionReceipt(hash) return !!receipt } + +export { getEventArg } diff --git a/vue-app/src/views/AboutMaci.vue b/vue-app/src/views/AboutMaci.vue index af12e822b..6e4b4b773 100644 --- a/vue-app/src/views/AboutMaci.vue +++ b/vue-app/src/views/AboutMaci.vue @@ -82,7 +82,7 @@

{{ $t('maci.helps.how.p3_t1') }} - {{ + {{ $t('maci.helps.how.p3_link') }}

@@ -108,7 +108,7 @@

- {{ $t('maci.helps.how.link') }} + {{ $t('maci.helps.how.link') }}

{{ $t('maci.constraints.h3') }}

@@ -127,15 +127,13 @@

{{ $t('maci.more.h3_1') }}

  • - {{ $t('maci.more.l1') }} + {{ $t('maci.more.l1') }}
  • - {{ $t('maci.more.l2') }} + {{ $t('maci.more.l2') }}
  • - {{ - $t('maci.more.l3') - }} + {{ $t('maci.more.l3') }}

{{ $t('maci.more.h3_2') }}

diff --git a/vue-app/src/views/AboutQuadraticFunding.vue b/vue-app/src/views/AboutQuadraticFunding.vue index f536b1047..d78d93319 100644 --- a/vue-app/src/views/AboutQuadraticFunding.vue +++ b/vue-app/src/views/AboutQuadraticFunding.vue @@ -79,7 +79,7 @@

{{ $t('quadratic_funding.resources.h2') }}

  • - {{ + {{ $t('quadratic_funding.resources.li1') }}
    • diff --git a/vue-app/src/views/JoinLanding.vue b/vue-app/src/views/JoinLanding.vue index 1ef67a06c..e93d648c5 100644 --- a/vue-app/src/views/JoinLanding.vue +++ b/vue-app/src/views/JoinLanding.vue @@ -150,7 +150,6 @@ diff --git a/vue-app/src/views/Verify.vue b/vue-app/src/views/Verify.vue index 4cf278baa..c3ea80179 100644 --- a/vue-app/src/views/Verify.vue +++ b/vue-app/src/views/Verify.vue @@ -335,7 +335,7 @@ async function selfSponsorAndWait() { return } - const signer = userStore.signer + const signer = await userStore.getSigner() loadingTx.value = true sponsorTxError.value = '' @@ -350,7 +350,7 @@ async function selfSponsorAndWait() { } async function register() { - const signer = userStore.signer + const signer = await userStore.getSigner() if (isBrightIdRequired && !brightId.value?.verification) { return diff --git a/vue-app/src/views/VerifyLanding.vue b/vue-app/src/views/VerifyLanding.vue index 9c00f9652..58b97f274 100644 --- a/vue-app/src/views/VerifyLanding.vue +++ b/vue-app/src/views/VerifyLanding.vue @@ -133,7 +133,7 @@ function translateDate(date: DateTime): string { }) } -async function promptSignagure() { +async function promptSignature() { const { open, close } = useModal({ component: SignatureModal, attrs: { @@ -152,7 +152,7 @@ function handleButtonClicked() { if (currentUser.value.encryptionKey) { gotoVerify() } else { - promptSignagure() + promptSignature() } } diff --git a/vue-app/vite.config.ts b/vue-app/vite.config.ts index 0deac1e96..42f47d116 100644 --- a/vue-app/vite.config.ts +++ b/vue-app/vite.config.ts @@ -1,15 +1,17 @@ import { defineConfig } from 'vite' import vue from '@vitejs/plugin-vue' -import path from 'path' -import nodeStdlibBrowser from 'node-stdlib-browser' +import * as path from 'path' +import { nodePolyfills } from 'vite-plugin-node-polyfills' import AutoImport from 'unplugin-auto-import/vite' import Components from 'unplugin-vue-components/vite' -import inject from '@rollup/plugin-inject' import VueI18nPlugin from '@intlify/unplugin-vue-i18n/vite' // https://vitejs.dev/config/ export default defineConfig({ base: '', + define: { + __VUE_PROD_HYDRATION_MISMATCH_DETAILS__: true, + }, plugins: [ vue(), // https://github.com/antfu/unplugin-auto-import#configuration @@ -28,15 +30,20 @@ export default defineConfig({ // https://stackoverflow.com/questions/75315371/vue-i18n-not-substituting-tokens-in-production-build runtimeOnly: false, }), + nodePolyfills({ + globals: { + Buffer: true, // can also be 'build', 'dev', or false + global: true, + process: true, + }, + }), ], resolve: { - alias: { '@': path.resolve(__dirname, 'src'), ...nodeStdlibBrowser }, + alias: { '@': path.resolve(__dirname, 'src') }, }, optimizeDeps: { - include: ['@clrfund/maci-utils'], esbuildOptions: { - target: 'esnext', // to enable nable Big integer literals - inject: [require.resolve('node-stdlib-browser/helpers/esbuild/shim')], + target: 'esnext', // to enable Big integer literals }, }, build: { @@ -48,17 +55,10 @@ export default defineConfig({ 'google-spreadsheet': ['google-spreadsheet'], '@kleros/gtcr-encoder': ['@kleros/gtcr-encoder'], '@vuelidate': ['@vuelidate/core', '@vuelidate/validators'], - maci: ['@clrfund/maci-utils'], + common: ['@clrfund/common'], qrcode: ['qrcode'], }, }, - plugins: [ - inject({ - global: [require.resolve('node-stdlib-browser/helpers/esbuild/shim'), 'global'], - process: [require.resolve('node-stdlib-browser/helpers/esbuild/shim'), 'process'], - Buffer: [require.resolve('node-stdlib-browser/helpers/esbuild/shim'), 'Buffer'], - }), - ], }, }, }) diff --git a/yarn.lock b/yarn.lock index 52719d836..86e13a1f9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,6 +2,26 @@ # yarn lockfile v1 +"@aashutoshrathi/word-wrap@^1.2.3": + version "1.2.6" + resolved "https://registry.yarnpkg.com/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz#bd9154aec9983f77b3a034ecaa015c2e4201f6cf" + integrity sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA== + +"@adraffy/ens-normalize@1.10.0": + version "1.10.0" + resolved "https://registry.yarnpkg.com/@adraffy/ens-normalize/-/ens-normalize-1.10.0.tgz#d2a39395c587e092d77cbbc80acf956a54f38bf7" + integrity sha512-nA9XHtlAkYfJxY7bce8DcN7eKxWWCWkU+1GR9d+U6MbNpfwQp8TI7vqOsBsMcHoT4mBu2kypKoSKnghEzOOq5Q== + +"@adraffy/ens-normalize@1.10.1": + version "1.10.1" + resolved "https://registry.yarnpkg.com/@adraffy/ens-normalize/-/ens-normalize-1.10.1.tgz#63430d04bd8c5e74f8d7d049338f1cd9d4f02069" + integrity sha512-96Z2IP3mYmF1Xg2cDm8f1gWGf/HUVedQ3FMifV4kG/PQ4yEP51xDtRAEfhVNt5f/uzpNkZHwWQuUcu6D6K+Ekw== + +"@alloc/quick-lru@^5.2.0": + version "5.2.0" + resolved "https://registry.yarnpkg.com/@alloc/quick-lru/-/quick-lru-5.2.0.tgz#7bf68b20c0a350f936915fcae06f58e32007ce30" + integrity sha512-UrcABB+4bUrFABwbluTIBErXwvbsU/V7TZWfmbgJfbkwiBuziS9gxdODUyuiecfdGQ85jglMW6juS3+z5TsKLw== + "@ampproject/remapping@^2.2.0": version "2.2.1" resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.2.1.tgz#99e8e11851128b8702cd57c33684f1d0f260b630" @@ -11,9 +31,9 @@ "@jridgewell/trace-mapping" "^0.3.9" "@antfu/utils@^0.7.0", "@antfu/utils@^0.7.2": - version "0.7.2" - resolved "https://registry.yarnpkg.com/@antfu/utils/-/utils-0.7.2.tgz#3bb6f37a6b188056fe9e2f363b6aa735ed65d7ca" - integrity sha512-vy9fM3pIxZmX07dL+VX1aZe7ynZ+YyB0jY+jE6r3hOK6GNY2t6W8rzpFC4tgpbXUYABkFQwgJq2XYXlxbXAI0g== + version "0.7.7" + resolved "https://registry.yarnpkg.com/@antfu/utils/-/utils-0.7.7.tgz#26ea493a831b4f3a85475e7157be02fb4eab51fb" + integrity sha512-gFPqTG7otEJ8uP6wrhDv6mqwGWYZKNvAcCq6u9hOj0c+IKCEsY4L1oC9trPq2SaWIzAfHvqfBDxF591JkMf+kg== "@ardatan/relay-compiler@12.0.0": version "12.0.0" @@ -45,418 +65,209 @@ dependencies: node-fetch "^2.6.1" -"@babel/code-frame@^7.0.0", "@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== +"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.16.0", "@babel/code-frame@^7.22.13", "@babel/code-frame@^7.23.5": + version "7.23.5" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.23.5.tgz#9009b69a8c602293476ad598ff53e4562e15c244" + integrity sha512-CgH3s1a96LipHCmSUmYFPwY7MNx8C3avkq7i4Wl3cfa662ldtUe4VM1TPXX70pfmrlWTb6jLqTYrZyT2ZTJBgA== dependencies: - "@babel/highlight" "^7.18.6" - -"@babel/compat-data@^7.17.7", "@babel/compat-data@^7.20.5", "@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/highlight" "^7.23.4" + chalk "^2.4.2" -"@babel/compat-data@^7.21.5": - version "7.21.7" - resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.21.7.tgz#61caffb60776e49a57ba61a88f02bedd8714f6bc" - integrity sha512-KYMqFYTaenzMK4yUtf4EW9wc4N9ef80FsbMtkwool5zpwl4YrT1SdWYSTRcT94KO4hannogdS+LxY7L+arP3gA== - -"@babel/core@^7.10.4": - version "7.21.8" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.21.8.tgz#2a8c7f0f53d60100ba4c32470ba0281c92aa9aa4" - integrity sha512-YeM22Sondbo523Sz0+CirSPnbj9bG3P0CdHcBZdqUuaeOaYEFbOLoGU7lebvGP6P5J/WE9wOn7u7C4J9HvS1xQ== - dependencies: - "@ampproject/remapping" "^2.2.0" - "@babel/code-frame" "^7.21.4" - "@babel/generator" "^7.21.5" - "@babel/helper-compilation-targets" "^7.21.5" - "@babel/helper-module-transforms" "^7.21.5" - "@babel/helpers" "^7.21.5" - "@babel/parser" "^7.21.8" - "@babel/template" "^7.20.7" - "@babel/traverse" "^7.21.5" - "@babel/types" "^7.21.5" - 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/compat-data@^7.20.5", "@babel/compat-data@^7.23.5": + version "7.23.5" + resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.23.5.tgz#ffb878728bb6bdcb6f4510aa51b1be9afb8cfd98" + integrity sha512-uU27kfDRlhfKl+w1U6vp16IuvSLtjAxdArVXPa9BvLkrr7CYIsxH5adpHObeAGY/41+syctUWOZ140a2Rvkgjw== "@babel/core@^7.14.0": - version "7.21.4" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.21.4.tgz#c6dc73242507b8e2a27fd13a9c1814f9fa34a659" - integrity sha512-qt/YV149Jman/6AfmlxJ04LMIu8bMoyl3RB91yTFrxQmgbrSvQMy7cI8Q62FHx1t8wJ8B5fu0UDoLwHAhUo1QA== + version "7.23.7" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.23.7.tgz#4d8016e06a14b5f92530a13ed0561730b5c6483f" + integrity sha512-+UpDgowcmqe36d4NwqvKsyPMlOLNGMsfMmQ5WGCu+siCe3t3dfe9njrzGfdN4qq+bcNUt0+Vw6haRxBOycs4dw== 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" + "@babel/code-frame" "^7.23.5" + "@babel/generator" "^7.23.6" + "@babel/helper-compilation-targets" "^7.23.6" + "@babel/helper-module-transforms" "^7.23.3" + "@babel/helpers" "^7.23.7" + "@babel/parser" "^7.23.6" + "@babel/template" "^7.22.15" + "@babel/traverse" "^7.23.7" + "@babel/types" "^7.23.6" + convert-source-map "^2.0.0" debug "^4.1.0" gensync "^1.0.0-beta.2" - json5 "^2.2.2" - semver "^6.3.0" - -"@babel/generator@^7.14.0", "@babel/generator@^7.18.13", "@babel/generator@^7.21.4": - version "7.21.4" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.21.4.tgz#64a94b7448989f421f919d5239ef553b37bb26bc" - integrity sha512-NieM3pVIYW2SwGzKoqfPrQsf4xGs9M9AIG3ThppsSRmO+m7eQhmI6amajKMUeIO37wFfsvnvcxQFx6x6iqxDnA== - dependencies: - "@babel/types" "^7.21.4" - "@jridgewell/gen-mapping" "^0.3.2" - "@jridgewell/trace-mapping" "^0.3.17" - jsesc "^2.5.1" + json5 "^2.2.3" + semver "^6.3.1" -"@babel/generator@^7.21.5": - version "7.21.5" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.21.5.tgz#c0c0e5449504c7b7de8236d99338c3e2a340745f" - integrity sha512-SrKK/sRv8GesIW1bDagf9cCG38IOMYZusoe1dfg0D8aiUe3Amvoj1QtjTPAWcfrZFvIwlleLb0gxzQidL9w14w== +"@babel/generator@^7.14.0", "@babel/generator@^7.18.13", "@babel/generator@^7.23.6": + version "7.23.6" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.23.6.tgz#9e1fca4811c77a10580d17d26b57b036133f3c2e" + integrity sha512-qrSfCYxYQB5owCmGLbl8XRpX1ytXlpueOb0N0UmQwA073KZxejgQTzAmJezxvpwQD9uGtK2shHdi55QT+MbjIw== dependencies: - "@babel/types" "^7.21.5" + "@babel/types" "^7.23.6" "@jridgewell/gen-mapping" "^0.3.2" "@jridgewell/trace-mapping" "^0.3.17" jsesc "^2.5.1" -"@babel/helper-annotate-as-pure@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.18.6.tgz#eaa49f6f80d5a33f9a5dd2276e6d6e451be0a6bb" - integrity sha512-duORpUiYrEpzKIop6iNbjnwKLAKnJ47csTyRACyEmWj0QdUrm5aqNJGHSSEQSUAvNW0ojX0dOmK9dZduvkfeXA== - dependencies: - "@babel/types" "^7.18.6" - -"@babel/helper-builder-binary-assignment-operator-visitor@^7.18.6": - version "7.21.5" - resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.21.5.tgz#817f73b6c59726ab39f6ba18c234268a519e5abb" - integrity sha512-uNrjKztPLkUk7bpCNC0jEKDJzzkvel/W+HguzbN8krA+LPfC1CEobJEvAvGka2A/M+ViOqXdcRL0GqPUJSjx9g== +"@babel/helper-annotate-as-pure@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.22.5.tgz#e7f06737b197d580a01edf75d97e2c8be99d3882" + integrity sha512-LvBTxu8bQSQkcyKOU+a1btnNFQ1dMAd0R6PyW3arXes06F6QLWLIrd681bxRPIXlrMGR3XYnW9JyML7dP3qgxg== dependencies: - "@babel/types" "^7.21.5" + "@babel/types" "^7.22.5" -"@babel/helper-compilation-targets@^7.17.7", "@babel/helper-compilation-targets@^7.18.9", "@babel/helper-compilation-targets@^7.20.7", "@babel/helper-compilation-targets@^7.21.4": - version "7.21.4" - resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.21.4.tgz#770cd1ce0889097ceacb99418ee6934ef0572656" - integrity sha512-Fa0tTuOXZ1iL8IeDFUWCzjZcn+sJGd9RZdH9esYVjEejGmzf+FFYQpMi/kZUk2kPy/q1H3/GPw7np8qar/stfg== +"@babel/helper-compilation-targets@^7.20.7", "@babel/helper-compilation-targets@^7.22.15", "@babel/helper-compilation-targets@^7.23.6": + version "7.23.6" + resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.23.6.tgz#4d79069b16cbcf1461289eccfbbd81501ae39991" + integrity sha512-9JB548GZoQVmzrFgp8o7KxdgkTGm6xs9DW0o/Pim72UDjzr5ObUQ6ZzYPqA+g9OTS2bBQoctLJrky0RDCAWRgQ== dependencies: - "@babel/compat-data" "^7.21.4" - "@babel/helper-validator-option" "^7.21.0" - browserslist "^4.21.3" + "@babel/compat-data" "^7.23.5" + "@babel/helper-validator-option" "^7.23.5" + browserslist "^4.22.2" lru-cache "^5.1.1" - semver "^6.3.0" - -"@babel/helper-compilation-targets@^7.21.5": - version "7.21.5" - resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.21.5.tgz#631e6cc784c7b660417421349aac304c94115366" - integrity sha512-1RkbFGUKex4lvsB9yhIfWltJM5cZKUftB2eNajaDv3dCMEp49iBG0K14uH8NnX9IPux2+mK7JGEOB0jn48/J6w== - dependencies: - "@babel/compat-data" "^7.21.5" - "@babel/helper-validator-option" "^7.21.0" - browserslist "^4.21.3" - lru-cache "^5.1.1" - semver "^6.3.0" + semver "^6.3.1" "@babel/helper-create-class-features-plugin@^7.18.6": - version "7.21.4" - resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.21.4.tgz#3a017163dc3c2ba7deb9a7950849a9586ea24c18" - integrity sha512-46QrX2CQlaFRF4TkwfTt6nJD7IHq8539cCL7SDpqWSDeJKY1xylKKY5F/33mJhLZ3mFvKv2gGrVS6NkyF6qs+Q== - dependencies: - "@babel/helper-annotate-as-pure" "^7.18.6" - "@babel/helper-environment-visitor" "^7.18.9" - "@babel/helper-function-name" "^7.21.0" - "@babel/helper-member-expression-to-functions" "^7.21.0" - "@babel/helper-optimise-call-expression" "^7.18.6" - "@babel/helper-replace-supers" "^7.20.7" - "@babel/helper-skip-transparent-expression-wrappers" "^7.20.0" - "@babel/helper-split-export-declaration" "^7.18.6" - -"@babel/helper-create-class-features-plugin@^7.21.0": - version "7.21.8" - resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.21.8.tgz#205b26330258625ef8869672ebca1e0dee5a0f02" - integrity sha512-+THiN8MqiH2AczyuZrnrKL6cAxFRRQDKW9h1YkBvbgKmAm6mwiacig1qT73DHIWMGo40GRnsEfN3LA+E6NtmSw== - dependencies: - "@babel/helper-annotate-as-pure" "^7.18.6" - "@babel/helper-environment-visitor" "^7.21.5" - "@babel/helper-function-name" "^7.21.0" - "@babel/helper-member-expression-to-functions" "^7.21.5" - "@babel/helper-optimise-call-expression" "^7.18.6" - "@babel/helper-replace-supers" "^7.21.5" - "@babel/helper-skip-transparent-expression-wrappers" "^7.20.0" - "@babel/helper-split-export-declaration" "^7.18.6" - semver "^6.3.0" - -"@babel/helper-create-regexp-features-plugin@^7.18.6", "@babel/helper-create-regexp-features-plugin@^7.20.5": - version "7.21.8" - resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.21.8.tgz#a7886f61c2e29e21fd4aaeaf1e473deba6b571dc" - integrity sha512-zGuSdedkFtsFHGbexAvNuipg1hbtitDLo2XE8/uf6Y9sOQV1xsYX/2pNbtedp/X0eU1pIt+kGvaqHCowkRbS5g== - dependencies: - "@babel/helper-annotate-as-pure" "^7.18.6" - regexpu-core "^5.3.1" - semver "^6.3.0" - -"@babel/helper-define-polyfill-provider@^0.3.3": - version "0.3.3" - resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.3.tgz#8612e55be5d51f0cd1f36b4a5a83924e89884b7a" - integrity sha512-z5aQKU4IzbqCC1XH0nAqfsFLMVSo22SBKUc0BxGrLkolTdPTructy0ToNnlO2zA4j9Q/7pjMZf0DSY+DSTYzww== - dependencies: - "@babel/helper-compilation-targets" "^7.17.7" - "@babel/helper-plugin-utils" "^7.16.7" - debug "^4.1.1" - lodash.debounce "^4.0.8" - resolve "^1.14.2" - semver "^6.1.2" - -"@babel/helper-environment-visitor@^7.18.9": - version "7.18.9" - resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz#0c0cee9b35d2ca190478756865bb3528422f51be" - integrity sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg== - -"@babel/helper-environment-visitor@^7.21.5": - version "7.21.5" - resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.21.5.tgz#c769afefd41d171836f7cb63e295bedf689d48ba" - integrity sha512-IYl4gZ3ETsWocUWgsFZLM5i1BYx9SoemminVEXadgLBa9TdeorzgLKm8wWLA6J1N/kT3Kch8XIk1laNzYoHKvQ== - -"@babel/helper-function-name@^7.18.9", "@babel/helper-function-name@^7.19.0", "@babel/helper-function-name@^7.21.0": - version "7.21.0" - resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.21.0.tgz#d552829b10ea9f120969304023cd0645fa00b1b4" - integrity sha512-HfK1aMRanKHpxemaY2gqBmL04iAPOPRj7DxtNbiDOrJK+gdwkiNRVpCpUJYbUT+aZyemKN8brqTOxzCaG6ExRg== - dependencies: - "@babel/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-member-expression-to-functions@^7.20.7", "@babel/helper-member-expression-to-functions@^7.21.0": - version "7.21.0" - resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.21.0.tgz#319c6a940431a133897148515877d2f3269c3ba5" - integrity sha512-Muu8cdZwNN6mRRNG6lAYErJ5X3bRevgYR2O8wN0yn7jJSnGDu6eG59RfT29JHxGUovyfrh6Pj0XzmR7drNVL3Q== - dependencies: - "@babel/types" "^7.21.0" - -"@babel/helper-member-expression-to-functions@^7.21.5": - version "7.21.5" - resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.21.5.tgz#3b1a009af932e586af77c1030fba9ee0bde396c0" - integrity sha512-nIcGfgwpH2u4n9GG1HpStW5Ogx7x7ekiFHbjjFRKXbn5zUvqO9ZgotCO4x1aNbKn/x/xOUaXEhyNHCwtFCpxWg== - dependencies: - "@babel/types" "^7.21.5" - -"@babel/helper-module-imports@^7.18.6", "@babel/helper-module-imports@^7.21.4": - version "7.21.4" - resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.21.4.tgz#ac88b2f76093637489e718a90cec6cf8a9b029af" - integrity sha512-orajc5T2PsRYUN3ZryCEFeMDYwyw09c/pZeaQEZPH0MpKzSvn3e0uXsDBu3k03VI+9DBiRo+l22BfKTpKwa/Wg== - dependencies: - "@babel/types" "^7.21.4" - -"@babel/helper-module-transforms@^7.18.6", "@babel/helper-module-transforms@^7.20.11", "@babel/helper-module-transforms@^7.21.5": - version "7.21.5" - resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.21.5.tgz#d937c82e9af68d31ab49039136a222b17ac0b420" - integrity sha512-bI2Z9zBGY2q5yMHoBvJ2a9iX3ZOAzJPm7Q8Yz6YeoUjU/Cvhmi2G4QyTNyPBqqXSgTjUxRg3L0xV45HvkNWWBw== - dependencies: - "@babel/helper-environment-visitor" "^7.21.5" - "@babel/helper-module-imports" "^7.21.4" - "@babel/helper-simple-access" "^7.21.5" - "@babel/helper-split-export-declaration" "^7.18.6" - "@babel/helper-validator-identifier" "^7.19.1" - "@babel/template" "^7.20.7" - "@babel/traverse" "^7.21.5" - "@babel/types" "^7.21.5" - -"@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-optimise-call-expression@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.18.6.tgz#9369aa943ee7da47edab2cb4e838acf09d290ffe" - integrity sha512-HP59oD9/fEHQkdcbgFCnbmgH5vIQTJbxh2yf+CdM89/glUNnuzr87Q8GIjGEnOktTROemO0Pe0iPAYbqZuOUiA== + version "7.23.7" + resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.23.7.tgz#b2e6826e0e20d337143655198b79d58fdc9bd43d" + integrity sha512-xCoqR/8+BoNnXOY7RVSgv6X+o7pmT5q1d+gGcRlXYkI+9B31glE4jeejhKVpA04O1AtzOt7OSQ6VYKP5FcRl9g== + dependencies: + "@babel/helper-annotate-as-pure" "^7.22.5" + "@babel/helper-environment-visitor" "^7.22.20" + "@babel/helper-function-name" "^7.23.0" + "@babel/helper-member-expression-to-functions" "^7.23.0" + "@babel/helper-optimise-call-expression" "^7.22.5" + "@babel/helper-replace-supers" "^7.22.20" + "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5" + "@babel/helper-split-export-declaration" "^7.22.6" + semver "^6.3.1" + +"@babel/helper-environment-visitor@^7.22.20": + version "7.22.20" + resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz#96159db61d34a29dba454c959f5ae4a649ba9167" + integrity sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA== + +"@babel/helper-function-name@^7.23.0": + version "7.23.0" + resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz#1f9a3cdbd5b2698a670c30d2735f9af95ed52759" + integrity sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw== + dependencies: + "@babel/template" "^7.22.15" + "@babel/types" "^7.23.0" + +"@babel/helper-hoist-variables@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz#c01a007dac05c085914e8fb652b339db50d823bb" + integrity sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw== + dependencies: + "@babel/types" "^7.22.5" + +"@babel/helper-member-expression-to-functions@^7.22.15", "@babel/helper-member-expression-to-functions@^7.23.0": + version "7.23.0" + resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.23.0.tgz#9263e88cc5e41d39ec18c9a3e0eced59a3e7d366" + integrity sha512-6gfrPwh7OuT6gZyJZvd6WbTfrqAo7vm4xCzAXOusKqq/vWdKXphTpj5klHKNmRUU6/QRGlBsyU9mAIPaWHlqJA== + dependencies: + "@babel/types" "^7.23.0" + +"@babel/helper-module-imports@^7.22.15": + version "7.22.15" + resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.22.15.tgz#16146307acdc40cc00c3b2c647713076464bdbf0" + integrity sha512-0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w== + dependencies: + "@babel/types" "^7.22.15" + +"@babel/helper-module-transforms@^7.23.3": + version "7.23.3" + resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.23.3.tgz#d7d12c3c5d30af5b3c0fcab2a6d5217773e2d0f1" + integrity sha512-7bBs4ED9OmswdfDzpz4MpWgSrV7FXlc3zIagvLFjS5H+Mk7Snr21vQ6QwrsoCGMfNC4e4LQPdoULEt4ykz0SRQ== + dependencies: + "@babel/helper-environment-visitor" "^7.22.20" + "@babel/helper-module-imports" "^7.22.15" + "@babel/helper-simple-access" "^7.22.5" + "@babel/helper-split-export-declaration" "^7.22.6" + "@babel/helper-validator-identifier" "^7.22.20" + +"@babel/helper-optimise-call-expression@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.22.5.tgz#f21531a9ccbff644fdd156b4077c16ff0c3f609e" + integrity sha512-HBwaojN0xFRx4yIvpwGqxiV2tUfl7401jlok564NgB9EHS1y6QT17FmKWm4ztqjeVdXLuC4fSvHc5ePpQjoTbw== + dependencies: + "@babel/types" "^7.22.5" + +"@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.20.2", "@babel/helper-plugin-utils@^7.22.5", "@babel/helper-plugin-utils@^7.8.0": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.22.5.tgz#dd7ee3735e8a313b9f7b05a773d892e88e6d7295" + integrity sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg== + +"@babel/helper-replace-supers@^7.22.20": + version "7.22.20" + resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.22.20.tgz#e37d367123ca98fe455a9887734ed2e16eb7a793" + integrity sha512-qsW0In3dbwQUbK8kejJ4R7IHVGwHJlV6lpG6UA7a9hSa2YEiAib+N1T2kr6PEeUT+Fl7najmSOS6SmAwCHK6Tw== + dependencies: + "@babel/helper-environment-visitor" "^7.22.20" + "@babel/helper-member-expression-to-functions" "^7.22.15" + "@babel/helper-optimise-call-expression" "^7.22.5" + +"@babel/helper-simple-access@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz#4938357dc7d782b80ed6dbb03a0fba3d22b1d5de" + integrity sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w== + dependencies: + "@babel/types" "^7.22.5" + +"@babel/helper-skip-transparent-expression-wrappers@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.22.5.tgz#007f15240b5751c537c40e77abb4e89eeaaa8847" + integrity sha512-tK14r66JZKiC43p8Ki33yLBVJKlQDFoA8GYN67lWCDCqoL6EMMSuM9b+Iff2jHaM/RRFYl7K+iiru7hbRqNx8Q== + dependencies: + "@babel/types" "^7.22.5" + +"@babel/helper-split-export-declaration@^7.22.6": + version "7.22.6" + resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz#322c61b7310c0997fe4c323955667f18fcefb91c" + integrity sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g== + dependencies: + "@babel/types" "^7.22.5" + +"@babel/helper-string-parser@^7.23.4": + version "7.23.4" + resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.23.4.tgz#9478c707febcbbe1ddb38a3d91a2e054ae622d83" + integrity sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ== + +"@babel/helper-validator-identifier@^7.22.20": + version "7.22.20" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz#c4ae002c61d2879e724581d96665583dbc1dc0e0" + integrity sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A== + +"@babel/helper-validator-option@^7.23.5": + version "7.23.5" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.23.5.tgz#907a3fbd4523426285365d1206c423c4c5520307" + integrity sha512-85ttAOMLsr53VgXkTbkx8oA6YTfT4q7/HzXSLEYmjcSTJPMPQtvq1BD79Byep5xMUYbGRzEpDsjUf3dyp54IKw== + +"@babel/helpers@^7.23.7": + version "7.23.8" + resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.23.8.tgz#fc6b2d65b16847fd50adddbd4232c76378959e34" + integrity sha512-KDqYz4PiOWvDFrdHLPhKtCThtIcKVy6avWD2oG4GEvyQ+XDZwHD4YQd+H2vNMnq2rkdxsDkU82T+Vk8U/WXHRQ== dependencies: - "@babel/types" "^7.18.6" - -"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.21.5", "@babel/helper-plugin-utils@^7.8.3": - version "7.21.5" - resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.21.5.tgz#345f2377d05a720a4e5ecfa39cbf4474a4daed56" - integrity sha512-0WDaIlXKOX/3KfBK/dwP1oQGiPh6rjMkT7HIRv7i5RR2VUMwrx5ZL0dwBkKx7+SW1zwNdgjHd34IMk5ZjTeHVg== - -"@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.16.7", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.18.9", "@babel/helper-plugin-utils@^7.19.0", "@babel/helper-plugin-utils@^7.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-remap-async-to-generator@^7.18.9": - version "7.18.9" - resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.18.9.tgz#997458a0e3357080e54e1d79ec347f8a8cd28519" - integrity sha512-dI7q50YKd8BAv3VEfgg7PS7yD3Rtbi2J1XMXaalXO0W0164hYLnh8zpjRS0mte9MfVp/tltvr/cfdXPvJr1opA== - dependencies: - "@babel/helper-annotate-as-pure" "^7.18.6" - "@babel/helper-environment-visitor" "^7.18.9" - "@babel/helper-wrap-function" "^7.18.9" - "@babel/types" "^7.18.9" - -"@babel/helper-replace-supers@^7.18.6", "@babel/helper-replace-supers@^7.20.7": - version "7.20.7" - resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.20.7.tgz#243ecd2724d2071532b2c8ad2f0f9f083bcae331" - integrity sha512-vujDMtB6LVfNW13jhlCrp48QNslK6JXi7lQG736HVbHz/mbf4Dc7tIRh1Xf5C0rF7BP8iiSxGMCmY6Ci1ven3A== - dependencies: - "@babel/helper-environment-visitor" "^7.18.9" - "@babel/helper-member-expression-to-functions" "^7.20.7" - "@babel/helper-optimise-call-expression" "^7.18.6" - "@babel/template" "^7.20.7" - "@babel/traverse" "^7.20.7" - "@babel/types" "^7.20.7" - -"@babel/helper-replace-supers@^7.21.5": - version "7.21.5" - resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.21.5.tgz#a6ad005ba1c7d9bc2973dfde05a1bba7065dde3c" - integrity sha512-/y7vBgsr9Idu4M6MprbOVUfH3vs7tsIfnVWv/Ml2xgwvyH6LTngdfbf5AdsKwkJy4zgy1X/kuNrEKvhhK28Yrg== - dependencies: - "@babel/helper-environment-visitor" "^7.21.5" - "@babel/helper-member-expression-to-functions" "^7.21.5" - "@babel/helper-optimise-call-expression" "^7.18.6" - "@babel/template" "^7.20.7" - "@babel/traverse" "^7.21.5" - "@babel/types" "^7.21.5" - -"@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-simple-access@^7.21.5": - version "7.21.5" - resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.21.5.tgz#d697a7971a5c39eac32c7e63c0921c06c8a249ee" - integrity sha512-ENPDAMC1wAjR0uaCUwliBdiSl1KBJAVnMTzXqi64c2MG8MPR6ii4qf7bSXDqSFbr4W6W028/rf5ivoHop5/mkg== - dependencies: - "@babel/types" "^7.21.5" - -"@babel/helper-skip-transparent-expression-wrappers@^7.20.0": - version "7.20.0" - resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.20.0.tgz#fbe4c52f60518cab8140d77101f0e63a8a230684" - integrity sha512-5y1JYeNKfvnT8sZcK9DVRtpTbGiomYIHviSP3OQWmDPU3DeH4a1ZlT/N2lyQ5P8egjcRaT/Y9aNqUxK0WsnIIg== - dependencies: - "@babel/types" "^7.20.0" - -"@babel/helper-split-export-declaration@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz#7367949bc75b20c6d5a5d4a97bba2824ae8ef075" - 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-string-parser@^7.21.5": - version "7.21.5" - resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.21.5.tgz#2b3eea65443c6bdc31c22d037c65f6d323b6b2bd" - integrity sha512-5pTUx3hAJaZIdW99sJ6ZUUgWq/Y+Hja7TowEnLNMm1VivRgZQL3vpBY3qUACVsvw+yQU6+YgfBVmcbLaZtrA1w== - -"@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/helper-wrap-function@^7.18.9": - version "7.20.5" - resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.20.5.tgz#75e2d84d499a0ab3b31c33bcfe59d6b8a45f62e3" - integrity sha512-bYMxIWK5mh+TgXGVqAtnu5Yn1un+v8DDZtqyzKRLUzrh70Eal2O3aZ7aPYiMADO4uKlkzOiRiZ6GX5q3qxvW9Q== - dependencies: - "@babel/helper-function-name" "^7.19.0" - "@babel/template" "^7.18.10" - "@babel/traverse" "^7.20.5" - "@babel/types" "^7.20.5" + "@babel/template" "^7.22.15" + "@babel/traverse" "^7.23.7" + "@babel/types" "^7.23.6" -"@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== +"@babel/highlight@^7.23.4": + version "7.23.4" + resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.23.4.tgz#edaadf4d8232e1a961432db785091207ead0621b" + integrity sha512-acGdbYSfp2WheJoJm/EBBBLh/ID8KDc64ISZ9DYtBmC8/Q204PZJLHyzeB5qMzJ5trcOkybd78M4x2KWsUq++A== dependencies: - "@babel/template" "^7.20.7" - "@babel/traverse" "^7.21.0" - "@babel/types" "^7.21.0" - -"@babel/helpers@^7.21.5": - version "7.21.5" - resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.21.5.tgz#5bac66e084d7a4d2d9696bdf0175a93f7fb63c08" - integrity sha512-BSY+JSlHxOmGsPTydUkPf1MdMQ3M81x5xGCOVgWM3G8XH77sJ292Y2oqcp0CbbgxhqBuI46iUz1tT7hqP7EfgA== - dependencies: - "@babel/template" "^7.20.7" - "@babel/traverse" "^7.21.5" - "@babel/types" "^7.21.5" - -"@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" + "@babel/helper-validator-identifier" "^7.22.20" + chalk "^2.4.2" js-tokens "^4.0.0" -"@babel/parser@^7.14.0", "@babel/parser@^7.16.4", "@babel/parser@^7.16.8", "@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/parser@^7.21.5", "@babel/parser@^7.21.8": - version "7.21.8" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.21.8.tgz#642af7d0333eab9c0ad70b14ac5e76dbde7bfdf8" - integrity sha512-6zavDGdzG3gUqAdWvlLFfk+36RilI+Pwyuuh7HItyeScCWP3k6i8vKclAQ0bM/0y/Kz/xiwvxhMv9MgTJP5gmA== +"@babel/parser@^7.14.0", "@babel/parser@^7.16.8", "@babel/parser@^7.21.8", "@babel/parser@^7.22.15", "@babel/parser@^7.22.5", "@babel/parser@^7.23.6": + version "7.23.6" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.23.6.tgz#ba1c9e512bda72a47e285ae42aff9d2a635a9e3b" + integrity sha512-Z2uID7YJ7oNvAI20O9X0bblw7Qqs8Q2hFy0R9tAfnfLkp5MW0UH9eUvnDSnFwKZ0AvgS1ucqR4KzvVHgnke1VQ== -"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6.tgz#da5b8f9a580acdfbe53494dba45ea389fb09a4d2" - integrity sha512-Dgxsyg54Fx1d4Nge8UnvTrED63vrwOdPmyvPzlNN/boaliRP54pm3pGzZD1SJUwrBA+Cs/xdG8kXX6Mn/RfISQ== - dependencies: - "@babel/helper-plugin-utils" "^7.18.6" - -"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.20.7": - version "7.20.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.20.7.tgz#d9c85589258539a22a901033853101a6198d4ef1" - integrity sha512-sbr9+wNE5aXMBBFBICk01tt7sBf2Oc9ikRFEcem/ZORup9IMUdNhW7/wVLEbbtlWOsEubJet46mHAL2C8+2jKQ== - dependencies: - "@babel/helper-plugin-utils" "^7.20.2" - "@babel/helper-skip-transparent-expression-wrappers" "^7.20.0" - "@babel/plugin-proposal-optional-chaining" "^7.20.7" - -"@babel/plugin-proposal-async-generator-functions@^7.20.7": - version "7.20.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.20.7.tgz#bfb7276d2d573cb67ba379984a2334e262ba5326" - integrity sha512-xMbiLsn/8RK7Wq7VeVytytS2L6qE69bXPB10YCmMdDZbKF4okCqY74pI/jJQ/8U0b/F6NrT2+14b8/P9/3AMGA== - dependencies: - "@babel/helper-environment-visitor" "^7.18.9" - "@babel/helper-plugin-utils" "^7.20.2" - "@babel/helper-remap-async-to-generator" "^7.18.9" - "@babel/plugin-syntax-async-generators" "^7.8.4" - -"@babel/plugin-proposal-class-properties@^7.0.0", "@babel/plugin-proposal-class-properties@^7.10.4", "@babel/plugin-proposal-class-properties@^7.18.6": +"@babel/plugin-proposal-class-properties@^7.0.0": version "7.18.6" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.18.6.tgz#b110f59741895f7ec21a6fff696ec46265c446a3" integrity sha512-cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ== @@ -464,64 +275,7 @@ "@babel/helper-create-class-features-plugin" "^7.18.6" "@babel/helper-plugin-utils" "^7.18.6" -"@babel/plugin-proposal-class-static-block@^7.21.0": - version "7.21.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.21.0.tgz#77bdd66fb7b605f3a61302d224bdfacf5547977d" - integrity sha512-XP5G9MWNUskFuP30IfFSEFB0Z6HzLIUcjYM4bYOPHXl7eiJ9HFv8tWj6TXTN5QODiEhDZAeI4hLok2iHFFV4hw== - dependencies: - "@babel/helper-create-class-features-plugin" "^7.21.0" - "@babel/helper-plugin-utils" "^7.20.2" - "@babel/plugin-syntax-class-static-block" "^7.14.5" - -"@babel/plugin-proposal-dynamic-import@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.18.6.tgz#72bcf8d408799f547d759298c3c27c7e7faa4d94" - integrity sha512-1auuwmK+Rz13SJj36R+jqFPMJWyKEDd7lLSdOj4oJK0UTgGueSAtkrCvz9ewmgyU/P941Rv2fQwZJN8s6QruXw== - dependencies: - "@babel/helper-plugin-utils" "^7.18.6" - "@babel/plugin-syntax-dynamic-import" "^7.8.3" - -"@babel/plugin-proposal-export-namespace-from@^7.18.9": - version "7.18.9" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.18.9.tgz#5f7313ab348cdb19d590145f9247540e94761203" - integrity sha512-k1NtHyOMvlDDFeb9G5PhUXuGj8m/wiwojgQVEhJ/fsVsMCpLyOP4h0uGEjYJKrRI+EVPlb5Jk+Gt9P97lOGwtA== - dependencies: - "@babel/helper-plugin-utils" "^7.18.9" - "@babel/plugin-syntax-export-namespace-from" "^7.8.3" - -"@babel/plugin-proposal-json-strings@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.18.6.tgz#7e8788c1811c393aff762817e7dbf1ebd0c05f0b" - integrity sha512-lr1peyn9kOdbYc0xr0OdHTZ5FMqS6Di+H0Fz2I/JwMzGmzJETNeOFq2pBySw6X/KFL5EWDjlJuMsUGRFb8fQgQ== - dependencies: - "@babel/helper-plugin-utils" "^7.18.6" - "@babel/plugin-syntax-json-strings" "^7.8.3" - -"@babel/plugin-proposal-logical-assignment-operators@^7.20.7": - version "7.20.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.20.7.tgz#dfbcaa8f7b4d37b51e8bfb46d94a5aea2bb89d83" - integrity sha512-y7C7cZgpMIjWlKE5T7eJwp+tnRYM89HmRvWM5EQuB5BoHEONjmQ8lSNmBUwOyy/GFRsohJED51YBF79hE1djug== - dependencies: - "@babel/helper-plugin-utils" "^7.20.2" - "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4" - -"@babel/plugin-proposal-nullish-coalescing-operator@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.18.6.tgz#fdd940a99a740e577d6c753ab6fbb43fdb9467e1" - integrity sha512-wQxQzxYeJqHcfppzBDnm1yAY0jSRkUXR2z8RePZYrKwMKgMlE8+Z6LUno+bd6LvbGh8Gltvy74+9pIYkr+XkKA== - dependencies: - "@babel/helper-plugin-utils" "^7.18.6" - "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3" - -"@babel/plugin-proposal-numeric-separator@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.18.6.tgz#899b14fbafe87f053d2c5ff05b36029c62e13c75" - integrity sha512-ozlZFogPqoLm8WBr5Z8UckIoE4YQ5KESVcNudyXOR8uqIkliTEgJ3RoketfG6pmzLdeZF0H/wjE9/cCEitBl7Q== - dependencies: - "@babel/helper-plugin-utils" "^7.18.6" - "@babel/plugin-syntax-numeric-separator" "^7.10.4" - -"@babel/plugin-proposal-object-rest-spread@^7.0.0", "@babel/plugin-proposal-object-rest-spread@^7.10.4", "@babel/plugin-proposal-object-rest-spread@^7.20.7": +"@babel/plugin-proposal-object-rest-spread@^7.0.0": version "7.20.7" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.20.7.tgz#aa662940ef425779c75534a5c41e9d936edc390a" integrity sha512-d2S98yCiLxDVmBmE8UjGcfPvNEUbA1U5q5WxaWFUGRzJSVAZqm5W6MbPct0jxnegUZ0niLeNX+IOzEs7wYg9Dg== @@ -532,139 +286,33 @@ "@babel/plugin-syntax-object-rest-spread" "^7.8.3" "@babel/plugin-transform-parameters" "^7.20.7" -"@babel/plugin-proposal-optional-catch-binding@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.18.6.tgz#f9400d0e6a3ea93ba9ef70b09e72dd6da638a2cb" - integrity sha512-Q40HEhs9DJQyaZfUjjn6vE8Cv4GmMHCYuMGIWUnlxH6400VGxOuwWsPt4FxXxJkC/5eOzgn0z21M9gMT4MOhbw== - dependencies: - "@babel/helper-plugin-utils" "^7.18.6" - "@babel/plugin-syntax-optional-catch-binding" "^7.8.3" - -"@babel/plugin-proposal-optional-chaining@^7.20.7", "@babel/plugin-proposal-optional-chaining@^7.21.0": - version "7.21.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.21.0.tgz#886f5c8978deb7d30f678b2e24346b287234d3ea" - integrity sha512-p4zeefM72gpmEe2fkUr/OnOXpWEf8nAgk7ZYVqqfFiyIG7oFfVZcCrU64hWn5xp4tQ9LkV4bTIa5rD0KANpKNA== - dependencies: - "@babel/helper-plugin-utils" "^7.20.2" - "@babel/helper-skip-transparent-expression-wrappers" "^7.20.0" - "@babel/plugin-syntax-optional-chaining" "^7.8.3" - -"@babel/plugin-proposal-private-methods@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.18.6.tgz#5209de7d213457548a98436fa2882f52f4be6bea" - integrity sha512-nutsvktDItsNn4rpGItSNV2sz1XwS+nfU0Rg8aCx3W3NOKVzdMjJRu0O5OkgDp3ZGICSTbgRpxZoWsxoKRvbeA== - dependencies: - "@babel/helper-create-class-features-plugin" "^7.18.6" - "@babel/helper-plugin-utils" "^7.18.6" - -"@babel/plugin-proposal-private-property-in-object@^7.21.0": - version "7.21.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0.tgz#19496bd9883dd83c23c7d7fc45dcd9ad02dfa1dc" - integrity sha512-ha4zfehbJjc5MmXBlHec1igel5TJXXLDDRbuJ4+XT2TJcyD9/V1919BA8gMvsdHcNMBy4WBUBiRb3nw/EQUtBw== - dependencies: - "@babel/helper-annotate-as-pure" "^7.18.6" - "@babel/helper-create-class-features-plugin" "^7.21.0" - "@babel/helper-plugin-utils" "^7.20.2" - "@babel/plugin-syntax-private-property-in-object" "^7.14.5" - -"@babel/plugin-proposal-unicode-property-regex@^7.18.6", "@babel/plugin-proposal-unicode-property-regex@^7.4.4": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.18.6.tgz#af613d2cd5e643643b65cded64207b15c85cb78e" - integrity sha512-2BShG/d5yoZyXZfVePH91urL5wTG6ASZU9M4o03lKK8u8UW1y08OMttBSOADTcJrnPMpvDXRG3G8fyLh4ovs8w== - dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.18.6" - "@babel/helper-plugin-utils" "^7.18.6" - -"@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-class-properties@^7.0.0", "@babel/plugin-syntax-class-properties@^7.12.13": +"@babel/plugin-syntax-class-properties@^7.0.0": version "7.12.13" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz#b5c987274c4a3a82b89714796931a6b53544ae10" integrity sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA== dependencies: "@babel/helper-plugin-utils" "^7.12.13" -"@babel/plugin-syntax-class-static-block@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz#195df89b146b4b78b3bf897fd7a257c84659d406" - integrity sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw== - dependencies: - "@babel/helper-plugin-utils" "^7.14.5" - -"@babel/plugin-syntax-dynamic-import@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz#62bf98b2da3cd21d626154fc96ee5b3cb68eacb3" - integrity sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ== - dependencies: - "@babel/helper-plugin-utils" "^7.8.0" - -"@babel/plugin-syntax-export-namespace-from@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz#028964a9ba80dbc094c915c487ad7c4e7a66465a" - integrity sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q== - dependencies: - "@babel/helper-plugin-utils" "^7.8.3" - -"@babel/plugin-syntax-flow@^7.0.0", "@babel/plugin-syntax-flow@^7.18.6": - version "7.21.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.21.4.tgz#3e37fca4f06d93567c1cd9b75156422e90a67107" - integrity sha512-l9xd3N+XG4fZRxEP3vXdK6RW7vN1Uf5dxzRC/09wV86wqZ/YYQooBIGNsiRdfNR3/q2/5pPzV4B54J/9ctX5jw== - dependencies: - "@babel/helper-plugin-utils" "^7.20.2" - -"@babel/plugin-syntax-import-assertions@7.20.0", "@babel/plugin-syntax-import-assertions@^7.20.0": - version "7.20.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.20.0.tgz#bb50e0d4bea0957235390641209394e87bdb9cc4" - integrity sha512-IUh1vakzNoWalR8ch/areW7qFopR2AEw03JlG7BbrDqmQ4X3q9uuipQwSGrUn7oGiemKjtSLDhNtQHzMHr1JdQ== +"@babel/plugin-syntax-flow@^7.0.0", "@babel/plugin-syntax-flow@^7.23.3": + version "7.23.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.23.3.tgz#084564e0f3cc21ea6c70c44cff984a1c0509729a" + integrity sha512-YZiAIpkJAwQXBJLIQbRFayR5c+gJ35Vcz3bg954k7cd73zqjvhacJuL9RbrzPz8qPmZdgqP6EUKwy0PCNhaaPA== dependencies: - "@babel/helper-plugin-utils" "^7.19.0" + "@babel/helper-plugin-utils" "^7.22.5" -"@babel/plugin-syntax-import-meta@^7.10.4": - 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== +"@babel/plugin-syntax-import-assertions@^7.20.0": + version "7.23.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.23.3.tgz#9c05a7f592982aff1a2768260ad84bcd3f0c77fc" + integrity sha512-lPgDSU+SJLK3xmFDTV2ZRQAiM7UuUjGidwBywFavObCiZc1BeAAcMtHJKUya92hPHO+at63JJPLygilZard8jw== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.22.5" -"@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== +"@babel/plugin-syntax-jsx@^7.0.0", "@babel/plugin-syntax-jsx@^7.23.3": + version "7.23.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.23.3.tgz#8f2e4f8a9b5f9aa16067e142c1ac9cd9f810f473" + integrity sha512-EB2MELswq55OHUoRZLGg/zC7QWUKfNLpE57m/S2yr1uEneIgsTgrSzXP3NXEsMkVn76OlaVVnzN+ugObuYGwhg== dependencies: - "@babel/helper-plugin-utils" "^7.8.0" - -"@babel/plugin-syntax-jsx@^7.0.0", "@babel/plugin-syntax-jsx@^7.18.6": - 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.10.4": - 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.10.4": - 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/helper-plugin-utils" "^7.22.5" "@babel/plugin-syntax-object-rest-spread@^7.0.0", "@babel/plugin-syntax-object-rest-spread@^7.8.3": version "7.8.3" @@ -673,537 +321,268 @@ 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-private-property-in-object@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz#0dc6671ec0ea22b6e94a1114f857970cd39de1ad" - integrity sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg== - dependencies: - "@babel/helper-plugin-utils" "^7.14.5" - -"@babel/plugin-syntax-top-level-await@^7.14.5": - 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-transform-arrow-functions@^7.0.0": - version "7.20.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.20.7.tgz#bea332b0e8b2dab3dafe55a163d8227531ab0551" - integrity sha512-3poA5E7dzDomxj9WXWwuD6A5F3kc7VXwIJO+E+J8qtDtS+pXPAhrgEyh+9GBwBgPq1Z+bB+/JD60lp5jsN7JPQ== - dependencies: - "@babel/helper-plugin-utils" "^7.20.2" - -"@babel/plugin-transform-arrow-functions@^7.21.5": - version "7.21.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.21.5.tgz#9bb42a53de447936a57ba256fbf537fc312b6929" - integrity sha512-wb1mhwGOCaXHDTcsRYMKF9e5bbMgqwxtqa2Y1ifH96dXJPwbuLX9qHy3clhrxVqgMz7nyNXs8VkxdH8UBcjKqA== - dependencies: - "@babel/helper-plugin-utils" "^7.21.5" - -"@babel/plugin-transform-async-to-generator@^7.20.7": - version "7.20.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.20.7.tgz#dfee18623c8cb31deb796aa3ca84dda9cea94354" - integrity sha512-Uo5gwHPT9vgnSXQxqGtpdufUiWp96gk7yiP4Mp5bm1QMkEmLXBO7PAGYbKoJ6DhAwiNkcHFBol/x5zZZkL/t0Q== - dependencies: - "@babel/helper-module-imports" "^7.18.6" - "@babel/helper-plugin-utils" "^7.20.2" - "@babel/helper-remap-async-to-generator" "^7.18.9" - -"@babel/plugin-transform-block-scoped-functions@^7.0.0", "@babel/plugin-transform-block-scoped-functions@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.18.6.tgz#9187bf4ba302635b9d70d986ad70f038726216a8" - integrity sha512-ExUcOqpPWnliRcPqves5HJcJOvHvIIWfuS4sroBUenPuMdmW+SMHDakmtS7qOo13sVppmUijqeTv7qqGsvURpQ== - dependencies: - "@babel/helper-plugin-utils" "^7.18.6" - -"@babel/plugin-transform-block-scoping@^7.0.0", "@babel/plugin-transform-block-scoping@^7.21.0": - version "7.21.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.21.0.tgz#e737b91037e5186ee16b76e7ae093358a5634f02" - integrity sha512-Mdrbunoh9SxwFZapeHVrwFmri16+oYotcZysSzhNIVDwIAb1UV+kvnxULSYq9J3/q5MDG+4X6w8QVgD1zhBXNQ== - dependencies: - "@babel/helper-plugin-utils" "^7.20.2" - -"@babel/plugin-transform-classes@^7.0.0", "@babel/plugin-transform-classes@^7.21.0": - version "7.21.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.21.0.tgz#f469d0b07a4c5a7dbb21afad9e27e57b47031665" - integrity sha512-RZhbYTCEUAe6ntPehC4hlslPWosNHDox+vAs4On/mCLRLfoDVHf6hVEd7kuxr1RnHwJmxFfUM3cZiZRmPxJPXQ== - dependencies: - "@babel/helper-annotate-as-pure" "^7.18.6" - "@babel/helper-compilation-targets" "^7.20.7" - "@babel/helper-environment-visitor" "^7.18.9" - "@babel/helper-function-name" "^7.21.0" - "@babel/helper-optimise-call-expression" "^7.18.6" - "@babel/helper-plugin-utils" "^7.20.2" - "@babel/helper-replace-supers" "^7.20.7" - "@babel/helper-split-export-declaration" "^7.18.6" + version "7.23.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.23.3.tgz#94c6dcfd731af90f27a79509f9ab7fb2120fc38b" + integrity sha512-NzQcQrzaQPkaEwoTm4Mhyl8jI1huEL/WWIEvudjTCMJ9aBZNpsJbMASx7EQECtQQPS/DcnFpo0FIh3LvEO9cxQ== + dependencies: + "@babel/helper-plugin-utils" "^7.22.5" + +"@babel/plugin-transform-block-scoped-functions@^7.0.0": + version "7.23.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.23.3.tgz#fe1177d715fb569663095e04f3598525d98e8c77" + integrity sha512-vI+0sIaPIO6CNuM9Kk5VmXcMVRiOpDh7w2zZt9GXzmE/9KD70CUEVhvPR/etAeNK/FAEkhxQtXOzVF3EuRL41A== + dependencies: + "@babel/helper-plugin-utils" "^7.22.5" + +"@babel/plugin-transform-block-scoping@^7.0.0": + version "7.23.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.23.4.tgz#b2d38589531c6c80fbe25e6b58e763622d2d3cf5" + integrity sha512-0QqbP6B6HOh7/8iNR4CQU2Th/bbRtBp4KS9vcaZd1fZ0wSh5Fyssg0UCIHwxh+ka+pNDREbVLQnHCMHKZfPwfw== + dependencies: + "@babel/helper-plugin-utils" "^7.22.5" + +"@babel/plugin-transform-classes@^7.0.0": + version "7.23.8" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.23.8.tgz#d08ae096c240347badd68cdf1b6d1624a6435d92" + integrity sha512-yAYslGsY1bX6Knmg46RjiCiNSwJKv2IUC8qOdYKqMMr0491SXFhcHqOdRDeCRohOOIzwN/90C6mQ9qAKgrP7dg== + dependencies: + "@babel/helper-annotate-as-pure" "^7.22.5" + "@babel/helper-compilation-targets" "^7.23.6" + "@babel/helper-environment-visitor" "^7.22.20" + "@babel/helper-function-name" "^7.23.0" + "@babel/helper-plugin-utils" "^7.22.5" + "@babel/helper-replace-supers" "^7.22.20" + "@babel/helper-split-export-declaration" "^7.22.6" globals "^11.1.0" "@babel/plugin-transform-computed-properties@^7.0.0": - version "7.20.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.20.7.tgz#704cc2fd155d1c996551db8276d55b9d46e4d0aa" - integrity sha512-Lz7MvBK6DTjElHAmfu6bfANzKcxpyNPeYBGEafyA6E5HtRpjpZwU+u7Qrgz/2OR0z+5TvKYbPdphfSaAcZBrYQ== + version "7.23.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.23.3.tgz#652e69561fcc9d2b50ba4f7ac7f60dcf65e86474" + integrity sha512-dTj83UVTLw/+nbiHqQSFdwO9CbTtwq1DsDqm3CUEtDrZNET5rT5E6bIdTlOftDTDLMYxvxHNEYO4B9SLl8SLZw== dependencies: - "@babel/helper-plugin-utils" "^7.20.2" - "@babel/template" "^7.20.7" + "@babel/helper-plugin-utils" "^7.22.5" + "@babel/template" "^7.22.15" -"@babel/plugin-transform-computed-properties@^7.21.5": - version "7.21.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.21.5.tgz#3a2d8bb771cd2ef1cd736435f6552fe502e11b44" - integrity sha512-TR653Ki3pAwxBxUe8srfF3e4Pe3FTA46uaNHYyQwIoM4oWKSoOZiDNyHJ0oIoDIUPSRQbQG7jzgVBX3FPVne1Q== +"@babel/plugin-transform-destructuring@^7.0.0": + version "7.23.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.23.3.tgz#8c9ee68228b12ae3dff986e56ed1ba4f3c446311" + integrity sha512-n225npDqjDIr967cMScVKHXJs7rout1q+tt50inyBCPkyZ8KxeI6d+GIbSBTT/w/9WdlWDOej3V9HE5Lgk57gw== dependencies: - "@babel/helper-plugin-utils" "^7.21.5" - "@babel/template" "^7.20.7" - -"@babel/plugin-transform-destructuring@^7.0.0", "@babel/plugin-transform-destructuring@^7.21.3": - version "7.21.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.21.3.tgz#73b46d0fd11cd6ef57dea8a381b1215f4959d401" - integrity sha512-bp6hwMFzuiE4HqYEyoGJ/V2LeIWn+hLVKc4pnj++E5XQptwhtcGmSayM029d/j2X1bPKGTlsyPwAubuU22KhMA== - dependencies: - "@babel/helper-plugin-utils" "^7.20.2" - -"@babel/plugin-transform-dotall-regex@^7.18.6", "@babel/plugin-transform-dotall-regex@^7.4.4": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.18.6.tgz#b286b3e7aae6c7b861e45bed0a2fafd6b1a4fef8" - integrity sha512-6S3jpun1eEbAxq7TdjLotAsl4WpQI9DxfkycRcKrjhQYzU87qpXdknpBg/e+TdcMehqGnLFi7tnFUBR02Vq6wg== - dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.18.6" - "@babel/helper-plugin-utils" "^7.18.6" - -"@babel/plugin-transform-duplicate-keys@^7.18.9": - version "7.18.9" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.18.9.tgz#687f15ee3cdad6d85191eb2a372c4528eaa0ae0e" - integrity sha512-d2bmXCtZXYc59/0SanQKbiWINadaJXqtvIQIzd4+hNwkWBgyCd5F/2t1kXoUdvPMrxzPvhK6EMQRROxsue+mfw== - dependencies: - "@babel/helper-plugin-utils" "^7.18.9" - -"@babel/plugin-transform-exponentiation-operator@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.18.6.tgz#421c705f4521888c65e91fdd1af951bfefd4dacd" - integrity sha512-wzEtc0+2c88FVR34aQmiz56dxEkxr2g8DQb/KfaFa1JYXOFVsbhvAonFN6PwVWj++fKmku8NP80plJ5Et4wqHw== - dependencies: - "@babel/helper-builder-binary-assignment-operator-visitor" "^7.18.6" - "@babel/helper-plugin-utils" "^7.18.6" + "@babel/helper-plugin-utils" "^7.22.5" "@babel/plugin-transform-flow-strip-types@^7.0.0": - version "7.21.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.21.0.tgz#6aeca0adcb81dc627c8986e770bfaa4d9812aff5" - integrity sha512-FlFA2Mj87a6sDkW4gfGrQQqwY/dLlBAyJa2dJEZ+FHXUVHBflO2wyKvg+OOEzXfrKYIa4HWl0mgmbCzt0cMb7w== + version "7.23.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.23.3.tgz#cfa7ca159cc3306fab526fc67091556b51af26ff" + integrity sha512-26/pQTf9nQSNVJCrLB1IkHUKyPxR+lMrH2QDPG89+Znu9rAMbtrybdbWeE9bb7gzjmE5iXHEY+e0HUwM6Co93Q== dependencies: - "@babel/helper-plugin-utils" "^7.20.2" - "@babel/plugin-syntax-flow" "^7.18.6" + "@babel/helper-plugin-utils" "^7.22.5" + "@babel/plugin-syntax-flow" "^7.23.3" "@babel/plugin-transform-for-of@^7.0.0": - version "7.21.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.21.0.tgz#964108c9988de1a60b4be2354a7d7e245f36e86e" - integrity sha512-LlUYlydgDkKpIY7mcBWvyPPmMcOphEyYA27Ef4xpbh1IiDNLr0kZsos2nf92vz3IccvJI25QUwp86Eo5s6HmBQ== + version "7.23.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.23.6.tgz#81c37e24171b37b370ba6aaffa7ac86bcb46f94e" + integrity sha512-aYH4ytZ0qSuBbpfhuofbg/e96oQ7U2w1Aw/UQmKT+1l39uEhUPoFS3fHevDc1G0OvewyDudfMKY1OulczHzWIw== dependencies: - "@babel/helper-plugin-utils" "^7.20.2" + "@babel/helper-plugin-utils" "^7.22.5" + "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5" -"@babel/plugin-transform-for-of@^7.21.5": - version "7.21.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.21.5.tgz#e890032b535f5a2e237a18535f56a9fdaa7b83fc" - integrity sha512-nYWpjKW/7j/I/mZkGVgHJXh4bA1sfdFnJoOXwJuj4m3Q2EraO/8ZyrkCau9P5tbHQk01RMSt6KYLCsW7730SXQ== +"@babel/plugin-transform-function-name@^7.0.0": + version "7.23.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.23.3.tgz#8f424fcd862bf84cb9a1a6b42bc2f47ed630f8dc" + integrity sha512-I1QXp1LxIvt8yLaib49dRW5Okt7Q4oaxao6tFVKS/anCdEOMtYwWVKoiOA1p34GOWIZjUK0E+zCp7+l1pfQyiw== dependencies: - "@babel/helper-plugin-utils" "^7.21.5" + "@babel/helper-compilation-targets" "^7.22.15" + "@babel/helper-function-name" "^7.23.0" + "@babel/helper-plugin-utils" "^7.22.5" -"@babel/plugin-transform-function-name@^7.0.0", "@babel/plugin-transform-function-name@^7.18.9": - version "7.18.9" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.18.9.tgz#cc354f8234e62968946c61a46d6365440fc764e0" - integrity sha512-WvIBoRPaJQ5yVHzcnJFor7oS5Ls0PYixlTYE63lCj2RtdQEl15M68FXQlxnG6wdraJIXRdR7KI+hQ7q/9QjrCQ== +"@babel/plugin-transform-literals@^7.0.0": + version "7.23.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.23.3.tgz#8214665f00506ead73de157eba233e7381f3beb4" + integrity sha512-wZ0PIXRxnwZvl9AYpqNUxpZ5BiTGrYt7kueGQ+N5FiQ7RCOD4cm8iShd6S6ggfVIWaJf2EMk8eRzAh52RfP4rQ== dependencies: - "@babel/helper-compilation-targets" "^7.18.9" - "@babel/helper-function-name" "^7.18.9" - "@babel/helper-plugin-utils" "^7.18.9" + "@babel/helper-plugin-utils" "^7.22.5" -"@babel/plugin-transform-literals@^7.0.0", "@babel/plugin-transform-literals@^7.18.9": - version "7.18.9" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.18.9.tgz#72796fdbef80e56fba3c6a699d54f0de557444bc" - integrity sha512-IFQDSRoTPnrAIrI5zoZv73IFeZu2dhu6irxQjY9rNjTT53VmKg9fenjvoiOWOkJ6mm4jKVPtdMzBY98Fp4Z4cg== +"@babel/plugin-transform-member-expression-literals@^7.0.0": + version "7.23.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.23.3.tgz#e37b3f0502289f477ac0e776b05a833d853cabcc" + integrity sha512-sC3LdDBDi5x96LA+Ytekz2ZPk8i/Ck+DEuDbRAll5rknJ5XRTSaPKEYwomLcs1AA8wg9b3KjIQRsnApj+q51Ag== dependencies: - "@babel/helper-plugin-utils" "^7.18.9" - -"@babel/plugin-transform-member-expression-literals@^7.0.0", "@babel/plugin-transform-member-expression-literals@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.18.6.tgz#ac9fdc1a118620ac49b7e7a5d2dc177a1bfee88e" - integrity sha512-qSF1ihLGO3q+/g48k85tUjD033C29TNTVB2paCwZPVmOsjn9pClvYYrM2VeJpBY2bcNkuny0YUyTNRyRxJ54KA== - dependencies: - "@babel/helper-plugin-utils" "^7.18.6" - -"@babel/plugin-transform-modules-amd@^7.20.11": - version "7.20.11" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.20.11.tgz#3daccca8e4cc309f03c3a0c4b41dc4b26f55214a" - integrity sha512-NuzCt5IIYOW0O30UvqktzHYR2ud5bOWbY0yaxWZ6G+aFzOMJvrs5YHNikrbdaT15+KNO31nPOy5Fim3ku6Zb5g== - dependencies: - "@babel/helper-module-transforms" "^7.20.11" - "@babel/helper-plugin-utils" "^7.20.2" + "@babel/helper-plugin-utils" "^7.22.5" "@babel/plugin-transform-modules-commonjs@^7.0.0": - version "7.21.2" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.21.2.tgz#6ff5070e71e3192ef2b7e39820a06fb78e3058e7" - integrity sha512-Cln+Yy04Gxua7iPdj6nOV96smLGjpElir5YwzF0LBPKoPlLDNJePNlrGGaybAJkd0zKRnOVXOgizSqPYMNYkzA== - dependencies: - "@babel/helper-module-transforms" "^7.21.2" - "@babel/helper-plugin-utils" "^7.20.2" - "@babel/helper-simple-access" "^7.20.2" - -"@babel/plugin-transform-modules-commonjs@^7.21.5": - version "7.21.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.21.5.tgz#d69fb947eed51af91de82e4708f676864e5e47bc" - integrity sha512-OVryBEgKUbtqMoB7eG2rs6UFexJi6Zj6FDXx+esBLPTCxCNxAY9o+8Di7IsUGJ+AVhp5ncK0fxWUBd0/1gPhrQ== + version "7.23.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.23.3.tgz#661ae831b9577e52be57dd8356b734f9700b53b4" + integrity sha512-aVS0F65LKsdNOtcz6FRCpE4OgsP2OFnW46qNxNIX9h3wuzaNcSQsJysuMwqSibC98HPrf2vCgtxKNwS0DAlgcA== dependencies: - "@babel/helper-module-transforms" "^7.21.5" - "@babel/helper-plugin-utils" "^7.21.5" - "@babel/helper-simple-access" "^7.21.5" + "@babel/helper-module-transforms" "^7.23.3" + "@babel/helper-plugin-utils" "^7.22.5" + "@babel/helper-simple-access" "^7.22.5" -"@babel/plugin-transform-modules-systemjs@^7.20.11": - version "7.20.11" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.20.11.tgz#467ec6bba6b6a50634eea61c9c232654d8a4696e" - integrity sha512-vVu5g9BPQKSFEmvt2TA4Da5N+QVS66EX21d8uoOihC+OCpUoGvzVsXeqFdtAEfVa5BILAeFt+U7yVmLbQnAJmw== +"@babel/plugin-transform-object-super@^7.0.0": + version "7.23.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.23.3.tgz#81fdb636dcb306dd2e4e8fd80db5b2362ed2ebcd" + integrity sha512-BwQ8q0x2JG+3lxCVFohg+KbQM7plfpBwThdW9A6TMtWwLsbDA01Ek2Zb/AgDN39BiZsExm4qrXxjk+P1/fzGrA== dependencies: - "@babel/helper-hoist-variables" "^7.18.6" - "@babel/helper-module-transforms" "^7.20.11" - "@babel/helper-plugin-utils" "^7.20.2" - "@babel/helper-validator-identifier" "^7.19.1" + "@babel/helper-plugin-utils" "^7.22.5" + "@babel/helper-replace-supers" "^7.22.20" -"@babel/plugin-transform-modules-umd@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.18.6.tgz#81d3832d6034b75b54e62821ba58f28ed0aab4b9" - integrity sha512-dcegErExVeXcRqNtkRU/z8WlBLnvD4MRnHgNs3MytRO1Mn1sHRyhbcpYbVMGclAqOjdW+9cfkdZno9dFdfKLfQ== +"@babel/plugin-transform-parameters@^7.0.0", "@babel/plugin-transform-parameters@^7.20.7": + version "7.23.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.23.3.tgz#83ef5d1baf4b1072fa6e54b2b0999a7b2527e2af" + integrity sha512-09lMt6UsUb3/34BbECKVbVwrT9bO6lILWln237z7sLaWnMsTi7Yc9fhX5DLpkJzAGfaReXI22wP41SZmnAA3Vw== dependencies: - "@babel/helper-module-transforms" "^7.18.6" - "@babel/helper-plugin-utils" "^7.18.6" + "@babel/helper-plugin-utils" "^7.22.5" -"@babel/plugin-transform-named-capturing-groups-regex@^7.20.5": - version "7.20.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.20.5.tgz#626298dd62ea51d452c3be58b285d23195ba69a8" - integrity sha512-mOW4tTzi5iTLnw+78iEq3gr8Aoq4WNRGpmSlrogqaiCBoR1HFhpU4JkpQFOHfeYx3ReVIFWOQJS4aZBRvuZ6mA== +"@babel/plugin-transform-property-literals@^7.0.0": + version "7.23.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.23.3.tgz#54518f14ac4755d22b92162e4a852d308a560875" + integrity sha512-jR3Jn3y7cZp4oEWPFAlRsSWjxKe4PZILGBSd4nis1TsC5qeSpb+nrtihJuDhNI7QHiVbUaiXa0X2RZY3/TI6Nw== dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.20.5" - "@babel/helper-plugin-utils" "^7.20.2" - -"@babel/plugin-transform-new-target@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.18.6.tgz#d128f376ae200477f37c4ddfcc722a8a1b3246a8" - integrity sha512-DjwFA/9Iu3Z+vrAn+8pBUGcjhxKguSMlsFqeCKbhb9BAV756v0krzVK04CRDi/4aqmk8BsHb4a/gFcaA5joXRw== - dependencies: - "@babel/helper-plugin-utils" "^7.18.6" - -"@babel/plugin-transform-object-assign@^7.10.4": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-assign/-/plugin-transform-object-assign-7.18.6.tgz#7830b4b6f83e1374a5afb9f6111bcfaea872cdd2" - integrity sha512-mQisZ3JfqWh2gVXvfqYCAAyRs6+7oev+myBsTwW5RnPhYXOTuCEw2oe3YgxlXMViXUS53lG8koulI7mJ+8JE+A== - dependencies: - "@babel/helper-plugin-utils" "^7.18.6" - -"@babel/plugin-transform-object-super@^7.0.0", "@babel/plugin-transform-object-super@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.18.6.tgz#fb3c6ccdd15939b6ff7939944b51971ddc35912c" - integrity sha512-uvGz6zk+pZoS1aTZrOvrbj6Pp/kK2mp45t2B+bTDre2UgsZZ8EZLSJtUg7m/no0zOJUWgFONpB7Zv9W2tSaFlA== - dependencies: - "@babel/helper-plugin-utils" "^7.18.6" - "@babel/helper-replace-supers" "^7.18.6" - -"@babel/plugin-transform-parameters@^7.0.0", "@babel/plugin-transform-parameters@^7.20.7", "@babel/plugin-transform-parameters@^7.21.3": - version "7.21.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.21.3.tgz#18fc4e797cf6d6d972cb8c411dbe8a809fa157db" - integrity sha512-Wxc+TvppQG9xWFYatvCGPvZ6+SIUxQ2ZdiBP+PHYMIjnPXD+uThCshaz4NZOnODAtBjjcVQQ/3OKs9LW28purQ== - dependencies: - "@babel/helper-plugin-utils" "^7.20.2" - -"@babel/plugin-transform-property-literals@^7.0.0", "@babel/plugin-transform-property-literals@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.18.6.tgz#e22498903a483448e94e032e9bbb9c5ccbfc93a3" - integrity sha512-cYcs6qlgafTud3PAzrrRNbQtfpQ8+y/+M5tKmksS9+M1ckbH6kzY8MrexEM9mcA6JDsukE19iIRvAyYl463sMg== - dependencies: - "@babel/helper-plugin-utils" "^7.18.6" + "@babel/helper-plugin-utils" "^7.22.5" "@babel/plugin-transform-react-display-name@^7.0.0": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.18.6.tgz#8b1125f919ef36ebdfff061d664e266c666b9415" - integrity sha512-TV4sQ+T013n61uMoygyMRm+xf04Bd5oqFpv2jAEQwSZ8NwQA7zeRPg1LMVg2PWi3zWBz+CLKD+v5bcpZ/BS0aA== + version "7.23.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.23.3.tgz#70529f034dd1e561045ad3c8152a267f0d7b6200" + integrity sha512-GnvhtVfA2OAtzdX58FJxU19rhoGeQzyVndw3GgtdECQvQFXPEZIOVULHVZGAYmOgmqjXpVpfocAbSjh99V/Fqw== dependencies: - "@babel/helper-plugin-utils" "^7.18.6" + "@babel/helper-plugin-utils" "^7.22.5" "@babel/plugin-transform-react-jsx@^7.0.0": - version "7.21.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.21.0.tgz#656b42c2fdea0a6d8762075d58ef9d4e3c4ab8a2" - integrity sha512-6OAWljMvQrZjR2DaNhVfRz6dkCAVV+ymcLUmaf8bccGOHn2v5rHJK3tTpij0BuhdYWP4LLaqj5lwcdlpAAPuvg== - dependencies: - "@babel/helper-annotate-as-pure" "^7.18.6" - "@babel/helper-module-imports" "^7.18.6" - "@babel/helper-plugin-utils" "^7.20.2" - "@babel/plugin-syntax-jsx" "^7.18.6" - "@babel/types" "^7.21.0" - -"@babel/plugin-transform-regenerator@^7.21.5": - version "7.21.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.21.5.tgz#576c62f9923f94bcb1c855adc53561fd7913724e" - integrity sha512-ZoYBKDb6LyMi5yCsByQ5jmXsHAQDDYeexT1Szvlmui+lADvfSecr5Dxd/PkrTC3pAD182Fcju1VQkB4oCp9M+w== - dependencies: - "@babel/helper-plugin-utils" "^7.21.5" - regenerator-transform "^0.15.1" - -"@babel/plugin-transform-reserved-words@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.18.6.tgz#b1abd8ebf8edaa5f7fe6bbb8d2133d23b6a6f76a" - integrity sha512-oX/4MyMoypzHjFrT1CdivfKZ+XvIPMFXwwxHp/r0Ddy2Vuomt4HDFGmft1TAY2yiTKiNSsh3kjBAzcM8kSdsjA== - dependencies: - "@babel/helper-plugin-utils" "^7.18.6" - -"@babel/plugin-transform-shorthand-properties@^7.0.0", "@babel/plugin-transform-shorthand-properties@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.18.6.tgz#6d6df7983d67b195289be24909e3f12a8f664dc9" - integrity sha512-eCLXXJqv8okzg86ywZJbRn19YJHU4XUa55oz2wbHhaQVn/MM+XhukiT7SYqp/7o00dg52Rj51Ny+Ecw4oyoygw== - dependencies: - "@babel/helper-plugin-utils" "^7.18.6" - -"@babel/plugin-transform-spread@^7.0.0", "@babel/plugin-transform-spread@^7.20.7": - version "7.20.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.20.7.tgz#c2d83e0b99d3bf83e07b11995ee24bf7ca09401e" - integrity sha512-ewBbHQ+1U/VnH1fxltbJqDeWBU1oNLG8Dj11uIv3xVf7nrQu0bPGe5Rf716r7K5Qz+SqtAOVswoVunoiBtGhxw== - dependencies: - "@babel/helper-plugin-utils" "^7.20.2" - "@babel/helper-skip-transparent-expression-wrappers" "^7.20.0" - -"@babel/plugin-transform-sticky-regex@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.18.6.tgz#c6706eb2b1524028e317720339583ad0f444adcc" - integrity sha512-kfiDrDQ+PBsQDO85yj1icueWMfGfJFKN1KCkndygtu/C9+XUfydLC8Iv5UYJqRwy4zk8EcplRxEOeLyjq1gm6Q== - dependencies: - "@babel/helper-plugin-utils" "^7.18.6" - -"@babel/plugin-transform-template-literals@^7.0.0", "@babel/plugin-transform-template-literals@^7.18.9": - version "7.18.9" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.18.9.tgz#04ec6f10acdaa81846689d63fae117dd9c243a5e" - integrity sha512-S8cOWfT82gTezpYOiVaGHrCbhlHgKhQt8XH5ES46P2XWmX92yisoZywf5km75wv5sYcXDUCLMmMxOLCtthDgMA== - dependencies: - "@babel/helper-plugin-utils" "^7.18.9" - -"@babel/plugin-transform-typeof-symbol@^7.18.9": - version "7.18.9" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.18.9.tgz#c8cea68263e45addcd6afc9091429f80925762c0" - integrity sha512-SRfwTtF11G2aemAZWivL7PD+C9z52v9EvMqH9BuYbabyPuKUvSWks3oCg6041pT925L4zVFqaVBeECwsmlguEw== - dependencies: - "@babel/helper-plugin-utils" "^7.18.9" - -"@babel/plugin-transform-unicode-escapes@^7.21.5": - version "7.21.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.21.5.tgz#1e55ed6195259b0e9061d81f5ef45a9b009fb7f2" - integrity sha512-LYm/gTOwZqsYohlvFUe/8Tujz75LqqVC2w+2qPHLR+WyWHGCZPN1KBpJCJn+4Bk4gOkQy/IXKIge6az5MqwlOg== + version "7.23.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.23.4.tgz#393f99185110cea87184ea47bcb4a7b0c2e39312" + integrity sha512-5xOpoPguCZCRbo/JeHlloSkTA8Bld1J/E1/kLfD1nsuiW1m8tduTA1ERCgIZokDflX/IBzKcqR3l7VlRgiIfHA== dependencies: - "@babel/helper-plugin-utils" "^7.21.5" - -"@babel/plugin-transform-unicode-regex@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.18.6.tgz#194317225d8c201bbae103364ffe9e2cea36cdca" - integrity sha512-gE7A6Lt7YLnNOL3Pb9BNeZvi+d8l7tcRrG4+pwJjK9hD2xX4mEvjlQW60G9EEmfXVYRPv9VRQcyegIVHCql/AA== - dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.18.6" - "@babel/helper-plugin-utils" "^7.18.6" - -"@babel/preset-env@^7.10.4": - version "7.21.5" - resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.21.5.tgz#db2089d99efd2297716f018aeead815ac3decffb" - integrity sha512-wH00QnTTldTbf/IefEVyChtRdw5RJvODT/Vb4Vcxq1AZvtXj6T0YeX0cAcXhI6/BdGuiP3GcNIL4OQbI2DVNxg== - dependencies: - "@babel/compat-data" "^7.21.5" - "@babel/helper-compilation-targets" "^7.21.5" - "@babel/helper-plugin-utils" "^7.21.5" - "@babel/helper-validator-option" "^7.21.0" - "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.18.6" - "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.20.7" - "@babel/plugin-proposal-async-generator-functions" "^7.20.7" - "@babel/plugin-proposal-class-properties" "^7.18.6" - "@babel/plugin-proposal-class-static-block" "^7.21.0" - "@babel/plugin-proposal-dynamic-import" "^7.18.6" - "@babel/plugin-proposal-export-namespace-from" "^7.18.9" - "@babel/plugin-proposal-json-strings" "^7.18.6" - "@babel/plugin-proposal-logical-assignment-operators" "^7.20.7" - "@babel/plugin-proposal-nullish-coalescing-operator" "^7.18.6" - "@babel/plugin-proposal-numeric-separator" "^7.18.6" - "@babel/plugin-proposal-object-rest-spread" "^7.20.7" - "@babel/plugin-proposal-optional-catch-binding" "^7.18.6" - "@babel/plugin-proposal-optional-chaining" "^7.21.0" - "@babel/plugin-proposal-private-methods" "^7.18.6" - "@babel/plugin-proposal-private-property-in-object" "^7.21.0" - "@babel/plugin-proposal-unicode-property-regex" "^7.18.6" - "@babel/plugin-syntax-async-generators" "^7.8.4" - "@babel/plugin-syntax-class-properties" "^7.12.13" - "@babel/plugin-syntax-class-static-block" "^7.14.5" - "@babel/plugin-syntax-dynamic-import" "^7.8.3" - "@babel/plugin-syntax-export-namespace-from" "^7.8.3" - "@babel/plugin-syntax-import-assertions" "^7.20.0" - "@babel/plugin-syntax-import-meta" "^7.10.4" - "@babel/plugin-syntax-json-strings" "^7.8.3" - "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4" - "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3" - "@babel/plugin-syntax-numeric-separator" "^7.10.4" - "@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-private-property-in-object" "^7.14.5" - "@babel/plugin-syntax-top-level-await" "^7.14.5" - "@babel/plugin-transform-arrow-functions" "^7.21.5" - "@babel/plugin-transform-async-to-generator" "^7.20.7" - "@babel/plugin-transform-block-scoped-functions" "^7.18.6" - "@babel/plugin-transform-block-scoping" "^7.21.0" - "@babel/plugin-transform-classes" "^7.21.0" - "@babel/plugin-transform-computed-properties" "^7.21.5" - "@babel/plugin-transform-destructuring" "^7.21.3" - "@babel/plugin-transform-dotall-regex" "^7.18.6" - "@babel/plugin-transform-duplicate-keys" "^7.18.9" - "@babel/plugin-transform-exponentiation-operator" "^7.18.6" - "@babel/plugin-transform-for-of" "^7.21.5" - "@babel/plugin-transform-function-name" "^7.18.9" - "@babel/plugin-transform-literals" "^7.18.9" - "@babel/plugin-transform-member-expression-literals" "^7.18.6" - "@babel/plugin-transform-modules-amd" "^7.20.11" - "@babel/plugin-transform-modules-commonjs" "^7.21.5" - "@babel/plugin-transform-modules-systemjs" "^7.20.11" - "@babel/plugin-transform-modules-umd" "^7.18.6" - "@babel/plugin-transform-named-capturing-groups-regex" "^7.20.5" - "@babel/plugin-transform-new-target" "^7.18.6" - "@babel/plugin-transform-object-super" "^7.18.6" - "@babel/plugin-transform-parameters" "^7.21.3" - "@babel/plugin-transform-property-literals" "^7.18.6" - "@babel/plugin-transform-regenerator" "^7.21.5" - "@babel/plugin-transform-reserved-words" "^7.18.6" - "@babel/plugin-transform-shorthand-properties" "^7.18.6" - "@babel/plugin-transform-spread" "^7.20.7" - "@babel/plugin-transform-sticky-regex" "^7.18.6" - "@babel/plugin-transform-template-literals" "^7.18.9" - "@babel/plugin-transform-typeof-symbol" "^7.18.9" - "@babel/plugin-transform-unicode-escapes" "^7.21.5" - "@babel/plugin-transform-unicode-regex" "^7.18.6" - "@babel/preset-modules" "^0.1.5" - "@babel/types" "^7.21.5" - babel-plugin-polyfill-corejs2 "^0.3.3" - babel-plugin-polyfill-corejs3 "^0.6.0" - babel-plugin-polyfill-regenerator "^0.4.1" - core-js-compat "^3.25.1" - semver "^6.3.0" + "@babel/helper-annotate-as-pure" "^7.22.5" + "@babel/helper-module-imports" "^7.22.15" + "@babel/helper-plugin-utils" "^7.22.5" + "@babel/plugin-syntax-jsx" "^7.23.3" + "@babel/types" "^7.23.4" -"@babel/preset-modules@^0.1.5": - version "0.1.5" - resolved "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.5.tgz#ef939d6e7f268827e1841638dc6ff95515e115d9" - integrity sha512-A57th6YRG7oR3cq/yt/Y84MvGgE0eJG2F1JLhKuyG+jFxEgrd/HAMJatiFtmOiZurz+0DkrvbheCLaV5f2JfjA== +"@babel/plugin-transform-shorthand-properties@^7.0.0": + version "7.23.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.23.3.tgz#97d82a39b0e0c24f8a981568a8ed851745f59210" + integrity sha512-ED2fgqZLmexWiN+YNFX26fx4gh5qHDhn1O2gvEhreLW2iI63Sqm4llRLCXALKrCnbN4Jy0VcMQZl/SAzqug/jg== dependencies: - "@babel/helper-plugin-utils" "^7.0.0" - "@babel/plugin-proposal-unicode-property-regex" "^7.4.4" - "@babel/plugin-transform-dotall-regex" "^7.4.4" - "@babel/types" "^7.4.4" - esutils "^2.0.2" + "@babel/helper-plugin-utils" "^7.22.5" -"@babel/regjsgen@^0.8.0": - version "0.8.0" - resolved "https://registry.yarnpkg.com/@babel/regjsgen/-/regjsgen-0.8.0.tgz#f0ba69b075e1f05fb2825b7fad991e7adbb18310" - integrity sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA== +"@babel/plugin-transform-spread@^7.0.0": + version "7.23.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.23.3.tgz#41d17aacb12bde55168403c6f2d6bdca563d362c" + integrity sha512-VvfVYlrlBVu+77xVTOAoxQ6mZbnIq5FM0aGBSFEcIh03qHf+zNqA4DC/3XMUozTg7bZV3e3mZQ0i13VB6v5yUg== + dependencies: + "@babel/helper-plugin-utils" "^7.22.5" + "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5" + +"@babel/plugin-transform-template-literals@^7.0.0": + version "7.23.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.23.3.tgz#5f0f028eb14e50b5d0f76be57f90045757539d07" + integrity sha512-Flok06AYNp7GV2oJPZZcP9vZdszev6vPBkHLwxwSpaIqx75wn6mUd3UFWsSsA0l8nXAKkyCmL/sR02m8RYGeHg== + dependencies: + "@babel/helper-plugin-utils" "^7.22.5" "@babel/runtime@^7.0.0": - version "7.21.0" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.21.0.tgz#5b55c9d394e5fcf304909a8b00c07dc217b56673" - integrity sha512-xwII0//EObnq89Ji5AKYQaRYiW/nZ3llSv29d49IuxPhKbtJoLP+9QUUZ4nVragQVtaVGeZrpB+ZtG/Pdy/POw== + version "7.23.8" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.23.8.tgz#8ee6fe1ac47add7122902f257b8ddf55c898f650" + integrity sha512-Y7KbAP984rn1VGMbGqKmBLio9V7y5Je9GvU4rQPCPinCyNfUcToxIXl06d59URp/F3LwinvODxab5N/G6qggkw== + dependencies: + regenerator-runtime "^0.14.0" + +"@babel/template@^7.18.10", "@babel/template@^7.22.15": + version "7.22.15" + resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.22.15.tgz#09576efc3830f0430f4548ef971dde1350ef2f38" + integrity sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w== + dependencies: + "@babel/code-frame" "^7.22.13" + "@babel/parser" "^7.22.15" + "@babel/types" "^7.22.15" + +"@babel/traverse@^7.14.0", "@babel/traverse@^7.16.8", "@babel/traverse@^7.23.7": + version "7.23.7" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.23.7.tgz#9a7bf285c928cb99b5ead19c3b1ce5b310c9c305" + integrity sha512-tY3mM8rH9jM0YHFGyfC0/xf+SB5eKUu7HPj7/k3fpi9dAlsMc5YbQvDi0Sh2QTPXqMhyaAtzAr807TIyfQrmyg== + dependencies: + "@babel/code-frame" "^7.23.5" + "@babel/generator" "^7.23.6" + "@babel/helper-environment-visitor" "^7.22.20" + "@babel/helper-function-name" "^7.23.0" + "@babel/helper-hoist-variables" "^7.22.5" + "@babel/helper-split-export-declaration" "^7.22.6" + "@babel/parser" "^7.23.6" + "@babel/types" "^7.23.6" + debug "^4.3.1" + globals "^11.1.0" + +"@babel/types@7.23.6", "@babel/types@^7.0.0", "@babel/types@^7.16.8", "@babel/types@^7.18.13", "@babel/types@^7.22.15", "@babel/types@^7.22.5", "@babel/types@^7.23.0", "@babel/types@^7.23.4", "@babel/types@^7.23.6": + version "7.23.6" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.23.6.tgz#be33fdb151e1f5a56877d704492c240fc71c7ccd" + integrity sha512-+uarb83brBzPKN38NX1MkB6vb6+mwvR6amUulqAE7ccQw1pEl+bCia9TbdG1lsnFP7lZySvUn37CHyXQdfTwzg== dependencies: - regenerator-runtime "^0.13.11" + "@babel/helper-string-parser" "^7.23.4" + "@babel/helper-validator-identifier" "^7.22.20" + to-fast-properties "^2.0.0" -"@babel/runtime@^7.8.4": - version "7.21.5" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.21.5.tgz#8492dddda9644ae3bda3b45eabe87382caee7200" - integrity sha512-8jI69toZqqcsnqGGqwGS4Qb1VwLOEp4hz+CXPywcvjs60u3B4Pom/U/7rm4W8tMOYEB+E9wgD0mW1l3r8qlI9Q== +"@bugsnag/browser@^7.20.2", "@bugsnag/browser@^7.22.3": + version "7.22.3" + resolved "https://registry.yarnpkg.com/@bugsnag/browser/-/browser-7.22.3.tgz#123402db4cbc0e5ee4e7ac03222c0a1de1d48799" + integrity sha512-TWQSdsCqzxEVmaKzbtmqoBLWF58yjXi/ScC+6L5VNgSj+62jkIQuw5Evjs+7kLQX8WCnaG6XLiDmUJmPx6ZUrA== dependencies: - regenerator-runtime "^0.13.11" + "@bugsnag/core" "^7.19.0" -"@babel/template@^7.18.10", "@babel/template@^7.20.7": - version "7.20.7" - resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.20.7.tgz#a15090c2839a83b02aa996c0b4994005841fd5a8" - integrity sha512-8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw== - dependencies: - "@babel/code-frame" "^7.18.6" - "@babel/parser" "^7.20.7" - "@babel/types" "^7.20.7" - -"@babel/traverse@^7.14.0", "@babel/traverse@^7.16.8", "@babel/traverse@^7.20.7", "@babel/traverse@^7.21.0", "@babel/traverse@^7.21.2", "@babel/traverse@^7.21.4": - 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" +"@bugsnag/core@^7.19.0": + version "7.19.0" + resolved "https://registry.yarnpkg.com/@bugsnag/core/-/core-7.19.0.tgz#7663a4addb1322e8315a4012dc9db2aad3fea53b" + integrity sha512-2KGwdaLD9PhR7Wk7xPi3jGuGsKTatc/28U4TOZIDU3CgC2QhGjubwiXSECel5gwxhZ3jACKcMKSV2ovHhv1NrA== + dependencies: + "@bugsnag/cuid" "^3.0.0" + "@bugsnag/safe-json-stringify" "^6.0.0" + error-stack-parser "^2.0.3" + iserror "0.0.2" + stack-generator "^2.0.3" -"@babel/traverse@^7.20.5", "@babel/traverse@^7.21.5": - version "7.21.5" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.21.5.tgz#ad22361d352a5154b498299d523cf72998a4b133" - integrity sha512-AhQoI3YjWi6u/y/ntv7k48mcrCXmus0t79J9qPNlk/lAsFlCiJ047RmbfMOawySTHtywXhbXgpx/8nXMYd+oFw== - dependencies: - "@babel/code-frame" "^7.21.4" - "@babel/generator" "^7.21.5" - "@babel/helper-environment-visitor" "^7.21.5" - "@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.5" - "@babel/types" "^7.21.5" - debug "^4.1.0" - globals "^11.1.0" +"@bugsnag/cuid@^3.0.0": + version "3.0.2" + resolved "https://registry.yarnpkg.com/@bugsnag/cuid/-/cuid-3.0.2.tgz#544f8e6e7e3768c8cb618ca5c5fb1eea6aacbb7e" + integrity sha512-cIwzC93r3PQ/INeuwtZwkZIG2K8WWN0rRLZQhu+mr48Ay+i6sEki4GYfTsflse7hZ1BeDWrNb/Q9vgY3B31xHQ== -"@babel/types@^7.0.0", "@babel/types@^7.16.8", "@babel/types@^7.18.13", "@babel/types@^7.18.6", "@babel/types@^7.20.0", "@babel/types@^7.20.2", "@babel/types@^7.20.7", "@babel/types@^7.21.0", "@babel/types@^7.21.2", "@babel/types@^7.21.4": - version "7.21.4" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.21.4.tgz#2d5d6bb7908699b3b416409ffd3b5daa25b030d4" - integrity sha512-rU2oY501qDxE8Pyo7i/Orqma4ziCOrby0/9mvbDUGEfvZjb279Nk9k19e2fiCxHbRRpY2ZyrgW1eq22mvmOIzA== +"@bugsnag/js@7.20.2": + version "7.20.2" + resolved "https://registry.yarnpkg.com/@bugsnag/js/-/js-7.20.2.tgz#218ec77d1df8b70d9353d4f2f2ccd3e51a331786" + integrity sha512-Q08k0h0h6NFwFGkFmib39Uln2WpvJdqT1EGF1JlyYiGW03Y+VopVb9r37pZrRrN9IY08mxaIEO8la5xeaWAs6A== dependencies: - "@babel/helper-string-parser" "^7.19.4" - "@babel/helper-validator-identifier" "^7.19.1" - to-fast-properties "^2.0.0" + "@bugsnag/browser" "^7.20.2" + "@bugsnag/node" "^7.19.0" -"@babel/types@^7.18.9", "@babel/types@^7.20.5", "@babel/types@^7.21.5", "@babel/types@^7.4.4": - version "7.21.5" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.21.5.tgz#18dfbd47c39d3904d5db3d3dc2cc80bedb60e5b6" - integrity sha512-m4AfNvVF2mVC/F7fDEdH2El3HzUg9It/XsCxZiOTTA3m3qYfcSVSbTfM6Q9xG+hYDniZssYhlXKKUMD5m8tF4Q== +"@bugsnag/js@^7.0.0", "@bugsnag/js@^7.20.0": + version "7.22.3" + resolved "https://registry.yarnpkg.com/@bugsnag/js/-/js-7.22.3.tgz#a7cb4443e0e8820aada0e15e486ac58d1b9fe257" + integrity sha512-SAZEElVlmQgZBPLbTdMAyFD2Pp1mP4t3bv+GmDVGSgBi4W6doKQVk0J/K9f5+JGw8fEh9AJHRlyub3XnlGI6Zw== dependencies: - "@babel/helper-string-parser" "^7.21.5" - "@babel/helper-validator-identifier" "^7.19.1" - to-fast-properties "^2.0.0" + "@bugsnag/browser" "^7.22.3" + "@bugsnag/node" "^7.22.3" + +"@bugsnag/node@^7.19.0", "@bugsnag/node@^7.22.3": + version "7.22.3" + resolved "https://registry.yarnpkg.com/@bugsnag/node/-/node-7.22.3.tgz#064b0ba332676481ab43fa46fdb56ecde91adb22" + integrity sha512-vDXu0mrduonyCjUkTp+zKSh1WHAtA2VjB49xK5s1f/HnTASiJvzUOQBRXrkqaj37sndYHUSMxUCPvLawyc75nA== + dependencies: + "@bugsnag/core" "^7.19.0" + byline "^5.0.0" + error-stack-parser "^2.0.2" + iserror "^0.0.2" + pump "^3.0.0" + stack-generator "^2.0.3" + +"@bugsnag/safe-json-stringify@^6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@bugsnag/safe-json-stringify/-/safe-json-stringify-6.0.0.tgz#22abdcd83e008c369902976730c34c150148a758" + integrity sha512-htzFO1Zc57S8kgdRK9mLcPVTW1BY2ijfH7Dk2CeZmspTWKdKqSo1iwmqrq2WtRjFlo8aRZYgLX0wFrDXF/9DLA== "@chainsafe/as-sha256@^0.3.1": version "0.3.1" resolved "https://registry.yarnpkg.com/@chainsafe/as-sha256/-/as-sha256-0.3.1.tgz#3639df0e1435cab03f4d9870cc3ac079e57a6fc9" integrity sha512-hldFFYuf49ed7DAakWVXSJODuq3pzJEguD8tQ7h+sGkM18vja+OFoJI9krnGmgzyuZC2ETX0NOIcCTy31v2Mtg== -"@chainsafe/is-ip@^2.0.1": - version "2.0.1" - resolved "https://registry.yarnpkg.com/@chainsafe/is-ip/-/is-ip-2.0.1.tgz#62cb285669d91f88fd9fa285048dde3882f0993b" - integrity sha512-nqSJ8u2a1Rv9FYbyI8qpDhTYujaKEyLknNrTejLYoSWmdeg+2WB7R6BZqPZYfrJzDxVi3rl6ZQuoaEvpKRZWgQ== - -"@chainsafe/netmask@^2.0.0": - version "2.0.0" - resolved "https://registry.yarnpkg.com/@chainsafe/netmask/-/netmask-2.0.0.tgz#0d4a75f47919f65011da4327a3845c9661f1038a" - integrity sha512-I3Z+6SWUoaljh3TBzCnCxjlUyN8tA+NAk5L6m9IxvCf1BENQTePzPMis97CoN/iMW1St3WN+AWCCRp+TTBRiDg== - dependencies: - "@chainsafe/is-ip" "^2.0.1" - "@chainsafe/persistent-merkle-tree@^0.4.2": version "0.4.2" resolved "https://registry.yarnpkg.com/@chainsafe/persistent-merkle-tree/-/persistent-merkle-tree-0.4.2.tgz#4c9ee80cc57cd3be7208d98c40014ad38f36f7ff" @@ -1235,11 +614,28 @@ "@chainsafe/persistent-merkle-tree" "^0.4.2" case "^1.6.3" +"@clrfund/waffle-mock-contract@^0.0.4": + version "0.0.4" + resolved "https://registry.yarnpkg.com/@clrfund/waffle-mock-contract/-/waffle-mock-contract-0.0.4.tgz#97bb6b20df60a77b8a501e45fb4f049bdaebbea0" + integrity sha512-YRAMIFIHVpvu99b7mvVY0+XsN1JWJ57St7xv5M2VzBTXB/ARPLZENAdfpyjr1xPdpyFVed6TCurdsR6K8SWWpQ== + dependencies: + ethers "^6.9.2" + "@colors/colors@1.5.0": version "1.5.0" resolved "https://registry.yarnpkg.com/@colors/colors/-/colors-1.5.0.tgz#bb504579c1cae923e6576a4f5da43d25f97bdbd9" integrity sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ== +"@colors/colors@1.6.0", "@colors/colors@^1.6.0": + version "1.6.0" + resolved "https://registry.yarnpkg.com/@colors/colors/-/colors-1.6.0.tgz#ec6cd237440700bc23ca23087f513c75508958b0" + integrity sha512-Ir+AOibqzrIsL6ajt3Rz3LskB7OiMVHqltZmspbW/TJuTVuyOMirVqAkjfY6JISiLHgyNqicAC8AyHHGzNd/dA== + +"@commander-js/extra-typings@^12.0.0": + version "12.0.0" + resolved "https://registry.yarnpkg.com/@commander-js/extra-typings/-/extra-typings-12.0.0.tgz#a3ef893e75dcf08bb1e51fc7e9fe8ed2d9246bf4" + integrity sha512-7zGCwtRKOJ978LCuEZbQ9ZmLdrRkNNASphEO5i9MZb6HfOk7KfsA3f4oXqYDhko4tNrU3GmZTlHqQ/nRlYtYSw== + "@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" @@ -1247,162 +643,268 @@ dependencies: "@jridgewell/trace-mapping" "0.3.9" -"@ensdomains/ens@^0.4.4": - version "0.4.5" - resolved "https://registry.yarnpkg.com/@ensdomains/ens/-/ens-0.4.5.tgz#e0aebc005afdc066447c6e22feb4eda89a5edbfc" - integrity sha512-JSvpj1iNMFjK6K+uVl4unqMoa9rf5jopb8cya5UGBWz23Nw8hSNT7efgUx4BTlAPAgpNlEioUfeTyQ6J9ZvTVw== +"@dabh/diagnostics@^2.0.2": + version "2.0.3" + resolved "https://registry.yarnpkg.com/@dabh/diagnostics/-/diagnostics-2.0.3.tgz#7f7e97ee9a725dffc7808d93668cc984e1dc477a" + integrity sha512-hrlQOIi7hAfzsMqlGSFyVucrx38O+j6wiGOf//H2ecvIEqYN4ADBSS2iLMh5UFyDunCNniUIPk/q3riFv45xRA== dependencies: - bluebird "^3.5.2" - eth-ens-namehash "^2.0.8" - solc "^0.4.20" - testrpc "0.0.1" - web3-utils "^1.0.0-beta.31" + colorspace "1.1.x" + enabled "2.0.x" + kuler "^2.0.0" -"@ensdomains/resolver@^0.2.4": - version "0.2.4" - resolved "https://registry.yarnpkg.com/@ensdomains/resolver/-/resolver-0.2.4.tgz#c10fe28bf5efbf49bff4666d909aed0265efbc89" - integrity sha512-bvaTH34PMCbv6anRa9I/0zjLJgY4EuznbEMgbV77JBCQ9KNC46rzi0avuxpOfu+xDjPEtSFGqVEOr5GlUSGudA== - -"@esbuild/android-arm64@0.17.17": - version "0.17.17" - resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.17.17.tgz#164b054d58551f8856285f386e1a8f45d9ba3a31" - integrity sha512-jaJ5IlmaDLFPNttv0ofcwy/cfeY4bh/n705Tgh+eLObbGtQBK3EPAu+CzL95JVE4nFAliyrnEu0d32Q5foavqg== - -"@esbuild/android-arm@0.15.18": - version "0.15.18" - resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.15.18.tgz#266d40b8fdcf87962df8af05b76219bc786b4f80" - integrity sha512-5GT+kcs2WVGjVs7+boataCkO5Fg0y4kCjzkB5bAip7H4jfnOS3dA6KPiww9W1OEKTKeAcUVhdZGvgI65OXmUnw== - -"@esbuild/android-arm@0.17.17": - version "0.17.17" - resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.17.17.tgz#1b3b5a702a69b88deef342a7a80df4c894e4f065" - integrity sha512-E6VAZwN7diCa3labs0GYvhEPL2M94WLF8A+czO8hfjREXxba8Ng7nM5VxV+9ihNXIY1iQO1XxUU4P7hbqbICxg== - -"@esbuild/android-x64@0.17.17": - version "0.17.17" - resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.17.17.tgz#6781527e3c4ea4de532b149d18a2167f06783e7f" - integrity sha512-446zpfJ3nioMC7ASvJB1pszHVskkw4u/9Eu8s5yvvsSDTzYh4p4ZIRj0DznSl3FBF0Z/mZfrKXTtt0QCoFmoHA== - -"@esbuild/darwin-arm64@0.17.17": - version "0.17.17" - resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.17.17.tgz#c5961ef4d3c1cc80dafe905cc145b5a71d2ac196" - integrity sha512-m/gwyiBwH3jqfUabtq3GH31otL/0sE0l34XKpSIqR7NjQ/XHQ3lpmQHLHbG8AHTGCw8Ao059GvV08MS0bhFIJQ== - -"@esbuild/darwin-x64@0.17.17": - version "0.17.17" - resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.17.17.tgz#b81f3259cc349691f67ae30f7b333a53899b3c20" - integrity sha512-4utIrsX9IykrqYaXR8ob9Ha2hAY2qLc6ohJ8c0CN1DR8yWeMrTgYFjgdeQ9LIoTOfLetXjuCu5TRPHT9yKYJVg== - -"@esbuild/freebsd-arm64@0.17.17": - version "0.17.17" - resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.17.17.tgz#db846ad16cf916fd3acdda79b85ea867cb100e87" - integrity sha512-4PxjQII/9ppOrpEwzQ1b0pXCsFLqy77i0GaHodrmzH9zq2/NEhHMAMJkJ635Ns4fyJPFOlHMz4AsklIyRqFZWA== - -"@esbuild/freebsd-x64@0.17.17": - version "0.17.17" - resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.17.17.tgz#4dd99acbaaba00949d509e7c144b1b6ef9e1815b" - integrity sha512-lQRS+4sW5S3P1sv0z2Ym807qMDfkmdhUYX30GRBURtLTrJOPDpoU0kI6pVz1hz3U0+YQ0tXGS9YWveQjUewAJw== - -"@esbuild/linux-arm64@0.17.17": - version "0.17.17" - resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.17.17.tgz#7f9274140b2bb9f4230dbbfdf5dc2761215e30f6" - integrity sha512-2+pwLx0whKY1/Vqt8lyzStyda1v0qjJ5INWIe+d8+1onqQxHLLi3yr5bAa4gvbzhZqBztifYEu8hh1La5+7sUw== - -"@esbuild/linux-arm@0.17.17": - version "0.17.17" - resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.17.17.tgz#5c8e44c2af056bb2147cf9ad13840220bcb8948b" - integrity sha512-biDs7bjGdOdcmIk6xU426VgdRUpGg39Yz6sT9Xp23aq+IEHDb/u5cbmu/pAANpDB4rZpY/2USPhCA+w9t3roQg== - -"@esbuild/linux-ia32@0.17.17": - version "0.17.17" - resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.17.17.tgz#18a6b3798658be7f46e9873fa0c8d4bec54c9212" - integrity sha512-IBTTv8X60dYo6P2t23sSUYym8fGfMAiuv7PzJ+0LcdAndZRzvke+wTVxJeCq4WgjppkOpndL04gMZIFvwoU34Q== - -"@esbuild/linux-loong64@0.15.18": - version "0.15.18" - resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.15.18.tgz#128b76ecb9be48b60cf5cfc1c63a4f00691a3239" - integrity sha512-L4jVKS82XVhw2nvzLg/19ClLWg0y27ulRwuP7lcyL6AbUWB5aPglXY3M21mauDQMDfRLs8cQmeT03r/+X3cZYQ== - -"@esbuild/linux-loong64@0.17.17": - version "0.17.17" - resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.17.17.tgz#a8d93514a47f7b4232716c9f02aeb630bae24c40" - integrity sha512-WVMBtcDpATjaGfWfp6u9dANIqmU9r37SY8wgAivuKmgKHE+bWSuv0qXEFt/p3qXQYxJIGXQQv6hHcm7iWhWjiw== - -"@esbuild/linux-mips64el@0.17.17": - version "0.17.17" - resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.17.17.tgz#4784efb1c3f0eac8133695fa89253d558149ee1b" - integrity sha512-2kYCGh8589ZYnY031FgMLy0kmE4VoGdvfJkxLdxP4HJvWNXpyLhjOvxVsYjYZ6awqY4bgLR9tpdYyStgZZhi2A== - -"@esbuild/linux-ppc64@0.17.17": - version "0.17.17" - resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.17.17.tgz#ef6558ec5e5dd9dc16886343e0ccdb0699d70d3c" - integrity sha512-KIdG5jdAEeAKogfyMTcszRxy3OPbZhq0PPsW4iKKcdlbk3YE4miKznxV2YOSmiK/hfOZ+lqHri3v8eecT2ATwQ== - -"@esbuild/linux-riscv64@0.17.17": - version "0.17.17" - resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.17.17.tgz#13a87fdbcb462c46809c9d16bcf79817ecf9ce6f" - integrity sha512-Cj6uWLBR5LWhcD/2Lkfg2NrkVsNb2sFM5aVEfumKB2vYetkA/9Uyc1jVoxLZ0a38sUhFk4JOVKH0aVdPbjZQeA== - -"@esbuild/linux-s390x@0.17.17": - version "0.17.17" - resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.17.17.tgz#83cb16d1d3ac0dca803b3f031ba3dc13f1ec7ade" - integrity sha512-lK+SffWIr0XsFf7E0srBjhpkdFVJf3HEgXCwzkm69kNbRar8MhezFpkIwpk0qo2IOQL4JE4mJPJI8AbRPLbuOQ== - -"@esbuild/linux-x64@0.17.17": - version "0.17.17" - resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.17.17.tgz#7bc400568690b688e20a0c94b2faabdd89ae1a79" - integrity sha512-XcSGTQcWFQS2jx3lZtQi7cQmDYLrpLRyz1Ns1DzZCtn898cWfm5Icx/DEWNcTU+T+tyPV89RQtDnI7qL2PObPg== - -"@esbuild/netbsd-x64@0.17.17": - version "0.17.17" - resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.17.17.tgz#1b5dcfbc4bfba80e67a11e9148de836af5b58b6c" - integrity sha512-RNLCDmLP5kCWAJR+ItLM3cHxzXRTe4N00TQyQiimq+lyqVqZWGPAvcyfUBM0isE79eEZhIuGN09rAz8EL5KdLA== - -"@esbuild/openbsd-x64@0.17.17": - version "0.17.17" - resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.17.17.tgz#e275098902291149a5dcd012c9ea0796d6b7adff" - integrity sha512-PAXswI5+cQq3Pann7FNdcpSUrhrql3wKjj3gVkmuz6OHhqqYxKvi6GgRBoaHjaG22HV/ZZEgF9TlS+9ftHVigA== - -"@esbuild/sunos-x64@0.17.17": - version "0.17.17" - resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.17.17.tgz#10603474866f64986c0370a2d4fe5a2bb7fee4f5" - integrity sha512-V63egsWKnx/4V0FMYkr9NXWrKTB5qFftKGKuZKFIrAkO/7EWLFnbBZNM1CvJ6Sis+XBdPws2YQSHF1Gqf1oj/Q== - -"@esbuild/win32-arm64@0.17.17": - version "0.17.17" - resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.17.17.tgz#521a6d97ee0f96b7c435930353cc4e93078f0b54" - integrity sha512-YtUXLdVnd6YBSYlZODjWzH+KzbaubV0YVd6UxSfoFfa5PtNJNaW+1i+Hcmjpg2nEe0YXUCNF5bkKy1NnBv1y7Q== - -"@esbuild/win32-ia32@0.17.17": - version "0.17.17" - resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.17.17.tgz#56f88462ebe82dad829dc2303175c0e0ccd8e38e" - integrity sha512-yczSLRbDdReCO74Yfc5tKG0izzm+lPMYyO1fFTcn0QNwnKmc3K+HdxZWLGKg4pZVte7XVgcFku7TIZNbWEJdeQ== - -"@esbuild/win32-x64@0.17.17": - version "0.17.17" - resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.17.17.tgz#2b577b976e6844106715bbe0cdc57cd1528063f9" - integrity sha512-FNZw7H3aqhF9OyRQbDDnzUApDXfC1N6fgBhkqEO2jvYCJ+DxMTfZVqg3AX0R1khg1wHTBRD5SdcibSJ+XF6bFg== - -"@eslint-community/eslint-utils@^4.2.0", "@eslint-community/eslint-utils@^4.3.0": +"@dependents/detective-less@^4.1.0": + version "4.1.0" + resolved "https://registry.yarnpkg.com/@dependents/detective-less/-/detective-less-4.1.0.tgz#4a979ee7a6a79eb33602862d6a1263e30f98002e" + integrity sha512-KrkT6qO5NxqNfy68sBl6CTSoJ4SNDIS5iQArkibhlbGU4LaDukZ3q2HIkh8aUKDio6o4itU4xDR7t82Y2eP1Bg== + dependencies: + gonzales-pe "^4.3.0" + node-source-walk "^6.0.1" + +"@esbuild/aix-ppc64@0.19.11": + version "0.19.11" + resolved "https://registry.yarnpkg.com/@esbuild/aix-ppc64/-/aix-ppc64-0.19.11.tgz#2acd20be6d4f0458bc8c784103495ff24f13b1d3" + integrity sha512-FnzU0LyE3ySQk7UntJO4+qIiQgI7KoODnZg5xzXIrFJlKd2P2gwHsHY4927xj9y5PJmJSzULiUCWmv7iWnNa7g== + +"@esbuild/android-arm64@0.18.20": + version "0.18.20" + resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.18.20.tgz#984b4f9c8d0377443cc2dfcef266d02244593622" + integrity sha512-Nz4rJcchGDtENV0eMKUNa6L12zz2zBDXuhj/Vjh18zGqB44Bi7MBMSXjgunJgjRhCmKOjnPuZp4Mb6OKqtMHLQ== + +"@esbuild/android-arm64@0.19.11": + version "0.19.11" + resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.19.11.tgz#b45d000017385c9051a4f03e17078abb935be220" + integrity sha512-aiu7K/5JnLj//KOnOfEZ0D90obUkRzDMyqd/wNAUQ34m4YUPVhRZpnqKV9uqDGxT7cToSDnIHsGooyIczu9T+Q== + +"@esbuild/android-arm@0.18.20": + version "0.18.20" + resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.18.20.tgz#fedb265bc3a589c84cc11f810804f234947c3682" + integrity sha512-fyi7TDI/ijKKNZTUJAQqiG5T7YjJXgnzkURqmGj13C6dCqckZBLdl4h7bkhHt/t0WP+zO9/zwroDvANaOqO5Sw== + +"@esbuild/android-arm@0.19.11": + version "0.19.11" + resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.19.11.tgz#f46f55414e1c3614ac682b29977792131238164c" + integrity sha512-5OVapq0ClabvKvQ58Bws8+wkLCV+Rxg7tUVbo9xu034Nm536QTII4YzhaFriQ7rMrorfnFKUsArD2lqKbFY4vw== + +"@esbuild/android-x64@0.18.20": + version "0.18.20" + resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.18.20.tgz#35cf419c4cfc8babe8893d296cd990e9e9f756f2" + integrity sha512-8GDdlePJA8D6zlZYJV/jnrRAi6rOiNaCC/JclcXpB+KIuvfBN4owLtgzY2bsxnx666XjJx2kDPUmnTtR8qKQUg== + +"@esbuild/android-x64@0.19.11": + version "0.19.11" + resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.19.11.tgz#bfc01e91740b82011ef503c48f548950824922b2" + integrity sha512-eccxjlfGw43WYoY9QgB82SgGgDbibcqyDTlk3l3C0jOVHKxrjdc9CTwDUQd0vkvYg5um0OH+GpxYvp39r+IPOg== + +"@esbuild/darwin-arm64@0.18.20": + version "0.18.20" + resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.18.20.tgz#08172cbeccf95fbc383399a7f39cfbddaeb0d7c1" + integrity sha512-bxRHW5kHU38zS2lPTPOyuyTm+S+eobPUnTNkdJEfAddYgEcll4xkT8DB9d2008DtTbl7uJag2HuE5NZAZgnNEA== + +"@esbuild/darwin-arm64@0.19.11": + version "0.19.11" + resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.19.11.tgz#533fb7f5a08c37121d82c66198263dcc1bed29bf" + integrity sha512-ETp87DRWuSt9KdDVkqSoKoLFHYTrkyz2+65fj9nfXsaV3bMhTCjtQfw3y+um88vGRKRiF7erPrh/ZuIdLUIVxQ== + +"@esbuild/darwin-x64@0.18.20": + version "0.18.20" + resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.18.20.tgz#d70d5790d8bf475556b67d0f8b7c5bdff053d85d" + integrity sha512-pc5gxlMDxzm513qPGbCbDukOdsGtKhfxD1zJKXjCCcU7ju50O7MeAZ8c4krSJcOIJGFR+qx21yMMVYwiQvyTyQ== + +"@esbuild/darwin-x64@0.19.11": + version "0.19.11" + resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.19.11.tgz#62f3819eff7e4ddc656b7c6815a31cf9a1e7d98e" + integrity sha512-fkFUiS6IUK9WYUO/+22omwetaSNl5/A8giXvQlcinLIjVkxwTLSktbF5f/kJMftM2MJp9+fXqZ5ezS7+SALp4g== + +"@esbuild/freebsd-arm64@0.18.20": + version "0.18.20" + resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.18.20.tgz#98755cd12707f93f210e2494d6a4b51b96977f54" + integrity sha512-yqDQHy4QHevpMAaxhhIwYPMv1NECwOvIpGCZkECn8w2WFHXjEwrBn3CeNIYsibZ/iZEUemj++M26W3cNR5h+Tw== + +"@esbuild/freebsd-arm64@0.19.11": + version "0.19.11" + resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.19.11.tgz#d478b4195aa3ca44160272dab85ef8baf4175b4a" + integrity sha512-lhoSp5K6bxKRNdXUtHoNc5HhbXVCS8V0iZmDvyWvYq9S5WSfTIHU2UGjcGt7UeS6iEYp9eeymIl5mJBn0yiuxA== + +"@esbuild/freebsd-x64@0.18.20": + version "0.18.20" + resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.18.20.tgz#c1eb2bff03915f87c29cece4c1a7fa1f423b066e" + integrity sha512-tgWRPPuQsd3RmBZwarGVHZQvtzfEBOreNuxEMKFcd5DaDn2PbBxfwLcj4+aenoh7ctXcbXmOQIn8HI6mCSw5MQ== + +"@esbuild/freebsd-x64@0.19.11": + version "0.19.11" + resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.19.11.tgz#7bdcc1917409178257ca6a1a27fe06e797ec18a2" + integrity sha512-JkUqn44AffGXitVI6/AbQdoYAq0TEullFdqcMY/PCUZ36xJ9ZJRtQabzMA+Vi7r78+25ZIBosLTOKnUXBSi1Kw== + +"@esbuild/linux-arm64@0.18.20": + version "0.18.20" + resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.18.20.tgz#bad4238bd8f4fc25b5a021280c770ab5fc3a02a0" + integrity sha512-2YbscF+UL7SQAVIpnWvYwM+3LskyDmPhe31pE7/aoTMFKKzIc9lLbyGUpmmb8a8AixOL61sQ/mFh3jEjHYFvdA== + +"@esbuild/linux-arm64@0.19.11": + version "0.19.11" + resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.19.11.tgz#58ad4ff11685fcc735d7ff4ca759ab18fcfe4545" + integrity sha512-LneLg3ypEeveBSMuoa0kwMpCGmpu8XQUh+mL8XXwoYZ6Be2qBnVtcDI5azSvh7vioMDhoJFZzp9GWp9IWpYoUg== + +"@esbuild/linux-arm@0.18.20": + version "0.18.20" + resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.18.20.tgz#3e617c61f33508a27150ee417543c8ab5acc73b0" + integrity sha512-/5bHkMWnq1EgKr1V+Ybz3s1hWXok7mDFUMQ4cG10AfW3wL02PSZi5kFpYKrptDsgb2WAJIvRcDm+qIvXf/apvg== + +"@esbuild/linux-arm@0.19.11": + version "0.19.11" + resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.19.11.tgz#ce82246d873b5534d34de1e5c1b33026f35e60e3" + integrity sha512-3CRkr9+vCV2XJbjwgzjPtO8T0SZUmRZla+UL1jw+XqHZPkPgZiyWvbDvl9rqAN8Zl7qJF0O/9ycMtjU67HN9/Q== + +"@esbuild/linux-ia32@0.18.20": + version "0.18.20" + resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.18.20.tgz#699391cccba9aee6019b7f9892eb99219f1570a7" + integrity sha512-P4etWwq6IsReT0E1KHU40bOnzMHoH73aXp96Fs8TIT6z9Hu8G6+0SHSw9i2isWrD2nbx2qo5yUqACgdfVGx7TA== + +"@esbuild/linux-ia32@0.19.11": + version "0.19.11" + resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.19.11.tgz#cbae1f313209affc74b80f4390c4c35c6ab83fa4" + integrity sha512-caHy++CsD8Bgq2V5CodbJjFPEiDPq8JJmBdeyZ8GWVQMjRD0sU548nNdwPNvKjVpamYYVL40AORekgfIubwHoA== + +"@esbuild/linux-loong64@0.18.20": + version "0.18.20" + resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.18.20.tgz#e6fccb7aac178dd2ffb9860465ac89d7f23b977d" + integrity sha512-nXW8nqBTrOpDLPgPY9uV+/1DjxoQ7DoB2N8eocyq8I9XuqJ7BiAMDMf9n1xZM9TgW0J8zrquIb/A7s3BJv7rjg== + +"@esbuild/linux-loong64@0.19.11": + version "0.19.11" + resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.19.11.tgz#5f32aead1c3ec8f4cccdb7ed08b166224d4e9121" + integrity sha512-ppZSSLVpPrwHccvC6nQVZaSHlFsvCQyjnvirnVjbKSHuE5N24Yl8F3UwYUUR1UEPaFObGD2tSvVKbvR+uT1Nrg== + +"@esbuild/linux-mips64el@0.18.20": + version "0.18.20" + resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.18.20.tgz#eeff3a937de9c2310de30622a957ad1bd9183231" + integrity sha512-d5NeaXZcHp8PzYy5VnXV3VSd2D328Zb+9dEq5HE6bw6+N86JVPExrA6O68OPwobntbNJ0pzCpUFZTo3w0GyetQ== + +"@esbuild/linux-mips64el@0.19.11": + version "0.19.11" + resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.19.11.tgz#38eecf1cbb8c36a616261de858b3c10d03419af9" + integrity sha512-B5x9j0OgjG+v1dF2DkH34lr+7Gmv0kzX6/V0afF41FkPMMqaQ77pH7CrhWeR22aEeHKaeZVtZ6yFwlxOKPVFyg== + +"@esbuild/linux-ppc64@0.18.20": + version "0.18.20" + resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.18.20.tgz#2f7156bde20b01527993e6881435ad79ba9599fb" + integrity sha512-WHPyeScRNcmANnLQkq6AfyXRFr5D6N2sKgkFo2FqguP44Nw2eyDlbTdZwd9GYk98DZG9QItIiTlFLHJHjxP3FA== + +"@esbuild/linux-ppc64@0.19.11": + version "0.19.11" + resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.19.11.tgz#9c5725a94e6ec15b93195e5a6afb821628afd912" + integrity sha512-MHrZYLeCG8vXblMetWyttkdVRjQlQUb/oMgBNurVEnhj4YWOr4G5lmBfZjHYQHHN0g6yDmCAQRR8MUHldvvRDA== + +"@esbuild/linux-riscv64@0.18.20": + version "0.18.20" + resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.18.20.tgz#6628389f210123d8b4743045af8caa7d4ddfc7a6" + integrity sha512-WSxo6h5ecI5XH34KC7w5veNnKkju3zBRLEQNY7mv5mtBmrP/MjNBCAlsM2u5hDBlS3NGcTQpoBvRzqBcRtpq1A== + +"@esbuild/linux-riscv64@0.19.11": + version "0.19.11" + resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.19.11.tgz#2dc4486d474a2a62bbe5870522a9a600e2acb916" + integrity sha512-f3DY++t94uVg141dozDu4CCUkYW+09rWtaWfnb3bqe4w5NqmZd6nPVBm+qbz7WaHZCoqXqHz5p6CM6qv3qnSSQ== + +"@esbuild/linux-s390x@0.18.20": + version "0.18.20" + resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.18.20.tgz#255e81fb289b101026131858ab99fba63dcf0071" + integrity sha512-+8231GMs3mAEth6Ja1iK0a1sQ3ohfcpzpRLH8uuc5/KVDFneH6jtAJLFGafpzpMRO6DzJ6AvXKze9LfFMrIHVQ== + +"@esbuild/linux-s390x@0.19.11": + version "0.19.11" + resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.19.11.tgz#4ad8567df48f7dd4c71ec5b1753b6f37561a65a8" + integrity sha512-A5xdUoyWJHMMlcSMcPGVLzYzpcY8QP1RtYzX5/bS4dvjBGVxdhuiYyFwp7z74ocV7WDc0n1harxmpq2ePOjI0Q== + +"@esbuild/linux-x64@0.18.20": + version "0.18.20" + resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.18.20.tgz#c7690b3417af318a9b6f96df3031a8865176d338" + integrity sha512-UYqiqemphJcNsFEskc73jQ7B9jgwjWrSayxawS6UVFZGWrAAtkzjxSqnoclCXxWtfwLdzU+vTpcNYhpn43uP1w== + +"@esbuild/linux-x64@0.19.11": + version "0.19.11" + resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.19.11.tgz#b7390c4d5184f203ebe7ddaedf073df82a658766" + integrity sha512-grbyMlVCvJSfxFQUndw5mCtWs5LO1gUlwP4CDi4iJBbVpZcqLVT29FxgGuBJGSzyOxotFG4LoO5X+M1350zmPA== + +"@esbuild/netbsd-x64@0.18.20": + version "0.18.20" + resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.18.20.tgz#30e8cd8a3dded63975e2df2438ca109601ebe0d1" + integrity sha512-iO1c++VP6xUBUmltHZoMtCUdPlnPGdBom6IrO4gyKPFFVBKioIImVooR5I83nTew5UOYrk3gIJhbZh8X44y06A== + +"@esbuild/netbsd-x64@0.19.11": + version "0.19.11" + resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.19.11.tgz#d633c09492a1721377f3bccedb2d821b911e813d" + integrity sha512-13jvrQZJc3P230OhU8xgwUnDeuC/9egsjTkXN49b3GcS5BKvJqZn86aGM8W9pd14Kd+u7HuFBMVtrNGhh6fHEQ== + +"@esbuild/openbsd-x64@0.18.20": + version "0.18.20" + resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.18.20.tgz#7812af31b205055874c8082ea9cf9ab0da6217ae" + integrity sha512-e5e4YSsuQfX4cxcygw/UCPIEP6wbIL+se3sxPdCiMbFLBWu0eiZOJ7WoD+ptCLrmjZBK1Wk7I6D/I3NglUGOxg== + +"@esbuild/openbsd-x64@0.19.11": + version "0.19.11" + resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.19.11.tgz#17388c76e2f01125bf831a68c03a7ffccb65d1a2" + integrity sha512-ysyOGZuTp6SNKPE11INDUeFVVQFrhcNDVUgSQVDzqsqX38DjhPEPATpid04LCoUr2WXhQTEZ8ct/EgJCUDpyNw== + +"@esbuild/sunos-x64@0.18.20": + version "0.18.20" + resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.18.20.tgz#d5c275c3b4e73c9b0ecd38d1ca62c020f887ab9d" + integrity sha512-kDbFRFp0YpTQVVrqUd5FTYmWo45zGaXe0X8E1G/LKFC0v8x0vWrhOWSLITcCn63lmZIxfOMXtCfti/RxN/0wnQ== + +"@esbuild/sunos-x64@0.19.11": + version "0.19.11" + resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.19.11.tgz#e320636f00bb9f4fdf3a80e548cb743370d41767" + integrity sha512-Hf+Sad9nVwvtxy4DXCZQqLpgmRTQqyFyhT3bZ4F2XlJCjxGmRFF0Shwn9rzhOYRB61w9VMXUkxlBy56dk9JJiQ== + +"@esbuild/win32-arm64@0.18.20": + version "0.18.20" + resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.18.20.tgz#73bc7f5a9f8a77805f357fab97f290d0e4820ac9" + integrity sha512-ddYFR6ItYgoaq4v4JmQQaAI5s7npztfV4Ag6NrhiaW0RrnOXqBkgwZLofVTlq1daVTQNhtI5oieTvkRPfZrePg== + +"@esbuild/win32-arm64@0.19.11": + version "0.19.11" + resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.19.11.tgz#c778b45a496e90b6fc373e2a2bb072f1441fe0ee" + integrity sha512-0P58Sbi0LctOMOQbpEOvOL44Ne0sqbS0XWHMvvrg6NE5jQ1xguCSSw9jQeUk2lfrXYsKDdOe6K+oZiwKPilYPQ== + +"@esbuild/win32-ia32@0.18.20": + version "0.18.20" + resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.18.20.tgz#ec93cbf0ef1085cc12e71e0d661d20569ff42102" + integrity sha512-Wv7QBi3ID/rROT08SABTS7eV4hX26sVduqDOTe1MvGMjNd3EjOz4b7zeexIR62GTIEKrfJXKL9LFxTYgkyeu7g== + +"@esbuild/win32-ia32@0.19.11": + version "0.19.11" + resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.19.11.tgz#481a65fee2e5cce74ec44823e6b09ecedcc5194c" + integrity sha512-6YOrWS+sDJDmshdBIQU+Uoyh7pQKrdykdefC1avn76ss5c+RN6gut3LZA4E2cH5xUEp5/cA0+YxRaVtRAb0xBg== + +"@esbuild/win32-x64@0.18.20": + version "0.18.20" + resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.18.20.tgz#786c5f41f043b07afb1af37683d7c33668858f6d" + integrity sha512-kTdfRcSiDfQca/y9QIkng02avJ+NCaQvrMejlsB3RRv5sE9rRoeBPISaZpKxHELzRxZyLvNts1P27W3wV+8geQ== + +"@esbuild/win32-x64@0.19.11": + version "0.19.11" + resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.19.11.tgz#a5d300008960bb39677c46bf16f53ec70d8dee04" + integrity sha512-vfkhltrjCAb603XaFhqhAF4LGDi2M4OrCRrFusyQ+iTLQ/o60QQXxc9cZC/FFpihBI9N1Grn6SMKVJ4KP7Fuiw== + +"@eslint-community/eslint-utils@^4.2.0", "@eslint-community/eslint-utils@^4.4.0": version "4.4.0" resolved "https://registry.yarnpkg.com/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz#a23514e8fb9af1269d5f7788aa556798d61c6b59" integrity sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA== dependencies: eslint-visitor-keys "^3.3.0" -"@eslint-community/regexpp@^4.4.0": - version "4.5.0" - resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.5.0.tgz#f6f729b02feee2c749f57e334b7a1b5f40a81724" - integrity sha512-vITaYzIcNmjn5tF5uxcZ/ft7/RXGrMUIS9HalWckEOF6ESiwXKoMzAQf2UW0aVd6rnOeExTJVd5hmWXucBKGXQ== +"@eslint-community/regexpp@^4.4.0", "@eslint-community/regexpp@^4.6.1": + version "4.10.0" + resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.10.0.tgz#548f6de556857c8bb73bbee70c35dc82a2e74d63" + integrity sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA== -"@eslint/eslintrc@^2.0.2": - version "2.0.2" - resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-2.0.2.tgz#01575e38707add677cf73ca1589abba8da899a02" - integrity sha512-3W4f5tDUra+pA+FzgugqL2pRimUTDJWKr7BINqOpkZrC0uYI0NIc0/JFgBROCU07HR6GieA5m3/rsPIhDmCXTQ== +"@eslint/eslintrc@^2.1.2", "@eslint/eslintrc@^2.1.4": + version "2.1.4" + resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-2.1.4.tgz#388a269f0f25c1b6adc317b5a2c55714894c70ad" + integrity sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ== dependencies: ajv "^6.12.4" debug "^4.3.2" - espree "^9.5.1" + espree "^9.6.0" globals "^13.19.0" ignore "^5.2.0" import-fresh "^3.2.1" @@ -1410,92 +912,29 @@ minimatch "^3.1.2" strip-json-comments "^3.1.1" -"@eslint/js@8.38.0": - version "8.38.0" - resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.38.0.tgz#73a8a0d8aa8a8e6fe270431c5e72ae91b5337892" - integrity sha512-IoD2MfUnOV58ghIHCiil01PcohxjbYR/qCxsoC+xNgUwh1EY8jOOrYmu3d3a71+tJJ23uscEV4X2HJWMsPJu4g== - -"@eslint/js@8.39.0": - version "8.39.0" - resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.39.0.tgz#58b536bcc843f4cd1e02a7e6171da5c040f4d44b" - integrity sha512-kf9RB0Fg7NZfap83B3QOqOGg9QmD9yBudqQXzzOtn3i4y7ZUXe5ONeW34Gwi+TxhH4mvj72R1Zc300KUMa9Bng== - -"@ethereum-waffle/chai@^3.4.4": - version "3.4.4" - resolved "https://registry.yarnpkg.com/@ethereum-waffle/chai/-/chai-3.4.4.tgz#16c4cc877df31b035d6d92486dfdf983df9138ff" - integrity sha512-/K8czydBtXXkcM9X6q29EqEkc5dN3oYenyH2a9hF7rGAApAJUpH8QBtojxOY/xQ2up5W332jqgxwp0yPiYug1g== - dependencies: - "@ethereum-waffle/provider" "^3.4.4" - ethers "^5.5.2" - -"@ethereum-waffle/compiler@^3.4.4": - version "3.4.4" - resolved "https://registry.yarnpkg.com/@ethereum-waffle/compiler/-/compiler-3.4.4.tgz#d568ee0f6029e68b5c645506079fbf67d0dfcf19" - integrity sha512-RUK3axJ8IkD5xpWjWoJgyHclOeEzDLQFga6gKpeGxiS/zBu+HB0W2FvsrrLalTFIaPw/CGYACRBSIxqiCqwqTQ== - dependencies: - "@resolver-engine/imports" "^0.3.3" - "@resolver-engine/imports-fs" "^0.3.3" - "@typechain/ethers-v5" "^2.0.0" - "@types/mkdirp" "^0.5.2" - "@types/node-fetch" "^2.5.5" - ethers "^5.0.1" - mkdirp "^0.5.1" - node-fetch "^2.6.1" - solc "^0.6.3" - ts-generator "^0.1.1" - typechain "^3.0.0" - -"@ethereum-waffle/ens@^3.4.4": - version "3.4.4" - resolved "https://registry.yarnpkg.com/@ethereum-waffle/ens/-/ens-3.4.4.tgz#db97ea2c9decbb70b9205d53de2ccbd6f3182ba1" - integrity sha512-0m4NdwWxliy3heBYva1Wr4WbJKLnwXizmy5FfSSr5PMbjI7SIGCdCB59U7/ZzY773/hY3bLnzLwvG5mggVjJWg== - dependencies: - "@ensdomains/ens" "^0.4.4" - "@ensdomains/resolver" "^0.2.4" - ethers "^5.5.2" - -"@ethereum-waffle/mock-contract@^3.4.4": - version "3.4.4" - resolved "https://registry.yarnpkg.com/@ethereum-waffle/mock-contract/-/mock-contract-3.4.4.tgz#fc6ffa18813546f4950a69f5892d4dd54b2c685a" - integrity sha512-Mp0iB2YNWYGUV+VMl5tjPsaXKbKo8MDH9wSJ702l9EBjdxFf/vBvnMBAC1Fub1lLtmD0JHtp1pq+mWzg/xlLnA== - dependencies: - "@ethersproject/abi" "^5.5.0" - ethers "^5.5.2" - -"@ethereum-waffle/provider@^3.4.4": - version "3.4.4" - resolved "https://registry.yarnpkg.com/@ethereum-waffle/provider/-/provider-3.4.4.tgz#398fc1f7eb91cc2df7d011272eacba8af0c7fffb" - integrity sha512-GK8oKJAM8+PKy2nK08yDgl4A80mFuI8zBkE0C9GqTRYQqvuxIyXoLmJ5NZU9lIwyWVv5/KsoA11BgAv2jXE82g== - dependencies: - "@ethereum-waffle/ens" "^3.4.4" - ethers "^5.5.2" - ganache-core "^2.13.2" - patch-package "^6.2.2" - postinstall-postinstall "^2.1.0" +"@eslint/js@8.48.0": + version "8.48.0" + resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.48.0.tgz#642633964e217905436033a2bd08bf322849b7fb" + integrity sha512-ZSjtmelB7IJfWD2Fvb7+Z+ChTIKWq6kjda95fLcQKNS5aheVHn4IkfgRQE3sIIzTcSLwLcLZUD9UBt+V7+h+Pw== -"@ethereumjs/common@2.5.0": - version "2.5.0" - resolved "https://registry.yarnpkg.com/@ethereumjs/common/-/common-2.5.0.tgz#ec61551b31bef7a69d1dc634d8932468866a4268" - integrity sha512-DEHjW6e38o+JmB/NO3GZBpW4lpaiBpkFgXF6jLcJ6gETBYpEyaA5nTimsWBUJR3Vmtm/didUEbNjajskugZORg== - dependencies: - crc-32 "^1.2.0" - ethereumjs-util "^7.1.1" +"@eslint/js@8.56.0": + version "8.56.0" + resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.56.0.tgz#ef20350fec605a7f7035a01764731b2de0f3782b" + integrity sha512-gMsVel9D7f2HLkBma9VbtzZRehRogVRfbr++f06nL2vnCGCNlzOD+/MUov/F4p8myyAHspEhVobgjpX64q5m6A== -"@ethereumjs/common@^2.5.0": - version "2.6.5" - resolved "https://registry.yarnpkg.com/@ethereumjs/common/-/common-2.6.5.tgz#0a75a22a046272579d91919cb12d84f2756e8d30" - integrity sha512-lRyVQOeCDaIVtgfbowla32pzeDv2Obr8oR8Put5RdUBNRGr1VGPGQNGP6elWIpgK3YdpzqTOh4GyUGOureVeeA== - dependencies: - crc-32 "^1.2.0" - ethereumjs-util "^7.1.5" +"@ethereumjs/rlp@^4.0.1": + version "4.0.1" + resolved "https://registry.yarnpkg.com/@ethereumjs/rlp/-/rlp-4.0.1.tgz#626fabfd9081baab3d0a3074b0c7ecaf674aaa41" + integrity sha512-tqsQiBQDQdmPWE1xkkBq4rlSW5QZpLOUJ5RJh2/9fug+q9tnUhuZoVLk7s0scUIKTOzEtR72DFBXI4WiZcMpvw== -"@ethereumjs/tx@3.3.2": - version "3.3.2" - resolved "https://registry.yarnpkg.com/@ethereumjs/tx/-/tx-3.3.2.tgz#348d4624bf248aaab6c44fec2ae67265efe3db00" - integrity sha512-6AaJhwg4ucmwTvw/1qLaZUX5miWrwZ4nLOUsKyb/HtzS3BMw/CasKhdi1ims9mBKeK9sOJCH4qGKOBGyJCeeog== +"@ethereumjs/util@^8.1.0": + version "8.1.0" + resolved "https://registry.yarnpkg.com/@ethereumjs/util/-/util-8.1.0.tgz#299df97fb6b034e0577ce9f94c7d9d1004409ed4" + integrity sha512-zQ0IqbdX8FZ9aw11vP+dZkKDkS+kgIvQPHnSAXzP9pLu+Rfu3D3XEeLbicvoXJTYnhZiPmsZUxgdzXwNKxRPbA== dependencies: - "@ethereumjs/common" "^2.5.0" - ethereumjs-util "^7.1.2" + "@ethereumjs/rlp" "^4.0.1" + ethereum-cryptography "^2.0.0" + micro-ftch "^0.3.1" "@ethersproject/abi@5.0.0-beta.153": version "5.0.0-beta.153" @@ -1527,7 +966,7 @@ "@ethersproject/properties" "^5.0.3" "@ethersproject/strings" "^5.0.4" -"@ethersproject/abi@5.7.0", "@ethersproject/abi@^5.1.2", "@ethersproject/abi@^5.5.0", "@ethersproject/abi@^5.6.3", "@ethersproject/abi@^5.7.0": +"@ethersproject/abi@5.7.0", "@ethersproject/abi@^5.0.9", "@ethersproject/abi@^5.1.2", "@ethersproject/abi@^5.7.0": version "5.7.0" resolved "https://registry.yarnpkg.com/@ethersproject/abi/-/abi-5.7.0.tgz#b3f3e045bbbeed1af3947335c247ad625a44e449" integrity sha512-351ktp42TiRcYB3H1OP8yajPeAQstMW/yCFokj/AthP9bLHzQFPlOrxOcwYEDkUAICmOHljvN4K39OMTMUa9RA== @@ -1802,7 +1241,7 @@ "@ethersproject/constants" "^5.7.0" "@ethersproject/logger" "^5.7.0" -"@ethersproject/transactions@5.7.0", "@ethersproject/transactions@^5.0.0-beta.135", "@ethersproject/transactions@^5.6.2", "@ethersproject/transactions@^5.7.0": +"@ethersproject/transactions@5.7.0", "@ethersproject/transactions@^5.0.0-beta.135", "@ethersproject/transactions@^5.7.0": version "5.7.0" resolved "https://registry.yarnpkg.com/@ethersproject/transactions/-/transactions-5.7.0.tgz#91318fc24063e057885a6af13fdb703e1f993d3b" integrity sha512-kmcNicCp1lp8qanMTC3RIikGgoJ80ztTyvtsFvCYpSCfkjhD0jZ2LOrnbcuxuToLIUYYf+4XwD1rP+B/erDIhQ== @@ -1869,6 +1308,66 @@ "@ethersproject/properties" "^5.7.0" "@ethersproject/strings" "^5.7.0" +"@fastify/accept-negotiator@^1.0.0", "@fastify/accept-negotiator@^1.1.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@fastify/accept-negotiator/-/accept-negotiator-1.1.0.tgz#c1c66b3b771c09742a54dd5bc87c582f6b0630ff" + integrity sha512-OIHZrb2ImZ7XG85HXOONLcJWGosv7sIvM2ifAPQVhg9Lv7qdmMBNVaai4QTdyuaqbKM5eO6sLSQOYI7wEQeCJQ== + +"@fastify/ajv-compiler@^3.5.0": + version "3.5.0" + resolved "https://registry.yarnpkg.com/@fastify/ajv-compiler/-/ajv-compiler-3.5.0.tgz#459bff00fefbf86c96ec30e62e933d2379e46670" + integrity sha512-ebbEtlI7dxXF5ziNdr05mOY8NnDiPB1XvAlLHctRt/Rc+C3LCOVW5imUVX+mhvUhnNzmPBHewUkOFgGlCxgdAA== + dependencies: + ajv "^8.11.0" + ajv-formats "^2.1.1" + fast-uri "^2.0.0" + +"@fastify/busboy@^2.0.0": + version "2.1.0" + resolved "https://registry.yarnpkg.com/@fastify/busboy/-/busboy-2.1.0.tgz#0709e9f4cb252351c609c6e6d8d6779a8d25edff" + integrity sha512-+KpH+QxZU7O4675t3mnkQKcZZg56u+K/Ct2K+N2AZYNVK8kyeo/bI18tI8aPm3tvNNRyTWfj6s5tnGNlcbQRsA== + +"@fastify/deepmerge@^1.0.0": + version "1.3.0" + resolved "https://registry.yarnpkg.com/@fastify/deepmerge/-/deepmerge-1.3.0.tgz#8116858108f0c7d9fd460d05a7d637a13fe3239a" + integrity sha512-J8TOSBq3SoZbDhM9+R/u77hP93gz/rajSA+K2kGyijPpORPWUXHUpTaleoj+92As0S9uPRP7Oi8IqMf0u+ro6A== + +"@fastify/error@^3.0.0": + version "3.4.1" + resolved "https://registry.yarnpkg.com/@fastify/error/-/error-3.4.1.tgz#b14bb4cac3dd4ec614becbc643d1511331a6425c" + integrity sha512-wWSvph+29GR783IhmvdwWnN4bUxTD01Vm5Xad4i7i1VuAOItLvbPAb69sb0IQ2N57yprvhNIwAP5B6xfKTmjmQ== + +"@fastify/fast-json-stringify-compiler@^4.3.0": + version "4.3.0" + resolved "https://registry.yarnpkg.com/@fastify/fast-json-stringify-compiler/-/fast-json-stringify-compiler-4.3.0.tgz#5df89fa4d1592cbb8780f78998355feb471646d5" + integrity sha512-aZAXGYo6m22Fk1zZzEUKBvut/CIIQe/BapEORnxiD5Qr0kPHqqI69NtEMCme74h+at72sPhbkb4ZrLd1W3KRLA== + dependencies: + fast-json-stringify "^5.7.0" + +"@fastify/send@^2.0.0": + version "2.1.0" + resolved "https://registry.yarnpkg.com/@fastify/send/-/send-2.1.0.tgz#1aa269ccb4b0940a2dadd1f844443b15d8224ea0" + integrity sha512-yNYiY6sDkexoJR0D8IDy3aRP3+L4wdqCpvx5WP+VtEU58sn7USmKynBzDQex5X42Zzvw2gNzzYgP90UfWShLFA== + dependencies: + "@lukeed/ms" "^2.0.1" + escape-html "~1.0.3" + fast-decode-uri-component "^1.0.1" + http-errors "2.0.0" + mime "^3.0.0" + +"@fastify/static@6.10.2": + version "6.10.2" + resolved "https://registry.yarnpkg.com/@fastify/static/-/static-6.10.2.tgz#dfaaccfa191a4ba85ea8e3926853c9e6d979e67f" + integrity sha512-UoaMvIHSBLCZBYOVZwFRYqX2ufUhd7FFMYGDeSf0Z+D8jhYtwljjmuQGuanUP8kS4y/ZEV1a8mfLha3zNwsnnQ== + dependencies: + "@fastify/accept-negotiator" "^1.0.0" + "@fastify/send" "^2.0.0" + content-disposition "^0.5.3" + fastify-plugin "^4.0.0" + glob "^8.0.1" + p-limit "^3.1.0" + readable-stream "^4.0.0" + "@float-capital/float-subgraph-uncrashable@^0.0.0-alpha.4": version "0.0.0-internal-testing.5" resolved "https://registry.yarnpkg.com/@float-capital/float-subgraph-uncrashable/-/float-subgraph-uncrashable-0.0.0-internal-testing.5.tgz#060f98440f6e410812766c5b040952d2d02e2b73" @@ -1879,25 +1378,34 @@ graphql-import-node "^0.0.5" js-yaml "^4.1.0" -"@floating-ui/core@^0.3.0": - version "0.3.1" - resolved "https://registry.yarnpkg.com/@floating-ui/core/-/core-0.3.1.tgz#3dde0ad0724d4b730567c92f49f0950910e18871" - integrity sha512-ensKY7Ub59u16qsVIFEo2hwTCqZ/r9oZZFh51ivcLGHfUwTn8l1Xzng8RJUe91H/UP8PeqeBronAGx0qmzwk2g== +"@floating-ui/core@^1.1.0": + version "1.5.3" + resolved "https://registry.yarnpkg.com/@floating-ui/core/-/core-1.5.3.tgz#b6aa0827708d70971c8679a16cf680a515b8a52a" + integrity sha512-O0WKDOo0yhJuugCx6trZQj5jVJ9yR0ystG2JaNAemYUWce+pmM6WUEFIibnWyEJKdrDxhm75NoSRME35FNaM/Q== + dependencies: + "@floating-ui/utils" "^0.2.0" -"@floating-ui/dom@^0.1.10": - version "0.1.10" - resolved "https://registry.yarnpkg.com/@floating-ui/dom/-/dom-0.1.10.tgz#ce304136a52c71ef157826d2ebf52d68fa2deed5" - integrity sha512-4kAVoogvQm2N0XE0G6APQJuCNuErjOfPW8Ux7DFxh8+AfugWflwVJ5LDlHOwrwut7z/30NUvdtHzQ3zSip4EzQ== +"@floating-ui/dom@~1.1.1": + version "1.1.1" + resolved "https://registry.yarnpkg.com/@floating-ui/dom/-/dom-1.1.1.tgz#66aa747e15894910869bf9144fc54fc7d6e9f975" + integrity sha512-TpIO93+DIujg3g7SykEAGZMDtbJRrmnYRCNYSjJlvIbGhBjRSNTLVbNeDQBrzy9qDgUbiWdc7KA0uZHZ2tJmiw== dependencies: - "@floating-ui/core" "^0.3.0" + "@floating-ui/core" "^1.1.0" + +"@floating-ui/utils@^0.2.0": + version "0.2.1" + resolved "https://registry.yarnpkg.com/@floating-ui/utils/-/utils-0.2.1.tgz#16308cea045f0fc777b6ff20a9f25474dd8293d2" + integrity sha512-9TANp6GPoMtYzQdt54kfAyMmz1+osLlXdg2ENroU7zzrtflTLrrC/lgrIfaSe+Wu0b89GKccT7vxXA0MoAIO+Q== -"@graphprotocol/graph-cli@^0.46.1": - version "0.46.1" - resolved "https://registry.yarnpkg.com/@graphprotocol/graph-cli/-/graph-cli-0.46.1.tgz#9e63bcc1bc085abab804862ecb25e689ac2077fd" - integrity sha512-594BiH2m9gThP1xdvxguVzvVlOb1KzJyVdh2F4dV78NPfMRFY2fe1nakmadKcewc72VVLXNgfdBu/J4IPfo0eg== +"@graphprotocol/graph-cli@^0.68.1": + version "0.68.1" + resolved "https://registry.yarnpkg.com/@graphprotocol/graph-cli/-/graph-cli-0.68.1.tgz#bab47ffda5a81f8874bf0120fe831e80c3348b9a" + integrity sha512-4jE/wISHuRDcN/xlcXAKj6u2ABd4uy/iScmXndpsr4UKPRx13fFP7uL67U69lsm02t8WEY39TnPjsszR+GbyVA== dependencies: "@float-capital/float-subgraph-uncrashable" "^0.0.0-alpha.4" - "@oclif/core" "2.8.0" + "@oclif/core" "2.8.6" + "@oclif/plugin-autocomplete" "^2.3.6" + "@oclif/plugin-not-found" "^2.4.0" "@whatwg-node/fetch" "^0.8.4" assemblyscript "0.19.23" binary-install-raw "0.0.13" @@ -1907,33 +1415,32 @@ docker-compose "0.23.19" dockerode "2.5.8" fs-extra "9.1.0" - glob "9.3.4" - gluegun "https://github.com/edgeandnode/gluegun#v4.3.1-pin-colors-dep" + glob "9.3.5" + gluegun "5.1.6" graphql "15.5.0" immutable "4.2.1" ipfs-http-client "55.0.0" jayson "4.0.0" js-yaml "3.14.1" - prettier "1.19.1" - request "2.88.2" - semver "7.3.8" + prettier "3.0.3" + semver "7.4.0" sync-request "6.1.0" tmp-promise "3.0.3" web3-eth-abi "1.7.0" which "2.0.2" yaml "1.10.2" -"@graphprotocol/graph-ts@^0.29.3": - version "0.29.3" - resolved "https://registry.yarnpkg.com/@graphprotocol/graph-ts/-/graph-ts-0.29.3.tgz#f0a664790e966f5fb9bce317a8861e84ec1f3394" - integrity sha512-FXBLGlunOSwjiUXYEz1J9J/I2D/myldyib/9v0R+gn/NJaYqUkXD39UmIuRxqj9cBzB/FYojHzoHidIG5nYZDw== +"@graphprotocol/graph-ts@^0.33.0": + version "0.33.0" + resolved "https://registry.yarnpkg.com/@graphprotocol/graph-ts/-/graph-ts-0.33.0.tgz#b918e698f31b31eb1f419f97a595bb60c61e01fc" + integrity sha512-HBUVblHUdjQZ/MEjjYPzVgmh+SiuF9VV0D8KubYfFAtzkqpVJlvdyk+RZTAJUiu8hpyYy0EVIcAnLEPtKlwMGQ== dependencies: assemblyscript "0.19.10" "@graphql-codegen/cli@^3.3.0": - version "3.3.0" - resolved "https://registry.yarnpkg.com/@graphql-codegen/cli/-/cli-3.3.0.tgz#12755b6b20b5a24eca7514a6fa00507b61406bef" - integrity sha512-KRQoAG0stor/ztMsBxHqxnwQzcM1DEZigwzah1LFej8bh6TT1WpUt37zt6PH0EdlMpelmeN3keY4Pq6GMd4ADw== + version "3.3.1" + resolved "https://registry.yarnpkg.com/@graphql-codegen/cli/-/cli-3.3.1.tgz#103e7a2263126fdde168a1ce623fc2bdc05352f0" + integrity sha512-4Es8Y9zFeT0Zx2qRL7L3qXDbbqvXK6aID+8v8lP6gaYD+uWx3Jd4Hsq5vxwVBR+6flm0BW/C85Qm0cvmT7O6LA== dependencies: "@babel/generator" "^7.18.13" "@babel/template" "^7.18.10" @@ -2037,24 +1544,24 @@ tslib "~2.4.0" "@graphql-codegen/typescript-operations@^3.0.3": - version "3.0.3" - resolved "https://registry.yarnpkg.com/@graphql-codegen/typescript-operations/-/typescript-operations-3.0.3.tgz#35b2dabd7d7d243ad7be7edccc605826aa305a9d" - integrity sha512-RtMRFpZ8nyXxwurdxklWVIHX9U6/fGWYWEpvarNIIci17BKajZPzdBPKP2GKhUEWzZVGNESqH3RX38jt0onLqQ== + version "3.0.4" + resolved "https://registry.yarnpkg.com/@graphql-codegen/typescript-operations/-/typescript-operations-3.0.4.tgz#60163c07f0ef73655779ece450d02c1172c44027" + integrity sha512-6yE2OL2+WJ1vd5MwFEGXpaxsFGzjAGUytPVHDML3Bi3TwP1F3lnQlIko4untwvHW0JhZEGQ7Ck30H9HjcxpdKA== dependencies: "@graphql-codegen/plugin-helpers" "^4.2.0" - "@graphql-codegen/typescript" "^3.0.3" - "@graphql-codegen/visitor-plugin-common" "3.1.0" + "@graphql-codegen/typescript" "^3.0.4" + "@graphql-codegen/visitor-plugin-common" "3.1.1" auto-bind "~4.0.0" tslib "~2.5.0" -"@graphql-codegen/typescript@^3.0.3": - version "3.0.3" - resolved "https://registry.yarnpkg.com/@graphql-codegen/typescript/-/typescript-3.0.3.tgz#3732e2072ba27970006db14b22d412ac4c943628" - integrity sha512-oVV4/RPs3Lmr2XqywlNDmLhNBCIhefA8rYcuxoWcnd/WRc6GNRm1b2NOIzDhhF4xriVluMyk3QQVRepkdj9enw== +"@graphql-codegen/typescript@^3.0.3", "@graphql-codegen/typescript@^3.0.4": + version "3.0.4" + resolved "https://registry.yarnpkg.com/@graphql-codegen/typescript/-/typescript-3.0.4.tgz#e12dc106a2722ebc7d18556980ccf47fa9d0805f" + integrity sha512-x4O47447DZrWNtE/l5CU9QzzW4m1RbmCEdijlA3s2flG/y1Ckqdemob4CWfilSm5/tZ3w1junVDY616RDTSvZw== dependencies: "@graphql-codegen/plugin-helpers" "^4.2.0" "@graphql-codegen/schema-ast" "^3.0.1" - "@graphql-codegen/visitor-plugin-common" "3.1.0" + "@graphql-codegen/visitor-plugin-common" "3.1.1" auto-bind "~4.0.0" tslib "~2.5.0" @@ -2074,10 +1581,10 @@ parse-filepath "^1.0.2" tslib "~2.4.0" -"@graphql-codegen/visitor-plugin-common@3.1.0": - version "3.1.0" - resolved "https://registry.yarnpkg.com/@graphql-codegen/visitor-plugin-common/-/visitor-plugin-common-3.1.0.tgz#93172d64440b103edfe8b63ea3ac8842a5277a54" - integrity sha512-S4BO/xP38eoEDULwbem5QeV7yWA8DpbcSGkvwrnMfVQW08nL6uHliCSV8hiuAi7Mhx7snVir4Iumk8uIDRVu6Q== +"@graphql-codegen/visitor-plugin-common@3.1.1": + version "3.1.1" + resolved "https://registry.yarnpkg.com/@graphql-codegen/visitor-plugin-common/-/visitor-plugin-common-3.1.1.tgz#50c2aa3c537a805ce68d2f115d0a9811b151428c" + integrity sha512-uAfp+zu/009R3HUAuTK2AamR1bxIltM6rrYYI6EXSmkM3rFtFsLTuJhjUDj98HcUCszJZrADppz8KKLGRUVlNg== dependencies: "@graphql-codegen/plugin-helpers" "^4.2.0" "@graphql-tools/optimize" "^1.3.0" @@ -2100,35 +1607,35 @@ "@whatwg-node/fetch" "^0.8.0" tslib "^2.4.0" -"@graphql-tools/batch-execute@^8.5.19": - version "8.5.19" - resolved "https://registry.yarnpkg.com/@graphql-tools/batch-execute/-/batch-execute-8.5.19.tgz#b204cc5bded1b1d12088b399d3b72eaf38d63132" - integrity sha512-eqofTMYPygg9wVPdA+p8lk4NBpaPTcDut6SlnDk9IiYdY23Yfo6pY7mzZ3b27GugI7HDtB2OZUxzZJSGsk6Qew== +"@graphql-tools/batch-execute@^8.5.22": + version "8.5.22" + resolved "https://registry.yarnpkg.com/@graphql-tools/batch-execute/-/batch-execute-8.5.22.tgz#a742aa9d138fe794e786d8fb6429665dc7df5455" + integrity sha512-hcV1JaY6NJQFQEwCKrYhpfLK8frSXDbtNMoTur98u10Cmecy1zrqNKSqhEyGetpgHxaJRqszGzKeI3RuroDN6A== dependencies: "@graphql-tools/utils" "^9.2.1" - dataloader "2.2.2" + dataloader "^2.2.2" tslib "^2.4.0" - value-or-promise "1.0.12" + value-or-promise "^1.0.12" "@graphql-tools/code-file-loader@^7.3.17": - version "7.3.22" - resolved "https://registry.yarnpkg.com/@graphql-tools/code-file-loader/-/code-file-loader-7.3.22.tgz#e2495c4697da19dec2ba880b82f3ce4b1d5e72ba" - integrity sha512-Dq38L0UTjWlGKaV8pTfOAHB/hhhNVuVOApBhpqMBSuE20B9vFslSWJvDXQzbCcSPNMAeuvq0JNjIeIec0O4qyw== + version "7.3.23" + resolved "https://registry.yarnpkg.com/@graphql-tools/code-file-loader/-/code-file-loader-7.3.23.tgz#33793f9a1f8e74981f8ae6ec4ab7061f9713db15" + integrity sha512-8Wt1rTtyTEs0p47uzsPJ1vAtfAx0jmxPifiNdmo9EOCuUPyQGEbMaik/YkqZ7QUFIEYEQu+Vgfo8tElwOPtx5Q== dependencies: - "@graphql-tools/graphql-tag-pluck" "7.5.1" + "@graphql-tools/graphql-tag-pluck" "7.5.2" "@graphql-tools/utils" "^9.2.1" globby "^11.0.3" tslib "^2.4.0" unixify "^1.0.0" "@graphql-tools/delegate@^9.0.31": - version "9.0.32" - resolved "https://registry.yarnpkg.com/@graphql-tools/delegate/-/delegate-9.0.32.tgz#c8d6c3d93e36aa48b51915161852f2eb72427249" - integrity sha512-ZleId1mDSca4cjHQidIDv4HQR7B7B+nazF3nsWm2IIps40suR/hkADVgfJNegYbn8KhA3C9b1qEjcltP/Do3Ag== + version "9.0.35" + resolved "https://registry.yarnpkg.com/@graphql-tools/delegate/-/delegate-9.0.35.tgz#94683f4bcec63520b4a6c8b2abf2e2e9324ea4f1" + integrity sha512-jwPu8NJbzRRMqi4Vp/5QX1vIUeUPpWmlQpOkXQD2r1X45YsVceyUUBnktCrlJlDB4jPRVy7JQGwmYo3KFiOBMA== dependencies: - "@graphql-tools/batch-execute" "^8.5.19" - "@graphql-tools/executor" "^0.0.18" - "@graphql-tools/schema" "^9.0.18" + "@graphql-tools/batch-execute" "^8.5.22" + "@graphql-tools/executor" "^0.0.20" + "@graphql-tools/schema" "^9.0.19" "@graphql-tools/utils" "^9.2.1" dataloader "^2.2.2" tslib "^2.5.0" @@ -2148,9 +1655,9 @@ ws "8.13.0" "@graphql-tools/executor-http@^0.1.7", "@graphql-tools/executor-http@^0.1.9": - version "0.1.9" - resolved "https://registry.yarnpkg.com/@graphql-tools/executor-http/-/executor-http-0.1.9.tgz#ddd74ef376b4a2ed59c622acbcca068890854a30" - integrity sha512-tNzMt5qc1ptlHKfpSv9wVBVKCZ7gks6Yb/JcYJluxZIT4qRV+TtOFjpptfBU63usgrGVOVcGjzWc/mt7KhmmpQ== + version "0.1.10" + resolved "https://registry.yarnpkg.com/@graphql-tools/executor-http/-/executor-http-0.1.10.tgz#faf48e18e62a925796c9653c2f50cf2095bc8e6f" + integrity sha512-hnAfbKv0/lb9s31LhWzawQ5hghBfHS+gYWtqxME6Rl0Aufq9GltiiLBcl7OVVOnkLF0KhwgbYP1mB5VKmgTGpg== dependencies: "@graphql-tools/utils" "^9.2.1" "@repeaterjs/repeater" "^3.0.4" @@ -2172,23 +1679,23 @@ tslib "^2.4.0" ws "8.13.0" -"@graphql-tools/executor@^0.0.18": - version "0.0.18" - resolved "https://registry.yarnpkg.com/@graphql-tools/executor/-/executor-0.0.18.tgz#5b9f881d59484ea55278de3b4743ece8d68bc6e7" - integrity sha512-xZC0C+/npXoSHBB5bsJdwxDLgtl1Gu4fL9J2TPQmXoZC3L2N506KJoppf9LgWdHU/xK04luJrhP6WjhfkIN0pQ== +"@graphql-tools/executor@^0.0.20": + version "0.0.20" + resolved "https://registry.yarnpkg.com/@graphql-tools/executor/-/executor-0.0.20.tgz#d51d159696e839522dd49d936636af251670e425" + integrity sha512-GdvNc4vszmfeGvUqlcaH1FjBoguvMYzxAfT6tDd4/LgwymepHhinqLNA5otqwVLW+JETcDaK7xGENzFomuE6TA== dependencies: "@graphql-tools/utils" "^9.2.1" "@graphql-typed-document-node/core" "3.2.0" - "@repeaterjs/repeater" "3.0.4" + "@repeaterjs/repeater" "^3.0.4" tslib "^2.4.0" - value-or-promise "1.0.12" + value-or-promise "^1.0.12" "@graphql-tools/git-loader@^7.2.13": - version "7.2.21" - resolved "https://registry.yarnpkg.com/@graphql-tools/git-loader/-/git-loader-7.2.21.tgz#9ebe7029bdb0d4b31c279fe462faaf832c945aa2" - integrity sha512-m9pZrhkc92iq7WRuZxA4NctNofQfhA34QoCLFCnm9krrvFUvzNZHhUvrfW5x3e63NTreu4+CFDPItBHeGZjoGA== + version "7.3.0" + resolved "https://registry.yarnpkg.com/@graphql-tools/git-loader/-/git-loader-7.3.0.tgz#ca10c17d4f58c4592432d9d2ac1c2b393aebad16" + integrity sha512-gcGAK+u16eHkwsMYqqghZbmDquh8QaO24Scsxq+cVR+vx1ekRlsEiXvu+yXVDbZdcJ6PBIbeLcQbEu+xhDLmvQ== dependencies: - "@graphql-tools/graphql-tag-pluck" "7.5.1" + "@graphql-tools/graphql-tag-pluck" "7.5.2" "@graphql-tools/utils" "^9.2.1" is-glob "4.0.3" micromatch "^4.0.4" @@ -2219,13 +1726,13 @@ tslib "^2.4.0" unixify "^1.0.0" -"@graphql-tools/graphql-tag-pluck@7.5.1", "@graphql-tools/graphql-tag-pluck@^7.4.6": - version "7.5.1" - resolved "https://registry.yarnpkg.com/@graphql-tools/graphql-tag-pluck/-/graphql-tag-pluck-7.5.1.tgz#6be7958ecbe8c3be2e918c110a77b61a0751e09f" - integrity sha512-TgKcSvs2sdFHMbUzyhR9bnYfwFHxqdpotX5Q0OcMmJkuieQe1q60+eEANWlCrjuEqr2giw528Ydq57MIWLKlNA== +"@graphql-tools/graphql-tag-pluck@7.5.2", "@graphql-tools/graphql-tag-pluck@^7.4.6": + version "7.5.2" + resolved "https://registry.yarnpkg.com/@graphql-tools/graphql-tag-pluck/-/graphql-tag-pluck-7.5.2.tgz#502f1e066e19d832ebdeba5f571d7636dc27572d" + integrity sha512-RW+H8FqOOLQw0BPXaahYepVSRjuOHw+7IL8Opaa5G5uYGOBxoXR7DceyQ7BcpMgktAOOmpDNQ2WtcboChOJSRA== dependencies: "@babel/parser" "^7.16.8" - "@babel/plugin-syntax-import-assertions" "7.20.0" + "@babel/plugin-syntax-import-assertions" "^7.20.0" "@babel/traverse" "^7.16.8" "@babel/types" "^7.16.8" "@graphql-tools/utils" "^9.2.1" @@ -2261,9 +1768,9 @@ tslib "^2.4.0" "@graphql-tools/merge@^8.2.6", "@graphql-tools/merge@^8.4.1": - version "8.4.1" - resolved "https://registry.yarnpkg.com/@graphql-tools/merge/-/merge-8.4.1.tgz#52879e5f73565f504ceea04fcd9ef90a6e733c62" - integrity sha512-hssnPpZ818mxgl5+GfyOOSnnflAxiaTn1A1AojZcIbh4J52sS1Q0gSuBR5VrnUDjuxiqoCotpXdAQl+K+U6KLQ== + version "8.4.2" + resolved "https://registry.yarnpkg.com/@graphql-tools/merge/-/merge-8.4.2.tgz#95778bbe26b635e8d2f60ce9856b388f11fe8288" + integrity sha512-XbrHAaj8yDuINph+sAfuq3QCZ/tKblrTLOpirK0+CAgNlZUCHs0Fa+xtMUURgwCVThLle1AF7svJCxFizygLsw== dependencies: "@graphql-tools/utils" "^9.2.1" tslib "^2.4.0" @@ -2276,9 +1783,9 @@ tslib "^2.4.0" "@graphql-tools/prisma-loader@^7.2.49": - version "7.2.71" - resolved "https://registry.yarnpkg.com/@graphql-tools/prisma-loader/-/prisma-loader-7.2.71.tgz#7540bfabcc9717c10c1ebdb359d265f721205199" - integrity sha512-FuIvhRrkduqPdj3QX0/anCxGViEETfoZ/1NvotfM6iVO1XxR75VXvP/iyKGbK6XvYRXwSstgj2DetlQnqdgXhA== + version "7.2.72" + resolved "https://registry.yarnpkg.com/@graphql-tools/prisma-loader/-/prisma-loader-7.2.72.tgz#6304fc23600458396f3ede713d8e2371df7850e3" + integrity sha512-0a7uV7Fky6yDqd0tI9+XMuvgIo6GAqiVzzzFV4OSLry4AwiQlI3igYseBV7ZVOGhedOTqj/URxjpiv07hRcwag== dependencies: "@graphql-tools/url-loader" "^7.17.18" "@graphql-tools/utils" "^9.2.1" @@ -2289,8 +1796,8 @@ debug "^4.3.1" dotenv "^16.0.0" graphql-request "^6.0.0" - http-proxy-agent "^5.0.0" - https-proxy-agent "^5.0.0" + http-proxy-agent "^6.0.0" + https-proxy-agent "^6.0.0" jose "^4.11.4" js-yaml "^4.0.0" json-stable-stringify "^1.0.1" @@ -2308,15 +1815,15 @@ "@graphql-tools/utils" "^9.2.1" tslib "^2.4.0" -"@graphql-tools/schema@^9.0.0", "@graphql-tools/schema@^9.0.18": - version "9.0.18" - resolved "https://registry.yarnpkg.com/@graphql-tools/schema/-/schema-9.0.18.tgz#f66dd5e76e1aba85904cb649fde88ae01718c45c" - integrity sha512-Kckb+qoo36o5RSIVfBNU5XR5fOg4adNa1xuhhUgbQejDaI684tIJbTWwYbrDPVEGL/dqJJX3rrsq7RLufjNFoQ== +"@graphql-tools/schema@^9.0.0", "@graphql-tools/schema@^9.0.18", "@graphql-tools/schema@^9.0.19": + version "9.0.19" + resolved "https://registry.yarnpkg.com/@graphql-tools/schema/-/schema-9.0.19.tgz#c4ad373b5e1b8a0cf365163435b7d236ebdd06e7" + integrity sha512-oBRPoNBtCkk0zbUsyP4GaIzCt8C0aCI4ycIRUL67KK5pOHljKLBBtGT+Jr6hkzA74C8Gco8bpZPe7aWFjiaK2w== dependencies: "@graphql-tools/merge" "^8.4.1" "@graphql-tools/utils" "^9.2.1" tslib "^2.4.0" - value-or-promise "1.0.12" + value-or-promise "^1.0.12" "@graphql-tools/url-loader@^7.13.2", "@graphql-tools/url-loader@^7.17.18", "@graphql-tools/url-loader@^7.9.7": version "7.17.18" @@ -2368,13 +1875,13 @@ resolved "https://registry.yarnpkg.com/@graphql-typed-document-node/core/-/core-3.2.0.tgz#5f3d96ec6b2354ad6d8a28bf216a1d97b5426861" integrity sha512-mB9oAsNCm9aM3/SOv4YtBMqZbYj10R7dkq8byBqxGY/ncFwhf2oQzMV+LCRlWoDSEBJ3COiR1yeDvMtsoOsuFQ== -"@humanwhocodes/config-array@^0.11.8": - version "0.11.8" - resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.8.tgz#03595ac2075a4dc0f191cc2131de14fbd7d410b9" - integrity sha512-UybHIJzJnR5Qc/MsD9Kr+RpO2h+/P1GhOwdiLPXK5TWk5sgTdu88bTD9UP+CKbPPh5Rni1u0GjAdYQLemG8g+g== +"@humanwhocodes/config-array@^0.11.10", "@humanwhocodes/config-array@^0.11.13": + version "0.11.14" + resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.14.tgz#d78e481a039f7566ecc9660b4ea7fe6b1fec442b" + integrity sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg== dependencies: - "@humanwhocodes/object-schema" "^1.2.1" - debug "^4.1.1" + "@humanwhocodes/object-schema" "^2.0.2" + debug "^4.3.1" minimatch "^3.0.5" "@humanwhocodes/module-importer@^1.0.1": @@ -2382,23 +1889,33 @@ resolved "https://registry.yarnpkg.com/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz#af5b2691a22b44be847b0ca81641c5fb6ad0172c" integrity sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA== -"@humanwhocodes/object-schema@^1.2.1": - version "1.2.1" - resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45" - integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA== +"@humanwhocodes/momoa@^2.0.2": + version "2.0.4" + resolved "https://registry.yarnpkg.com/@humanwhocodes/momoa/-/momoa-2.0.4.tgz#8b9e7a629651d15009c3587d07a222deeb829385" + integrity sha512-RE815I4arJFtt+FVeU1Tgp9/Xvecacji8w/V6XtXsWWH/wz/eNkNbhb+ny/+PlVZjV0rxQpRSQKNKE3lcktHEA== + +"@humanwhocodes/object-schema@^2.0.2": + version "2.0.2" + resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-2.0.2.tgz#d9fae00a2d5cb40f92cfe64b47ad749fbc38f917" + integrity sha512-6EwiSjwWYP7pTckG6I5eyFANjPhmPjUX9JRLUSfNPC7FX7zK9gyZAfUEaECL6ALTpGX5AjnBq3C9XmVWPitNpw== "@iden3/bigarray@0.0.2": version "0.0.2" resolved "https://registry.yarnpkg.com/@iden3/bigarray/-/bigarray-0.0.2.tgz#6fc4ba5be18daf8a26ee393f2fb62b80d98c05e9" integrity sha512-Xzdyxqm1bOFF6pdIsiHLLl3HkSLjbhqJHVyqaTxXt3RqXBEnmsUmEW47H7VOi/ak7TdkRpNkxjyK5Zbkm+y52g== -"@iden3/binfileutils@0.0.8": - version "0.0.8" - resolved "https://registry.yarnpkg.com/@iden3/binfileutils/-/binfileutils-0.0.8.tgz#d1d349bdbaa9f0a99644232c7d75ea0db98ea1c7" - integrity sha512-/GqTsujUssGuQY+sd/XaLrA+OiCwzm+6yH28C57QQDWCHET2Logry9fGxU10n6XKdhCQBjZ7T/YMQkLwwkpRTQ== +"@iden3/binfileutils@0.0.11": + version "0.0.11" + resolved "https://registry.yarnpkg.com/@iden3/binfileutils/-/binfileutils-0.0.11.tgz#9ffbbcc1279f2b2182bb6dcff4eee8a5b2167911" + integrity sha512-LylnJoZ0CTdgErnKY8OxohvW4K+p6UHD3sxt+3P9AmMyBQjYR4IpoqoYZZ+9aMj89cmCQ21UvdhndAx04er3NA== dependencies: - fastfile "0.0.19" - ffjavascript "^0.2.30" + fastfile "0.0.20" + ffjavascript "^0.2.48" + +"@import-maps/resolve@^1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@import-maps/resolve/-/resolve-1.0.1.tgz#1e9fcadcf23aa0822256a329aabca241879d37c9" + integrity sha512-tWZNBIS1CoekcwlMuyG2mr0a1Wo5lb5lEHwwWvZo+5GLgr3e9LLDTtmgtCWEwBpXMkxn9D+2W9j2FY6eZQq0tA== "@intlify/bundle-utils@^4.0.0": version "4.0.0" @@ -2411,48 +1928,39 @@ source-map "0.6.1" yaml-eslint-parser "^0.3.2" -"@intlify/core-base@9.2.2": - version "9.2.2" - resolved "https://registry.yarnpkg.com/@intlify/core-base/-/core-base-9.2.2.tgz#5353369b05cc9fe35cab95fe20afeb8a4481f939" - integrity sha512-JjUpQtNfn+joMbrXvpR4hTF8iJQ2sEFzzK3KIESOx+f+uwIjgw20igOyaIdhfsVVBCds8ZM64MoeNSx+PHQMkA== - dependencies: - "@intlify/devtools-if" "9.2.2" - "@intlify/message-compiler" "9.2.2" - "@intlify/shared" "9.2.2" - "@intlify/vue-devtools" "9.2.2" - -"@intlify/devtools-if@9.2.2": - version "9.2.2" - resolved "https://registry.yarnpkg.com/@intlify/devtools-if/-/devtools-if-9.2.2.tgz#b13d9ac4b4e2fe6d2e7daa556517a8061fe8bd39" - integrity sha512-4ttr/FNO29w+kBbU7HZ/U0Lzuh2cRDhP8UlWOtV9ERcjHzuyXVZmjyleESK6eVP60tGC9QtQW9yZE+JeRhDHkg== +"@intlify/core-base@9.9.0": + version "9.9.0" + resolved "https://registry.yarnpkg.com/@intlify/core-base/-/core-base-9.9.0.tgz#edc55a5e3dbbf8dbbbf656529ed27832c4c4f522" + integrity sha512-C7UXPymDIOlMGSNjAhNLtKgzITc/8BjINK5gNKXg8GiWCTwL6n3MWr55czksxn8RM5wTMz0qcLOFT+adtaVQaA== dependencies: - "@intlify/shared" "9.2.2" + "@intlify/message-compiler" "9.9.0" + "@intlify/shared" "9.9.0" -"@intlify/message-compiler@9.2.2": - version "9.2.2" - resolved "https://registry.yarnpkg.com/@intlify/message-compiler/-/message-compiler-9.2.2.tgz#e42ab6939b8ae5b3d21faf6a44045667a18bba1c" - integrity sha512-IUrQW7byAKN2fMBe8z6sK6riG1pue95e5jfokn8hA5Q3Bqy4MBJ5lJAofUsawQJYHeoPJ7svMDyBaVJ4d0GTtA== +"@intlify/message-compiler@9.9.0": + version "9.9.0" + resolved "https://registry.yarnpkg.com/@intlify/message-compiler/-/message-compiler-9.9.0.tgz#7952759329e7af0388afbce7a984820bbeff82eb" + integrity sha512-yDU/jdUm9KuhEzYfS+wuyja209yXgdl1XFhMlKtXEgSFTxz4COZQCRXXbbH8JrAjMsaJ7bdoPSLsKlY6mXG2iA== dependencies: - "@intlify/shared" "9.2.2" - source-map "0.6.1" + "@intlify/shared" "9.9.0" + source-map-js "^1.0.2" "@intlify/message-compiler@next": - version "9.3.0-beta.17" - resolved "https://registry.yarnpkg.com/@intlify/message-compiler/-/message-compiler-9.3.0-beta.17.tgz#be9ca3a617926b3bbd8ab80dd354a1bb57969ef1" - integrity sha512-i7hvVIRk1Ax2uKa9xLRJCT57to08OhFMhFXXjWN07rmx5pWQYQ23MfX1xgggv9drnWTNhqEiD+u4EJeHoS5+Ww== + version "9.4.1" + resolved "https://registry.yarnpkg.com/@intlify/message-compiler/-/message-compiler-9.4.1.tgz#aa00629a455e23cece3464293834a02994b4fb04" + integrity sha512-aN2N+dUx320108QhH51Ycd2LEpZ+NKbzyQ2kjjhqMcxhHdxtOnkgdx+MDBhOy/CObwBmhC3Nygzc6hNlfKvPNw== dependencies: - "@intlify/shared" "9.3.0-beta.17" - source-map "0.6.1" + "@intlify/shared" "9.4.1" + source-map-js "^1.0.2" -"@intlify/shared@9.2.2": - version "9.2.2" - resolved "https://registry.yarnpkg.com/@intlify/shared/-/shared-9.2.2.tgz#5011be9ca2b4ab86f8660739286e2707f9abb4a5" - integrity sha512-wRwTpsslgZS5HNyM7uDQYZtxnbI12aGiBZURX3BTR9RFIKKRWpllTsgzHWvj3HKm3Y2Sh5LPC1r0PDCKEhVn9Q== +"@intlify/shared@9.4.1", "@intlify/shared@next": + version "9.4.1" + resolved "https://registry.yarnpkg.com/@intlify/shared/-/shared-9.4.1.tgz#bd0d221aaac476b6778a10ddcd0472f812c64e27" + integrity sha512-A51elBmZWf1FS80inf/32diO9DeXoqg9GR9aUDHFcfHoNDuT46Q+fpPOdj8jiJnSHSBh8E1E+6qWRhAZXdK3Ng== -"@intlify/shared@9.3.0-beta.17", "@intlify/shared@next": - version "9.3.0-beta.17" - resolved "https://registry.yarnpkg.com/@intlify/shared/-/shared-9.3.0-beta.17.tgz#1180dcb0b30741555fad0b62e4621802e8272ee5" - integrity sha512-mscf7RQsUTOil35jTij4KGW1RC9SWQjYScwLxP53Ns6g24iEd5HN7ksbt9O6FvTmlQuX77u+MXpBdfJsGqizLQ== +"@intlify/shared@9.9.0": + version "9.9.0" + resolved "https://registry.yarnpkg.com/@intlify/shared/-/shared-9.9.0.tgz#56907633c0f7b2d50f53269d31e88e7b24d39187" + integrity sha512-1ECUyAHRrzOJbOizyGufYP2yukqGrWXtkmTu4PcswVnWbkcjzk3YQGmJ0bLkM7JZ0ZYAaohLGdYvBYnTOGYJ9g== "@intlify/unplugin-vue-i18n@^0.8.1": version "0.8.2" @@ -2472,13 +1980,10 @@ source-map "0.6.1" unplugin "^1.0.0" -"@intlify/vue-devtools@9.2.2": - version "9.2.2" - resolved "https://registry.yarnpkg.com/@intlify/vue-devtools/-/vue-devtools-9.2.2.tgz#b95701556daf7ebb3a2d45aa3ae9e6415aed8317" - integrity sha512-+dUyqyCHWHb/UcvY1MlIpO87munedm3Gn6E9WWYdWrMuYLcoIoOEVDWSS8xSwtlPU+kA+MEQTP6Q1iI/ocusJg== - dependencies: - "@intlify/core-base" "9.2.2" - "@intlify/shared" "9.2.2" +"@ioredis/commands@^1.1.1": + version "1.2.0" + resolved "https://registry.yarnpkg.com/@ioredis/commands/-/commands-1.2.0.tgz#6d61b3097470af1fdbbe622795b8921d42018e11" + integrity sha512-Sx1pU8EM64o2BrqNpEO1CNLtKQwyhuXuqyfH7oGKCk+1a33d2r5saW8zNwm3j6BTExtjrv2BxTgzzkMwts6vGg== "@ipld/dag-cbor@^7.0.0": version "7.0.3" @@ -2503,6 +2008,29 @@ dependencies: multiformats "^9.5.4" +"@isaacs/cliui@^8.0.2": + version "8.0.2" + resolved "https://registry.yarnpkg.com/@isaacs/cliui/-/cliui-8.0.2.tgz#b37667b7bc181c168782259bab42474fbf52b550" + integrity sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA== + dependencies: + string-width "^5.1.2" + string-width-cjs "npm:string-width@^4.2.0" + strip-ansi "^7.0.1" + strip-ansi-cjs "npm:strip-ansi@^6.0.1" + wrap-ansi "^8.1.0" + wrap-ansi-cjs "npm:wrap-ansi@^7.0.0" + +"@jest/types@^27.5.1": + version "27.5.1" + resolved "https://registry.yarnpkg.com/@jest/types/-/types-27.5.1.tgz#3c79ec4a8ba61c170bf937bcf9e98a9df175ec80" + integrity sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw== + dependencies: + "@types/istanbul-lib-coverage" "^2.0.0" + "@types/istanbul-reports" "^3.0.0" + "@types/node" "*" + "@types/yargs" "^16.0.0" + 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" @@ -2512,12 +2040,7 @@ "@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": +"@jridgewell/resolve-uri@^3.0.3", "@jridgewell/resolve-uri@^3.1.0": 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== @@ -2527,12 +2050,7 @@ resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.2.tgz#7c6cf998d6d20b914c0a55a91ae928ff25965e72" integrity sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw== -"@jridgewell/sourcemap-codec@1.4.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", "@jridgewell/sourcemap-codec@^1.4.13": +"@jridgewell/sourcemap-codec@^1.4.10", "@jridgewell/sourcemap-codec@^1.4.13", "@jridgewell/sourcemap-codec@^1.4.14", "@jridgewell/sourcemap-codec@^1.4.15": version "1.4.15" resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz#d7c6e6755c78567a951e04ab52ef0fd26de59f32" integrity sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg== @@ -2546,12 +2064,12 @@ "@jridgewell/sourcemap-codec" "^1.4.10" "@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== + version "0.3.21" + resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.21.tgz#5dc1df7b3dc4a6209e503a924e1ca56097a2bb15" + integrity sha512-SRfKmRe1KvYnxjEMtxEr+J4HIeMX5YBg/qhRHpxEIGjhX1rshcHlnFUE9K0GazhVKWM7B+nARSkV8LuvJdJ5/g== dependencies: - "@jridgewell/resolve-uri" "3.1.0" - "@jridgewell/sourcemap-codec" "1.4.14" + "@jridgewell/resolve-uri" "^3.1.0" + "@jridgewell/sourcemap-codec" "^1.4.14" "@kleros/gtcr-encoder@1.4.0": version "1.4.0" @@ -2571,23 +2089,52 @@ ethers "^5.0.3" rlp "^2.2.5" -"@libp2p/interfaces@^3.3.1": - version "3.3.1" - resolved "https://registry.yarnpkg.com/@libp2p/interfaces/-/interfaces-3.3.1.tgz#519c77c030b10d776250bbebf65990af53ccb2ee" - integrity sha512-3N+goQt74SmaVOjwpwMPKLNgh1uDQGw8GD12c40Kc86WOq0qvpm3NfACW+H8Su2X6KmWjCSMzk9JWs9+8FtUfg== - "@lit-labs/ssr-dom-shim@^1.0.0", "@lit-labs/ssr-dom-shim@^1.1.0": - version "1.1.1" - resolved "https://registry.yarnpkg.com/@lit-labs/ssr-dom-shim/-/ssr-dom-shim-1.1.1.tgz#64df34e2f12e68e78ac57e571d25ec07fa460ca9" - integrity sha512-kXOeFbfCm4fFf2A3WwVEeQj55tMZa8c8/f9AKHMobQMkzNUfUj+antR3fRPaZJawsa1aZiP/Da3ndpZrwEe4rQ== + version "1.1.2" + resolved "https://registry.yarnpkg.com/@lit-labs/ssr-dom-shim/-/ssr-dom-shim-1.1.2.tgz#d693d972974a354034454ec1317eb6afd0b00312" + integrity sha512-jnOD+/+dSrfTWYfSXBXlo5l5f0q1UuJo3tkbMDCYA2lKUYq79jaxqtGEvnRoh049nt1vdo1+45RinipU6FGY2g== "@lit/reactive-element@^1.3.0", "@lit/reactive-element@^1.6.0": - version "1.6.1" - resolved "https://registry.yarnpkg.com/@lit/reactive-element/-/reactive-element-1.6.1.tgz#0d958b6d479d0e3db5fc1132ecc4fa84be3f0b93" - integrity sha512-va15kYZr7KZNNPZdxONGQzpUr+4sxVu7V/VG7a8mRfPPXUyhEYj5RzXCQmGrlP3tAh0L3HHm5AjBMFYRqlM9SA== + version "1.6.3" + resolved "https://registry.yarnpkg.com/@lit/reactive-element/-/reactive-element-1.6.3.tgz#25b4eece2592132845d303e091bad9b04cdcfe03" + integrity sha512-QuTgnG52Poic7uM1AN5yJ09QMe0O28e10XzSvWDz02TJiiKee4stsiownEIadWm8nYzyDAyT+gKzUoZmiWQtsQ== dependencies: "@lit-labs/ssr-dom-shim" "^1.0.0" +"@ljharb/resumer@~0.0.1": + version "0.0.1" + resolved "https://registry.yarnpkg.com/@ljharb/resumer/-/resumer-0.0.1.tgz#8a940a9192dd31f6a1df17564bbd26dc6ad3e68d" + integrity sha512-skQiAOrCfO7vRTq53cxznMpks7wS1va95UCidALlOVWqvBAzwPVErwizDwoMqNVMEn1mDq0utxZd02eIrvF1lw== + dependencies: + "@ljharb/through" "^2.3.9" + +"@ljharb/through@^2.3.9", "@ljharb/through@~2.3.9": + version "2.3.11" + resolved "https://registry.yarnpkg.com/@ljharb/through/-/through-2.3.11.tgz#783600ff12c06f21a76cc26e33abd0b1595092f9" + integrity sha512-ccfcIDlogiXNq5KcbAwbaO7lMh3Tm1i3khMPYpxlK8hH/W53zN81KM9coerRLOnTGu3nfXIniAmQbRI9OxbC0w== + dependencies: + call-bind "^1.0.2" + +"@lukeed/ms@^2.0.1": + version "2.0.2" + resolved "https://registry.yarnpkg.com/@lukeed/ms/-/ms-2.0.2.tgz#07f09e59a74c52f4d88c6db5c1054e819538e2a8" + integrity sha512-9I2Zn6+NJLfaGoz9jN3lpwDgAYvfGeNYdbAIjJOqzs4Tpc+VU3Jqq4IofSUBKajiDS8k9fZIg18/z13mpk1bsA== + +"@mapbox/node-pre-gyp@^1.0.5": + version "1.0.11" + resolved "https://registry.yarnpkg.com/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.11.tgz#417db42b7f5323d79e93b34a6d7a2a12c0df43fa" + integrity sha512-Yhlar6v9WQgUp/He7BdgzOz8lqMQ8sU+jkCq7Wx8Myc5YFJLbEe7lgui/V7G1qB1DJykHSGwreceSaD60Y0PUQ== + dependencies: + detect-libc "^2.0.0" + https-proxy-agent "^5.0.0" + make-dir "^3.1.0" + node-fetch "^2.6.7" + nopt "^5.0.0" + npmlog "^5.0.1" + rimraf "^3.0.2" + semver "^7.3.5" + tar "^6.1.11" + "@metamask/eth-sig-util@^4.0.0": version "4.0.1" resolved "https://registry.yarnpkg.com/@metamask/eth-sig-util/-/eth-sig-util-4.0.1.tgz#3ad61f6ea9ad73ba5b19db780d40d9aae5157088" @@ -2599,112 +2146,508 @@ tweetnacl "^1.0.3" tweetnacl-util "^0.15.1" -"@motionone/animation@^10.15.1": - version "10.15.1" - resolved "https://registry.yarnpkg.com/@motionone/animation/-/animation-10.15.1.tgz#4a85596c31cbc5100ae8eb8b34c459fb0ccf6807" - integrity sha512-mZcJxLjHor+bhcPuIFErMDNyrdb2vJur8lSfMCsuCB4UyV8ILZLvK+t+pg56erv8ud9xQGK/1OGPt10agPrCyQ== +"@motionone/animation@^10.15.1", "@motionone/animation@^10.17.0": + version "10.17.0" + resolved "https://registry.yarnpkg.com/@motionone/animation/-/animation-10.17.0.tgz#7633c6f684b5fee2b61c405881b8c24662c68fca" + integrity sha512-ANfIN9+iq1kGgsZxs+Nz96uiNcPLGTXwfNo2Xz/fcJXniPYpaz/Uyrfa+7I5BPLxCP82sh7quVDudf1GABqHbg== dependencies: - "@motionone/easing" "^10.15.1" - "@motionone/types" "^10.15.1" - "@motionone/utils" "^10.15.1" + "@motionone/easing" "^10.17.0" + "@motionone/types" "^10.17.0" + "@motionone/utils" "^10.17.0" tslib "^2.3.1" -"@motionone/dom@^10.16.2": - version "10.16.2" - resolved "https://registry.yarnpkg.com/@motionone/dom/-/dom-10.16.2.tgz#0c44df8ee3d1cfc50ee11d27050b27824355a61a" - integrity sha512-bnuHdNbge1FutZXv+k7xub9oPWcF0hsu8y1HTH/qg6av58YI0VufZ3ngfC7p2xhMJMnoh0LXFma2EGTgPeCkeg== +"@motionone/dom@^10.16.2", "@motionone/dom@^10.16.4": + version "10.17.0" + resolved "https://registry.yarnpkg.com/@motionone/dom/-/dom-10.17.0.tgz#519dd78aab0750a94614c69a82da5290cd617383" + integrity sha512-cMm33swRlCX/qOPHWGbIlCl0K9Uwi6X5RiL8Ma6OrlJ/TP7Q+Np5GE4xcZkFptysFjMTi4zcZzpnNQGQ5D6M0Q== dependencies: - "@motionone/animation" "^10.15.1" - "@motionone/generators" "^10.15.1" - "@motionone/types" "^10.15.1" - "@motionone/utils" "^10.15.1" + "@motionone/animation" "^10.17.0" + "@motionone/generators" "^10.17.0" + "@motionone/types" "^10.17.0" + "@motionone/utils" "^10.17.0" hey-listen "^1.0.8" tslib "^2.3.1" -"@motionone/easing@^10.15.1": - version "10.15.1" - resolved "https://registry.yarnpkg.com/@motionone/easing/-/easing-10.15.1.tgz#95cf3adaef34da6deebb83940d8143ede3deb693" - integrity sha512-6hIHBSV+ZVehf9dcKZLT7p5PEKHGhDwky2k8RKkmOvUoYP3S+dXsKupyZpqx5apjd9f+php4vXk4LuS+ADsrWw== +"@motionone/easing@^10.17.0": + version "10.17.0" + resolved "https://registry.yarnpkg.com/@motionone/easing/-/easing-10.17.0.tgz#d66cecf7e3ee30104ad00389fb3f0b2282d81aa9" + integrity sha512-Bxe2wSuLu/qxqW4rBFS5m9tMLOw+QBh8v5A7Z5k4Ul4sTj5jAOfZG5R0bn5ywmk+Fs92Ij1feZ5pmC4TeXA8Tg== dependencies: - "@motionone/utils" "^10.15.1" + "@motionone/utils" "^10.17.0" tslib "^2.3.1" -"@motionone/generators@^10.15.1": - version "10.15.1" - resolved "https://registry.yarnpkg.com/@motionone/generators/-/generators-10.15.1.tgz#dc6abb11139d1bafe758a41c134d4c753a9b871c" - integrity sha512-67HLsvHJbw6cIbLA/o+gsm7h+6D4Sn7AUrB/GPxvujse1cGZ38F5H7DzoH7PhX+sjvtDnt2IhFYF2Zp1QTMKWQ== +"@motionone/generators@^10.17.0": + version "10.17.0" + resolved "https://registry.yarnpkg.com/@motionone/generators/-/generators-10.17.0.tgz#878d292539c41434c13310d5f863a87a94e6e689" + integrity sha512-T6Uo5bDHrZWhIfxG/2Aut7qyWQyJIWehk6OB4qNvr/jwA/SRmixwbd7SOrxZi1z5rH3LIeFFBKK1xHnSbGPZSQ== dependencies: - "@motionone/types" "^10.15.1" - "@motionone/utils" "^10.15.1" + "@motionone/types" "^10.17.0" + "@motionone/utils" "^10.17.0" + tslib "^2.3.1" + +"@motionone/svelte@^10.16.2": + version "10.16.4" + resolved "https://registry.yarnpkg.com/@motionone/svelte/-/svelte-10.16.4.tgz#5daf117cf5b2576fc6dd487c5e0500938a742470" + integrity sha512-zRVqk20lD1xqe+yEDZhMYgftsuHc25+9JSo+r0a0OWUJFocjSV9D/+UGhX4xgJsuwB9acPzXLr20w40VnY2PQA== + dependencies: + "@motionone/dom" "^10.16.4" + tslib "^2.3.1" + +"@motionone/types@^10.15.1", "@motionone/types@^10.17.0": + version "10.17.0" + resolved "https://registry.yarnpkg.com/@motionone/types/-/types-10.17.0.tgz#179571ce98851bac78e19a1c3974767227f08ba3" + integrity sha512-EgeeqOZVdRUTEHq95Z3t8Rsirc7chN5xFAPMYFobx8TPubkEfRSm5xihmMUkbaR2ErKJTUw3347QDPTHIW12IA== + +"@motionone/utils@^10.15.1", "@motionone/utils@^10.17.0": + version "10.17.0" + resolved "https://registry.yarnpkg.com/@motionone/utils/-/utils-10.17.0.tgz#cc0ba8acdc6848ff48d8c1f2d0d3e7602f4f942e" + integrity sha512-bGwrki4896apMWIj9yp5rAS2m0xyhxblg6gTB/leWDPt+pb410W8lYWsxyurX+DH+gO1zsQsfx2su/c1/LtTpg== + dependencies: + "@motionone/types" "^10.17.0" + hey-listen "^1.0.8" + tslib "^2.3.1" + +"@motionone/vue@^10.16.2": + version "10.16.4" + resolved "https://registry.yarnpkg.com/@motionone/vue/-/vue-10.16.4.tgz#07d09e3aa5115ca0bcc0076cb9e5322775277c09" + integrity sha512-z10PF9JV6SbjFq+/rYabM+8CVlMokgl8RFGvieSGNTmrkQanfHn+15XBrhG3BgUfvmTeSeyShfOHpG0i9zEdcg== + dependencies: + "@motionone/dom" "^10.16.4" tslib "^2.3.1" -"@motionone/svelte@^10.16.2": - version "10.16.2" - resolved "https://registry.yarnpkg.com/@motionone/svelte/-/svelte-10.16.2.tgz#0b37c3b12927814d31d24941d1ca0ff49981b444" - integrity sha512-38xsroKrfK+aHYhuQlE6eFcGy0EwrB43Q7RGjF73j/kRUTcLNu/LAaKiLLsN5lyqVzCgTBVt4TMT/ShWbTbc5Q== +"@netlify/binary-info@^1.0.0": + version "1.0.0" + resolved "https://registry.yarnpkg.com/@netlify/binary-info/-/binary-info-1.0.0.tgz#cd0d86fb783fb03e52067f0cd284865e57be86c8" + integrity sha512-4wMPu9iN3/HL97QblBsBay3E1etIciR84izI3U+4iALY+JHCrI+a2jO0qbAZ/nxKoegypYEaiiqWXylm+/zfrw== + +"@netlify/blobs@6.4.2", "@netlify/blobs@^6.4.2": + version "6.4.2" + resolved "https://registry.yarnpkg.com/@netlify/blobs/-/blobs-6.4.2.tgz#e0f0e74bbf44055ddb79a50a438b339084c9302e" + integrity sha512-MccXfC/b8vRr5FWJTvMN7L3aBgtrbhNLWQsSu802C/R2Gmlb5C9/OC0IY4i0+BEZ8rS+F4TU/8NQsVlqHHVESQ== + +"@netlify/build-info@7.12.0": + version "7.12.0" + resolved "https://registry.yarnpkg.com/@netlify/build-info/-/build-info-7.12.0.tgz#7db828805c7957e293920313ff6c28b2398f1a4a" + integrity sha512-sYL/IIWYcZIqY+8W+2AysWnHB0PG7iUSJz9yb3aGSp40WaYsrjw69GUkw6GPRkcNxS/VR8a8eHL6ISlwYw/ONw== + dependencies: + "@bugsnag/js" "^7.20.0" + dot-prop "^7.2.0" + find-up "^6.3.0" + minimatch "^9.0.0" + read-pkg "^7.1.0" + semver "^7.3.8" + toml "^3.0.0" + yaml "^2.1.3" + yargs "^17.6.0" + +"@netlify/build@29.33.4": + version "29.33.4" + resolved "https://registry.yarnpkg.com/@netlify/build/-/build-29.33.4.tgz#34fc494c497e4652974cd437cd0b8fa52ab66272" + integrity sha512-pB0NDP0VoBNUKpe4XnmnjmDtzRVXxJgzgZ+vk2fNmvI81Ta+fSC+oHSURaxugHKvF2yFOzFgsV8FUlIlk3o5Eg== + dependencies: + "@bugsnag/js" "^7.0.0" + "@netlify/blobs" "^6.4.2" + "@netlify/cache-utils" "^5.1.5" + "@netlify/config" "^20.10.3" + "@netlify/edge-bundler" "11.2.2" + "@netlify/framework-info" "^9.8.10" + "@netlify/functions-utils" "^5.2.49" + "@netlify/git-utils" "^5.1.1" + "@netlify/opentelemetry-utils" "^1.0.1" + "@netlify/plugins-list" "^6.73.0" + "@netlify/run-utils" "^5.1.1" + "@netlify/zip-it-and-ship-it" "9.29.0" + "@opentelemetry/api" "~1.6.0" + "@sindresorhus/slugify" "^2.0.0" + ansi-escapes "^6.0.0" + chalk "^5.0.0" + clean-stack "^4.0.0" + execa "^6.0.0" + fdir "^6.0.1" + figures "^5.0.0" + filter-obj "^5.0.0" + got "^12.0.0" + hot-shots "10.0.0" + indent-string "^5.0.0" + is-plain-obj "^4.0.0" + js-yaml "^4.0.0" + keep-func-props "^4.0.0" + locate-path "^7.0.0" + log-process-errors "^8.0.0" + map-obj "^5.0.0" + memoize-one "^6.0.0" + node-fetch "^3.3.2" + os-name "^5.0.0" + p-event "^5.0.0" + p-every "^2.0.0" + p-filter "^3.0.0" + p-locate "^6.0.0" + p-map "^6.0.0" + p-reduce "^3.0.0" + path-exists "^5.0.0" + path-type "^5.0.0" + pkg-dir "^7.0.0" + pretty-ms "^8.0.0" + ps-list "^8.0.0" + read-pkg-up "^9.0.0" + readdirp "^3.4.0" + resolve "^2.0.0-next.1" + rfdc "^1.3.0" + safe-json-stringify "^1.2.0" + semver "^7.3.8" + string-width "^5.0.0" + strip-ansi "^7.0.0" + supports-color "^9.0.0" + terminal-link "^3.0.0" + ts-node "^10.9.1" + typescript "^5.0.0" + uuid "^9.0.0" + yargs "^17.6.0" + +"@netlify/cache-utils@^5.1.5": + version "5.1.5" + resolved "https://registry.yarnpkg.com/@netlify/cache-utils/-/cache-utils-5.1.5.tgz#848c59003e576fa0b2f9c6ca270eff27af938b25" + integrity sha512-lMNdFmy2Yu3oVquSPooRDLxJ8QOsIX6X6vzA2pKz/9V2LQFJiqBukggXM+Rnqzk1regPpdJ0jK3dPGvOKaRQgg== + dependencies: + cpy "^9.0.0" + get-stream "^6.0.0" + globby "^13.0.0" + junk "^4.0.0" + locate-path "^7.0.0" + move-file "^3.0.0" + path-exists "^5.0.0" + readdirp "^3.4.0" + +"@netlify/config@20.10.3": + version "20.10.3" + resolved "https://registry.yarnpkg.com/@netlify/config/-/config-20.10.3.tgz#ff3312a811f4b54f514c18acbae23d8d11a7d637" + integrity sha512-MZAvf6BWMBk3MpMeqjrZoI8EUjHIVJTHSFRlRn8/QROHyUgO9XWTZL892MKJZE3mgu1YP0iQP4rVkzidAikTQA== + dependencies: + chalk "^5.0.0" + cron-parser "^4.1.0" + deepmerge "^4.2.2" + dot-prop "^7.0.0" + execa "^6.0.0" + fast-safe-stringify "^2.0.7" + figures "^5.0.0" + filter-obj "^5.0.0" + find-up "^6.0.0" + indent-string "^5.0.0" + is-plain-obj "^4.0.0" + js-yaml "^4.0.0" + map-obj "^5.0.0" + netlify "^13.1.14" + netlify-headers-parser "^7.1.3" + netlify-redirect-parser "^14.2.1" + node-fetch "^3.3.1" + omit.js "^2.0.2" + p-locate "^6.0.0" + path-type "^5.0.0" + toml "^3.0.0" + tomlify-j0.4 "^3.0.0" + validate-npm-package-name "^4.0.0" + yargs "^17.6.0" + +"@netlify/config@^20.10.3": + version "20.11.0" + resolved "https://registry.yarnpkg.com/@netlify/config/-/config-20.11.0.tgz#78a1adcd8349982b24d3e9540f5018da7d88d3cb" + integrity sha512-MjWSgtVCtWpAb0CRmro0sfC6SiIJd37eRHSFggEyX9bSI8JytpDUt3J8wpiS4z+LhpFDp+IKAZ1pionbVvXiUw== + dependencies: + chalk "^5.0.0" + cron-parser "^4.1.0" + deepmerge "^4.2.2" + dot-prop "^7.0.0" + execa "^6.0.0" + fast-safe-stringify "^2.0.7" + figures "^5.0.0" + filter-obj "^5.0.0" + find-up "^6.0.0" + indent-string "^5.0.0" + is-plain-obj "^4.0.0" + js-yaml "^4.0.0" + map-obj "^5.0.0" + netlify "^13.1.14" + netlify-headers-parser "^7.1.3" + netlify-redirect-parser "^14.2.1" + node-fetch "^3.3.1" + omit.js "^2.0.2" + p-locate "^6.0.0" + path-type "^5.0.0" + toml "^3.0.0" + tomlify-j0.4 "^3.0.0" + validate-npm-package-name "^4.0.0" + yargs "^17.6.0" + +"@netlify/edge-bundler@11.2.2": + version "11.2.2" + resolved "https://registry.yarnpkg.com/@netlify/edge-bundler/-/edge-bundler-11.2.2.tgz#ad2b40eb53dedfd3bc8da9bf4912a0c6a924b24b" + integrity sha512-RrRmM/bSl9K5InIJS9BbpY89Y7Y+83DoOoKR1/PE3gy7b9FONm8Cry9/YC4y+tUUWLuUo4dgt8+/Pw0uGFyI+g== + dependencies: + "@import-maps/resolve" "^1.0.1" + "@vercel/nft" "^0.26.0" + ajv "^8.11.2" + ajv-errors "^3.0.0" + better-ajv-errors "^1.2.0" + common-path-prefix "^3.0.0" + env-paths "^3.0.0" + esbuild "0.19.11" + execa "^6.0.0" + find-up "^6.3.0" + get-package-name "^2.2.0" + get-port "^6.1.2" + is-path-inside "^4.0.0" + jsonc-parser "^3.2.0" + node-fetch "^3.1.1" + node-stream-zip "^1.15.0" + p-retry "^5.1.1" + p-wait-for "^4.1.0" + path-key "^4.0.0" + regexp-tree "^0.1.24" + semver "^7.3.8" + tmp-promise "^3.0.3" + urlpattern-polyfill "8.0.2" + uuid "^9.0.0" + +"@netlify/framework-info@^9.8.10": + version "9.8.10" + resolved "https://registry.yarnpkg.com/@netlify/framework-info/-/framework-info-9.8.10.tgz#a18589f132dafb5cb7f86c05a9895b9118633fe1" + integrity sha512-VT8ejAaB/XU2xRpdpQinHUO1YL3+BMx6LJ49wJk2u9Yq/VI1/gYCi5VqbqTHBQXJUlOi84YuiRlrDBsLpPr8eg== + dependencies: + ajv "^8.12.0" + filter-obj "^5.0.0" + find-up "^6.3.0" + is-plain-obj "^4.0.0" + locate-path "^7.0.0" + p-filter "^3.0.0" + p-locate "^6.0.0" + process "^0.11.10" + read-pkg-up "^9.0.0" + semver "^7.3.8" + +"@netlify/functions-utils@^5.2.49": + version "5.2.49" + resolved "https://registry.yarnpkg.com/@netlify/functions-utils/-/functions-utils-5.2.49.tgz#d54bf01a6f9345954165805a6d0b9158c05d604a" + integrity sha512-risycfkRDJtlJ7/ixdlOth3h92toGuvkFol15VGywstXz40icIEFEw35VZR3w6TTR64gfDo4A3s4lGDdH5UdGA== + dependencies: + "@netlify/zip-it-and-ship-it" "9.29.0" + cpy "^9.0.0" + path-exists "^5.0.0" + +"@netlify/functions@^2.5.1": + version "2.5.1" + resolved "https://registry.yarnpkg.com/@netlify/functions/-/functions-2.5.1.tgz#a3c111979cf14654267de8a2384348a066481b4e" + integrity sha512-7//hmiFHXGusAzuzEuXvRT9ItaeRjRs5lRs6lYUkaAXO1jnTWYDB2XdqFq5X4yMRX+/A96nrQ2HwCE+Pd0YMwg== + dependencies: + "@netlify/serverless-functions-api" "1.13.0" + is-promise "^4.0.0" + +"@netlify/git-utils@^5.1.1": + version "5.1.1" + resolved "https://registry.yarnpkg.com/@netlify/git-utils/-/git-utils-5.1.1.tgz#36d5a6433a070035099b47d9151638053752cd7b" + integrity sha512-oyHieuTZH3rKTmg7EKpGEGa28IFxta2oXuVwpPJI/FJAtBje3UE+yko0eDjNufgm3AyGa8G77trUxgBhInAYuw== + dependencies: + execa "^6.0.0" + map-obj "^5.0.0" + micromatch "^4.0.2" + moize "^6.1.3" + path-exists "^5.0.0" + +"@netlify/local-functions-proxy-darwin-arm64@1.1.1": + version "1.1.1" + resolved "https://registry.yarnpkg.com/@netlify/local-functions-proxy-darwin-arm64/-/local-functions-proxy-darwin-arm64-1.1.1.tgz#c83a0a142637fb8cefe25c95f5c5cf6f2d7e32ed" + integrity sha512-lphJ9qqZ3glnKWEqlemU1LMqXxtJ/tKf7VzakqqyjigwLscXSZSb6fupSjQfd4tR1xqxA76ylws/2HDhc/gs+Q== + +"@netlify/local-functions-proxy-darwin-x64@1.1.1": + version "1.1.1" + resolved "https://registry.yarnpkg.com/@netlify/local-functions-proxy-darwin-x64/-/local-functions-proxy-darwin-x64-1.1.1.tgz#e8b558cfd459a5d8343d468e5c128a144638967a" + integrity sha512-4CRB0H+dXZzoEklq5Jpmg+chizXlVwCko94d8+UHWCgy/bA3M/rU/BJ8OLZisnJaAktHoeLABKtcLOhtRHpxZQ== + +"@netlify/local-functions-proxy-freebsd-arm64@1.1.1": + version "1.1.1" + resolved "https://registry.yarnpkg.com/@netlify/local-functions-proxy-freebsd-arm64/-/local-functions-proxy-freebsd-arm64-1.1.1.tgz#3a60e32fe1929f97817db5da0925c37feea7606e" + integrity sha512-u13lWTVMJDF0A6jX7V4N3HYGTIHLe5d1Z2wT43fSIHwXkTs6UXi72cGSraisajG+5JFIwHfPr7asw5vxFC0P9w== + +"@netlify/local-functions-proxy-freebsd-x64@1.1.1": + version "1.1.1" + resolved "https://registry.yarnpkg.com/@netlify/local-functions-proxy-freebsd-x64/-/local-functions-proxy-freebsd-x64-1.1.1.tgz#ddc526256cb835f6dbd6747d75a7f3dbcca77da8" + integrity sha512-g5xw4xATK5YDzvXtzJ8S1qSkWBiyF8VVRehXPMOAMzpGjCX86twYhWp8rbAk7yA1zBWmmWrWNA2Odq/MgpKJJg== + +"@netlify/local-functions-proxy-linux-arm64@1.1.1": + version "1.1.1" + resolved "https://registry.yarnpkg.com/@netlify/local-functions-proxy-linux-arm64/-/local-functions-proxy-linux-arm64-1.1.1.tgz#c88c3d8eacdaf655f871eb1eff58b1b3262c38ff" + integrity sha512-dPGu1H5n8na7mBKxiXQ+FNmthDAiA57wqgpm5JMAHtcdcmRvcXwJkwWVGvwfj8ShhYJHQaSaS9oPgO+mpKkgmA== + +"@netlify/local-functions-proxy-linux-arm@1.1.1": + version "1.1.1" + resolved "https://registry.yarnpkg.com/@netlify/local-functions-proxy-linux-arm/-/local-functions-proxy-linux-arm-1.1.1.tgz#d92905605f3f17c442001e6ead3710b64366fbd1" + integrity sha512-YsTpL+AbHwQrfHWXmKnwUrJBjoUON363nr6jUG1ueYnpbbv6wTUA7gI5snMi/gkGpqFusBthAA7C30e6bixfiA== + +"@netlify/local-functions-proxy-linux-ia32@1.1.1": + version "1.1.1" + resolved "https://registry.yarnpkg.com/@netlify/local-functions-proxy-linux-ia32/-/local-functions-proxy-linux-ia32-1.1.1.tgz#b4cb57c438a82f42c2e30ee4ec50cfa233379d59" + integrity sha512-Ra0FlXDrmPRaq+rYH3/ttkXSrwk1D5Zx/Na7UPfJZxMY7Qo5iY4bgi/FuzjzWzlp0uuKZOhYOYzYzsIIyrSvmw== + +"@netlify/local-functions-proxy-linux-ppc64@1.1.1": + version "1.1.1" + resolved "https://registry.yarnpkg.com/@netlify/local-functions-proxy-linux-ppc64/-/local-functions-proxy-linux-ppc64-1.1.1.tgz#3fdef281191dd819fee72ac58ccbca1ac650fee3" + integrity sha512-oXf1satwqwUUxz7LHS1BxbRqc4FFEKIDFTls04eXiLReFR3sqv9H/QuYNTCCDMuRcCOd92qKyDfATdnxT4HR8w== + +"@netlify/local-functions-proxy-linux-x64@1.1.1": + version "1.1.1" + resolved "https://registry.yarnpkg.com/@netlify/local-functions-proxy-linux-x64/-/local-functions-proxy-linux-x64-1.1.1.tgz#bd2c8059c5d7dd46ef5da174723ca2cdd7bfdb2f" + integrity sha512-bS3u4JuDg/eC0y4Na3i/29JBOxrdUvsK5JSjHfzUeZEbOcuXYf4KavTpHS5uikdvTgyczoSrvbmQJ5m0FLXfLA== + +"@netlify/local-functions-proxy-openbsd-x64@1.1.1": + version "1.1.1" + resolved "https://registry.yarnpkg.com/@netlify/local-functions-proxy-openbsd-x64/-/local-functions-proxy-openbsd-x64-1.1.1.tgz#31a3340f4f10dd5c95cd3f2dc9f1e967c051aa2a" + integrity sha512-1xLef/kLRNkBTXJ+ZGoRFcwsFxd/B2H3oeJZyXaZ3CN5umd9Mv9wZuAD74NuMt/535yRva8jtAJqvEgl9xMSdA== + +"@netlify/local-functions-proxy-win32-ia32@1.1.1": + version "1.1.1" + resolved "https://registry.yarnpkg.com/@netlify/local-functions-proxy-win32-ia32/-/local-functions-proxy-win32-ia32-1.1.1.tgz#354890bc58f54e8b26721447f243c49945f2fe74" + integrity sha512-4IOMDBxp2f8VbIkhZ85zGNDrZR4ey8d68fCMSOIwitjsnKav35YrCf8UmAh3UR6CNIRJdJL4MW1GYePJ7iJ8uA== + +"@netlify/local-functions-proxy-win32-x64@1.1.1": + version "1.1.1" + resolved "https://registry.yarnpkg.com/@netlify/local-functions-proxy-win32-x64/-/local-functions-proxy-win32-x64-1.1.1.tgz#7ee183b4ccd0062b6124275387d844530ea0b224" + integrity sha512-VCBXBJWBujVxyo5f+3r8ovLc9I7wJqpmgDn3ixs1fvdrER5Ac+SzYwYH4mUug9HI08mzTSAKZErzKeuadSez3w== + +"@netlify/local-functions-proxy@1.1.1": + version "1.1.1" + resolved "https://registry.yarnpkg.com/@netlify/local-functions-proxy/-/local-functions-proxy-1.1.1.tgz#e5d1416e6d607f8e8bd4d295b1ee1e550d5bd3cb" + integrity sha512-eXSsayLT6PMvjzFQpjC9nkg2Otc3lZ5GoYele9M6f8PmsvWpaXRhwjNQ0NYhQQ2UZbLMIiO2dH8dbRsT3bMkFw== + optionalDependencies: + "@netlify/local-functions-proxy-darwin-arm64" "1.1.1" + "@netlify/local-functions-proxy-darwin-x64" "1.1.1" + "@netlify/local-functions-proxy-freebsd-arm64" "1.1.1" + "@netlify/local-functions-proxy-freebsd-x64" "1.1.1" + "@netlify/local-functions-proxy-linux-arm" "1.1.1" + "@netlify/local-functions-proxy-linux-arm64" "1.1.1" + "@netlify/local-functions-proxy-linux-ia32" "1.1.1" + "@netlify/local-functions-proxy-linux-ppc64" "1.1.1" + "@netlify/local-functions-proxy-linux-x64" "1.1.1" + "@netlify/local-functions-proxy-openbsd-x64" "1.1.1" + "@netlify/local-functions-proxy-win32-ia32" "1.1.1" + "@netlify/local-functions-proxy-win32-x64" "1.1.1" + +"@netlify/node-cookies@^0.1.0": + version "0.1.0" + resolved "https://registry.yarnpkg.com/@netlify/node-cookies/-/node-cookies-0.1.0.tgz#dda912ba618527695cf519fafa221c5e6777c612" + integrity sha512-OAs1xG+FfLX0LoRASpqzVntVV/RpYkgpI0VrUnw2u0Q1qiZUzcPffxRK8HF3gc4GjuhG5ahOEMJ9bswBiZPq0g== + +"@netlify/open-api@^2.28.0": + version "2.28.0" + resolved "https://registry.yarnpkg.com/@netlify/open-api/-/open-api-2.28.0.tgz#11f22423decd54e563a4c79135ffd21e1abed86f" + integrity sha512-lSx9yVn5mzTS7u9aevQyDRoWaHJYNl15B7CU373g8We39wW8fGh4sdNY7ciPWshf42FblOVlBdoasn/LpzquXg== + +"@netlify/opentelemetry-utils@^1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@netlify/opentelemetry-utils/-/opentelemetry-utils-1.0.1.tgz#4bc1faccf971e58d6d7fd5fe47fd13ecb8ab9757" + integrity sha512-mL8vhn4tUpdkHg1+WuqEhguULNeN0kQWZtel6lFEEZ36G41Vxm1gv6n7RcOanNLHxQEnaLS4J8zRVUSuwj6iTQ== dependencies: - "@motionone/dom" "^10.16.2" - tslib "^2.3.1" + "@opentelemetry/api" "~1.6.0" -"@motionone/types@^10.15.1": - version "10.15.1" - resolved "https://registry.yarnpkg.com/@motionone/types/-/types-10.15.1.tgz#89441b54285012795cbba8612cbaa0fa420db3eb" - integrity sha512-iIUd/EgUsRZGrvW0jqdst8st7zKTzS9EsKkP+6c6n4MPZoQHwiHuVtTQLD6Kp0bsBLhNzKIBlHXponn/SDT4hA== +"@netlify/plugins-list@^6.73.0": + version "6.75.0" + resolved "https://registry.yarnpkg.com/@netlify/plugins-list/-/plugins-list-6.75.0.tgz#953855a92eb5ff688da4885608e85d5a30a9a6bf" + integrity sha512-xH5UWc6v6oOu53kaNhJI6o0vESVECoGBjD5hW5nmjFaIkEJFDfbtHj/gSQ2hCcwIzTlGYRGIyGVBMY+e7ki6bw== -"@motionone/utils@^10.15.1": - version "10.15.1" - resolved "https://registry.yarnpkg.com/@motionone/utils/-/utils-10.15.1.tgz#6b5f51bde75be88b5411e084310299050368a438" - integrity sha512-p0YncgU+iklvYr/Dq4NobTRdAPv9PveRDUXabPEeOjBLSO/1FNB2phNTZxOxpi1/GZwYpAoECEa0Wam+nsmhSw== +"@netlify/run-utils@^5.1.1": + version "5.1.1" + resolved "https://registry.yarnpkg.com/@netlify/run-utils/-/run-utils-5.1.1.tgz#be1938aaca58f9032054cddea02e2673ffa9c4ee" + integrity sha512-V2B8ZB19heVKa715uOeDkztxLH7uaqZ+9U5fV7BRzbQ2514DO5Vxj9hG0irzuRLfZXZZjp/chPUesv4VVsce/A== dependencies: - "@motionone/types" "^10.15.1" - hey-listen "^1.0.8" - tslib "^2.3.1" + execa "^6.0.0" -"@motionone/vue@^10.16.2": - version "10.16.2" - resolved "https://registry.yarnpkg.com/@motionone/vue/-/vue-10.16.2.tgz#faf13afc27620a2df870c71c58a04ee8de8dea65" - integrity sha512-7/dEK/nWQXOkJ70bqb2KyNfSWbNvWqKKq1C8juj+0Mg/AorgD8O5wE3naddK0G+aXuNMqRuc4jlsYHHWHtIzVw== +"@netlify/serverless-functions-api@1.13.0": + version "1.13.0" + resolved "https://registry.yarnpkg.com/@netlify/serverless-functions-api/-/serverless-functions-api-1.13.0.tgz#cba7550881721ffc13db5bc7d6addcacef548d2f" + integrity sha512-H3SMpHw24jWjnEMqbXgILWdo3/Iv/2DRzOZZevqqEswRTOWcQJGlU35Dth72VAOxhPyWXjulogG1zJNRw8m2sQ== dependencies: - "@motionone/dom" "^10.16.2" - tslib "^2.3.1" + "@netlify/node-cookies" "^0.1.0" + urlpattern-polyfill "8.0.2" -"@multiformats/mafmt@^11.0.3": - version "11.1.2" - resolved "https://registry.yarnpkg.com/@multiformats/mafmt/-/mafmt-11.1.2.tgz#c03ef4022c795b7f230b136f2f974fc263eac4f1" - integrity sha512-3n1o5eLU7WzTAPLuz3AodV7Iql6NWf7Ws8fqVaGT7o5nDDabUPYGBm2cZuh3OrqmwyCY61LrNUIsjzivU6UdpQ== - dependencies: - "@multiformats/multiaddr" "^12.0.0" +"@netlify/serverless-functions-api@^1.13.1": + version "1.13.1" + resolved "https://registry.yarnpkg.com/@netlify/serverless-functions-api/-/serverless-functions-api-1.13.1.tgz#d76ba1acad441b7ae4059f305803e9f36a65b407" + integrity sha512-LWi0/ku6UvkCIwlREoJc3k2y/2uTc1u2pf+ODUdCwGwtewDJW8+wduVeQYLyywWemdIdg9IoMga3Q5wW0lBitQ== + dependencies: + "@netlify/node-cookies" "^0.1.0" + urlpattern-polyfill "8.0.2" + +"@netlify/zip-it-and-ship-it@9.29.0": + version "9.29.0" + resolved "https://registry.yarnpkg.com/@netlify/zip-it-and-ship-it/-/zip-it-and-ship-it-9.29.0.tgz#cdbf7879980e27df2f8c0d9a0b0354343adbfc6b" + integrity sha512-z6DxHmFmBiBRMZ1FgM/LnfnS0PFy9xdBVxk8SlzFPiNwOSQKpz1zV+DFcAfrWKEa4hvTtNzW05+teIqXRLLIqA== + dependencies: + "@babel/parser" "^7.22.5" + "@babel/types" "7.23.6" + "@netlify/binary-info" "^1.0.0" + "@netlify/serverless-functions-api" "^1.13.1" + "@vercel/nft" "^0.23.0" + archiver "^6.0.0" + common-path-prefix "^3.0.0" + cp-file "^10.0.0" + es-module-lexer "^1.0.0" + esbuild "0.19.11" + execa "^6.0.0" + fast-glob "^3.3.2" + filter-obj "^5.0.0" + find-up "^6.0.0" + glob "^8.0.3" + is-builtin-module "^3.1.0" + is-path-inside "^4.0.0" + junk "^4.0.0" + locate-path "^7.0.0" + merge-options "^3.0.4" + minimatch "^9.0.0" + normalize-path "^3.0.0" + p-map "^5.0.0" + path-exists "^5.0.0" + precinct "^11.0.0" + require-package-name "^2.0.1" + resolve "^2.0.0-next.1" + semver "^7.3.8" + tmp-promise "^3.0.2" + toml "^3.0.0" + unixify "^1.0.0" + urlpattern-polyfill "8.0.2" + yargs "^17.0.0" -"@multiformats/multiaddr@^11.0.0": - version "11.6.1" - resolved "https://registry.yarnpkg.com/@multiformats/multiaddr/-/multiaddr-11.6.1.tgz#ec46984a298e715e27a398434c087856db5f3185" - integrity sha512-doST0+aB7/3dGK9+U5y3mtF3jq85KGbke1QiH0KE1F5mGQ9y56mFebTeu2D9FNOm+OT6UHb8Ss8vbSnpGjeLNw== +"@noble/curves@1.1.0", "@noble/curves@~1.1.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@noble/curves/-/curves-1.1.0.tgz#f13fc667c89184bc04cccb9b11e8e7bae27d8c3d" + integrity sha512-091oBExgENk/kGj3AZmtBDMpxQPDtxQABR2B9lb1JbVTs6ytdzZNwvhxQ4MWasRNEzlbEH8jCWFCwhF/Obj5AA== dependencies: - "@chainsafe/is-ip" "^2.0.1" - dns-over-http-resolver "^2.1.0" - err-code "^3.0.1" - multiformats "^11.0.0" - uint8arrays "^4.0.2" - varint "^6.0.0" + "@noble/hashes" "1.3.1" -"@multiformats/multiaddr@^12.0.0": - version "12.1.2" - resolved "https://registry.yarnpkg.com/@multiformats/multiaddr/-/multiaddr-12.1.2.tgz#816654413a88f2c5c929ac4e12a54743511312c3" - integrity sha512-EYYUEAddjWoyig5Dcu+JGq2JdpEpT2tW/K4sefdDWVSQW+rfnABfz1rx/KnrituB20jC8aPBcT62kISTZ3oL5A== - dependencies: - "@chainsafe/is-ip" "^2.0.1" - "@chainsafe/netmask" "^2.0.0" - "@libp2p/interfaces" "^3.3.1" - dns-over-http-resolver "^2.1.0" - multiformats "^11.0.0" - uint8arrays "^4.0.2" - varint "^6.0.0" +"@noble/curves@1.2.0": + version "1.2.0" + resolved "https://registry.yarnpkg.com/@noble/curves/-/curves-1.2.0.tgz#92d7e12e4e49b23105a2555c6984d41733d65c35" + integrity sha512-oYclrNgRaM9SsBUBVbb8M6DTV7ZHRTKugureoYEncY5c65HOmRzvSiTE3y5CYaPYJA/GVkrhXEoF0M3Ya9PMnw== + dependencies: + "@noble/hashes" "1.3.2" "@noble/hashes@1.2.0", "@noble/hashes@~1.2.0": version "1.2.0" resolved "https://registry.yarnpkg.com/@noble/hashes/-/hashes-1.2.0.tgz#a3150eeb09cc7ab207ebf6d7b9ad311a9bdbed12" integrity sha512-FZfhjEDbT5GRswV3C6uvLPHMiVD6lQBmpoX5+eSiPaMTXte/IKqI5dykDxzZB/WBeK/CDuQRBWarPdi3FNY2zQ== +"@noble/hashes@1.3.1": + version "1.3.1" + resolved "https://registry.yarnpkg.com/@noble/hashes/-/hashes-1.3.1.tgz#8831ef002114670c603c458ab8b11328406953a9" + integrity sha512-EbqwksQwz9xDRGfDST86whPBgM65E0OH/pCgqW0GBVzO22bNE+NuIbeTb714+IfSjU3aRk47EUvXIb5bTsenKA== + +"@noble/hashes@1.3.2": + version "1.3.2" + resolved "https://registry.yarnpkg.com/@noble/hashes/-/hashes-1.3.2.tgz#6f26dbc8fbc7205873ce3cee2f690eba0d421b39" + integrity sha512-MVC8EAQp7MvEcm30KWENFjgR+Mkmf+D189XJTkFIlwohU5hcBbn1ZkKq7KVTi2Hme3PMGF390DaL52beVrIihQ== + +"@noble/hashes@~1.3.0", "@noble/hashes@~1.3.1": + version "1.3.3" + resolved "https://registry.yarnpkg.com/@noble/hashes/-/hashes-1.3.3.tgz#39908da56a4adc270147bb07968bf3b16cfe1699" + integrity sha512-V7/fPHgl+jsVPXqqeOzT8egNj2iBIVt+ECeMMG8TdcnTikP3oaBtUVqpT/gYCR68aEBJSF+XbYUxStjbFMqIIA== + "@noble/secp256k1@1.7.1", "@noble/secp256k1@~1.7.0": version "1.7.1" resolved "https://registry.yarnpkg.com/@noble/secp256k1/-/secp256k1-1.7.1.tgz#b251c70f824ce3ca7f8dc3df08d58f005cc0507c" @@ -2731,31 +2674,43 @@ "@nodelib/fs.scandir" "2.1.5" fastq "^1.6.0" -"@nomicfoundation/ethereumjs-block@5.0.1": - version "5.0.1" - resolved "https://registry.yarnpkg.com/@nomicfoundation/ethereumjs-block/-/ethereumjs-block-5.0.1.tgz#6f89664f55febbd723195b6d0974773d29ee133d" - integrity sha512-u1Yioemi6Ckj3xspygu/SfFvm8vZEO8/Yx5a1QLzi6nVU0jz3Pg2OmHKJ5w+D9Ogk1vhwRiqEBAqcb0GVhCyHw== - dependencies: - "@nomicfoundation/ethereumjs-common" "4.0.1" - "@nomicfoundation/ethereumjs-rlp" "5.0.1" - "@nomicfoundation/ethereumjs-trie" "6.0.1" - "@nomicfoundation/ethereumjs-tx" "5.0.1" - "@nomicfoundation/ethereumjs-util" "9.0.1" +"@nomicfoundation/ethereumjs-block@5.0.2": + version "5.0.2" + resolved "https://registry.yarnpkg.com/@nomicfoundation/ethereumjs-block/-/ethereumjs-block-5.0.2.tgz#13a7968f5964f1697da941281b7f7943b0465d04" + integrity sha512-hSe6CuHI4SsSiWWjHDIzWhSiAVpzMUcDRpWYzN0T9l8/Rz7xNn3elwVOJ/tAyS0LqL6vitUD78Uk7lQDXZun7Q== + dependencies: + "@nomicfoundation/ethereumjs-common" "4.0.2" + "@nomicfoundation/ethereumjs-rlp" "5.0.2" + "@nomicfoundation/ethereumjs-trie" "6.0.2" + "@nomicfoundation/ethereumjs-tx" "5.0.2" + "@nomicfoundation/ethereumjs-util" "9.0.2" ethereum-cryptography "0.1.3" ethers "^5.7.1" -"@nomicfoundation/ethereumjs-blockchain@7.0.1": - version "7.0.1" - resolved "https://registry.yarnpkg.com/@nomicfoundation/ethereumjs-blockchain/-/ethereumjs-blockchain-7.0.1.tgz#80e0bd3535bfeb9baa29836b6f25123dab06a726" - integrity sha512-NhzndlGg829XXbqJEYrF1VeZhAwSPgsK/OB7TVrdzft3y918hW5KNd7gIZ85sn6peDZOdjBsAXIpXZ38oBYE5A== - dependencies: - "@nomicfoundation/ethereumjs-block" "5.0.1" - "@nomicfoundation/ethereumjs-common" "4.0.1" - "@nomicfoundation/ethereumjs-ethash" "3.0.1" - "@nomicfoundation/ethereumjs-rlp" "5.0.1" - "@nomicfoundation/ethereumjs-trie" "6.0.1" - "@nomicfoundation/ethereumjs-tx" "5.0.1" - "@nomicfoundation/ethereumjs-util" "9.0.1" +"@nomicfoundation/ethereumjs-block@5.0.4": + version "5.0.4" + resolved "https://registry.yarnpkg.com/@nomicfoundation/ethereumjs-block/-/ethereumjs-block-5.0.4.tgz#ff2acb98a86b9290e35e315a6abfb9aebb9cf39e" + integrity sha512-AcyacJ9eX/uPEvqsPiB+WO1ymE+kyH48qGGiGV+YTojdtas8itUTW5dehDSOXEEItWGbbzEJ4PRqnQZlWaPvDw== + dependencies: + "@nomicfoundation/ethereumjs-common" "4.0.4" + "@nomicfoundation/ethereumjs-rlp" "5.0.4" + "@nomicfoundation/ethereumjs-trie" "6.0.4" + "@nomicfoundation/ethereumjs-tx" "5.0.4" + "@nomicfoundation/ethereumjs-util" "9.0.4" + ethereum-cryptography "0.1.3" + +"@nomicfoundation/ethereumjs-blockchain@7.0.2": + version "7.0.2" + resolved "https://registry.yarnpkg.com/@nomicfoundation/ethereumjs-blockchain/-/ethereumjs-blockchain-7.0.2.tgz#45323b673b3d2fab6b5008535340d1b8fea7d446" + integrity sha512-8UUsSXJs+MFfIIAKdh3cG16iNmWzWC/91P40sazNvrqhhdR/RtGDlFk2iFTGbBAZPs2+klZVzhRX8m2wvuvz3w== + dependencies: + "@nomicfoundation/ethereumjs-block" "5.0.2" + "@nomicfoundation/ethereumjs-common" "4.0.2" + "@nomicfoundation/ethereumjs-ethash" "3.0.2" + "@nomicfoundation/ethereumjs-rlp" "5.0.2" + "@nomicfoundation/ethereumjs-trie" "6.0.2" + "@nomicfoundation/ethereumjs-tx" "5.0.2" + "@nomicfoundation/ethereumjs-util" "9.0.2" abstract-level "^1.0.3" debug "^4.3.3" ethereum-cryptography "0.1.3" @@ -2763,108 +2718,277 @@ lru-cache "^5.1.1" memory-level "^1.0.0" -"@nomicfoundation/ethereumjs-common@4.0.1": - version "4.0.1" - resolved "https://registry.yarnpkg.com/@nomicfoundation/ethereumjs-common/-/ethereumjs-common-4.0.1.tgz#4702d82df35b07b5407583b54a45bf728e46a2f0" - integrity sha512-OBErlkfp54GpeiE06brBW/TTbtbuBJV5YI5Nz/aB2evTDo+KawyEzPjBlSr84z/8MFfj8wS2wxzQX1o32cev5g== +"@nomicfoundation/ethereumjs-blockchain@7.0.4": + version "7.0.4" + resolved "https://registry.yarnpkg.com/@nomicfoundation/ethereumjs-blockchain/-/ethereumjs-blockchain-7.0.4.tgz#b77511b389290b186c8d999e70f4b15c27ef44ea" + integrity sha512-jYsd/kwzbmpnxx86tXsYV8wZ5xGvFL+7/P0c6OlzpClHsbFzeF41KrYA9scON8Rg6bZu3ZTv6JOAgj3t7USUfg== + dependencies: + "@nomicfoundation/ethereumjs-block" "5.0.4" + "@nomicfoundation/ethereumjs-common" "4.0.4" + "@nomicfoundation/ethereumjs-ethash" "3.0.4" + "@nomicfoundation/ethereumjs-rlp" "5.0.4" + "@nomicfoundation/ethereumjs-trie" "6.0.4" + "@nomicfoundation/ethereumjs-tx" "5.0.4" + "@nomicfoundation/ethereumjs-util" "9.0.4" + debug "^4.3.3" + ethereum-cryptography "0.1.3" + lru-cache "^10.0.0" + +"@nomicfoundation/ethereumjs-common@4.0.2": + version "4.0.2" + resolved "https://registry.yarnpkg.com/@nomicfoundation/ethereumjs-common/-/ethereumjs-common-4.0.2.tgz#a15d1651ca36757588fdaf2a7d381a150662a3c3" + integrity sha512-I2WGP3HMGsOoycSdOTSqIaES0ughQTueOsddJ36aYVpI3SN8YSusgRFLwzDJwRFVIYDKx/iJz0sQ5kBHVgdDwg== dependencies: - "@nomicfoundation/ethereumjs-util" "9.0.1" + "@nomicfoundation/ethereumjs-util" "9.0.2" crc-32 "^1.2.0" -"@nomicfoundation/ethereumjs-ethash@3.0.1": - version "3.0.1" - resolved "https://registry.yarnpkg.com/@nomicfoundation/ethereumjs-ethash/-/ethereumjs-ethash-3.0.1.tgz#65ca494d53e71e8415c9a49ef48bc921c538fc41" - integrity sha512-KDjGIB5igzWOp8Ik5I6QiRH5DH+XgILlplsHR7TEuWANZA759G6krQ6o8bvj+tRUz08YygMQu/sGd9mJ1DYT8w== +"@nomicfoundation/ethereumjs-common@4.0.4": + version "4.0.4" + resolved "https://registry.yarnpkg.com/@nomicfoundation/ethereumjs-common/-/ethereumjs-common-4.0.4.tgz#9901f513af2d4802da87c66d6f255b510bef5acb" + integrity sha512-9Rgb658lcWsjiicr5GzNCjI1llow/7r0k50dLL95OJ+6iZJcVbi15r3Y0xh2cIO+zgX0WIHcbzIu6FeQf9KPrg== dependencies: - "@nomicfoundation/ethereumjs-block" "5.0.1" - "@nomicfoundation/ethereumjs-rlp" "5.0.1" - "@nomicfoundation/ethereumjs-util" "9.0.1" + "@nomicfoundation/ethereumjs-util" "9.0.4" + +"@nomicfoundation/ethereumjs-ethash@3.0.2": + version "3.0.2" + resolved "https://registry.yarnpkg.com/@nomicfoundation/ethereumjs-ethash/-/ethereumjs-ethash-3.0.2.tgz#da77147f806401ee996bfddfa6487500118addca" + integrity sha512-8PfoOQCcIcO9Pylq0Buijuq/O73tmMVURK0OqdjhwqcGHYC2PwhbajDh7GZ55ekB0Px197ajK3PQhpKoiI/UPg== + dependencies: + "@nomicfoundation/ethereumjs-block" "5.0.2" + "@nomicfoundation/ethereumjs-rlp" "5.0.2" + "@nomicfoundation/ethereumjs-util" "9.0.2" abstract-level "^1.0.3" bigint-crypto-utils "^3.0.23" ethereum-cryptography "0.1.3" -"@nomicfoundation/ethereumjs-evm@2.0.1": - version "2.0.1" - resolved "https://registry.yarnpkg.com/@nomicfoundation/ethereumjs-evm/-/ethereumjs-evm-2.0.1.tgz#f35681e203363f69ce2b3d3bf9f44d4e883ca1f1" - integrity sha512-oL8vJcnk0Bx/onl+TgQOQ1t/534GKFaEG17fZmwtPFeH8S5soiBYPCLUrvANOl4sCp9elYxIMzIiTtMtNNN8EQ== +"@nomicfoundation/ethereumjs-ethash@3.0.4": + version "3.0.4" + resolved "https://registry.yarnpkg.com/@nomicfoundation/ethereumjs-ethash/-/ethereumjs-ethash-3.0.4.tgz#06cb2502b3012fb6c11cffd44af08aecf71310da" + integrity sha512-xvIrwIMl9sSaiYKRem68+O7vYdj7Q2XWv5P7JXiIkn83918QzWHvqbswTRsH7+r6X1UEvdsURRnZbvZszEjAaQ== + dependencies: + "@nomicfoundation/ethereumjs-block" "5.0.4" + "@nomicfoundation/ethereumjs-rlp" "5.0.4" + "@nomicfoundation/ethereumjs-util" "9.0.4" + bigint-crypto-utils "^3.2.2" + ethereum-cryptography "0.1.3" + +"@nomicfoundation/ethereumjs-evm@2.0.2": + version "2.0.2" + resolved "https://registry.yarnpkg.com/@nomicfoundation/ethereumjs-evm/-/ethereumjs-evm-2.0.2.tgz#4c2f4b84c056047102a4fa41c127454e3f0cfcf6" + integrity sha512-rBLcUaUfANJxyOx9HIdMX6uXGin6lANCulIm/pjMgRqfiCRMZie3WKYxTSd8ZE/d+qT+zTedBF4+VHTdTSePmQ== dependencies: "@ethersproject/providers" "^5.7.1" - "@nomicfoundation/ethereumjs-common" "4.0.1" - "@nomicfoundation/ethereumjs-tx" "5.0.1" - "@nomicfoundation/ethereumjs-util" "9.0.1" + "@nomicfoundation/ethereumjs-common" "4.0.2" + "@nomicfoundation/ethereumjs-tx" "5.0.2" + "@nomicfoundation/ethereumjs-util" "9.0.2" debug "^4.3.3" ethereum-cryptography "0.1.3" mcl-wasm "^0.7.1" rustbn.js "~0.2.0" -"@nomicfoundation/ethereumjs-rlp@5.0.1": - version "5.0.1" - resolved "https://registry.yarnpkg.com/@nomicfoundation/ethereumjs-rlp/-/ethereumjs-rlp-5.0.1.tgz#0b30c1cf77d125d390408e391c4bb5291ef43c28" - integrity sha512-xtxrMGa8kP4zF5ApBQBtjlSbN5E2HI8m8FYgVSYAnO6ssUoY5pVPGy2H8+xdf/bmMa22Ce8nWMH3aEW8CcqMeQ== +"@nomicfoundation/ethereumjs-evm@2.0.4": + version "2.0.4" + resolved "https://registry.yarnpkg.com/@nomicfoundation/ethereumjs-evm/-/ethereumjs-evm-2.0.4.tgz#c9c761767283ac53946185474362230b169f8f63" + integrity sha512-lTyZZi1KpeMHzaO6cSVisR2tjiTTedjo7PcmhI/+GNFo9BmyY6QYzGeSti0sFttmjbEMioHgXxl5yrLNRg6+1w== + dependencies: + "@nomicfoundation/ethereumjs-common" "4.0.4" + "@nomicfoundation/ethereumjs-statemanager" "2.0.4" + "@nomicfoundation/ethereumjs-tx" "5.0.4" + "@nomicfoundation/ethereumjs-util" "9.0.4" + "@types/debug" "^4.1.9" + debug "^4.3.3" + ethereum-cryptography "0.1.3" + rustbn-wasm "^0.2.0" -"@nomicfoundation/ethereumjs-statemanager@2.0.1": - version "2.0.1" - resolved "https://registry.yarnpkg.com/@nomicfoundation/ethereumjs-statemanager/-/ethereumjs-statemanager-2.0.1.tgz#8824a97938db4471911e2d2f140f79195def5935" - integrity sha512-B5ApMOnlruVOR7gisBaYwFX+L/AP7i/2oAahatssjPIBVDF6wTX1K7Qpa39E/nzsH8iYuL3krkYeUFIdO3EMUQ== +"@nomicfoundation/ethereumjs-rlp@5.0.2": + version "5.0.2" + resolved "https://registry.yarnpkg.com/@nomicfoundation/ethereumjs-rlp/-/ethereumjs-rlp-5.0.2.tgz#4fee8dc58a53ac6ae87fb1fca7c15dc06c6b5dea" + integrity sha512-QwmemBc+MMsHJ1P1QvPl8R8p2aPvvVcKBbvHnQOKBpBztEo0omN0eaob6FeZS/e3y9NSe+mfu3nNFBHszqkjTA== + +"@nomicfoundation/ethereumjs-rlp@5.0.4": + version "5.0.4" + resolved "https://registry.yarnpkg.com/@nomicfoundation/ethereumjs-rlp/-/ethereumjs-rlp-5.0.4.tgz#66c95256fc3c909f6fb18f6a586475fc9762fa30" + integrity sha512-8H1S3s8F6QueOc/X92SdrA4RDenpiAEqMg5vJH99kcQaCy/a3Q6fgseo75mgWlbanGJXSlAPtnCeG9jvfTYXlw== + +"@nomicfoundation/ethereumjs-statemanager@2.0.2": + version "2.0.2" + resolved "https://registry.yarnpkg.com/@nomicfoundation/ethereumjs-statemanager/-/ethereumjs-statemanager-2.0.2.tgz#3ba4253b29b1211cafe4f9265fee5a0d780976e0" + integrity sha512-dlKy5dIXLuDubx8Z74sipciZnJTRSV/uHG48RSijhgm1V7eXYFC567xgKtsKiVZB1ViTP9iFL4B6Je0xD6X2OA== dependencies: - "@nomicfoundation/ethereumjs-common" "4.0.1" - "@nomicfoundation/ethereumjs-rlp" "5.0.1" + "@nomicfoundation/ethereumjs-common" "4.0.2" + "@nomicfoundation/ethereumjs-rlp" "5.0.2" debug "^4.3.3" ethereum-cryptography "0.1.3" ethers "^5.7.1" js-sdsl "^4.1.4" -"@nomicfoundation/ethereumjs-trie@6.0.1": - version "6.0.1" - resolved "https://registry.yarnpkg.com/@nomicfoundation/ethereumjs-trie/-/ethereumjs-trie-6.0.1.tgz#662c55f6b50659fd4b22ea9f806a7401cafb7717" - integrity sha512-A64It/IMpDVODzCgxDgAAla8jNjNtsoQZIzZUfIV5AY6Coi4nvn7+VReBn5itlxMiL2yaTlQr9TRWp3CSI6VoA== +"@nomicfoundation/ethereumjs-statemanager@2.0.4": + version "2.0.4" + resolved "https://registry.yarnpkg.com/@nomicfoundation/ethereumjs-statemanager/-/ethereumjs-statemanager-2.0.4.tgz#bf14415e1f31b5ea8b98a0c027c547d0555059b6" + integrity sha512-HPDjeFrxw6llEi+BzqXkZ+KkvFnTOPczuHBtk21hRlDiuKuZz32dPzlhpRsDBGV1b5JTmRDUVqCS1lp3Gghw4Q== + dependencies: + "@nomicfoundation/ethereumjs-common" "4.0.4" + "@nomicfoundation/ethereumjs-rlp" "5.0.4" + "@nomicfoundation/ethereumjs-trie" "6.0.4" + "@nomicfoundation/ethereumjs-util" "9.0.4" + debug "^4.3.3" + ethereum-cryptography "0.1.3" + js-sdsl "^4.1.4" + lru-cache "^10.0.0" + +"@nomicfoundation/ethereumjs-trie@6.0.2": + version "6.0.2" + resolved "https://registry.yarnpkg.com/@nomicfoundation/ethereumjs-trie/-/ethereumjs-trie-6.0.2.tgz#9a6dbd28482dca1bc162d12b3733acab8cd12835" + integrity sha512-yw8vg9hBeLYk4YNg5MrSJ5H55TLOv2FSWUTROtDtTMMmDGROsAu+0tBjiNGTnKRi400M6cEzoFfa89Fc5k8NTQ== dependencies: - "@nomicfoundation/ethereumjs-rlp" "5.0.1" - "@nomicfoundation/ethereumjs-util" "9.0.1" + "@nomicfoundation/ethereumjs-rlp" "5.0.2" + "@nomicfoundation/ethereumjs-util" "9.0.2" "@types/readable-stream" "^2.3.13" ethereum-cryptography "0.1.3" readable-stream "^3.6.0" -"@nomicfoundation/ethereumjs-tx@5.0.1": - version "5.0.1" - resolved "https://registry.yarnpkg.com/@nomicfoundation/ethereumjs-tx/-/ethereumjs-tx-5.0.1.tgz#7629dc2036b4a33c34e9f0a592b43227ef4f0c7d" - integrity sha512-0HwxUF2u2hrsIM1fsasjXvlbDOq1ZHFV2dd1yGq8CA+MEYhaxZr8OTScpVkkxqMwBcc5y83FyPl0J9MZn3kY0w== +"@nomicfoundation/ethereumjs-trie@6.0.4": + version "6.0.4" + resolved "https://registry.yarnpkg.com/@nomicfoundation/ethereumjs-trie/-/ethereumjs-trie-6.0.4.tgz#688a3f76646c209365ee6d959c3d7330ede5e609" + integrity sha512-3nSwQiFMvr2VFe/aZUyinuohYvtytUqZCUCvIWcPJ/BwJH6oQdZRB42aNFBJ/8nAh2s3OcroWpBLskzW01mFKA== + dependencies: + "@nomicfoundation/ethereumjs-rlp" "5.0.4" + "@nomicfoundation/ethereumjs-util" "9.0.4" + "@types/readable-stream" "^2.3.13" + ethereum-cryptography "0.1.3" + lru-cache "^10.0.0" + readable-stream "^3.6.0" + +"@nomicfoundation/ethereumjs-tx@5.0.2": + version "5.0.2" + resolved "https://registry.yarnpkg.com/@nomicfoundation/ethereumjs-tx/-/ethereumjs-tx-5.0.2.tgz#117813b69c0fdc14dd0446698a64be6df71d7e56" + integrity sha512-T+l4/MmTp7VhJeNloMkM+lPU3YMUaXdcXgTGCf8+ZFvV9NYZTRLFekRwlG6/JMmVfIfbrW+dRRJ9A6H5Q/Z64g== dependencies: "@chainsafe/ssz" "^0.9.2" "@ethersproject/providers" "^5.7.2" - "@nomicfoundation/ethereumjs-common" "4.0.1" - "@nomicfoundation/ethereumjs-rlp" "5.0.1" - "@nomicfoundation/ethereumjs-util" "9.0.1" + "@nomicfoundation/ethereumjs-common" "4.0.2" + "@nomicfoundation/ethereumjs-rlp" "5.0.2" + "@nomicfoundation/ethereumjs-util" "9.0.2" ethereum-cryptography "0.1.3" -"@nomicfoundation/ethereumjs-util@9.0.1": - version "9.0.1" - resolved "https://registry.yarnpkg.com/@nomicfoundation/ethereumjs-util/-/ethereumjs-util-9.0.1.tgz#530cda8bae33f8b5020a8f199ed1d0a2ce48ec89" - integrity sha512-TwbhOWQ8QoSCFhV/DDfSmyfFIHjPjFBj957219+V3jTZYZ2rf9PmDtNOeZWAE3p3vlp8xb02XGpd0v6nTUPbsA== +"@nomicfoundation/ethereumjs-tx@5.0.4": + version "5.0.4" + resolved "https://registry.yarnpkg.com/@nomicfoundation/ethereumjs-tx/-/ethereumjs-tx-5.0.4.tgz#b0ceb58c98cc34367d40a30d255d6315b2f456da" + integrity sha512-Xjv8wAKJGMrP1f0n2PeyfFCCojHd7iS3s/Ab7qzF1S64kxZ8Z22LCMynArYsVqiFx6rzYy548HNVEyI+AYN/kw== + dependencies: + "@nomicfoundation/ethereumjs-common" "4.0.4" + "@nomicfoundation/ethereumjs-rlp" "5.0.4" + "@nomicfoundation/ethereumjs-util" "9.0.4" + ethereum-cryptography "0.1.3" + +"@nomicfoundation/ethereumjs-util@9.0.2": + version "9.0.2" + resolved "https://registry.yarnpkg.com/@nomicfoundation/ethereumjs-util/-/ethereumjs-util-9.0.2.tgz#16bdc1bb36f333b8a3559bbb4b17dac805ce904d" + integrity sha512-4Wu9D3LykbSBWZo8nJCnzVIYGvGCuyiYLIJa9XXNVt1q1jUzHdB+sJvx95VGCpPkCT+IbLecW6yfzy3E1bQrwQ== dependencies: "@chainsafe/ssz" "^0.10.0" - "@nomicfoundation/ethereumjs-rlp" "5.0.1" + "@nomicfoundation/ethereumjs-rlp" "5.0.2" ethereum-cryptography "0.1.3" -"@nomicfoundation/ethereumjs-vm@7.0.1": - version "7.0.1" - resolved "https://registry.yarnpkg.com/@nomicfoundation/ethereumjs-vm/-/ethereumjs-vm-7.0.1.tgz#7d035e0993bcad10716c8b36e61dfb87fa3ca05f" - integrity sha512-rArhyn0jPsS/D+ApFsz3yVJMQ29+pVzNZ0VJgkzAZ+7FqXSRtThl1C1prhmlVr3YNUlfpZ69Ak+RUT4g7VoOuQ== - dependencies: - "@nomicfoundation/ethereumjs-block" "5.0.1" - "@nomicfoundation/ethereumjs-blockchain" "7.0.1" - "@nomicfoundation/ethereumjs-common" "4.0.1" - "@nomicfoundation/ethereumjs-evm" "2.0.1" - "@nomicfoundation/ethereumjs-rlp" "5.0.1" - "@nomicfoundation/ethereumjs-statemanager" "2.0.1" - "@nomicfoundation/ethereumjs-trie" "6.0.1" - "@nomicfoundation/ethereumjs-tx" "5.0.1" - "@nomicfoundation/ethereumjs-util" "9.0.1" +"@nomicfoundation/ethereumjs-util@9.0.4": + version "9.0.4" + resolved "https://registry.yarnpkg.com/@nomicfoundation/ethereumjs-util/-/ethereumjs-util-9.0.4.tgz#84c5274e82018b154244c877b76bc049a4ed7b38" + integrity sha512-sLOzjnSrlx9Bb9EFNtHzK/FJFsfg2re6bsGqinFinH1gCqVfz9YYlXiMWwDM4C/L4ywuHFCYwfKTVr/QHQcU0Q== + dependencies: + "@nomicfoundation/ethereumjs-rlp" "5.0.4" + ethereum-cryptography "0.1.3" + +"@nomicfoundation/ethereumjs-verkle@0.0.2": + version "0.0.2" + resolved "https://registry.yarnpkg.com/@nomicfoundation/ethereumjs-verkle/-/ethereumjs-verkle-0.0.2.tgz#7686689edec775b2efea5a71548f417c18f7dea4" + integrity sha512-bjnfZElpYGK/XuuVRmLS3yDvr+cDs85D9oonZ0YUa5A3lgFgokWMp76zXrxX2jVQ0BfHaw12y860n1+iOi6yFQ== + dependencies: + "@nomicfoundation/ethereumjs-rlp" "5.0.4" + "@nomicfoundation/ethereumjs-util" "9.0.4" + lru-cache "^10.0.0" + rust-verkle-wasm "^0.0.1" + +"@nomicfoundation/ethereumjs-vm@7.0.2": + version "7.0.2" + resolved "https://registry.yarnpkg.com/@nomicfoundation/ethereumjs-vm/-/ethereumjs-vm-7.0.2.tgz#3b0852cb3584df0e18c182d0672a3596c9ca95e6" + integrity sha512-Bj3KZT64j54Tcwr7Qm/0jkeZXJMfdcAtRBedou+Hx0dPOSIgqaIr0vvLwP65TpHbak2DmAq+KJbW2KNtIoFwvA== + dependencies: + "@nomicfoundation/ethereumjs-block" "5.0.2" + "@nomicfoundation/ethereumjs-blockchain" "7.0.2" + "@nomicfoundation/ethereumjs-common" "4.0.2" + "@nomicfoundation/ethereumjs-evm" "2.0.2" + "@nomicfoundation/ethereumjs-rlp" "5.0.2" + "@nomicfoundation/ethereumjs-statemanager" "2.0.2" + "@nomicfoundation/ethereumjs-trie" "6.0.2" + "@nomicfoundation/ethereumjs-tx" "5.0.2" + "@nomicfoundation/ethereumjs-util" "9.0.2" debug "^4.3.3" ethereum-cryptography "0.1.3" mcl-wasm "^0.7.1" rustbn.js "~0.2.0" +"@nomicfoundation/ethereumjs-vm@7.0.4": + version "7.0.4" + resolved "https://registry.yarnpkg.com/@nomicfoundation/ethereumjs-vm/-/ethereumjs-vm-7.0.4.tgz#e5a6eec4877dc62dda93003c6d7afd1fe4b9625b" + integrity sha512-gsA4IhmtWHI4BofKy3kio9W+dqZQs5Ji5mLjLYxHCkat+JQBUt5szjRKra2F9nGDJ2XcI/wWb0YWUFNgln4zRQ== + dependencies: + "@nomicfoundation/ethereumjs-block" "5.0.4" + "@nomicfoundation/ethereumjs-blockchain" "7.0.4" + "@nomicfoundation/ethereumjs-common" "4.0.4" + "@nomicfoundation/ethereumjs-evm" "2.0.4" + "@nomicfoundation/ethereumjs-rlp" "5.0.4" + "@nomicfoundation/ethereumjs-statemanager" "2.0.4" + "@nomicfoundation/ethereumjs-trie" "6.0.4" + "@nomicfoundation/ethereumjs-tx" "5.0.4" + "@nomicfoundation/ethereumjs-util" "9.0.4" + debug "^4.3.3" + ethereum-cryptography "0.1.3" + +"@nomicfoundation/hardhat-chai-matchers@^2.0.3": + version "2.0.3" + resolved "https://registry.yarnpkg.com/@nomicfoundation/hardhat-chai-matchers/-/hardhat-chai-matchers-2.0.3.tgz#f4c074d39b74bd283c99e2c2bf143e3cef51ae18" + integrity sha512-A40s7EAK4Acr8UP1Yudgi9GGD9Cca/K3LHt3DzmRIje14lBfHtg9atGQ7qK56vdPcTwKmeaGn30FzxMUfPGEMw== + dependencies: + "@types/chai-as-promised" "^7.1.3" + chai-as-promised "^7.1.1" + deep-eql "^4.0.1" + ordinal "^1.0.3" + +"@nomicfoundation/hardhat-ethers@^3.0.5": + version "3.0.5" + resolved "https://registry.yarnpkg.com/@nomicfoundation/hardhat-ethers/-/hardhat-ethers-3.0.5.tgz#0422c2123dec7c42e7fb2be8e1691f1d9708db56" + integrity sha512-RNFe8OtbZK6Ila9kIlHp0+S80/0Bu/3p41HUpaRIoHLm6X3WekTd83vob3rE54Duufu1edCiBDxspBzi2rxHHw== + dependencies: + debug "^4.1.1" + lodash.isequal "^4.5.0" + +"@nomicfoundation/hardhat-network-helpers@^1.0.10": + version "1.0.10" + resolved "https://registry.yarnpkg.com/@nomicfoundation/hardhat-network-helpers/-/hardhat-network-helpers-1.0.10.tgz#c61042ceb104fdd6c10017859fdef6529c1d6585" + integrity sha512-R35/BMBlx7tWN5V6d/8/19QCwEmIdbnA4ZrsuXgvs8i2qFx5i7h6mH5pBS4Pwi4WigLH+upl6faYusrNPuzMrQ== + dependencies: + ethereumjs-util "^7.1.4" + +"@nomicfoundation/hardhat-toolbox@^4.0.0": + version "4.0.0" + resolved "https://registry.yarnpkg.com/@nomicfoundation/hardhat-toolbox/-/hardhat-toolbox-4.0.0.tgz#eb1f619218dd1414fa161dfec92d3e5e53a2f407" + integrity sha512-jhcWHp0aHaL0aDYj8IJl80v4SZXWMS1A2XxXa1CA6pBiFfJKuZinCkO6wb+POAt0LIfXB3gA3AgdcOccrcwBwA== + +"@nomicfoundation/hardhat-verify@^2.0.3": + version "2.0.3" + resolved "https://registry.yarnpkg.com/@nomicfoundation/hardhat-verify/-/hardhat-verify-2.0.3.tgz#173557f8cfa53c8c9da23a326f54d24fe459ae68" + integrity sha512-ESbRu9by53wu6VvgwtMtm108RSmuNsVqXtzg061D+/4R7jaWh/Wl/8ve+p6SdDX7vA1Z3L02hDO1Q3BY4luLXQ== + dependencies: + "@ethersproject/abi" "^5.1.2" + "@ethersproject/address" "^5.0.2" + cbor "^8.1.0" + chalk "^2.4.2" + debug "^4.1.1" + lodash.clonedeep "^4.5.0" + semver "^6.3.0" + table "^6.8.0" + undici "^5.14.0" + "@nomicfoundation/solidity-analyzer-darwin-arm64@0.1.1": version "0.1.1" resolved "https://registry.yarnpkg.com/@nomicfoundation/solidity-analyzer-darwin-arm64/-/solidity-analyzer-darwin-arm64-0.1.1.tgz#4c858096b1c17fe58a474fe81b46815f93645c15" @@ -2931,27 +3055,6 @@ "@nomicfoundation/solidity-analyzer-win32-ia32-msvc" "0.1.1" "@nomicfoundation/solidity-analyzer-win32-x64-msvc" "0.1.1" -"@nomiclabs/hardhat-ethers@^2.2.1": - version "2.2.3" - resolved "https://registry.yarnpkg.com/@nomiclabs/hardhat-ethers/-/hardhat-ethers-2.2.3.tgz#b41053e360c31a32c2640c9a45ee981a7e603fe0" - integrity sha512-YhzPdzb612X591FOe68q+qXVXGG2ANZRvDo0RRUtimev85rCrAlv/TLMEZw5c+kq9AbzocLTVX/h2jVIFPL9Xg== - -"@nomiclabs/hardhat-etherscan@^3.1.4": - version "3.1.7" - resolved "https://registry.yarnpkg.com/@nomiclabs/hardhat-etherscan/-/hardhat-etherscan-3.1.7.tgz#72e3d5bd5d0ceb695e097a7f6f5ff6fcbf062b9a" - integrity sha512-tZ3TvSgpvsQ6B6OGmo1/Au6u8BrAkvs1mIC/eURA3xgIfznUZBhmpne8hv7BXUzw9xNL3fXdpOYgOQlVMTcoHQ== - dependencies: - "@ethersproject/abi" "^5.1.2" - "@ethersproject/address" "^5.0.2" - cbor "^8.1.0" - chalk "^2.4.2" - debug "^4.1.1" - fs-extra "^7.0.1" - lodash "^4.17.11" - semver "^6.3.0" - table "^6.8.0" - undici "^5.14.0" - "@nomiclabs/hardhat-ganache@^2.0.1": version "2.0.1" resolved "https://registry.yarnpkg.com/@nomiclabs/hardhat-ganache/-/hardhat-ganache-2.0.1.tgz#d4974dc379cef1892904378de00e12709c0719aa" @@ -2961,15 +3064,10 @@ ganache-core "^2.7.0" ts-interface-checker "^0.1.9" -"@nomiclabs/hardhat-waffle@^2.0.3": - version "2.0.5" - resolved "https://registry.yarnpkg.com/@nomiclabs/hardhat-waffle/-/hardhat-waffle-2.0.5.tgz#97c217f1db795395c04404291937edb528f3f218" - integrity sha512-U1RH9OQ1mWYQfb+moX5aTgGjpVVlOcpiFI47wwnaGG4kLhcTy90cNiapoqZenxcRAITVbr0/+QSduINL5EsUIQ== - -"@oclif/core@2.8.0": - version "2.8.0" - resolved "https://registry.yarnpkg.com/@oclif/core/-/core-2.8.0.tgz#4948de3168804169fa68895af8ec4853f332b307" - integrity sha512-A2wHItFrD/WOw5bJ6Mtv9MD7If0bsKNR0pwEY0me+fo4HSXlJOtgYGqmzb8t8akX3DUUT7XsjPajsoHLkIJyvg== +"@oclif/core@2.8.6": + version "2.8.6" + resolved "https://registry.yarnpkg.com/@oclif/core/-/core-2.8.6.tgz#7eb6984108f471ad0d719d3c07cde14c47ab17c5" + integrity sha512-1QlPaHMhOORySCXkQyzjsIsy2GYTilOw3LkjeHkCgsPJQjAT4IclVytJusWktPbYNys9O+O4V23J44yomQvnBQ== dependencies: "@types/cli-progress" "^3.11.0" ansi-escapes "^4.3.2" @@ -3001,15 +3099,188 @@ wordwrap "^1.0.0" wrap-ansi "^7.0.0" +"@oclif/core@^2.15.0": + version "2.15.0" + resolved "https://registry.yarnpkg.com/@oclif/core/-/core-2.15.0.tgz#f27797b30a77d13279fba88c1698fc34a0bd0d2a" + integrity sha512-fNEMG5DzJHhYmI3MgpByTvltBOMyFcnRIUMxbiz2ai8rhaYgaTHMG3Q38HcosfIvtw9nCjxpcQtC8MN8QtVCcA== + dependencies: + "@types/cli-progress" "^3.11.0" + ansi-escapes "^4.3.2" + ansi-styles "^4.3.0" + cardinal "^2.1.1" + chalk "^4.1.2" + clean-stack "^3.0.1" + cli-progress "^3.12.0" + debug "^4.3.4" + ejs "^3.1.8" + get-package-type "^0.1.0" + globby "^11.1.0" + hyperlinker "^1.0.0" + indent-string "^4.0.0" + is-wsl "^2.2.0" + js-yaml "^3.14.1" + natural-orderby "^2.0.3" + object-treeify "^1.1.33" + password-prompt "^1.1.2" + slice-ansi "^4.0.0" + string-width "^4.2.3" + strip-ansi "^6.0.1" + supports-color "^8.1.1" + supports-hyperlinks "^2.2.0" + ts-node "^10.9.1" + tslib "^2.5.0" + widest-line "^3.1.0" + wordwrap "^1.0.0" + wrap-ansi "^7.0.0" + +"@oclif/plugin-autocomplete@^2.3.6": + version "2.3.10" + resolved "https://registry.yarnpkg.com/@oclif/plugin-autocomplete/-/plugin-autocomplete-2.3.10.tgz#787f6208cdfe10ffc68ad89e9e7f1a7ad0e8987f" + integrity sha512-Ow1AR8WtjzlyCtiWWPgzMyT8SbcDJFr47009riLioHa+MHX2BCDtVn2DVnN/E6b9JlPV5ptQpjefoRSNWBesmg== + dependencies: + "@oclif/core" "^2.15.0" + chalk "^4.1.0" + debug "^4.3.4" + +"@oclif/plugin-not-found@^2.4.0": + version "2.4.3" + resolved "https://registry.yarnpkg.com/@oclif/plugin-not-found/-/plugin-not-found-2.4.3.tgz#3d24095adb0f3876cb4bcfdfdcb775086cf6d4b5" + integrity sha512-nIyaR4y692frwh7wIHZ3fb+2L6XEecQwRDIb4zbEam0TvaVmBQWZoColQyWA84ljFBPZ8XWiQyTz+ixSwdRkqg== + dependencies: + "@oclif/core" "^2.15.0" + chalk "^4" + fast-levenshtein "^3.0.0" + +"@octokit/auth-token@^3.0.0": + version "3.0.4" + resolved "https://registry.yarnpkg.com/@octokit/auth-token/-/auth-token-3.0.4.tgz#70e941ba742bdd2b49bdb7393e821dea8520a3db" + integrity sha512-TWFX7cZF2LXoCvdmJWY7XVPi74aSY0+FfBZNSXEXFkMpjcqsQwDSYVv5FhRFaI0V1ECnwbz4j59T/G+rXNWaIQ== + +"@octokit/core@^4.2.1": + version "4.2.4" + resolved "https://registry.yarnpkg.com/@octokit/core/-/core-4.2.4.tgz#d8769ec2b43ff37cc3ea89ec4681a20ba58ef907" + integrity sha512-rYKilwgzQ7/imScn3M9/pFfUf4I1AZEH3KhyJmtPdE2zfaXAn2mFfUy4FbKewzc2We5y/LlKLj36fWJLKC2SIQ== + dependencies: + "@octokit/auth-token" "^3.0.0" + "@octokit/graphql" "^5.0.0" + "@octokit/request" "^6.0.0" + "@octokit/request-error" "^3.0.0" + "@octokit/types" "^9.0.0" + before-after-hook "^2.2.0" + universal-user-agent "^6.0.0" + +"@octokit/endpoint@^7.0.0": + version "7.0.6" + resolved "https://registry.yarnpkg.com/@octokit/endpoint/-/endpoint-7.0.6.tgz#791f65d3937555141fb6c08f91d618a7d645f1e2" + integrity sha512-5L4fseVRUsDFGR00tMWD/Trdeeihn999rTMGRMC1G/Ldi1uWlWJzI98H4Iak5DB/RVvQuyMYKqSK/R6mbSOQyg== + dependencies: + "@octokit/types" "^9.0.0" + is-plain-object "^5.0.0" + universal-user-agent "^6.0.0" + +"@octokit/graphql@^5.0.0": + version "5.0.6" + resolved "https://registry.yarnpkg.com/@octokit/graphql/-/graphql-5.0.6.tgz#9eac411ac4353ccc5d3fca7d76736e6888c5d248" + integrity sha512-Fxyxdy/JH0MnIB5h+UQ3yCoh1FG4kWXfFKkpWqjZHw/p+Kc8Y44Hu/kCgNBT6nU1shNumEchmW/sUO1JuQnPcw== + dependencies: + "@octokit/request" "^6.0.0" + "@octokit/types" "^9.0.0" + universal-user-agent "^6.0.0" + +"@octokit/openapi-types@^18.0.0": + version "18.1.1" + resolved "https://registry.yarnpkg.com/@octokit/openapi-types/-/openapi-types-18.1.1.tgz#09bdfdabfd8e16d16324326da5148010d765f009" + integrity sha512-VRaeH8nCDtF5aXWnjPuEMIYf1itK/s3JYyJcWFJT8X9pSNnBtriDf7wlEWsGuhPLl4QIH4xM8fqTXDwJ3Mu6sw== + +"@octokit/plugin-paginate-rest@^6.1.2": + version "6.1.2" + resolved "https://registry.yarnpkg.com/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-6.1.2.tgz#f86456a7a1fe9e58fec6385a85cf1b34072341f8" + integrity sha512-qhrmtQeHU/IivxucOV1bbI/xZyC/iOBhclokv7Sut5vnejAIAEXVcGQeRpQlU39E0WwK9lNvJHphHri/DB6lbQ== + dependencies: + "@octokit/tsconfig" "^1.0.2" + "@octokit/types" "^9.2.3" + +"@octokit/plugin-request-log@^1.0.4": + version "1.0.4" + resolved "https://registry.yarnpkg.com/@octokit/plugin-request-log/-/plugin-request-log-1.0.4.tgz#5e50ed7083a613816b1e4a28aeec5fb7f1462e85" + integrity sha512-mLUsMkgP7K/cnFEw07kWqXGF5LKrOkD+lhCrKvPHXWDywAwuDUeDwWBpc69XK3pNX0uKiVt8g5z96PJ6z9xCFA== + +"@octokit/plugin-rest-endpoint-methods@^7.1.2": + version "7.2.3" + resolved "https://registry.yarnpkg.com/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-7.2.3.tgz#37a84b171a6cb6658816c82c4082ac3512021797" + integrity sha512-I5Gml6kTAkzVlN7KCtjOM+Ruwe/rQppp0QU372K1GP7kNOYEKe8Xn5BW4sE62JAHdwpq95OQK/qGNyKQMUzVgA== + dependencies: + "@octokit/types" "^10.0.0" + +"@octokit/request-error@^3.0.0": + version "3.0.3" + resolved "https://registry.yarnpkg.com/@octokit/request-error/-/request-error-3.0.3.tgz#ef3dd08b8e964e53e55d471acfe00baa892b9c69" + integrity sha512-crqw3V5Iy2uOU5Np+8M/YexTlT8zxCfI+qu+LxUB7SZpje4Qmx3mub5DfEKSO8Ylyk0aogi6TYdf6kxzh2BguQ== + dependencies: + "@octokit/types" "^9.0.0" + deprecation "^2.0.0" + once "^1.4.0" + +"@octokit/request@^6.0.0": + version "6.2.8" + resolved "https://registry.yarnpkg.com/@octokit/request/-/request-6.2.8.tgz#aaf480b32ab2b210e9dadd8271d187c93171d8eb" + integrity sha512-ow4+pkVQ+6XVVsekSYBzJC0VTVvh/FCTUUgTsboGq+DTeWdyIFV8WSCdo0RIxk6wSkBTHqIK1mYuY7nOBXOchw== + dependencies: + "@octokit/endpoint" "^7.0.0" + "@octokit/request-error" "^3.0.0" + "@octokit/types" "^9.0.0" + is-plain-object "^5.0.0" + node-fetch "^2.6.7" + universal-user-agent "^6.0.0" + +"@octokit/rest@19.0.13": + version "19.0.13" + resolved "https://registry.yarnpkg.com/@octokit/rest/-/rest-19.0.13.tgz#e799393264edc6d3c67eeda9e5bd7832dcf974e4" + integrity sha512-/EzVox5V9gYGdbAI+ovYj3nXQT1TtTHRT+0eZPcuC05UFSWO3mdO9UY1C0i2eLF9Un1ONJkAk+IEtYGAC+TahA== + dependencies: + "@octokit/core" "^4.2.1" + "@octokit/plugin-paginate-rest" "^6.1.2" + "@octokit/plugin-request-log" "^1.0.4" + "@octokit/plugin-rest-endpoint-methods" "^7.1.2" + +"@octokit/tsconfig@^1.0.2": + version "1.0.2" + resolved "https://registry.yarnpkg.com/@octokit/tsconfig/-/tsconfig-1.0.2.tgz#59b024d6f3c0ed82f00d08ead5b3750469125af7" + integrity sha512-I0vDR0rdtP8p2lGMzvsJzbhdOWy405HcGovrspJ8RRibHnyRgggUSNO5AIox5LmqiwmatHKYsvj6VGFHkqS7lA== + +"@octokit/types@^10.0.0": + version "10.0.0" + resolved "https://registry.yarnpkg.com/@octokit/types/-/types-10.0.0.tgz#7ee19c464ea4ada306c43f1a45d444000f419a4a" + integrity sha512-Vm8IddVmhCgU1fxC1eyinpwqzXPEYu0NrYzD3YZjlGjyftdLBTeqNblRC0jmJmgxbJIsQlyogVeGnrNaaMVzIg== + dependencies: + "@octokit/openapi-types" "^18.0.0" + +"@octokit/types@^9.0.0", "@octokit/types@^9.2.3": + version "9.3.2" + resolved "https://registry.yarnpkg.com/@octokit/types/-/types-9.3.2.tgz#3f5f89903b69f6a2d196d78ec35f888c0013cac5" + integrity sha512-D4iHGTdAnEEVsB8fl95m1hiz7D5YiRdQ9b/OEb3BYRVwbLsGHcRVPz+u+BgRLNk0Q0/4iZCBqDN96j2XNxfXrA== + dependencies: + "@octokit/openapi-types" "^18.0.0" + "@openfonts/inter_all@^1.0.2": version "1.0.2" resolved "https://registry.yarnpkg.com/@openfonts/inter_all/-/inter_all-1.0.2.tgz#87fc59c58926d2e5e63022a0960f12be82915d00" integrity sha512-hdB3gPFLztuDbEDLImVRTQyH4EHHrX9iEsw6wZW+VuwUoTwMJEhOV9dWliM6WZtJYF/cqYuiMK+Bqdd2XztnDg== -"@openzeppelin/contracts@3.2.0", "@openzeppelin/contracts@~3.2.0": - version "3.2.0" - resolved "https://registry.yarnpkg.com/@openzeppelin/contracts/-/contracts-3.2.0.tgz#3e6b3a7662d8ed64271ade96ef42655db983fd9d" - integrity sha512-bUOmkSoPkjnUyMiKo6RYnb0VHBk5D9KKDAgNLzF41aqAM3TeE0yGdFF5dVRcV60pZdJLlyFT/jjXIZCWyyEzAQ== +"@opentelemetry/api@~1.6.0": + version "1.6.0" + resolved "https://registry.yarnpkg.com/@opentelemetry/api/-/api-1.6.0.tgz#de2c6823203d6f319511898bb5de7e70f5267e19" + integrity sha512-OWlrQAnWn9577PhVgqjUvMr1pg57Bc4jv0iL4w0PRuOSRvq67rvHW9Ie/dZVMvCzhSCB+UxhcY/PmCmFj33Q+g== + +"@openzeppelin/contracts@4.9.0": + version "4.9.0" + resolved "https://registry.yarnpkg.com/@openzeppelin/contracts/-/contracts-4.9.0.tgz#683f33b6598970051bc5f0806fd8660da9e018dd" + integrity sha512-DUP74AFGKlic2sQb/CmgrN2aUPMFGxRrmCTUxLHsiU2RzwWqVuMPZBxiAyvlff6Pea77uylAX6B5x9W6evEbhA== + +"@openzeppelin/contracts@^4.8.0": + version "4.9.5" + resolved "https://registry.yarnpkg.com/@openzeppelin/contracts/-/contracts-4.9.5.tgz#1eed23d4844c861a1835b5d33507c1017fa98de8" + integrity sha512-ZK+W5mVhRppff9BE6YdR8CC52C8zAvsVAiWhEtQ5+oNxFE6h1WdeWo+FJSF8KKvtxxVYZ7MTP/5KoVpAU3aSWg== "@openzeppelin/merkle-tree@^1.0.5": version "1.0.5" @@ -3019,24 +3290,106 @@ "@ethersproject/abi" "^5.7.0" ethereum-cryptography "^1.1.2" -"@parcel/watcher@^2.1.0": - version "2.1.0" - resolved "https://registry.yarnpkg.com/@parcel/watcher/-/watcher-2.1.0.tgz#5f32969362db4893922c526a842d8af7a8538545" - integrity sha512-8s8yYjd19pDSsBpbkOHnT6Z2+UJSuLQx61pCFM0s5wSRvKCEMDjd/cHY3/GI1szHIWbpXpsJdg3V6ISGGx9xDw== +"@parcel/watcher-android-arm64@2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@parcel/watcher-android-arm64/-/watcher-android-arm64-2.3.0.tgz#d82e74bb564ebd4d8a88791d273a3d2bd61e27ab" + integrity sha512-f4o9eA3dgk0XRT3XhB0UWpWpLnKgrh1IwNJKJ7UJek7eTYccQ8LR7XUWFKqw6aEq5KUNlCcGvSzKqSX/vtWVVA== + +"@parcel/watcher-darwin-arm64@2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@parcel/watcher-darwin-arm64/-/watcher-darwin-arm64-2.3.0.tgz#c9cd03f8f233d512fcfc873d5b4e23f1569a82ad" + integrity sha512-mKY+oijI4ahBMc/GygVGvEdOq0L4DxhYgwQqYAz/7yPzuGi79oXrZG52WdpGA1wLBPrYb0T8uBaGFo7I6rvSKw== + +"@parcel/watcher-darwin-x64@2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@parcel/watcher-darwin-x64/-/watcher-darwin-x64-2.3.0.tgz#83c902994a2a49b9e1ab5050dba24876fdc2c219" + integrity sha512-20oBj8LcEOnLE3mgpy6zuOq8AplPu9NcSSSfyVKgfOhNAc4eF4ob3ldj0xWjGGbOF7Dcy1Tvm6ytvgdjlfUeow== + +"@parcel/watcher-freebsd-x64@2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@parcel/watcher-freebsd-x64/-/watcher-freebsd-x64-2.3.0.tgz#7a0f4593a887e2752b706aff2dae509aef430cf6" + integrity sha512-7LftKlaHunueAEiojhCn+Ef2CTXWsLgTl4hq0pkhkTBFI3ssj2bJXmH2L67mKpiAD5dz66JYk4zS66qzdnIOgw== + +"@parcel/watcher-linux-arm-glibc@2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@parcel/watcher-linux-arm-glibc/-/watcher-linux-arm-glibc-2.3.0.tgz#3fc90c3ebe67de3648ed2f138068722f9b1d47da" + integrity sha512-1apPw5cD2xBv1XIHPUlq0cO6iAaEUQ3BcY0ysSyD9Kuyw4MoWm1DV+W9mneWI+1g6OeP6dhikiFE6BlU+AToTQ== + +"@parcel/watcher-linux-arm64-glibc@2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@parcel/watcher-linux-arm64-glibc/-/watcher-linux-arm64-glibc-2.3.0.tgz#f7bbbf2497d85fd11e4c9e9c26ace8f10ea9bcbc" + integrity sha512-mQ0gBSQEiq1k/MMkgcSB0Ic47UORZBmWoAWlMrTW6nbAGoLZP+h7AtUM7H3oDu34TBFFvjy4JCGP43JlylkTQA== + +"@parcel/watcher-linux-arm64-musl@2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@parcel/watcher-linux-arm64-musl/-/watcher-linux-arm64-musl-2.3.0.tgz#de131a9fcbe1fa0854e9cbf4c55bed3b35bcff43" + integrity sha512-LXZAExpepJew0Gp8ZkJ+xDZaTQjLHv48h0p0Vw2VMFQ8A+RKrAvpFuPVCVwKJCr5SE+zvaG+Etg56qXvTDIedw== + +"@parcel/watcher-linux-x64-glibc@2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@parcel/watcher-linux-x64-glibc/-/watcher-linux-x64-glibc-2.3.0.tgz#193dd1c798003cdb5a1e59470ff26300f418a943" + integrity sha512-P7Wo91lKSeSgMTtG7CnBS6WrA5otr1K7shhSjKHNePVmfBHDoAOHYRXgUmhiNfbcGk0uMCHVcdbfxtuiZCHVow== + +"@parcel/watcher-linux-x64-musl@2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@parcel/watcher-linux-x64-musl/-/watcher-linux-x64-musl-2.3.0.tgz#6dbdb86d96e955ab0fe4a4b60734ec0025a689dd" + integrity sha512-+kiRE1JIq8QdxzwoYY+wzBs9YbJ34guBweTK8nlzLKimn5EQ2b2FSC+tAOpq302BuIMjyuUGvBiUhEcLIGMQ5g== + +"@parcel/watcher-wasm@2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@parcel/watcher-wasm/-/watcher-wasm-2.3.0.tgz#73b66c6fbd2a3326ae86a1ec77eab7139d0dd725" + integrity sha512-ejBAX8H0ZGsD8lSICDNyMbSEtPMWgDL0WFCt/0z7hyf5v8Imz4rAM8xY379mBsECkq/Wdqa5WEDLqtjZ+6NxfA== dependencies: is-glob "^4.0.3" micromatch "^4.0.5" - node-addon-api "^3.2.1" - node-gyp-build "^4.3.0" + napi-wasm "^1.1.0" + +"@parcel/watcher-win32-arm64@2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@parcel/watcher-win32-arm64/-/watcher-win32-arm64-2.3.0.tgz#59da26a431da946e6c74fa6b0f30b120ea6650b6" + integrity sha512-35gXCnaz1AqIXpG42evcoP2+sNL62gZTMZne3IackM+6QlfMcJLy3DrjuL6Iks7Czpd3j4xRBzez3ADCj1l7Aw== + +"@parcel/watcher-win32-ia32@2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@parcel/watcher-win32-ia32/-/watcher-win32-ia32-2.3.0.tgz#3ee6a18b08929cd3b788e8cc9547fd9a540c013a" + integrity sha512-FJS/IBQHhRpZ6PiCjFt1UAcPr0YmCLHRbTc00IBTrelEjlmmgIVLeOx4MSXzx2HFEy5Jo5YdhGpxCuqCyDJ5ow== + +"@parcel/watcher-win32-x64@2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@parcel/watcher-win32-x64/-/watcher-win32-x64-2.3.0.tgz#14e7246289861acc589fd608de39fe5d8b4bb0a7" + integrity sha512-dLx+0XRdMnVI62kU3wbXvbIRhLck4aE28bIGKbRGS7BJNt54IIj9+c/Dkqb+7DJEbHUZAX1bwaoM8PqVlHJmCA== + +"@parcel/watcher@^2.1.0", "@parcel/watcher@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@parcel/watcher/-/watcher-2.3.0.tgz#803517abbc3981a1a1221791d9f59dc0590d50f9" + integrity sha512-pW7QaFiL11O0BphO+bq3MgqeX/INAk9jgBldVDYjlQPO4VddoZnF22TcF9onMhnLVHuNqBJeRf+Fj7eezi/+rQ== + dependencies: + detect-libc "^1.0.3" + is-glob "^4.0.3" + micromatch "^4.0.5" + node-addon-api "^7.0.0" + optionalDependencies: + "@parcel/watcher-android-arm64" "2.3.0" + "@parcel/watcher-darwin-arm64" "2.3.0" + "@parcel/watcher-darwin-x64" "2.3.0" + "@parcel/watcher-freebsd-x64" "2.3.0" + "@parcel/watcher-linux-arm-glibc" "2.3.0" + "@parcel/watcher-linux-arm64-glibc" "2.3.0" + "@parcel/watcher-linux-arm64-musl" "2.3.0" + "@parcel/watcher-linux-x64-glibc" "2.3.0" + "@parcel/watcher-linux-x64-musl" "2.3.0" + "@parcel/watcher-win32-arm64" "2.3.0" + "@parcel/watcher-win32-ia32" "2.3.0" + "@parcel/watcher-win32-x64" "2.3.0" "@peculiar/asn1-schema@^2.3.6": - version "2.3.6" - resolved "https://registry.yarnpkg.com/@peculiar/asn1-schema/-/asn1-schema-2.3.6.tgz#3dd3c2ade7f702a9a94dfb395c192f5fa5d6b922" - integrity sha512-izNRxPoaeJeg/AyH8hER6s+H7p4itk+03QCa4sbxI3lNdseQYCuxzgsuNK8bTXChtLTjpJz6NmXKA73qLa3rCA== + version "2.3.8" + resolved "https://registry.yarnpkg.com/@peculiar/asn1-schema/-/asn1-schema-2.3.8.tgz#04b38832a814e25731232dd5be883460a156da3b" + integrity sha512-ULB1XqHKx1WBU/tTFIA+uARuRoBVZ4pNdOA878RDrRbBfBGcSzi5HBkdScC6ZbHn8z7L8gmKCgPC1LHRrP46tA== dependencies: asn1js "^3.0.5" - pvtsutils "^1.3.2" - tslib "^2.4.0" + pvtsutils "^1.3.5" + tslib "^2.6.2" "@peculiar/json-schema@^1.1.12": version "1.1.12" @@ -3056,6 +3409,42 @@ tslib "^2.5.0" webcrypto-core "^1.7.7" +"@pinata/sdk@^2.1.0": + version "2.1.0" + resolved "https://registry.yarnpkg.com/@pinata/sdk/-/sdk-2.1.0.tgz#d61aa8f21ec1206e867f4b65996db52b70316945" + integrity sha512-hkS0tcKtsjf9xhsEBs2Nbey5s+Db7x5rlOH9TaWHBXkJ7IwwOs2xnEDigNaxAHKjYAwcw+m2hzpO5QgOfeF7Zw== + dependencies: + axios "^0.21.1" + form-data "^2.3.3" + is-ipfs "^0.6.0" + path "^0.12.7" + +"@pkgjs/parseargs@^0.11.0": + version "0.11.0" + resolved "https://registry.yarnpkg.com/@pkgjs/parseargs/-/parseargs-0.11.0.tgz#a77ea742fab25775145434eb1d2328cf5013ac33" + integrity sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg== + +"@pnpm/config.env-replace@^1.1.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@pnpm/config.env-replace/-/config.env-replace-1.1.0.tgz#ab29da53df41e8948a00f2433f085f54de8b3a4c" + integrity sha512-htyl8TWnKL7K/ESFa1oW2UB5lVDxuF5DpM7tBi6Hu2LNL3mWkIzNLG6N4zoCUP1lCKNxWy/3iu8mS8MvToGd6w== + +"@pnpm/network.ca-file@^1.0.1": + version "1.0.2" + resolved "https://registry.yarnpkg.com/@pnpm/network.ca-file/-/network.ca-file-1.0.2.tgz#2ab05e09c1af0cdf2fcf5035bea1484e222f7983" + integrity sha512-YcPQ8a0jwYU9bTdJDpXjMi7Brhkr1mXsXrUJvjqM2mQDgkRiz8jFaQGOdaLxgjtUfQgZhKy/O3cG/YwmgKaxLA== + dependencies: + graceful-fs "4.2.10" + +"@pnpm/npm-conf@^2.1.0": + version "2.2.2" + resolved "https://registry.yarnpkg.com/@pnpm/npm-conf/-/npm-conf-2.2.2.tgz#0058baf1c26cbb63a828f0193795401684ac86f0" + integrity sha512-UA91GwWPhFExt3IizW6bOeY/pQ0BkuNwKjk9iQW9KqxluGCrg4VenZ0/L+2Y0+ZOtme72EVvg6v0zo3AMQRCeA== + dependencies: + "@pnpm/config.env-replace" "^1.1.0" + "@pnpm/network.ca-file" "^1.0.1" + config-chain "^1.1.11" + "@protobufjs/aspromise@^1.1.1", "@protobufjs/aspromise@^1.1.2": version "1.1.2" resolved "https://registry.yarnpkg.com/@protobufjs/aspromise/-/aspromise-1.1.2.tgz#9b8b0cc663d669a7d8f6f5d0893a14d348f30fbf" @@ -3109,63 +3498,31 @@ resolved "https://registry.yarnpkg.com/@protobufjs/utf8/-/utf8-1.1.0.tgz#a777360b5b39a1a2e5106f8e858f2fd2d060c570" integrity sha512-Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw== -"@repeaterjs/repeater@3.0.4", "@repeaterjs/repeater@^3.0.4": +"@repeaterjs/repeater@3.0.4": version "3.0.4" resolved "https://registry.yarnpkg.com/@repeaterjs/repeater/-/repeater-3.0.4.tgz#a04d63f4d1bf5540a41b01a921c9a7fddc3bd1ca" integrity sha512-AW8PKd6iX3vAZ0vA43nOUOnbq/X5ihgU+mSXXqunMkeQADGiqw/PY0JNeYtD5sr0PAy51YPgAPbDoeapv9r8WA== +"@repeaterjs/repeater@^3.0.4": + version "3.0.5" + resolved "https://registry.yarnpkg.com/@repeaterjs/repeater/-/repeater-3.0.5.tgz#b77571685410217a548a9c753aa3cdfc215bfc78" + integrity sha512-l3YHBLAol6d/IKnB9LhpD0cEZWAoe3eFKUyTYWmFmCO2Q/WOckxLQAUyMZWwZV2M/m3+4vgRoaolFqaII82/TA== + "@rescript/std@9.0.0": version "9.0.0" resolved "https://registry.yarnpkg.com/@rescript/std/-/std-9.0.0.tgz#df53f3fa5911cb4e85bd66b92e9e58ddf3e4a7e1" integrity sha512-zGzFsgtZ44mgL4Xef2gOy1hrRVdrs9mcxCOOKZrIPsmbZW14yTkaF591GXxpQvjXiHtgZ/iA9qLyWH6oSReIxQ== -"@resolver-engine/core@^0.3.3": - version "0.3.3" - resolved "https://registry.yarnpkg.com/@resolver-engine/core/-/core-0.3.3.tgz#590f77d85d45bc7ecc4e06c654f41345db6ca967" - integrity sha512-eB8nEbKDJJBi5p5SrvrvILn4a0h42bKtbCTri3ZxCGt6UvoQyp7HnGOfki944bUjBSHKK3RvgfViHn+kqdXtnQ== - dependencies: - debug "^3.1.0" - is-url "^1.2.4" - request "^2.85.0" - -"@resolver-engine/fs@^0.3.3": - version "0.3.3" - resolved "https://registry.yarnpkg.com/@resolver-engine/fs/-/fs-0.3.3.tgz#fbf83fa0c4f60154a82c817d2fe3f3b0c049a973" - integrity sha512-wQ9RhPUcny02Wm0IuJwYMyAG8fXVeKdmhm8xizNByD4ryZlx6PP6kRen+t/haF43cMfmaV7T3Cx6ChOdHEhFUQ== - dependencies: - "@resolver-engine/core" "^0.3.3" - debug "^3.1.0" - -"@resolver-engine/imports-fs@^0.3.3": - version "0.3.3" - resolved "https://registry.yarnpkg.com/@resolver-engine/imports-fs/-/imports-fs-0.3.3.tgz#4085db4b8d3c03feb7a425fbfcf5325c0d1e6c1b" - integrity sha512-7Pjg/ZAZtxpeyCFlZR5zqYkz+Wdo84ugB5LApwriT8XFeQoLwGUj4tZFFvvCuxaNCcqZzCYbonJgmGObYBzyCA== - dependencies: - "@resolver-engine/fs" "^0.3.3" - "@resolver-engine/imports" "^0.3.3" - debug "^3.1.0" - -"@resolver-engine/imports@^0.3.3": - version "0.3.3" - resolved "https://registry.yarnpkg.com/@resolver-engine/imports/-/imports-0.3.3.tgz#badfb513bb3ff3c1ee9fd56073e3144245588bcc" - integrity sha512-anHpS4wN4sRMwsAbMXhMfOD/y4a4Oo0Cw/5+rue7hSwGWsDOQaAU1ClK1OxjUC35/peazxEl8JaSRRS+Xb8t3Q== - dependencies: - "@resolver-engine/core" "^0.3.3" - debug "^3.1.0" - hosted-git-info "^2.6.0" - path-browserify "^1.0.0" - url "^0.11.0" - -"@rollup/plugin-inject@^5.0.2": - version "5.0.3" - resolved "https://registry.yarnpkg.com/@rollup/plugin-inject/-/plugin-inject-5.0.3.tgz#0783711efd93a9547d52971db73b2fb6140a67b1" - integrity sha512-411QlbL+z2yXpRWFXSmw/teQRMkXcAAC8aYTemc15gwJRpvEVDQwoe+N/HTFD8RFG8+88Bme9DK2V9CVm7hJdA== +"@rollup/plugin-inject@^5.0.3": + version "5.0.5" + resolved "https://registry.yarnpkg.com/@rollup/plugin-inject/-/plugin-inject-5.0.5.tgz#616f3a73fe075765f91c5bec90176608bed277a3" + integrity sha512-2+DEJbNBoPROPkgTDNe8/1YXWcqxbN5DTjASVIOx8HS+pITXushyNiBV56RB08zuptzz8gT3YfkqriTBVycepg== dependencies: "@rollup/pluginutils" "^5.0.1" estree-walker "^2.0.2" - magic-string "^0.27.0" + magic-string "^0.30.3" -"@rollup/pluginutils@^4.2.0": +"@rollup/pluginutils@^4.0.0", "@rollup/pluginutils@^4.2.0": version "4.2.1" resolved "https://registry.yarnpkg.com/@rollup/pluginutils/-/pluginutils-4.2.1.tgz#e6c6c3aba0744edce3fb2074922d3776c0af2a6d" integrity sha512-iKnFXr7NkdZAIHiIWE+BX5ULi/ucVFYWD6TbAV+rZctiRTY2PL6tsIKhoIOaoskiWAkgu+VsbXgUVDNLHf+InQ== @@ -3174,23 +3531,23 @@ picomatch "^2.2.2" "@rollup/pluginutils@^5.0.1", "@rollup/pluginutils@^5.0.2": - version "5.0.2" - resolved "https://registry.yarnpkg.com/@rollup/pluginutils/-/pluginutils-5.0.2.tgz#012b8f53c71e4f6f9cb317e311df1404f56e7a33" - integrity sha512-pTd9rIsP92h+B6wWwFbW8RkZv4hiR/xKsqre4SIuAOaOEQRxi0lqLke9k2/7WegC85GgUs9pjmOjCUi3In4vwA== + version "5.1.0" + resolved "https://registry.yarnpkg.com/@rollup/pluginutils/-/pluginutils-5.1.0.tgz#7e53eddc8c7f483a4ad0b94afb1f7f5fd3c771e0" + integrity sha512-XTIWOPPcpvyKI6L1NHo0lFlCyznUEyPmPY1mc3KpPVDYulHSTvyeLNVW00QTLIAFNhR3kYnJTQHeGqU4M3n09g== dependencies: "@types/estree" "^1.0.0" estree-walker "^2.0.2" picomatch "^2.3.1" "@rushstack/eslint-patch@^1.2.0": - version "1.2.0" - resolved "https://registry.yarnpkg.com/@rushstack/eslint-patch/-/eslint-patch-1.2.0.tgz#8be36a1f66f3265389e90b5f9c9962146758f728" - integrity sha512-sXo/qW2/pAcmT43VoRKOJbDOfV3cYpq3szSVfIThQXNt+E4DfKj361vaAt3c88U5tPUxzEswam7GW48PJqtKAg== + version "1.6.1" + resolved "https://registry.yarnpkg.com/@rushstack/eslint-patch/-/eslint-patch-1.6.1.tgz#9ab8f811930d7af3e3d549183a50884f9eb83f36" + integrity sha512-UY+FGM/2jjMkzQLn8pxcHGMaVLh9aEitG3zY2CiY7XHdLiz3bZOwa6oDxNqEMv7zZkV+cj5DOdz0cQ1BP5Hjgw== -"@scure/base@~1.1.0": - version "1.1.1" - resolved "https://registry.yarnpkg.com/@scure/base/-/base-1.1.1.tgz#ebb651ee52ff84f420097055f4bf46cfba403938" - integrity sha512-ZxOhsSyxYwLJj3pLZCefNitxsj093tb2vq90mp2txoYeBqbcjDjqFhyM8eUjq/uFm6zJ+mUuqxlS2FkuSY1MTA== +"@scure/base@^1.1.1", "@scure/base@~1.1.0": + version "1.1.5" + resolved "https://registry.yarnpkg.com/@scure/base/-/base-1.1.5.tgz#1d85d17269fe97694b9c592552dd9e5e33552157" + integrity sha512-Brj9FiG2W1MRQSTB212YVPRrcbjkv48FoZi/u4l/zds/ieRrqsh7aUf6CLwkAq61oKXr/ZlTzlY66gLIj3TFTQ== "@scure/bip32@1.1.5": version "1.1.5" @@ -3201,6 +3558,15 @@ "@noble/secp256k1" "~1.7.0" "@scure/base" "~1.1.0" +"@scure/bip32@1.3.1": + version "1.3.1" + resolved "https://registry.yarnpkg.com/@scure/bip32/-/bip32-1.3.1.tgz#7248aea723667f98160f593d621c47e208ccbb10" + integrity sha512-osvveYtyzdEVbt3OfwwXFr4P2iVBL5u1Q3q4ONBfDY/UpOuXmOlbgwc1xECEboY8wIays8Yt6onaWMUdUbfl0A== + dependencies: + "@noble/curves" "~1.1.0" + "@noble/hashes" "~1.3.1" + "@scure/base" "~1.1.0" + "@scure/bip39@1.1.1": version "1.1.1" resolved "https://registry.yarnpkg.com/@scure/bip39/-/bip39-1.1.1.tgz#b54557b2e86214319405db819c4b6a370cf340c5" @@ -3209,6 +3575,14 @@ "@noble/hashes" "~1.2.0" "@scure/base" "~1.1.0" +"@scure/bip39@1.2.1": + version "1.2.1" + resolved "https://registry.yarnpkg.com/@scure/bip39/-/bip39-1.2.1.tgz#5cee8978656b272a917b7871c981e0541ad6ac2a" + integrity sha512-Z3/Fsz1yr904dduJD0NpiyRHhRYHdcnyh73FZWiV+/qhWi83wNJ3NWolYqCEN+ZWsUz2TWwajJggcRE9r1zUYg== + dependencies: + "@noble/hashes" "~1.3.0" + "@scure/base" "~1.1.0" + "@sentry/core@5.30.0": version "5.30.0" resolved "https://registry.yarnpkg.com/@sentry/core/-/core-5.30.0.tgz#6b203664f69e75106ee8b5a2fe1d717379b331f3" @@ -3282,15 +3656,42 @@ resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.14.0.tgz#9fb3a3cf3132328151f353de4632e01e52102bea" integrity sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ== -"@sindresorhus/is@^4.0.0", "@sindresorhus/is@^4.6.0": +"@sindresorhus/is@^4.0.0": version "4.6.0" resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-4.6.0.tgz#3c7c9c46e678feefe7a2e5bb609d3dbd665ffb3f" integrity sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw== +"@sindresorhus/is@^5.2.0": + version "5.6.0" + resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-5.6.0.tgz#41dd6093d34652cddb5d5bdeee04eafc33826668" + integrity sha512-TV7t8GKYaJWsn00tFDqBw8+Uqmr8A0fRU1tvTQhyZzGv0sJCGRQL3JGMI3ucuKo3XIZdUP+Lx7/gh2t3lewy7g== + +"@sindresorhus/slugify@^2.0.0": + version "2.2.1" + resolved "https://registry.yarnpkg.com/@sindresorhus/slugify/-/slugify-2.2.1.tgz#fa2e2e25d6e1e74a2eeb5e2c37f5ccc516ed2c4b" + integrity sha512-MkngSCRZ8JdSOCHRaYd+D01XhvU3Hjy6MGl06zhOk614hp9EOAp5gIkBeQg7wtmxpitU6eAL4kdiRMcJa2dlrw== + dependencies: + "@sindresorhus/transliterate" "^1.0.0" + escape-string-regexp "^5.0.0" + +"@sindresorhus/transliterate@^1.0.0": + version "1.6.0" + resolved "https://registry.yarnpkg.com/@sindresorhus/transliterate/-/transliterate-1.6.0.tgz#2309fff65a868047e6d2dd70dec747c5b36a8327" + integrity sha512-doH1gimEu3A46VX6aVxpHTeHrytJAG6HgdxntYnCFiIFHEM/ZGpG8KiZGBChchjQmG0XFIBL552kBTjVcMZXwQ== + dependencies: + escape-string-regexp "^5.0.0" + +"@solidity-parser/parser@^0.14.0": + version "0.14.5" + resolved "https://registry.yarnpkg.com/@solidity-parser/parser/-/parser-0.14.5.tgz#87bc3cc7b068e08195c219c91cd8ddff5ef1a804" + integrity sha512-6dKnHZn7fg/iQATVEzqyUOyEidbn05q7YA2mQ9hC0MMXhhV3/JrsxmFSYZAcr7j1yUP700LLhTruvJ3MiQmjJg== + dependencies: + antlr4ts "^0.5.0-alpha.4" + "@solidity-parser/parser@^0.16.0": - version "0.16.0" - resolved "https://registry.yarnpkg.com/@solidity-parser/parser/-/parser-0.16.0.tgz#1fb418c816ca1fc3a1e94b08bcfe623ec4e1add4" - integrity sha512-ESipEcHyRHg4Np4SqBCfcXwyxxna1DgFVz69bgpLV8vzl/NP1DtcKsJ4dJZXWQhY/Z4J2LeKBiOkOVZn9ct33Q== + version "0.16.2" + resolved "https://registry.yarnpkg.com/@solidity-parser/parser/-/parser-0.16.2.tgz#42cb1e3d88b3e8029b0c9befff00b634cd92d2fa" + integrity sha512-PI9NfoA3P8XK2VBkK5oIfRgKDsicwDZfkVq9ZTBCQYGOP1N2owgY2dyLGyU5/J/hQs8KRk55kdmvTLjy3Mu3vg== dependencies: antlr4ts "^0.5.0-alpha.4" @@ -3449,11 +3850,21 @@ dependencies: defer-to-connect "^2.0.1" +"@tokenizer/token@^0.3.0": + version "0.3.0" + resolved "https://registry.yarnpkg.com/@tokenizer/token/-/token-0.3.0.tgz#fe98a93fe789247e998c75e74e9c7c63217aa276" + integrity sha512-OvjF+z51L3ov0OyAU0duzsYuvO01PH7x4t6DJx+guahgTnBHkhJdG7soQeTSFLWN3efnHyibZ4Z8l2EuWwJN3A== + "@tootallnate/once@2": version "2.0.0" resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-2.0.0.tgz#f544a148d3ab35801c1f633a7441fd87c2e484bf" integrity sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A== +"@trysound/sax@0.2.0": + version "0.2.0" + resolved "https://registry.yarnpkg.com/@trysound/sax/-/sax-0.2.0.tgz#cccaab758af56761eb7bf37af6f03f326dd798ad" + integrity sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA== + "@tsconfig/node10@^1.0.7": version "1.0.9" resolved "https://registry.yarnpkg.com/@tsconfig/node10/-/node10-1.0.9.tgz#df4907fc07a886922637b15e02d4cebc4c0021b2" @@ -3470,16 +3881,24 @@ 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== + version "1.0.4" + resolved "https://registry.yarnpkg.com/@tsconfig/node16/-/node16-1.0.4.tgz#0b92dcc0cc1c81f6f306a381f28e31b1a56536e9" + integrity sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA== -"@typechain/ethers-v5@^2.0.0": - version "2.0.0" - resolved "https://registry.yarnpkg.com/@typechain/ethers-v5/-/ethers-v5-2.0.0.tgz#cd3ca1590240d587ca301f4c029b67bfccd08810" - integrity sha512-0xdCkyGOzdqh4h5JSf+zoWx85IusEjDcPIwNEHP8mrWSnCae4rvrqB+/gtpdNfX7zjlFlZiMeePn2r63EI3Lrw== +"@typechain/ethers-v6@^0.5.1": + version "0.5.1" + resolved "https://registry.yarnpkg.com/@typechain/ethers-v6/-/ethers-v6-0.5.1.tgz#42fe214a19a8b687086c93189b301e2b878797ea" + integrity sha512-F+GklO8jBWlsaVV+9oHaPh5NJdd6rAKN4tklGfInX1Q7h0xPgVLP39Jl3eCulPB5qexI71ZFHwbljx4ZXNfouA== dependencies: - ethers "^5.0.2" + lodash "^4.17.15" + ts-essentials "^7.0.1" + +"@typechain/hardhat@^9.1.0": + version "9.1.0" + resolved "https://registry.yarnpkg.com/@typechain/hardhat/-/hardhat-9.1.0.tgz#6985015f01dfb37ef2ca8a29c742d05890351ddc" + integrity sha512-mtaUlzLlkqTlfPwB3FORdejqBskSnh+Jl8AIJGjXNAQfRQ4ofHADPl1+oU7Z3pAJzmZbUXII8MhOLQltcHgKnA== + dependencies: + fs-extra "^9.1.0" "@types/bn.js@^4.11.3", "@types/bn.js@^4.11.5": version "4.11.6" @@ -3488,14 +3907,14 @@ dependencies: "@types/node" "*" -"@types/bn.js@^5.1.0", "@types/bn.js@^5.1.1": - version "5.1.1" - resolved "https://registry.yarnpkg.com/@types/bn.js/-/bn.js-5.1.1.tgz#b51e1b55920a4ca26e9285ff79936bbdec910682" - integrity sha512-qNrYbZqMx0uJAfKnKclPh+dTwK33KfLHYqtyODwd5HnXOjnkhc4qgn3BrK6RWyGZm5+sIFE7Q7Vz6QQtJB7w7g== +"@types/bn.js@^5.1.0": + version "5.1.5" + resolved "https://registry.yarnpkg.com/@types/bn.js/-/bn.js-5.1.5.tgz#2e0dacdcce2c0f16b905d20ff87aedbc6f7b4bf0" + integrity sha512-V46N0zwKRF5Q00AZ6hWtN0T8gGmDUaUzLWQvHFo5yThtVwK/VCenFY3wXVbOvNfajEpsTfQM4IN9k/d6gUVX3A== dependencies: "@types/node" "*" -"@types/cacheable-request@^6.0.1", "@types/cacheable-request@^6.0.2": +"@types/cacheable-request@^6.0.1": version "6.0.3" resolved "https://registry.yarnpkg.com/@types/cacheable-request/-/cacheable-request-6.0.3.tgz#a430b3260466ca7b5ca5bfd735693b36e7a9d183" integrity sha512-IQ3EbTzGxIigb1I3qPZc1rWJnH0BmSKv5QYTalEwweFvyBDLSAe24zP0le/hyi7ecGfZVlIVAg4BZqb8WBwKqw== @@ -3505,22 +3924,29 @@ "@types/node" "*" "@types/responselike" "^1.0.0" +"@types/chai-as-promised@^7.1.3": + version "7.1.8" + resolved "https://registry.yarnpkg.com/@types/chai-as-promised/-/chai-as-promised-7.1.8.tgz#f2b3d82d53c59626b5d6bbc087667ccb4b677fe9" + integrity sha512-ThlRVIJhr69FLlh6IctTXFkmhtP3NpMZ2QGq69StYLyKZFp/HOp1VdKZj7RvfNWYYcJ1xlbLGLLWj1UvP5u/Gw== + dependencies: + "@types/chai" "*" + "@types/chai-subset@^1.3.3": - version "1.3.3" - resolved "https://registry.yarnpkg.com/@types/chai-subset/-/chai-subset-1.3.3.tgz#97893814e92abd2c534de422cb377e0e0bdaac94" - integrity sha512-frBecisrNGz+F4T6bcc+NLeolfiojh5FxW2klu669+8BARtyQv2C/GkNW6FUodVe4BroGMP/wER/YDGc7rEllw== + version "1.3.5" + resolved "https://registry.yarnpkg.com/@types/chai-subset/-/chai-subset-1.3.5.tgz#3fc044451f26985f45625230a7f22284808b0a9a" + integrity sha512-c2mPnw+xHtXDoHmdtcCXGwyLMiauiAyxWMzhGpqHC4nqI/Y5G2XhTampslK2rb59kpcuHon03UH8W6iYUzw88A== dependencies: "@types/chai" "*" -"@types/chai@*", "@types/chai@^4.2.11", "@types/chai@^4.3.4": - version "4.3.4" - resolved "https://registry.yarnpkg.com/@types/chai/-/chai-4.3.4.tgz#e913e8175db8307d78b4e8fa690408ba6b65dee4" - integrity sha512-KnRanxnpfpjUTqTCXslZSEdLfXExwgNxYPdiO2WGUj8+HDjFi8R3k5RVKPeSCzLjCcshCAtVO2QBbVuAV4kTnw== +"@types/chai@*", "@types/chai@^4.3.4": + version "4.3.11" + resolved "https://registry.yarnpkg.com/@types/chai/-/chai-4.3.11.tgz#e95050bf79a932cb7305dd130254ccdf9bde671c" + integrity sha512-qQR1dr2rGIHYlJulmr8Ioq3De0Le9E4MJ5AiaeAETJJpndT1uUNHsGFK3L/UIu+rbkQSdj8J/w2bCsBZc/Y5fQ== "@types/cli-progress@^3.11.0": - version "3.11.0" - resolved "https://registry.yarnpkg.com/@types/cli-progress/-/cli-progress-3.11.0.tgz#ec79df99b26757c3d1c7170af8422e0fc95eef7e" - integrity sha512-XhXhBv1R/q2ahF3BM7qT5HLzJNlIL0wbcGyZVjqOTqAybAnsLisd7gy1UCyIqpL+5Iv6XhlSyzjLCnI2sIdbCg== + version "3.11.5" + resolved "https://registry.yarnpkg.com/@types/cli-progress/-/cli-progress-3.11.5.tgz#9518c745e78557efda057e3f96a5990c717268c3" + integrity sha512-D4PbNRbviKyppS5ivBGyFO29POlySLmA2HyUFE4p5QGazAMM3CwkKWcvTl8gvElSuxRh6FPKL8XmidX873ou4g== dependencies: "@types/node" "*" @@ -3532,16 +3958,23 @@ "@types/node" "*" "@types/connect@^3.4.33": - version "3.4.35" - resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.35.tgz#5fcf6ae445e4021d1fc2219a4873cc73a3bb2ad1" - integrity sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ== + version "3.4.38" + resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.38.tgz#5ba7f3bc4fbbdeaff8dded952e5ff2cc53f8d858" + integrity sha512-K6uROf1LD88uDQqJCktA4yzL1YYAK6NgfsI0v/mTgyPKWsX1CnJ0XPSDhViejru1GcRkLWb8RlzFYJRqGUbaug== dependencies: "@types/node" "*" +"@types/debug@^4.1.9": + version "4.1.12" + resolved "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.12.tgz#a155f21690871953410df4b6b6f53187f0500917" + integrity sha512-vIChWdVG3LG1SMxEvI/AK+FWJthlrqlTu7fbrlywTkkaONwk/UAGaULXRlf8vkzFBLVm0zkMdCquhL5aOjhXPQ== + dependencies: + "@types/ms" "*" + "@types/estree@^1.0.0": - version "1.0.0" - resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.0.tgz#5fb2e536c1ae9bf35366eed879e827fa59ca41c2" - integrity sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ== + version "1.0.5" + resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.5.tgz#a6ce3e556e00fd9895dd872dd172ad0d4bd687f4" + integrity sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw== "@types/form-data@0.0.33": version "0.0.33" @@ -3550,30 +3983,64 @@ dependencies: "@types/node" "*" -"@types/http-cache-semantics@*": - version "4.0.1" - resolved "https://registry.yarnpkg.com/@types/http-cache-semantics/-/http-cache-semantics-4.0.1.tgz#0ea7b61496902b95890dc4c3a116b60cb8dae812" - integrity sha512-SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ== +"@types/glob@^7.1.1": + version "7.2.0" + resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.2.0.tgz#bc1b5bf3aa92f25bd5dd39f35c57361bdce5b2eb" + integrity sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA== + dependencies: + "@types/minimatch" "*" + "@types/node" "*" + +"@types/http-cache-semantics@*", "@types/http-cache-semantics@^4.0.2": + version "4.0.4" + resolved "https://registry.yarnpkg.com/@types/http-cache-semantics/-/http-cache-semantics-4.0.4.tgz#b979ebad3919799c979b17c72621c0bc0a31c6c4" + integrity sha512-1m0bIFVc7eJWyve9S0RnuRgcQqF/Xd5QsUZAZeQFr1Q3/p9JWoQQEqmVy+DPTNpGXwhgIetAoYF8JSc33q29QA== + +"@types/http-proxy@^1.17.8": + version "1.17.14" + resolved "https://registry.yarnpkg.com/@types/http-proxy/-/http-proxy-1.17.14.tgz#57f8ccaa1c1c3780644f8a94f9c6b5000b5e2eec" + integrity sha512-SSrD0c1OQzlFX7pGu1eXxSEjemej64aaNPRhhVYUGqXh0BtldAAx37MG8btcumvpgKyZp1F5Gn3JkktdxiFv6w== + dependencies: + "@types/node" "*" "@types/humanize-duration@^3.27.1": - version "3.27.1" - resolved "https://registry.yarnpkg.com/@types/humanize-duration/-/humanize-duration-3.27.1.tgz#f14740d1f585a0a8e3f46359b62fda8b0eaa31e7" - integrity sha512-K3e+NZlpCKd6Bd/EIdqjFJRFHbrq5TzPPLwREk5Iv/YoIjQrs6ljdAUCo+Lb2xFlGNOjGSE0dqsVD19cZL137w== + version "3.27.4" + resolved "https://registry.yarnpkg.com/@types/humanize-duration/-/humanize-duration-3.27.4.tgz#51d6d278213374735440bc3749de920935e9127e" + integrity sha512-yaf7kan2Sq0goxpbcwTQ+8E9RP6HutFBPv74T/IA/ojcHKhuKVlk2YFYyHhWZeLvZPzzLE3aatuQB4h0iqyyUA== + +"@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0": + version "2.0.6" + resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.6.tgz#7739c232a1fee9b4d3ce8985f314c0c6d33549d7" + integrity sha512-2QF/t/auWm0lsy8XtKVPG19v3sSOQlJe/YHZgfjb/KBBHOGSV+J2q/S671rcq9uTBrLAXmZpqJiaQbMT+zNU1w== + +"@types/istanbul-lib-report@*": + version "3.0.3" + resolved "https://registry.yarnpkg.com/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.3.tgz#53047614ae72e19fc0401d872de3ae2b4ce350bf" + integrity sha512-NQn7AHQnk/RSLOxrBbGyJM/aVQ+pjj5HCgasFxc0K/KhoATfQ/47AyUl15I2yBUpihjmas+a+VJBOqecrFH+uA== + dependencies: + "@types/istanbul-lib-coverage" "*" + +"@types/istanbul-reports@^3.0.0": + version "3.0.4" + resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-3.0.4.tgz#0f03e3d2f670fbdac586e34b433783070cc16f54" + integrity sha512-pk2B1NWalF9toCRu6gjBzR69syFjP4Od8WRAX+0mmf9lAjCRicLOWc+ZrxZHx/0XRjotgkF9t6iaMJ+aXcOdZQ== + dependencies: + "@types/istanbul-lib-report" "*" "@types/js-yaml@^4.0.0": - version "4.0.5" - resolved "https://registry.yarnpkg.com/@types/js-yaml/-/js-yaml-4.0.5.tgz#738dd390a6ecc5442f35e7f03fa1431353f7e138" - integrity sha512-FhpRzf927MNQdRZP0J5DLIdTXhjLYzeUTmLAu69mnVksLH9CJY3IuSeEgbKUki7GQZm0WqDkGzyxju2EZGD2wA== + version "4.0.9" + resolved "https://registry.yarnpkg.com/@types/js-yaml/-/js-yaml-4.0.9.tgz#cd82382c4f902fed9691a2ed79ec68c5898af4c2" + integrity sha512-k4MGaQl5TGo/iipqb2UDG2UwjXziSWkh0uysQelTlJpX1qGlpUZYm8PnO4DxG1qBomtJUdYJ6qR6xdIah10JLg== -"@types/json-schema@^7.0.5", "@types/json-schema@^7.0.9": - version "7.0.11" - resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.11.tgz#d421b6c527a3037f7c84433fd2c4229e016863d3" - integrity sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ== +"@types/json-schema@^7.0.9": + version "7.0.15" + resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.15.tgz#596a1747233694d50f6ad8a7869fcb6f56cf5841" + integrity sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA== "@types/json-stable-stringify@^1.0.32": - version "1.0.34" - resolved "https://registry.yarnpkg.com/@types/json-stable-stringify/-/json-stable-stringify-1.0.34.tgz#c0fb25e4d957e0ee2e497c1f553d7f8bb668fd75" - integrity sha512-s2cfwagOQAS8o06TcwKfr9Wx11dNGbH2E9vJz1cqV+a/LOyhWNLUNd6JSRYNzvB4d29UuJX2M0Dj9vE1T8fRXw== + version "1.0.36" + resolved "https://registry.yarnpkg.com/@types/json-stable-stringify/-/json-stable-stringify-1.0.36.tgz#fe6c6001a69ff8160a772da08779448a333c7ddd" + integrity sha512-b7bq23s4fgBB76n34m2b3RBf6M369B0Z9uRR8aHTMd8kZISRkmDEpPD8hhpYvDFzr3bJCPES96cm3Q6qRNDbQw== "@types/keyv@^3.1.4": version "3.1.4" @@ -3593,9 +4060,14 @@ integrity sha512-ssE3Vlrys7sdIzs5LOxCzTVMsU7i9oa/IaW92wF32JFb3CVczqOkru2xspuKczHEbG3nvmPY7IFqVmGGHdNbYw== "@types/luxon@^3.1.0": - version "3.3.0" - resolved "https://registry.yarnpkg.com/@types/luxon/-/luxon-3.3.0.tgz#a61043a62c0a72696c73a0a305c544c96501e006" - integrity sha512-uKRI5QORDnrGFYgcdAVnHvEIvEZ8noTpP/Bg+HeUzZghwinDlIS87DEenV5r1YoOF9G4x600YsUXLWZ19rmTmg== + version "3.4.1" + resolved "https://registry.yarnpkg.com/@types/luxon/-/luxon-3.4.1.tgz#962ccf5cb483b9c4644ef6132d0e5d2cde521561" + integrity sha512-m1KQEZZCITtheRhMVq5jDvAl0HwFhunLs7x6tpFFvUTJpKfmewS/Ymg+YA97/s8w1I1nC4pJyi0aAnn+vf3yew== + +"@types/minimatch@*": + version "5.1.2" + resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-5.1.2.tgz#07508b45797cb81ec3f273011b054cd0755eddca" + integrity sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA== "@types/minimatch@^3.0.4": version "3.0.5" @@ -3603,9 +4075,9 @@ integrity sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ== "@types/minimist@^1.2.0": - version "1.2.2" - resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.2.tgz#ee771e2ba4b3dc5b372935d549fd9617bf345b8c" - integrity sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ== + version "1.2.5" + resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.5.tgz#ec10755e871497bcd83efe927e43ec46e8c0747e" + integrity sha512-hov8bUuiLiyFPGyFPE1lwWhmzYbirOXQNNo40+y3zow8aFVTeyn3VWL0VFFfdNddA8S4Vf0Tc062rzyNr7Paag== "@types/mkdirp@^0.5.2": version "0.5.2" @@ -3614,23 +4086,27 @@ dependencies: "@types/node" "*" -"@types/mocha@^7.0.2": - version "7.0.2" - resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-7.0.2.tgz#b17f16cf933597e10d6d78eae3251e692ce8b0ce" - integrity sha512-ZvO2tAcjmMi8V/5Z3JsyofMe3hasRcaw88cto5etSVMwVQfeivGAlEYmaQgceUSVYFofVjT+ioHsATjdWcFt1w== +"@types/mocha@^10.0.6": + version "10.0.6" + resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-10.0.6.tgz#818551d39113081048bdddbef96701b4e8bb9d1b" + integrity sha512-dJvrYWxP/UcXm36Qn36fxhUKu8A/xMRXVT2cliFF1Z7UA9liG5Psj3ezNSZw+5puH2czDXRLcXQxf8JbJt0ejg== -"@types/node-fetch@^2.5.5": - version "2.6.3" - resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.6.3.tgz#175d977f5e24d93ad0f57602693c435c57ad7e80" - integrity sha512-ETTL1mOEdq/sxUtgtOhKjyB2Irra4cjxksvcMUR5Zr4n+PxVhsCD9WS46oPbHL3et9Zde7CNRr+WUNlcHvsX+w== - dependencies: - "@types/node" "*" - form-data "^3.0.0" +"@types/ms@*": + version "0.7.34" + resolved "https://registry.yarnpkg.com/@types/ms/-/ms-0.7.34.tgz#10964ba0dee6ac4cd462e2795b6bebd407303433" + integrity sha512-nG96G3Wp6acyAgJqGasjODb+acrI7KltPiRxzHPXnP3NgI28bpQDRv53olbqGXbfcgF5aiiHmO3xpwEpS5Ld9g== "@types/node@*", "@types/node@>=13.7.0": - version "18.15.11" - resolved "https://registry.yarnpkg.com/@types/node/-/node-18.15.11.tgz#b3b790f09cb1696cffcec605de025b088fa4225f" - integrity sha512-E5Kwq2n4SbMzQOn6wnmBjuK9ouqlURrcZDVfbo9ftDDTFt3nk7ZKK4GMOzoYgnpQJKcxwQw+lGaBvvlMo0qN/Q== + version "20.11.2" + resolved "https://registry.yarnpkg.com/@types/node/-/node-20.11.2.tgz#39cea3fe02fbbc2f80ed283e94e1d24f2d3856fb" + integrity sha512-cZShBaVa+UO1LjWWBPmWRR4+/eY/JR/UIEcDlVsw3okjWEu+rB7/mH6X3B/L+qJVHDLjk9QW/y2upp9wp1yDXA== + dependencies: + undici-types "~5.26.4" + +"@types/node@18.15.13": + version "18.15.13" + resolved "https://registry.yarnpkg.com/@types/node/-/node-18.15.13.tgz#f64277c341150c979e42b00e4ac289290c9df469" + integrity sha512-N+0kuo9KgrUQ1Sn/ifDXsvg0TTleP7rIy4zOBGECxAljqvqfqpTfzx0Q1NUedOixRMBfe2Whhb056a42cWs26Q== "@types/node@^10.0.3": version "10.17.60" @@ -3642,54 +4118,44 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-12.20.55.tgz#c329cbd434c42164f846b909bd6f85b5537f6240" integrity sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ== -"@types/node@^13.9.2": - version "13.13.52" - resolved "https://registry.yarnpkg.com/@types/node/-/node-13.13.52.tgz#03c13be70b9031baaed79481c0c0cfb0045e53f7" - integrity sha512-s3nugnZumCC//n4moGGe6tkNMyYEdaDBitVjwPxXmR5lnMG5dHePinH2EdxkG3Rh1ghFHHixAG4NJhpJW1rthQ== - "@types/node@^8.0.0": version "8.10.66" resolved "https://registry.yarnpkg.com/@types/node/-/node-8.10.66.tgz#dd035d409df322acc83dff62a602f12a5783bbb3" integrity sha512-tktOkFUA4kXx2hhhrB8bIFb5TbwzS4uOhKEmwiD+NoiL0qtP2OQ9mFldbgD4dV1djrlBYP6eBuQZiWjuHUpqFw== -"@types/normalize-package-data@^2.4.0": - version "2.4.1" - resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz#d3357479a0fdfdd5907fe67e17e0a85c906e1301" - integrity sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw== +"@types/normalize-package-data@^2.4.0", "@types/normalize-package-data@^2.4.1": + version "2.4.4" + resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.4.tgz#56e2cc26c397c038fab0e3a917a12d5c5909e901" + integrity sha512-37i+OaWTh9qeK4LSHPsyRC7NahnGotNuZvjLSgcPzblpHB3rrCJxAOgI5gCdKm7coonsaX1Of0ILiTcnZjbfxA== "@types/parse-json@^4.0.0": - version "4.0.0" - resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz#2f8bb441434d163b35fb8ffdccd7138927ffb8c0" - integrity sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA== + version "4.0.2" + resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.2.tgz#5950e50960793055845e956c427fc2b0d70c5239" + integrity sha512-dISoDXWWQwUquiKsyZ4Ng+HX2KsPL7LyHKHQwgGFEA3IaKac4Obd+h2a/a6waisAoepJlBcx9paWqjA8/HVjCw== "@types/pbkdf2@^3.0.0": - version "3.1.0" - resolved "https://registry.yarnpkg.com/@types/pbkdf2/-/pbkdf2-3.1.0.tgz#039a0e9b67da0cdc4ee5dab865caa6b267bb66b1" - integrity sha512-Cf63Rv7jCQ0LaL8tNXmEyqTHuIJxRdlS5vMh1mj5voN4+QFhVZnlZruezqpWYDiJ8UTzhP0VmeLXCmBk66YrMQ== + version "3.1.2" + resolved "https://registry.yarnpkg.com/@types/pbkdf2/-/pbkdf2-3.1.2.tgz#2dc43808e9985a2c69ff02e2d2027bd4fe33e8dc" + integrity sha512-uRwJqmiXmh9++aSu1VNEn3iIxWOhd8AHXNSdlaLfdAAdSTY9jYVeGWnzejM3dvrkbqE3/hyQkQQ29IFATEGlew== dependencies: "@types/node" "*" -"@types/prettier@^1.13.2": - version "1.19.1" - resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-1.19.1.tgz#33509849f8e679e4add158959fdb086440e9553f" - integrity sha512-5qOlnZscTn4xxM5MeGXAMOsIOIKIbh9e85zJWfBRVPlRMEVawzoPhINYbRGkBZCI8LxvBe7tJCdWiarA99OZfQ== - "@types/prettier@^2.1.1": - version "2.7.2" - resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.7.2.tgz#6c2324641cc4ba050a8c710b2b251b377581fbf0" - integrity sha512-KufADq8uQqo1pYKVIYzfKbJfBAc0sOeXqGbFaSpv8MRmC/zXgowNZmFcbngndGk922QDmOASEXUZCaY48gs4cg== + version "2.7.3" + resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.7.3.tgz#3e51a17e291d01d17d3fc61422015a933af7a08f" + integrity sha512-+68kP9yzs4LMp7VNh8gdzMSPZFL44MLGqiHWvttYJe+6qnuVr4Ek9wSBQoveqY/r+LwjCcU29kNVkidwim+kYA== "@types/qrcode@^1.5.0": - version "1.5.0" - resolved "https://registry.yarnpkg.com/@types/qrcode/-/qrcode-1.5.0.tgz#6a98fe9a9a7b2a9a3167b6dde17eff999eabe40b" - integrity sha512-x5ilHXRxUPIMfjtM+1vf/GPTRWZ81nqscursm5gMznJeK9M0YnZ1c3bEvRLQ0zSSgedLx1J6MGL231ObQGGhaA== + version "1.5.5" + resolved "https://registry.yarnpkg.com/@types/qrcode/-/qrcode-1.5.5.tgz#993ff7c6b584277eee7aac0a20861eab682f9dac" + integrity sha512-CdfBi/e3Qk+3Z/fXYShipBT13OJ2fDO2Q2w5CIP5anLTLIndQG9z6P1cnm+8zCWSpm5dnxMFd/uREtb0EXuQzg== dependencies: "@types/node" "*" "@types/qs@^6.2.31": - version "6.9.7" - resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.7.tgz#63bb7d067db107cc1e457c303bc25d511febf6cb" - integrity sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw== + version "6.9.11" + resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.11.tgz#208d8a30bc507bd82e03ada29e4732ea46a6bbda" + integrity sha512-oGk0gmhnEJK4Yyk+oI7EfXsLayXatCWPHary1MtcmbAifkobT9cM9yutG/hZKIseOU0MqbIwQ/u2nn/Gb+ltuQ== "@types/readable-stream@^2.3.13": version "2.3.15" @@ -3707,34 +4173,49 @@ "@types/node" "*" "@types/responselike@^1.0.0": - version "1.0.0" - resolved "https://registry.yarnpkg.com/@types/responselike/-/responselike-1.0.0.tgz#251f4fe7d154d2bad125abe1b429b23afd262e29" - integrity sha512-85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA== + version "1.0.3" + resolved "https://registry.yarnpkg.com/@types/responselike/-/responselike-1.0.3.tgz#cc29706f0a397cfe6df89debfe4bf5cea159db50" + integrity sha512-H/+L+UkTV33uf49PH5pCAUBVPNj2nDBXTN+qS1dOwyyg24l3CcicicCA7ca+HMvJBZcFgl5r8e+RR6elsb4Lyw== dependencies: "@types/node" "*" +"@types/retry@0.12.1": + version "0.12.1" + resolved "https://registry.yarnpkg.com/@types/retry/-/retry-0.12.1.tgz#d8f1c0d0dc23afad6dc16a9e993a0865774b4065" + integrity sha512-xoDlM2S4ortawSWORYqsdU+2rxdh4LRW9ytc3zmT37RIKQh6IHyKwwtKhKis9ah8ol07DCkZxPt8BBvPjC6v4g== + "@types/secp256k1@^4.0.1": - version "4.0.3" - resolved "https://registry.yarnpkg.com/@types/secp256k1/-/secp256k1-4.0.3.tgz#1b8e55d8e00f08ee7220b4d59a6abe89c37a901c" - integrity sha512-Da66lEIFeIz9ltsdMZcpQvmrmmoqrfju8pm1BH8WbYjZSwUgCwXLb9C+9XYogwBITnbsSaMdVPb2ekf7TV+03w== + version "4.0.6" + resolved "https://registry.yarnpkg.com/@types/secp256k1/-/secp256k1-4.0.6.tgz#d60ba2349a51c2cbc5e816dcd831a42029d376bf" + integrity sha512-hHxJU6PAEUn0TP4S/ZOzuTUvJWuZ6eIKeNKb5RBpODvSl6hp1Wrw4s7ATY50rklRCScUDpHzVA/DQdSjJ3UoYQ== dependencies: "@types/node" "*" "@types/semver@^7.3.12": - version "7.3.13" - resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.3.13.tgz#da4bfd73f49bd541d28920ab0e2bf0ee80f71c91" - integrity sha512-21cFJr9z3g5dW8B0CVI9g2O9beqaThGQ6ZFBqHfwhzLDKUxaqTIy3vnfah/UPkfOiF2pLq+tGz+W8RyCskuslw== + version "7.5.6" + resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.5.6.tgz#c65b2bfce1bec346582c07724e3f8c1017a20339" + integrity sha512-dn1l8LaMea/IjDoHNd9J52uBbInB796CDffS6VdIxvqYCPSG0V0DzHp76GpaWnlhg88uYyPbXCDIowa86ybd5A== + +"@types/triple-beam@^1.3.2": + version "1.3.5" + resolved "https://registry.yarnpkg.com/@types/triple-beam/-/triple-beam-1.3.5.tgz#74fef9ffbaa198eb8b588be029f38b00299caa2c" + integrity sha512-6WaYesThRMCl19iryMYP7/x2OVgCtbIVflDGFpWnb9irXI3UjYE4AzmYuiUKY1AJstGijoY+MgUszMgRxIYTYw== "@types/trusted-types@^2.0.2": - version "2.0.3" - resolved "https://registry.yarnpkg.com/@types/trusted-types/-/trusted-types-2.0.3.tgz#a136f83b0758698df454e328759dbd3d44555311" - integrity sha512-NfQ4gyz38SL8sDNrSixxU2Os1a5xcdFxipAFxYEuLUlvU2uDwS4NUpsImcf1//SlWItCVMMLiylsxbmNMToV/g== + version "2.0.7" + resolved "https://registry.yarnpkg.com/@types/trusted-types/-/trusted-types-2.0.7.tgz#baccb07a970b91707df3a3e8ba6896c57ead2d11" + integrity sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw== "@types/web-bluetooth@^0.0.16": version "0.0.16" resolved "https://registry.yarnpkg.com/@types/web-bluetooth/-/web-bluetooth-0.0.16.tgz#1d12873a8e49567371f2a75fe3e7f7edca6662d8" integrity sha512-oh8q2Zc32S6gd/j50GowEjKLoOVOwHP/bWVjKJInBwQqdOYMdPrf1oVlelTlyfFK3CKxL1uahMDAr+vy8T7yMQ== +"@types/web-bluetooth@^0.0.20": + version "0.0.20" + resolved "https://registry.yarnpkg.com/@types/web-bluetooth/-/web-bluetooth-0.0.20.tgz#f066abfcd1cbe66267cdbbf0de010d8a41b41597" + integrity sha512-g9gZnnXVq7gM7v3tJCWV/qw7w+KeOlSHAhgF9RytFyifW6AF61hdT2ucrYhPq9hLs5JIryeupHV3qGk95dH9ow== + "@types/ws@^7.4.4": version "7.4.7" resolved "https://registry.yarnpkg.com/@types/ws/-/ws-7.4.7.tgz#f7c390a36f7a0679aa69de2d501319f4f8d9b702" @@ -3743,196 +4224,228 @@ "@types/node" "*" "@types/ws@^8.0.0": - version "8.5.4" - resolved "https://registry.yarnpkg.com/@types/ws/-/ws-8.5.4.tgz#bb10e36116d6e570dd943735f86c933c1587b8a5" - integrity sha512-zdQDHKUgcX/zBc4GrwsE/7dVdAD8JR4EuiAXiiUhhfyIJXXb2+PrGshFyeXWQPMmmZ2XxgaqclgpIC7eTXc1mg== + version "8.5.10" + resolved "https://registry.yarnpkg.com/@types/ws/-/ws-8.5.10.tgz#4acfb517970853fa6574a3a6886791d04a396787" + integrity sha512-vmQSUcfalpIq0R9q7uTo2lXs6eGIpt9wtnLdMv9LVpIjCA/+ufZRozlVoVelIYixx1ugCBKDhn89vnsEGOCx9A== + dependencies: + "@types/node" "*" + +"@types/yargs-parser@*": + version "21.0.3" + resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-21.0.3.tgz#815e30b786d2e8f0dcd85fd5bcf5e1a04d008f15" + integrity sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ== + +"@types/yargs@^16.0.0": + version "16.0.9" + resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-16.0.9.tgz#ba506215e45f7707e6cbcaf386981155b7ab956e" + integrity sha512-tHhzvkFXZQeTECenFoRljLBYPZJ7jAVxqqtEI0qTLOmuultnFp4I9yKE17vTuhf7BkhCu7I4XuemPgikDVuYqA== + dependencies: + "@types/yargs-parser" "*" + +"@types/yauzl@^2.9.1": + version "2.10.3" + resolved "https://registry.yarnpkg.com/@types/yauzl/-/yauzl-2.10.3.tgz#e9b2808b4f109504a03cda958259876f61017999" + integrity sha512-oJoftv0LSuaDZE3Le4DbKX+KS9G36NzOeSap90UIK0yMA/NhKJhqlSGtNDORNRaIbQfzjXDrQa0ytJ6mNRGz/Q== dependencies: "@types/node" "*" -"@typescript-eslint/eslint-plugin@^5.0.0", "@typescript-eslint/eslint-plugin@^5.44.0": - version "5.59.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.59.0.tgz#c0e10eeb936debe5d1c3433cf36206a95befefd0" - integrity sha512-p0QgrEyrxAWBecR56gyn3wkG15TJdI//eetInP3zYRewDh0XS+DhB3VUAd3QqvziFsfaQIoIuZMxZRB7vXYaYw== +"@typescript-eslint/eslint-plugin@^5.44.0", "@typescript-eslint/eslint-plugin@^5.59.1": + version "5.62.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.62.0.tgz#aeef0328d172b9e37d9bab6dbc13b87ed88977db" + integrity sha512-TiZzBSJja/LbhNPvk6yc0JrX9XqhQ0hdh6M2svYfsHGejaKFIAGd9MQ+ERIMzLGlN/kZoYIgdxFV0PuljTKXag== dependencies: "@eslint-community/regexpp" "^4.4.0" - "@typescript-eslint/scope-manager" "5.59.0" - "@typescript-eslint/type-utils" "5.59.0" - "@typescript-eslint/utils" "5.59.0" + "@typescript-eslint/scope-manager" "5.62.0" + "@typescript-eslint/type-utils" "5.62.0" + "@typescript-eslint/utils" "5.62.0" debug "^4.3.4" - grapheme-splitter "^1.0.4" + graphemer "^1.4.0" ignore "^5.2.0" natural-compare-lite "^1.4.0" semver "^7.3.7" tsutils "^3.21.0" -"@typescript-eslint/parser@^5.0.0", "@typescript-eslint/parser@^5.44.0": - version "5.59.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.59.0.tgz#0ad7cd019346cc5d150363f64869eca10ca9977c" - integrity sha512-qK9TZ70eJtjojSUMrrEwA9ZDQ4N0e/AuoOIgXuNBorXYcBDk397D2r5MIe1B3cok/oCtdNC5j+lUUpVB+Dpb+w== +"@typescript-eslint/parser@^5.44.0", "@typescript-eslint/parser@^5.59.1": + version "5.62.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.62.0.tgz#1b63d082d849a2fcae8a569248fbe2ee1b8a56c7" + integrity sha512-VlJEV0fOQ7BExOsHYAGrgbEiZoi8D+Bl2+f6V2RrXerRSylnp+ZBHmPvaIa8cz0Ajx7WO7Z5RqfgYg7ED1nRhA== dependencies: - "@typescript-eslint/scope-manager" "5.59.0" - "@typescript-eslint/types" "5.59.0" - "@typescript-eslint/typescript-estree" "5.59.0" + "@typescript-eslint/scope-manager" "5.62.0" + "@typescript-eslint/types" "5.62.0" + "@typescript-eslint/typescript-estree" "5.62.0" debug "^4.3.4" -"@typescript-eslint/scope-manager@5.59.0": - version "5.59.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.59.0.tgz#86501d7a17885710b6716a23be2e93fc54a4fe8c" - integrity sha512-tsoldKaMh7izN6BvkK6zRMINj4Z2d6gGhO2UsI8zGZY3XhLq1DndP3Ycjhi1JwdwPRwtLMW4EFPgpuKhbCGOvQ== +"@typescript-eslint/scope-manager@5.62.0": + version "5.62.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.62.0.tgz#d9457ccc6a0b8d6b37d0eb252a23022478c5460c" + integrity sha512-VXuvVvZeQCQb5Zgf4HAxc04q5j+WrNAtNh9OwCsCgpKqESMTu3tF/jhZ3xG6T4NZwWl65Bg8KuS2uEvhSfLl0w== dependencies: - "@typescript-eslint/types" "5.59.0" - "@typescript-eslint/visitor-keys" "5.59.0" + "@typescript-eslint/types" "5.62.0" + "@typescript-eslint/visitor-keys" "5.62.0" -"@typescript-eslint/type-utils@5.59.0": - version "5.59.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.59.0.tgz#8e8d1420fc2265989fa3a0d897bde37f3851e8c9" - integrity sha512-d/B6VSWnZwu70kcKQSCqjcXpVH+7ABKH8P1KNn4K7j5PXXuycZTPXF44Nui0TEm6rbWGi8kc78xRgOC4n7xFgA== +"@typescript-eslint/type-utils@5.62.0": + version "5.62.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.62.0.tgz#286f0389c41681376cdad96b309cedd17d70346a" + integrity sha512-xsSQreu+VnfbqQpW5vnCJdq1Z3Q0U31qiWmRhr98ONQmcp/yhiPJFPq8MXiJVLiksmOKSjIldZzkebzHuCGzew== dependencies: - "@typescript-eslint/typescript-estree" "5.59.0" - "@typescript-eslint/utils" "5.59.0" + "@typescript-eslint/typescript-estree" "5.62.0" + "@typescript-eslint/utils" "5.62.0" debug "^4.3.4" tsutils "^3.21.0" -"@typescript-eslint/types@5.59.0": - version "5.59.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.59.0.tgz#3fcdac7dbf923ec5251545acdd9f1d42d7c4fe32" - integrity sha512-yR2h1NotF23xFFYKHZs17QJnB51J/s+ud4PYU4MqdZbzeNxpgUr05+dNeCN/bb6raslHvGdd6BFCkVhpPk/ZeA== +"@typescript-eslint/types@5.62.0": + version "5.62.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.62.0.tgz#258607e60effa309f067608931c3df6fed41fd2f" + integrity sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ== -"@typescript-eslint/typescript-estree@5.59.0": - version "5.59.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.59.0.tgz#8869156ee1dcfc5a95be3ed0e2809969ea28e965" - integrity sha512-sUNnktjmI8DyGzPdZ8dRwW741zopGxltGs/SAPgGL/AAgDpiLsCFLcMNSpbfXfmnNeHmK9h3wGmCkGRGAoUZAg== +"@typescript-eslint/typescript-estree@5.62.0", "@typescript-eslint/typescript-estree@^5.59.5": + version "5.62.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.62.0.tgz#7d17794b77fabcac615d6a48fb143330d962eb9b" + integrity sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA== dependencies: - "@typescript-eslint/types" "5.59.0" - "@typescript-eslint/visitor-keys" "5.59.0" + "@typescript-eslint/types" "5.62.0" + "@typescript-eslint/visitor-keys" "5.62.0" debug "^4.3.4" globby "^11.1.0" is-glob "^4.0.3" semver "^7.3.7" tsutils "^3.21.0" -"@typescript-eslint/utils@5.59.0": - version "5.59.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.59.0.tgz#063d066b3bc4850c18872649ed0da9ee72d833d5" - integrity sha512-GGLFd+86drlHSvPgN/el6dRQNYYGOvRSDVydsUaQluwIW3HvbXuxyuD5JETvBt/9qGYe+lOrDk6gRrWOHb/FvA== +"@typescript-eslint/utils@5.62.0": + version "5.62.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.62.0.tgz#141e809c71636e4a75daa39faed2fb5f4b10df86" + integrity sha512-n8oxjeb5aIbPFEtmQxQYOLI0i9n5ySBEY/ZEHHZqKQSFnxio1rv6dthascc9dLuwrL0RC5mPCxB7vnAVGAYWAQ== dependencies: "@eslint-community/eslint-utils" "^4.2.0" "@types/json-schema" "^7.0.9" "@types/semver" "^7.3.12" - "@typescript-eslint/scope-manager" "5.59.0" - "@typescript-eslint/types" "5.59.0" - "@typescript-eslint/typescript-estree" "5.59.0" + "@typescript-eslint/scope-manager" "5.62.0" + "@typescript-eslint/types" "5.62.0" + "@typescript-eslint/typescript-estree" "5.62.0" eslint-scope "^5.1.1" semver "^7.3.7" -"@typescript-eslint/visitor-keys@5.59.0": - version "5.59.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.59.0.tgz#a59913f2bf0baeb61b5cfcb6135d3926c3854365" - integrity sha512-qZ3iXxQhanchCeaExlKPV3gDQFxMUmU35xfd5eCXB6+kUw1TUAbIy2n7QIrwz9s98DQLzNWyHp61fY0da4ZcbA== +"@typescript-eslint/visitor-keys@5.62.0": + version "5.62.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.62.0.tgz#2174011917ce582875954ffe2f6912d5931e353e" + integrity sha512-07ny+LHRzQXepkGg6w0mFY41fVUNBrL2Roj/++7V1txKugfjm/Ci/qSND03r2RhlJhJYMcTn9AhhSSqQp0Ysyw== dependencies: - "@typescript-eslint/types" "5.59.0" + "@typescript-eslint/types" "5.62.0" eslint-visitor-keys "^3.3.0" -"@ungap/promise-all-settled@1.1.2": - version "1.1.2" - resolved "https://registry.yarnpkg.com/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz#aa58042711d6e3275dd37dc597e5d31e8c290a44" - integrity sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q== +"@ungap/structured-clone@^1.2.0": + version "1.2.0" + resolved "https://registry.yarnpkg.com/@ungap/structured-clone/-/structured-clone-1.2.0.tgz#756641adb587851b5ccb3e095daf27ae581c8406" + integrity sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ== + +"@vercel/nft@^0.23.0": + version "0.23.1" + resolved "https://registry.yarnpkg.com/@vercel/nft/-/nft-0.23.1.tgz#f17c5f9d3f3a0178ea25eb7397a14618c00529bf" + integrity sha512-NE0xSmGWVhgHF1OIoir71XAd0W0C1UE3nzFyhpFiMr3rVhetww7NvM1kc41trBsPG37Bh+dE5FYCTMzM/gBu0w== + dependencies: + "@mapbox/node-pre-gyp" "^1.0.5" + "@rollup/pluginutils" "^4.0.0" + acorn "^8.6.0" + async-sema "^3.1.1" + bindings "^1.4.0" + estree-walker "2.0.2" + glob "^7.1.3" + graceful-fs "^4.2.9" + micromatch "^4.0.2" + node-gyp-build "^4.2.2" + resolve-from "^5.0.0" + +"@vercel/nft@^0.26.0": + version "0.26.3" + resolved "https://registry.yarnpkg.com/@vercel/nft/-/nft-0.26.3.tgz#9d8f5195565d67e0fc478a9d611e3236e1512c68" + integrity sha512-h1z/NN9ppS4YOKwSgBoopJlhm7tS2Qb/9Ld1HXjDpvvTE7mY0xVD8nllXs+RihD9uTGJISOIMzp18Eg0EApaMA== + dependencies: + "@mapbox/node-pre-gyp" "^1.0.5" + "@rollup/pluginutils" "^4.0.0" + acorn "^8.6.0" + acorn-import-attributes "^1.9.2" + async-sema "^3.1.1" + bindings "^1.4.0" + estree-walker "2.0.2" + glob "^7.1.3" + graceful-fs "^4.2.9" + micromatch "^4.0.2" + node-gyp-build "^4.2.2" + resolve-from "^5.0.0" "@vitejs/plugin-vue@3.2.0": version "3.2.0" resolved "https://registry.yarnpkg.com/@vitejs/plugin-vue/-/plugin-vue-3.2.0.tgz#a1484089dd85d6528f435743f84cdd0d215bbb54" integrity sha512-E0tnaL4fr+qkdCNxJ+Xd0yM31UwMkQje76fsDVBBUCoGOUPexu2VDUYHL8P4CwV+zMvWw6nlRw19OnRKmYAJpw== -"@volar/language-core@1.3.0-alpha.0": - version "1.3.0-alpha.0" - resolved "https://registry.yarnpkg.com/@volar/language-core/-/language-core-1.3.0-alpha.0.tgz#4924b4cbc37dbce5f3845c1d2b2811938223a980" - integrity sha512-W3uMzecHPcbwddPu4SJpUcPakRBK/y/BP+U0U6NiPpUX1tONLC4yCawt+QBJqtgJ+sfD6ztf5PyvPL3hQRqfOA== +"@volar/language-core@1.11.1", "@volar/language-core@~1.11.1": + version "1.11.1" + resolved "https://registry.yarnpkg.com/@volar/language-core/-/language-core-1.11.1.tgz#ecdf12ea8dc35fb8549e517991abcbf449a5ad4f" + integrity sha512-dOcNn3i9GgZAcJt43wuaEykSluAuOkQgzni1cuxLxTV0nJKanQztp7FxyswdRILaKH+P2XZMPRp2S4MV/pElCw== dependencies: - "@volar/source-map" "1.3.0-alpha.0" + "@volar/source-map" "1.11.1" -"@volar/source-map@1.3.0-alpha.0": - version "1.3.0-alpha.0" - resolved "https://registry.yarnpkg.com/@volar/source-map/-/source-map-1.3.0-alpha.0.tgz#c45d51ecb9759604d29fb80211d2fc9765e5559c" - integrity sha512-jSdizxWFvDTvkPYZnO6ew3sBZUnS0abKCbuopkc0JrIlFbznWC/fPH3iPFIMS8/IIkRxq1Jh9VVG60SmtsdaMQ== +"@volar/source-map@1.11.1", "@volar/source-map@~1.11.1": + version "1.11.1" + resolved "https://registry.yarnpkg.com/@volar/source-map/-/source-map-1.11.1.tgz#535b0328d9e2b7a91dff846cab4058e191f4452f" + integrity sha512-hJnOnwZ4+WT5iupLRnuzbULZ42L7BWWPMmruzwtLhJfpDVoZLjNBxHDi2sY2bgZXCKlpU5XcsMFoYrsQmPhfZg== dependencies: - muggle-string "^0.2.2" + muggle-string "^0.3.1" -"@volar/typescript@1.3.0-alpha.0": - version "1.3.0-alpha.0" - resolved "https://registry.yarnpkg.com/@volar/typescript/-/typescript-1.3.0-alpha.0.tgz#f79bbc9939016700812b18191c47eb035913c6c3" - integrity sha512-5UItyW2cdH2mBLu4RrECRNJRgtvvzKrSCn2y3v/D61QwIDkGx4aeil6x8RFuUL5TFtV6QvVHXnsOHxNgd+sCow== +"@volar/typescript@~1.11.1": + version "1.11.1" + resolved "https://registry.yarnpkg.com/@volar/typescript/-/typescript-1.11.1.tgz#ba86c6f326d88e249c7f5cfe4b765be3946fd627" + integrity sha512-iU+t2mas/4lYierSnoFOeRFQUhAEMgsFuQxoxvwn5EdQopw43j+J27a4lt9LMInx1gLJBC6qL14WYGlgymaSMQ== dependencies: - "@volar/language-core" "1.3.0-alpha.0" - -"@volar/vue-language-core@1.2.0": - version "1.2.0" - resolved "https://registry.yarnpkg.com/@volar/vue-language-core/-/vue-language-core-1.2.0.tgz#a600aa93c6a4e89bf2b525b7e876b39e3afdfb9b" - integrity sha512-w7yEiaITh2WzKe6u8ZdeLKCUz43wdmY/OqAmsB/PGDvvhTcVhCJ6f0W/RprZL1IhqH8wALoWiwEh/Wer7ZviMQ== - dependencies: - "@volar/language-core" "1.3.0-alpha.0" - "@volar/source-map" "1.3.0-alpha.0" - "@vue/compiler-dom" "^3.2.47" - "@vue/compiler-sfc" "^3.2.47" - "@vue/reactivity" "^3.2.47" - "@vue/shared" "^3.2.47" - minimatch "^6.1.6" - muggle-string "^0.2.2" - vue-template-compiler "^2.7.14" + "@volar/language-core" "1.11.1" + path-browserify "^1.0.1" -"@volar/vue-typescript@1.2.0": - version "1.2.0" - resolved "https://registry.yarnpkg.com/@volar/vue-typescript/-/vue-typescript-1.2.0.tgz#825dab4624a116d8be21efbf0c4a7bd6dec51d37" - integrity sha512-zjmRi9y3J1EkG+pfuHp8IbHmibihrKK485cfzsHjiuvJMGrpkWvlO5WVEk8oslMxxeGC5XwBFE9AOlvh378EPA== +"@vue/compiler-core@3.4.14": + version "3.4.14" + resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.4.14.tgz#c3efdf3be8b0c4bf30830063d505c8c7945b6f0d" + integrity sha512-ro4Zzl/MPdWs7XwxT7omHRxAjMbDFRZEEjD+2m3NBf8YzAe3HuoSEZosXQo+m1GQ1G3LQ1LdmNh1RKTYe+ssEg== dependencies: - "@volar/typescript" "1.3.0-alpha.0" - "@volar/vue-language-core" "1.2.0" + "@babel/parser" "^7.23.6" + "@vue/shared" "3.4.14" + entities "^4.5.0" + estree-walker "^2.0.2" + source-map-js "^1.0.2" -"@vue/compiler-core@3.2.47": - version "3.2.47" - resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.2.47.tgz#3e07c684d74897ac9aa5922c520741f3029267f8" - integrity sha512-p4D7FDnQb7+YJmO2iPEv0SQNeNzcbHdGByJDsT4lynf63AFkOTFN07HsiRSvjGo0QrxR/o3d0hUyNCUnBU2Tig== +"@vue/compiler-dom@3.4.14", "@vue/compiler-dom@^3.3.0": + version "3.4.14" + resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.4.14.tgz#ba7269996ef12a3b9293083ac109b52d14c9ccb5" + integrity sha512-nOZTY+veWNa0DKAceNWxorAbWm0INHdQq7cejFaWM1WYnoNSJbSEKYtE7Ir6lR/+mo9fttZpPVI9ZFGJ1juUEQ== dependencies: - "@babel/parser" "^7.16.4" - "@vue/shared" "3.2.47" - estree-walker "^2.0.2" - source-map "^0.6.1" + "@vue/compiler-core" "3.4.14" + "@vue/shared" "3.4.14" -"@vue/compiler-dom@3.2.47", "@vue/compiler-dom@^3.2.47": - version "3.2.47" - resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.2.47.tgz#a0b06caf7ef7056939e563dcaa9cbde30794f305" - integrity sha512-dBBnEHEPoftUiS03a4ggEig74J2YBZ2UIeyfpcRM2tavgMWo4bsEfgCGsu+uJIL/vax9S+JztH8NmQerUo7shQ== - dependencies: - "@vue/compiler-core" "3.2.47" - "@vue/shared" "3.2.47" - -"@vue/compiler-sfc@3.2.47", "@vue/compiler-sfc@^3.2.45", "@vue/compiler-sfc@^3.2.47": - version "3.2.47" - resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.2.47.tgz#1bdc36f6cdc1643f72e2c397eb1a398f5004ad3d" - integrity sha512-rog05W+2IFfxjMcFw10tM9+f7i/+FFpZJJ5XHX72NP9eC2uRD+42M3pYcQqDXVYoj74kHMSEdQ/WmCjt8JFksQ== - dependencies: - "@babel/parser" "^7.16.4" - "@vue/compiler-core" "3.2.47" - "@vue/compiler-dom" "3.2.47" - "@vue/compiler-ssr" "3.2.47" - "@vue/reactivity-transform" "3.2.47" - "@vue/shared" "3.2.47" +"@vue/compiler-sfc@3.4.14", "@vue/compiler-sfc@^3.2.45": + version "3.4.14" + resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.4.14.tgz#d472b9be05f0f958911a8aad0826a12d92fdb82f" + integrity sha512-1vHc9Kv1jV+YBZC/RJxQJ9JCxildTI+qrhtDh6tPkR1O8S+olBUekimY0km0ZNn8nG1wjtFAe9XHij+YLR8cRQ== + dependencies: + "@babel/parser" "^7.23.6" + "@vue/compiler-core" "3.4.14" + "@vue/compiler-dom" "3.4.14" + "@vue/compiler-ssr" "3.4.14" + "@vue/shared" "3.4.14" estree-walker "^2.0.2" - magic-string "^0.25.7" - postcss "^8.1.10" - source-map "^0.6.1" + magic-string "^0.30.5" + postcss "^8.4.33" + source-map-js "^1.0.2" -"@vue/compiler-ssr@3.2.47": - version "3.2.47" - resolved "https://registry.yarnpkg.com/@vue/compiler-ssr/-/compiler-ssr-3.2.47.tgz#35872c01a273aac4d6070ab9d8da918ab13057ee" - integrity sha512-wVXC+gszhulcMD8wpxMsqSOpvDZ6xKXSVWkf50Guf/S+28hTAXPDYRTbLQ3EDkOP5Xz/+SY37YiwDquKbJOgZw== +"@vue/compiler-ssr@3.4.14": + version "3.4.14" + resolved "https://registry.yarnpkg.com/@vue/compiler-ssr/-/compiler-ssr-3.4.14.tgz#7de5a04267e036d18ad33768a78a780cab570305" + integrity sha512-bXT6+oAGlFjTYVOTtFJ4l4Jab1wjsC0cfSfOe2B4Z0N2vD2zOBSQ9w694RsCfhjk+bC2DY5Gubb1rHZVii107Q== dependencies: - "@vue/compiler-dom" "3.2.47" - "@vue/shared" "3.2.47" + "@vue/compiler-dom" "3.4.14" + "@vue/shared" "3.4.14" -"@vue/devtools-api@^6.2.1", "@vue/devtools-api@^6.4.5", "@vue/devtools-api@^6.5.0": - version "6.5.0" - resolved "https://registry.yarnpkg.com/@vue/devtools-api/-/devtools-api-6.5.0.tgz#98b99425edee70b4c992692628fa1ea2c1e57d07" - integrity sha512-o9KfBeaBmCKl10usN4crU53fYtC1r7jJwdGKjPT24t348rHxgfpZ0xL3Xm/gLUYnc0oTp8LAmrxOeLyu6tbk2Q== +"@vue/devtools-api@^6.5.0": + version "6.5.1" + resolved "https://registry.yarnpkg.com/@vue/devtools-api/-/devtools-api-6.5.1.tgz#7f71f31e40973eeee65b9a64382b13593fdbd697" + integrity sha512-+KpckaAQyfbvshdDW5xQylLni1asvNSGme1JFs8I1+/H5pHEhqUKMEQD/qn3Nx5+/nycBq11qAEi8lk+LXI2dA== "@vue/eslint-config-prettier@^7.0.0": version "7.1.0" @@ -3943,61 +4456,65 @@ eslint-plugin-prettier "^4.0.0" "@vue/eslint-config-typescript@^11.0.2": - version "11.0.2" - resolved "https://registry.yarnpkg.com/@vue/eslint-config-typescript/-/eslint-config-typescript-11.0.2.tgz#03353f404d4472900794e653450bb6623de3c642" - integrity sha512-EiKud1NqlWmSapBFkeSrE994qpKx7/27uCGnhdqzllYDpQZroyX/O6bwjEpeuyKamvLbsGdO6PMR2faIf+zFnw== - dependencies: - "@typescript-eslint/eslint-plugin" "^5.0.0" - "@typescript-eslint/parser" "^5.0.0" - vue-eslint-parser "^9.0.0" - -"@vue/reactivity-transform@3.2.47": - version "3.2.47" - resolved "https://registry.yarnpkg.com/@vue/reactivity-transform/-/reactivity-transform-3.2.47.tgz#e45df4d06370f8abf29081a16afd25cffba6d84e" - integrity sha512-m8lGXw8rdnPVVIdIFhf0LeQ/ixyHkH5plYuS83yop5n7ggVJU+z5v0zecwEnX7fa7HNLBhh2qngJJkxpwEEmYA== - dependencies: - "@babel/parser" "^7.16.4" - "@vue/compiler-core" "3.2.47" - "@vue/shared" "3.2.47" - estree-walker "^2.0.2" - magic-string "^0.25.7" + version "11.0.3" + resolved "https://registry.yarnpkg.com/@vue/eslint-config-typescript/-/eslint-config-typescript-11.0.3.tgz#c720efa657d102cd2945bc54b4a79f35d57f6307" + integrity sha512-dkt6W0PX6H/4Xuxg/BlFj5xHvksjpSlVjtkQCpaYJBIEuKj2hOVU7r+TIe+ysCwRYFz/lGqvklntRkCAibsbPw== + dependencies: + "@typescript-eslint/eslint-plugin" "^5.59.1" + "@typescript-eslint/parser" "^5.59.1" + vue-eslint-parser "^9.1.1" + +"@vue/language-core@1.8.27": + version "1.8.27" + resolved "https://registry.yarnpkg.com/@vue/language-core/-/language-core-1.8.27.tgz#2ca6892cb524e024a44e554e4c55d7a23e72263f" + integrity sha512-L8Kc27VdQserNaCUNiSFdDl9LWT24ly8Hpwf1ECy3aFb9m6bDhBGQYOujDm21N7EW3moKIOKEanQwe1q5BK+mA== + dependencies: + "@volar/language-core" "~1.11.1" + "@volar/source-map" "~1.11.1" + "@vue/compiler-dom" "^3.3.0" + "@vue/shared" "^3.3.0" + computeds "^0.0.1" + minimatch "^9.0.3" + muggle-string "^0.3.1" + path-browserify "^1.0.1" + vue-template-compiler "^2.7.14" -"@vue/reactivity@3.2.47", "@vue/reactivity@^3.2.47": - version "3.2.47" - resolved "https://registry.yarnpkg.com/@vue/reactivity/-/reactivity-3.2.47.tgz#1d6399074eadfc3ed35c727e2fd707d6881140b6" - integrity sha512-7khqQ/75oyyg+N/e+iwV6lpy1f5wq759NdlS1fpAhFXa8VeAIKGgk2E/C4VF59lx5b+Ezs5fpp/5WsRYXQiKxQ== +"@vue/reactivity@3.4.14": + version "3.4.14" + resolved "https://registry.yarnpkg.com/@vue/reactivity/-/reactivity-3.4.14.tgz#3970f9b813101e7e8555359aaae3ea6819eb4450" + integrity sha512-xRYwze5Q4tK7tT2J4uy4XLhK/AIXdU5EBUu9PLnIHcOKXO0uyXpNNMzlQKuq7B+zwtq6K2wuUL39pHA6ZQzObw== dependencies: - "@vue/shared" "3.2.47" + "@vue/shared" "3.4.14" -"@vue/runtime-core@3.2.47": - version "3.2.47" - resolved "https://registry.yarnpkg.com/@vue/runtime-core/-/runtime-core-3.2.47.tgz#406ebade3d5551c00fc6409bbc1eeb10f32e121d" - integrity sha512-RZxbLQIRB/K0ev0K9FXhNbBzT32H9iRtYbaXb0ZIz2usLms/D55dJR2t6cIEUn6vyhS3ALNvNthI+Q95C+NOpA== +"@vue/runtime-core@3.4.14": + version "3.4.14" + resolved "https://registry.yarnpkg.com/@vue/runtime-core/-/runtime-core-3.4.14.tgz#bbb6317d2dfd5742711ae1c09132f219268f8598" + integrity sha512-qu+NMkfujCoZL6cfqK5NOfxgXJROSlP2ZPs4CTcVR+mLrwl4TtycF5Tgo0QupkdBL+2kigc6EsJlTcuuZC1NaQ== dependencies: - "@vue/reactivity" "3.2.47" - "@vue/shared" "3.2.47" + "@vue/reactivity" "3.4.14" + "@vue/shared" "3.4.14" -"@vue/runtime-dom@3.2.47": - version "3.2.47" - resolved "https://registry.yarnpkg.com/@vue/runtime-dom/-/runtime-dom-3.2.47.tgz#93e760eeaeab84dedfb7c3eaf3ed58d776299382" - integrity sha512-ArXrFTjS6TsDei4qwNvgrdmHtD930KgSKGhS5M+j8QxXrDJYLqYw4RRcDy1bz1m1wMmb6j+zGLifdVHtkXA7gA== +"@vue/runtime-dom@3.4.14": + version "3.4.14" + resolved "https://registry.yarnpkg.com/@vue/runtime-dom/-/runtime-dom-3.4.14.tgz#75181c69613d93d227d0e2081eab646b9d3871cc" + integrity sha512-B85XmcR4E7XsirEHVqhmy4HPbRT9WLFWV9Uhie3OapV9m1MEN9+Er6hmUIE6d8/l2sUygpK9RstFM2bmHEUigA== dependencies: - "@vue/runtime-core" "3.2.47" - "@vue/shared" "3.2.47" - csstype "^2.6.8" + "@vue/runtime-core" "3.4.14" + "@vue/shared" "3.4.14" + csstype "^3.1.3" -"@vue/server-renderer@3.2.47": - version "3.2.47" - resolved "https://registry.yarnpkg.com/@vue/server-renderer/-/server-renderer-3.2.47.tgz#8aa1d1871fc4eb5a7851aa7f741f8f700e6de3c0" - integrity sha512-dN9gc1i8EvmP9RCzvneONXsKfBRgqFeFZLurmHOveL7oH6HiFXJw5OGu294n1nHc/HMgTy6LulU/tv5/A7f/LA== +"@vue/server-renderer@3.4.14": + version "3.4.14" + resolved "https://registry.yarnpkg.com/@vue/server-renderer/-/server-renderer-3.4.14.tgz#efac363baed3a500a3309cce1138b368f92892a8" + integrity sha512-pwSKXQfYdJBTpvWHGEYI+akDE18TXAiLcGn+Q/2Fj8wQSHWztoo7PSvfMNqu6NDhp309QXXbPFEGCU5p85HqkA== dependencies: - "@vue/compiler-ssr" "3.2.47" - "@vue/shared" "3.2.47" + "@vue/compiler-ssr" "3.4.14" + "@vue/shared" "3.4.14" -"@vue/shared@3.2.47", "@vue/shared@^3.2.47": - version "3.2.47" - resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.2.47.tgz#e597ef75086c6e896ff5478a6bfc0a7aa4bbd14c" - integrity sha512-BHGyyGN3Q97EZx0taMQ+OLNuZcW3d37ZEVmEAyeoA9ERdGvm9Irc/0Fua8SNyOtV1w6BS4q25wbMzJujO9HIfQ== +"@vue/shared@3.4.14", "@vue/shared@^3.3.0": + version "3.4.14" + resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.4.14.tgz#bc2d199a42a87f0349492fdfb83abc205ddd4d60" + integrity sha512-nmi3BtLpvqXAWoRZ6HQ+pFJOHBU4UnH3vD3opgmwXac7vhaHKA9nj1VeGjMggdB9eLtW83eHyPCmOU1qzdsC7Q== "@vue/tsconfig@^0.1.3": version "0.1.3" @@ -4005,20 +4522,30 @@ integrity sha512-kQVsh8yyWPvHpb8gIc9l/HIDiiVUy1amynLNpCy8p+FoCiZXCo6fQos5/097MmnNZc9AtseDsCrfkhqCrJ8Olg== "@vuelidate/core@^2.0.0": - version "2.0.2" - resolved "https://registry.yarnpkg.com/@vuelidate/core/-/core-2.0.2.tgz#e874afc830ccc5295e83a0c0a0f0621e084348c9" - integrity sha512-aG1OZWv6xVws3ljyKy/pyxq1rdZZ2ryj+FEREcC9d4GP4qOvNHHZUl/NQxa0Bck3Ooc0RfXU8vwCA9piRoWy6w== + version "2.0.3" + resolved "https://registry.yarnpkg.com/@vuelidate/core/-/core-2.0.3.tgz#40468c5ed15b72bde880a026b0699c2f0f1ecede" + integrity sha512-AN6l7KF7+mEfyWG0doT96z+47ljwPpZfi9/JrNMkOGLFv27XVZvKzRLXlmDPQjPl/wOB1GNnHuc54jlCLRNqGA== dependencies: vue-demi "^0.13.11" "@vuelidate/validators@^2.0.0": - version "2.0.2" - resolved "https://registry.yarnpkg.com/@vuelidate/validators/-/validators-2.0.2.tgz#8b372b7d6f056d161f1fb551f063e3c83cb97d5e" - integrity sha512-6y6QLoK567XVmaLP3Paf1vkg6K2zO6xax3yTyczy1RnJ4PsLDLLGzP1PFzSpwb16aw4CKduBgI63HvIuctJhQg== + version "2.0.4" + resolved "https://registry.yarnpkg.com/@vuelidate/validators/-/validators-2.0.4.tgz#0a88a7b2b18f15fd9c384095593f369a6f7384e9" + integrity sha512-odTxtUZ2JpwwiQ10t0QWYJkkYrfd0SyFYhdHH44QQ1jDatlZgTh/KRzrWVmn/ib9Gq7H4hFD4e8ahoo5YlUlDw== dependencies: vue-demi "^0.13.11" -"@vueuse/core@9.13.0", "@vueuse/core@^9.13.0", "@vueuse/core@^9.6.0": +"@vueuse/core@10.7.2", "@vueuse/core@^10.5.0": + version "10.7.2" + resolved "https://registry.yarnpkg.com/@vueuse/core/-/core-10.7.2.tgz#78917803a29a0bca1803a6521fdf7ff873f6e72c" + integrity sha512-AOyAL2rK0By62Hm+iqQn6Rbu8bfmbgaIMXcE3TSr7BdQ42wnSFlwIdPjInO62onYsEMK/yDMU8C6oGfDAtZ2qQ== + dependencies: + "@types/web-bluetooth" "^0.0.20" + "@vueuse/metadata" "10.7.2" + "@vueuse/shared" "10.7.2" + vue-demi ">=0.14.6" + +"@vueuse/core@^9.6.0": version "9.13.0" resolved "https://registry.yarnpkg.com/@vueuse/core/-/core-9.13.0.tgz#2f69e66d1905c1e4eebc249a01759cf88ea00cf4" integrity sha512-pujnclbeHWxxPRqXWmdkKV5OX4Wk4YeK7wusHqRwU0Q7EFusHoqNA/aPhB6KCh9hEqJkLAJo7bb0Lh9b+OIVzw== @@ -4028,20 +4555,32 @@ "@vueuse/shared" "9.13.0" vue-demi "*" -"@vueuse/integrations@^9.13.0": - version "9.13.0" - resolved "https://registry.yarnpkg.com/@vueuse/integrations/-/integrations-9.13.0.tgz#a086459ab19b5bf98546d4f455c102dcf38a5cef" - integrity sha512-I1kX/tsfcvWWLZD7HZaP0LsSfchK13YxReLfharXhk72SFXp87doLbRaTfIF5w8m/gr/vPtcNyQPAXW7Ubpuww== +"@vueuse/integrations@^10.5.0": + version "10.7.2" + resolved "https://registry.yarnpkg.com/@vueuse/integrations/-/integrations-10.7.2.tgz#763de1337d3925be9097aac9a725eec39d4c8e69" + integrity sha512-+u3RLPFedjASs5EKPc69Ge49WNgqeMfSxFn+qrQTzblPXZg6+EFzhjarS5edj2qAf6xQ93f95TUxRwKStXj/sQ== dependencies: - "@vueuse/core" "9.13.0" - "@vueuse/shared" "9.13.0" - vue-demi "*" + "@vueuse/core" "10.7.2" + "@vueuse/shared" "10.7.2" + vue-demi ">=0.14.6" + +"@vueuse/metadata@10.7.2": + version "10.7.2" + resolved "https://registry.yarnpkg.com/@vueuse/metadata/-/metadata-10.7.2.tgz#ba0187ce138c287fd80301afc5b0d6a97e563633" + integrity sha512-kCWPb4J2KGrwLtn1eJwaJD742u1k5h6v/St5wFe8Quih90+k2a0JP8BS4Zp34XUuJqS2AxFYMb1wjUL8HfhWsQ== "@vueuse/metadata@9.13.0": version "9.13.0" resolved "https://registry.yarnpkg.com/@vueuse/metadata/-/metadata-9.13.0.tgz#bc25a6cdad1b1a93c36ce30191124da6520539ff" integrity sha512-gdU7TKNAUVlXXLbaF+ZCfte8BjRJQWPCa2J55+7/h+yDtzw3vOoGQDRXzI6pyKyo6bXFT5/QoPE4hAknExjRLQ== +"@vueuse/shared@10.7.2": + version "10.7.2" + resolved "https://registry.yarnpkg.com/@vueuse/shared/-/shared-10.7.2.tgz#746441fbc08072371dd600a55883422c83fd0cab" + integrity sha512-qFbXoxS44pi2FkgFjPvF4h7c9oMDutpyBdcJdMYIMg9XyXli2meFMuaKn+UMgsClo//Th6+beeCgqweT/79BVA== + dependencies: + vue-demi ">=0.14.6" + "@vueuse/shared@9.13.0": version "9.13.0" resolved "https://registry.yarnpkg.com/@vueuse/shared/-/shared-9.13.0.tgz#089ff4cc4e2e7a4015e57a8f32e4b39d096353b9" @@ -4049,25 +4588,26 @@ dependencies: vue-demi "*" -"@walletconnect/core@2.9.0": - version "2.9.0" - resolved "https://registry.yarnpkg.com/@walletconnect/core/-/core-2.9.0.tgz#7837a5d015a22b48d35b987bcde2aa9ccdf300d8" - integrity sha512-MZYJghS9YCvGe32UOgDj0mCasaOoGHQaYXWeQblXE/xb8HuaM6kAWhjIQN9P+MNp5QP134BHP5olQostcCotXQ== +"@walletconnect/core@2.11.0": + version "2.11.0" + resolved "https://registry.yarnpkg.com/@walletconnect/core/-/core-2.11.0.tgz#3a4e301077b2f858fd916b7a20b5b984d1afce63" + integrity sha512-2Tjp5BCevI7dbmqo/OrCjX4tqgMqwJNQLlQAlphqPfvwlF9+tIu6pGcVbSN3U9zyXzWIZCeleqEaWUeSeET4Ew== dependencies: "@walletconnect/heartbeat" "1.2.1" "@walletconnect/jsonrpc-provider" "1.0.13" "@walletconnect/jsonrpc-types" "1.0.3" "@walletconnect/jsonrpc-utils" "1.0.8" - "@walletconnect/jsonrpc-ws-connection" "1.0.12" - "@walletconnect/keyvaluestorage" "^1.0.2" + "@walletconnect/jsonrpc-ws-connection" "1.0.14" + "@walletconnect/keyvaluestorage" "^1.1.1" "@walletconnect/logger" "^2.0.1" "@walletconnect/relay-api" "^1.0.9" "@walletconnect/relay-auth" "^1.0.4" "@walletconnect/safe-json" "^1.0.2" "@walletconnect/time" "^1.0.2" - "@walletconnect/types" "2.9.0" - "@walletconnect/utils" "2.9.0" + "@walletconnect/types" "2.11.0" + "@walletconnect/utils" "2.11.0" events "^3.3.0" + isomorphic-unfetch "3.1.0" lodash.isequal "4.5.0" uint8arrays "^3.1.0" @@ -4079,18 +4619,19 @@ tslib "1.14.1" "@walletconnect/ethereum-provider@^2.9.0": - version "2.9.0" - resolved "https://registry.yarnpkg.com/@walletconnect/ethereum-provider/-/ethereum-provider-2.9.0.tgz#aa6e9e441678c824af8f744c50dafd604f19d69e" - integrity sha512-rSXkC0SXMigJRdIi/M2RMuEuATY1AwtlTWQBnqyxoht7xbO2bQNPCXn0XL4s/GRNrSUtoKSY4aPMHXV4W4yLBA== + version "2.11.0" + resolved "https://registry.yarnpkg.com/@walletconnect/ethereum-provider/-/ethereum-provider-2.11.0.tgz#feb90368d8b2608d7d120ac8feeb3e26eac8c709" + integrity sha512-YrTeHVjuSuhlUw7SQ6xBJXDuJ6iAC+RwINm9nVhoKYJSHAy3EVSJZOofMKrnecL0iRMtD29nj57mxAInIBRuZA== dependencies: "@walletconnect/jsonrpc-http-connection" "^1.0.7" "@walletconnect/jsonrpc-provider" "^1.0.13" "@walletconnect/jsonrpc-types" "^1.0.3" "@walletconnect/jsonrpc-utils" "^1.0.8" - "@walletconnect/sign-client" "2.9.0" - "@walletconnect/types" "2.9.0" - "@walletconnect/universal-provider" "2.9.0" - "@walletconnect/utils" "2.9.0" + "@walletconnect/modal" "^2.6.2" + "@walletconnect/sign-client" "2.11.0" + "@walletconnect/types" "2.11.0" + "@walletconnect/universal-provider" "2.11.0" + "@walletconnect/utils" "2.11.0" events "^3.3.0" "@walletconnect/events@^1.0.1": @@ -4129,7 +4670,7 @@ "@walletconnect/safe-json" "^1.0.2" tslib "1.14.1" -"@walletconnect/jsonrpc-types@1.0.3", "@walletconnect/jsonrpc-types@^1.0.3": +"@walletconnect/jsonrpc-types@1.0.3", "@walletconnect/jsonrpc-types@^1.0.2", "@walletconnect/jsonrpc-types@^1.0.3": version "1.0.3" resolved "https://registry.yarnpkg.com/@walletconnect/jsonrpc-types/-/jsonrpc-types-1.0.3.tgz#65e3b77046f1a7fa8347ae02bc1b841abe6f290c" integrity sha512-iIQ8hboBl3o5ufmJ8cuduGad0CQm3ZlsHtujv9Eu16xq89q+BG7Nh5VLxxUgmtpnrePgFkTwXirCTkwJH1v+Yw== @@ -4137,15 +4678,7 @@ keyvaluestorage-interface "^1.0.0" tslib "1.14.1" -"@walletconnect/jsonrpc-types@^1.0.2": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@walletconnect/jsonrpc-types/-/jsonrpc-types-1.0.2.tgz#b79519f679cd6a5fa4a1bea888f27c1916689a20" - integrity sha512-CZe8tjJX73OWdHjrBHy7HtAapJ2tT0Q3TYhPBhRxi3643lwPIQWC9En45ldY14TZwgSewkbZ0FtGBZK0G7Bbyg== - dependencies: - keyvaluestorage-interface "^1.0.0" - tslib "1.14.1" - -"@walletconnect/jsonrpc-utils@1.0.8", "@walletconnect/jsonrpc-utils@^1.0.8": +"@walletconnect/jsonrpc-utils@1.0.8", "@walletconnect/jsonrpc-utils@^1.0.6", "@walletconnect/jsonrpc-utils@^1.0.7", "@walletconnect/jsonrpc-utils@^1.0.8": version "1.0.8" resolved "https://registry.yarnpkg.com/@walletconnect/jsonrpc-utils/-/jsonrpc-utils-1.0.8.tgz#82d0cc6a5d6ff0ecc277cb35f71402c91ad48d72" integrity sha512-vdeb03bD8VzJUL6ZtzRYsFMq1eZQcM3EAzT0a3st59dyLfJ0wq+tKMpmGH7HlB7waD858UWgfIcudbPFsbzVdw== @@ -4154,33 +4687,24 @@ "@walletconnect/jsonrpc-types" "^1.0.3" tslib "1.14.1" -"@walletconnect/jsonrpc-utils@^1.0.6", "@walletconnect/jsonrpc-utils@^1.0.7": - version "1.0.7" - resolved "https://registry.yarnpkg.com/@walletconnect/jsonrpc-utils/-/jsonrpc-utils-1.0.7.tgz#1812d17c784f1ec0735bf03d0884287f60bfa2ce" - integrity sha512-zJziApzUF/Il4VcwabnaU+0yo1QI4eUkYX99zmCVTHJvZOf2l0zjADf/OpKqWyeNFC3Io56Z/8uJHVtcNVvyFA== - dependencies: - "@walletconnect/environment" "^1.0.1" - "@walletconnect/jsonrpc-types" "^1.0.2" - tslib "1.14.1" - -"@walletconnect/jsonrpc-ws-connection@1.0.12": - version "1.0.12" - resolved "https://registry.yarnpkg.com/@walletconnect/jsonrpc-ws-connection/-/jsonrpc-ws-connection-1.0.12.tgz#2192314884fabdda6d0a9d22e157e5b352025ed8" - integrity sha512-HAcadga3Qjt1Cqy+qXEW6zjaCs8uJGdGQrqltzl3OjiK4epGZRdvSzTe63P+t/3z+D2wG+ffEPn0GVcDozmN1w== +"@walletconnect/jsonrpc-ws-connection@1.0.14": + version "1.0.14" + resolved "https://registry.yarnpkg.com/@walletconnect/jsonrpc-ws-connection/-/jsonrpc-ws-connection-1.0.14.tgz#eec700e74766c7887de2bd76c91a0206628732aa" + integrity sha512-Jsl6fC55AYcbkNVkwNM6Jo+ufsuCQRqViOQ8ZBPH9pRREHH9welbBiszuTLqEJiQcO/6XfFDl6bzCJIkrEi8XA== dependencies: "@walletconnect/jsonrpc-utils" "^1.0.6" "@walletconnect/safe-json" "^1.0.2" events "^3.3.0" - tslib "1.14.1" ws "^7.5.1" -"@walletconnect/keyvaluestorage@^1.0.2": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@walletconnect/keyvaluestorage/-/keyvaluestorage-1.0.2.tgz#92f5ca0f54c1a88a093778842ce0c874d86369c8" - integrity sha512-U/nNG+VLWoPFdwwKx0oliT4ziKQCEoQ27L5Hhw8YOFGA2Po9A9pULUYNWhDgHkrb0gYDNt//X7wABcEWWBd3FQ== +"@walletconnect/keyvaluestorage@^1.1.1": + version "1.1.1" + resolved "https://registry.yarnpkg.com/@walletconnect/keyvaluestorage/-/keyvaluestorage-1.1.1.tgz#dd2caddabfbaf80f6b8993a0704d8b83115a1842" + integrity sha512-V7ZQq2+mSxAq7MrRqDxanTzu2RcElfK1PfNYiaVnJgJ7Q7G7hTVwF8voIBx92qsRyGHZihrwNPHuZd1aKkd0rA== dependencies: - safe-json-utils "^1.1.1" - tslib "1.14.1" + "@walletconnect/safe-json" "^1.0.1" + idb-keyval "^6.2.1" + unstorage "^1.9.0" "@walletconnect/logger@^2.0.1": version "2.0.1" @@ -4190,30 +4714,30 @@ pino "7.11.0" tslib "1.14.1" -"@walletconnect/modal-core@2.6.0": - version "2.6.0" - resolved "https://registry.yarnpkg.com/@walletconnect/modal-core/-/modal-core-2.6.0.tgz#5e77559b8a7718db355b6cad81412137ca5ce7a9" - integrity sha512-95315iaiVlz72W8IWd0gvBGHenS9cbLXwURjbN6wm12KSc6zbQA6u2RO0SRlcwc+dQcNzhwB/ce7TZYLQUVMfw== +"@walletconnect/modal-core@2.6.2": + version "2.6.2" + resolved "https://registry.yarnpkg.com/@walletconnect/modal-core/-/modal-core-2.6.2.tgz#d73e45d96668764e0c8668ea07a45bb8b81119e9" + integrity sha512-cv8ibvdOJQv2B+nyxP9IIFdxvQznMz8OOr/oR/AaUZym4hjXNL/l1a2UlSQBXrVjo3xxbouMxLb3kBsHoYP2CA== dependencies: - valtio "1.10.7" + valtio "1.11.2" -"@walletconnect/modal-ui@2.6.0": - version "2.6.0" - resolved "https://registry.yarnpkg.com/@walletconnect/modal-ui/-/modal-ui-2.6.0.tgz#f62b2d3d29d2cf83851f5302e03ed02062eaf9e6" - integrity sha512-A9Eohricm+VYTiUELVfum7AjyhxquWqy8ZhyVWXfm2ucpHnG0lhiY2mdLrqoE9EEW/ql4tmfYltX2ZD9wzTu9A== +"@walletconnect/modal-ui@2.6.2": + version "2.6.2" + resolved "https://registry.yarnpkg.com/@walletconnect/modal-ui/-/modal-ui-2.6.2.tgz#fa57c087c57b7f76aaae93deab0f84bb68b59cf9" + integrity sha512-rbdstM1HPGvr7jprQkyPggX7rP4XiCG85ZA+zWBEX0dVQg8PpAgRUqpeub4xQKDgY7pY/xLRXSiCVdWGqvG2HA== dependencies: - "@walletconnect/modal-core" "2.6.0" - lit "2.7.6" + "@walletconnect/modal-core" "2.6.2" + lit "2.8.0" motion "10.16.2" qrcode "1.5.3" -"@walletconnect/modal@^2.6.0": - version "2.6.0" - resolved "https://registry.yarnpkg.com/@walletconnect/modal/-/modal-2.6.0.tgz#c29b5b6da93e0f5e699a9fd6bb385001a8e4aa4b" - integrity sha512-hV8pfWvUDjanxfXZ7DouyboM+LOcSsJBX3cMsDyNwe0f19W/yIZTUQz9k4DkuIGjEQSUO9zfEX+BAYAeP27uag== +"@walletconnect/modal@^2.6.0", "@walletconnect/modal@^2.6.2": + version "2.6.2" + resolved "https://registry.yarnpkg.com/@walletconnect/modal/-/modal-2.6.2.tgz#4b534a836f5039eeb3268b80be7217a94dd12651" + integrity sha512-eFopgKi8AjKf/0U4SemvcYw9zlLpx9njVN8sf6DAkowC2Md0gPU/UNEbH1Wwj407pEKnEds98pKWib1NN1ACoA== dependencies: - "@walletconnect/modal-core" "2.6.0" - "@walletconnect/modal-ui" "2.6.0" + "@walletconnect/modal-core" "2.6.2" + "@walletconnect/modal-ui" "2.6.2" "@walletconnect/relay-api@^1.0.9": version "1.0.9" @@ -4242,19 +4766,19 @@ dependencies: tslib "1.14.1" -"@walletconnect/sign-client@2.9.0": - version "2.9.0" - resolved "https://registry.yarnpkg.com/@walletconnect/sign-client/-/sign-client-2.9.0.tgz#fd3b0acb68bc8d56350f01ed70f8c6326e6e89fa" - integrity sha512-mEKc4LlLMebCe45qzqh+MX4ilQK4kOEBzLY6YJpG8EhyT45eX4JMNA7qQoYa9MRMaaVb/7USJcc4e3ZrjZvQmA== +"@walletconnect/sign-client@2.11.0": + version "2.11.0" + resolved "https://registry.yarnpkg.com/@walletconnect/sign-client/-/sign-client-2.11.0.tgz#de10f976cc1b8ab04b7f7c27f6a298e4e083ab25" + integrity sha512-H2ukscibBS+6WrzQWh+WyVBqO5z4F5et12JcwobdwgHnJSlqIoZxqnUYYWNCI5rUR5UKsKWaUyto4AE9N5dw4Q== dependencies: - "@walletconnect/core" "2.9.0" + "@walletconnect/core" "2.11.0" "@walletconnect/events" "^1.0.1" "@walletconnect/heartbeat" "1.2.1" "@walletconnect/jsonrpc-utils" "1.0.8" "@walletconnect/logger" "^2.0.1" "@walletconnect/time" "^1.0.2" - "@walletconnect/types" "2.9.0" - "@walletconnect/utils" "2.9.0" + "@walletconnect/types" "2.11.0" + "@walletconnect/utils" "2.11.0" events "^3.3.0" "@walletconnect/time@^1.0.2": @@ -4264,37 +4788,37 @@ dependencies: tslib "1.14.1" -"@walletconnect/types@2.9.0": - version "2.9.0" - resolved "https://registry.yarnpkg.com/@walletconnect/types/-/types-2.9.0.tgz#6e5dfdc7212c1ec4ab49a1ec409c743e16093f72" - integrity sha512-ORopsMfSRvUYqtjKKd6scfg8o4/aGebipLxx92AuuUgMTERSU6cGmIrK6rdLu7W6FBJkmngPLEGc9mRqAb9Lug== +"@walletconnect/types@2.11.0": + version "2.11.0" + resolved "https://registry.yarnpkg.com/@walletconnect/types/-/types-2.11.0.tgz#474a009c56faa9ef4063b76ed84415c801dc9f1e" + integrity sha512-AB5b1lrEbCGHxqS2vqfCkIoODieH+ZAUp9rA1O2ftrhnqDJiJK983Df87JhYhECsQUBHHfALphA8ydER0q+9sw== dependencies: "@walletconnect/events" "^1.0.1" "@walletconnect/heartbeat" "1.2.1" "@walletconnect/jsonrpc-types" "1.0.3" - "@walletconnect/keyvaluestorage" "^1.0.2" + "@walletconnect/keyvaluestorage" "^1.1.1" "@walletconnect/logger" "^2.0.1" events "^3.3.0" -"@walletconnect/universal-provider@2.9.0": - version "2.9.0" - resolved "https://registry.yarnpkg.com/@walletconnect/universal-provider/-/universal-provider-2.9.0.tgz#a6b4a1f099262536e17b5c25bf7b3c89db9945a8" - integrity sha512-k3nkSBkF69sJJVoe17IVoPtnhp/sgaa2t+x7BvA/BKeMxE0DGdtRJdEXotTc8DBmI7o2tkq6l8+HyFBGjQ/CjQ== +"@walletconnect/universal-provider@2.11.0": + version "2.11.0" + resolved "https://registry.yarnpkg.com/@walletconnect/universal-provider/-/universal-provider-2.11.0.tgz#89053c2360b5ce766c213ca4e33bb4ce4976b0be" + integrity sha512-zgJv8jDvIMP4Qse/D9oIRXGdfoNqonsrjPZanQ/CHNe7oXGOBiQND2IIeX+tS0H7uNA0TPvctljCLiIN9nw4eA== dependencies: "@walletconnect/jsonrpc-http-connection" "^1.0.7" "@walletconnect/jsonrpc-provider" "1.0.13" "@walletconnect/jsonrpc-types" "^1.0.2" "@walletconnect/jsonrpc-utils" "^1.0.7" "@walletconnect/logger" "^2.0.1" - "@walletconnect/sign-client" "2.9.0" - "@walletconnect/types" "2.9.0" - "@walletconnect/utils" "2.9.0" + "@walletconnect/sign-client" "2.11.0" + "@walletconnect/types" "2.11.0" + "@walletconnect/utils" "2.11.0" events "^3.3.0" -"@walletconnect/utils@2.9.0": - version "2.9.0" - resolved "https://registry.yarnpkg.com/@walletconnect/utils/-/utils-2.9.0.tgz#c73925edb9fefe79021bcf028e957028f986b728" - integrity sha512-7Tu3m6dZL84KofrNBcblsgpSqU2vdo9ImLD7zWimLXERVGNQ8smXG+gmhQYblebIBhsPzjy9N38YMC3nPlfQNw== +"@walletconnect/utils@2.11.0": + version "2.11.0" + resolved "https://registry.yarnpkg.com/@walletconnect/utils/-/utils-2.11.0.tgz#31c95151c823022077883dda61800cdea71879b7" + integrity sha512-hxkHPlTlDQILHfIKXlmzgNJau/YcSBC3XHUSuZuKZbNEw3duFT6h6pm3HT/1+j1a22IG05WDsNBuTCRkwss+BQ== dependencies: "@stablelib/chacha20poly1305" "1.0.1" "@stablelib/hkdf" "1.0.1" @@ -4304,7 +4828,7 @@ "@walletconnect/relay-api" "^1.0.9" "@walletconnect/safe-json" "^1.0.2" "@walletconnect/time" "^1.0.2" - "@walletconnect/types" "2.9.0" + "@walletconnect/types" "2.11.0" "@walletconnect/window-getters" "^1.0.1" "@walletconnect/window-metadata" "^1.0.1" detect-browser "5.3.0" @@ -4326,193 +4850,147 @@ "@walletconnect/window-getters" "^1.0.1" tslib "1.14.1" -"@webassemblyjs/ast@1.9.0": - version "1.9.0" - resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.9.0.tgz#bd850604b4042459a5a41cd7d338cbed695ed964" - integrity sha512-C6wW5L+b7ogSDVqymbkkvuW9kruN//YisMED04xzeBBqjHa2FYnmvOlS6Xj68xWQRgWvI9cIglsjFowH/RJyEA== - dependencies: - "@webassemblyjs/helper-module-context" "1.9.0" - "@webassemblyjs/helper-wasm-bytecode" "1.9.0" - "@webassemblyjs/wast-parser" "1.9.0" - -"@webassemblyjs/floating-point-hex-parser@1.9.0": - version "1.9.0" - resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.9.0.tgz#3c3d3b271bddfc84deb00f71344438311d52ffb4" - integrity sha512-TG5qcFsS8QB4g4MhrxK5TqfdNe7Ey/7YL/xN+36rRjl/BlGE/NcBvJcqsRgCP6Z92mRE+7N50pRIi8SmKUbcQA== - -"@webassemblyjs/helper-api-error@1.9.0": - version "1.9.0" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.9.0.tgz#203f676e333b96c9da2eeab3ccef33c45928b6a2" - integrity sha512-NcMLjoFMXpsASZFxJ5h2HZRcEhDkvnNFOAKneP5RbKRzaWJN36NC4jqQHKwStIhGXu5mUWlUUk7ygdtrO8lbmw== - -"@webassemblyjs/helper-buffer@1.9.0": - version "1.9.0" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.9.0.tgz#a1442d269c5feb23fcbc9ef759dac3547f29de00" - integrity sha512-qZol43oqhq6yBPx7YM3m9Bv7WMV9Eevj6kMi6InKOuZxhw+q9hOkvq5e/PpKSiLfyetpaBnogSbNCfBwyB00CA== - -"@webassemblyjs/helper-code-frame@1.9.0": - version "1.9.0" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.9.0.tgz#647f8892cd2043a82ac0c8c5e75c36f1d9159f27" - integrity sha512-ERCYdJBkD9Vu4vtjUYe8LZruWuNIToYq/ME22igL+2vj2dQ2OOujIZr3MEFvfEaqKoVqpsFKAGsRdBSBjrIvZA== - dependencies: - "@webassemblyjs/wast-printer" "1.9.0" - -"@webassemblyjs/helper-fsm@1.9.0": - version "1.9.0" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.9.0.tgz#c05256b71244214671f4b08ec108ad63b70eddb8" - integrity sha512-OPRowhGbshCb5PxJ8LocpdX9Kl0uB4XsAjl6jH/dWKlk/mzsANvhwbiULsaiqT5GZGT9qinTICdj6PLuM5gslw== - -"@webassemblyjs/helper-module-context@1.9.0": - version "1.9.0" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.9.0.tgz#25d8884b76839871a08a6c6f806c3979ef712f07" - integrity sha512-MJCW8iGC08tMk2enck1aPW+BE5Cw8/7ph/VGZxwyvGbJwjktKkDK7vy7gAmMDx88D7mhDTCNKAW5tED+gZ0W8g== - dependencies: - "@webassemblyjs/ast" "1.9.0" - -"@webassemblyjs/helper-wasm-bytecode@1.9.0": - version "1.9.0" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.9.0.tgz#4fed8beac9b8c14f8c58b70d124d549dd1fe5790" - integrity sha512-R7FStIzyNcd7xKxCZH5lE0Bqy+hGTwS3LJjuv1ZVxd9O7eHCedSdrId/hMOd20I+v8wDXEn+bjfKDLzTepoaUw== - -"@webassemblyjs/helper-wasm-section@1.9.0": - version "1.9.0" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.9.0.tgz#5a4138d5a6292ba18b04c5ae49717e4167965346" - integrity sha512-XnMB8l3ek4tvrKUUku+IVaXNHz2YsJyOOmz+MMkZvh8h1uSJpSen6vYnw3IoQ7WwEuAhL8Efjms1ZWjqh2agvw== - dependencies: - "@webassemblyjs/ast" "1.9.0" - "@webassemblyjs/helper-buffer" "1.9.0" - "@webassemblyjs/helper-wasm-bytecode" "1.9.0" - "@webassemblyjs/wasm-gen" "1.9.0" - -"@webassemblyjs/ieee754@1.9.0": - version "1.9.0" - resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.9.0.tgz#15c7a0fbaae83fb26143bbacf6d6df1702ad39e4" - integrity sha512-dcX8JuYU/gvymzIHc9DgxTzUUTLexWwt8uCTWP3otys596io0L5aW02Gb1RjYpx2+0Jus1h4ZFqjla7umFniTg== - dependencies: - "@xtuc/ieee754" "^1.2.0" - -"@webassemblyjs/leb128@1.9.0": - version "1.9.0" - resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.9.0.tgz#f19ca0b76a6dc55623a09cffa769e838fa1e1c95" - integrity sha512-ENVzM5VwV1ojs9jam6vPys97B/S65YQtv/aanqnU7D8aSoHFX8GyhGg0CMfyKNIHBuAVjy3tlzd5QMMINa7wpw== - dependencies: - "@xtuc/long" "4.2.2" - -"@webassemblyjs/utf8@1.9.0": - version "1.9.0" - resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.9.0.tgz#04d33b636f78e6a6813227e82402f7637b6229ab" - integrity sha512-GZbQlWtopBTP0u7cHrEx+73yZKrQoBMpwkGEIqlacljhXCkVM1kMQge/Mf+csMJAjEdSwhOyLAS0AoR3AG5P8w== - -"@webassemblyjs/wasm-edit@1.9.0": - version "1.9.0" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.9.0.tgz#3fe6d79d3f0f922183aa86002c42dd256cfee9cf" - integrity sha512-FgHzBm80uwz5M8WKnMTn6j/sVbqilPdQXTWraSjBwFXSYGirpkSWE2R9Qvz9tNiTKQvoKILpCuTjBKzOIm0nxw== - dependencies: - "@webassemblyjs/ast" "1.9.0" - "@webassemblyjs/helper-buffer" "1.9.0" - "@webassemblyjs/helper-wasm-bytecode" "1.9.0" - "@webassemblyjs/helper-wasm-section" "1.9.0" - "@webassemblyjs/wasm-gen" "1.9.0" - "@webassemblyjs/wasm-opt" "1.9.0" - "@webassemblyjs/wasm-parser" "1.9.0" - "@webassemblyjs/wast-printer" "1.9.0" - -"@webassemblyjs/wasm-gen@1.9.0": - version "1.9.0" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.9.0.tgz#50bc70ec68ded8e2763b01a1418bf43491a7a49c" - integrity sha512-cPE3o44YzOOHvlsb4+E9qSqjc9Qf9Na1OO/BHFy4OI91XDE14MjFN4lTMezzaIWdPqHnsTodGGNP+iRSYfGkjA== - dependencies: - "@webassemblyjs/ast" "1.9.0" - "@webassemblyjs/helper-wasm-bytecode" "1.9.0" - "@webassemblyjs/ieee754" "1.9.0" - "@webassemblyjs/leb128" "1.9.0" - "@webassemblyjs/utf8" "1.9.0" +"@whatwg-node/events@^0.0.3": + version "0.0.3" + resolved "https://registry.yarnpkg.com/@whatwg-node/events/-/events-0.0.3.tgz#13a65dd4f5893f55280f766e29ae48074927acad" + integrity sha512-IqnKIDWfXBJkvy/k6tzskWTc2NK3LcqHlb+KHGCrjOCH4jfQckRX0NAiIcC/vIqQkzLYw2r2CTSwAxcrtcD6lA== -"@webassemblyjs/wasm-opt@1.9.0": - version "1.9.0" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.9.0.tgz#2211181e5b31326443cc8112eb9f0b9028721a61" - integrity sha512-Qkjgm6Anhm+OMbIL0iokO7meajkzQD71ioelnfPEj6r4eOFuqm4YC3VBPqXjFyyNwowzbMD+hizmprP/Fwkl2A== +"@whatwg-node/fetch@^0.8.0", "@whatwg-node/fetch@^0.8.1", "@whatwg-node/fetch@^0.8.2", "@whatwg-node/fetch@^0.8.4": + version "0.8.8" + resolved "https://registry.yarnpkg.com/@whatwg-node/fetch/-/fetch-0.8.8.tgz#48c6ad0c6b7951a73e812f09dd22d75e9fa18cae" + integrity sha512-CdcjGC2vdKhc13KKxgsc6/616BQ7ooDIgPeTuAiE8qfCnS0mGzcfCOoZXypQSz73nxI+GWc7ZReIAVhxoE1KCg== dependencies: - "@webassemblyjs/ast" "1.9.0" - "@webassemblyjs/helper-buffer" "1.9.0" - "@webassemblyjs/wasm-gen" "1.9.0" - "@webassemblyjs/wasm-parser" "1.9.0" + "@peculiar/webcrypto" "^1.4.0" + "@whatwg-node/node-fetch" "^0.3.6" + busboy "^1.6.0" + urlpattern-polyfill "^8.0.0" + web-streams-polyfill "^3.2.1" -"@webassemblyjs/wasm-parser@1.9.0": - version "1.9.0" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.9.0.tgz#9d48e44826df4a6598294aa6c87469d642fff65e" - integrity sha512-9+wkMowR2AmdSWQzsPEjFU7njh8HTO5MqO8vjwEHuM+AMHioNqSBONRdr0NQQ3dVQrzp0s8lTcYqzUdb7YgELA== +"@whatwg-node/node-fetch@^0.3.6": + version "0.3.6" + resolved "https://registry.yarnpkg.com/@whatwg-node/node-fetch/-/node-fetch-0.3.6.tgz#e28816955f359916e2d830b68a64493124faa6d0" + integrity sha512-w9wKgDO4C95qnXZRwZTfCmLWqyRnooGjcIwG0wADWjw9/HN0p7dtvtgSvItZtUyNteEvgTrd8QojNEqV6DAGTA== dependencies: - "@webassemblyjs/ast" "1.9.0" - "@webassemblyjs/helper-api-error" "1.9.0" - "@webassemblyjs/helper-wasm-bytecode" "1.9.0" - "@webassemblyjs/ieee754" "1.9.0" - "@webassemblyjs/leb128" "1.9.0" - "@webassemblyjs/utf8" "1.9.0" + "@whatwg-node/events" "^0.0.3" + busboy "^1.6.0" + fast-querystring "^1.1.1" + fast-url-parser "^1.1.3" + tslib "^2.3.1" -"@webassemblyjs/wast-parser@1.9.0": - version "1.9.0" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.9.0.tgz#3031115d79ac5bd261556cecc3fa90a3ef451914" - integrity sha512-qsqSAP3QQ3LyZjNC/0jBJ/ToSxfYJ8kYyuiGvtn/8MK89VrNEfwj7BPQzJVHi0jGTRK2dGdJ5PRqhtjzoww+bw== +"@xhmikosr/archive-type@^6.0.1": + version "6.0.1" + resolved "https://registry.yarnpkg.com/@xhmikosr/archive-type/-/archive-type-6.0.1.tgz#684e9e5369bfa93223d7aeb2c84fe0780d6d5e24" + integrity sha512-PB3NeJL8xARZt52yDBupK0dNPn8uIVQDe15qNehUpoeeLWCZyAOam4vGXnoZGz2N9D1VXtjievJuCsXam2TmbQ== dependencies: - "@webassemblyjs/ast" "1.9.0" - "@webassemblyjs/floating-point-hex-parser" "1.9.0" - "@webassemblyjs/helper-api-error" "1.9.0" - "@webassemblyjs/helper-code-frame" "1.9.0" - "@webassemblyjs/helper-fsm" "1.9.0" - "@xtuc/long" "4.2.2" + file-type "^18.5.0" -"@webassemblyjs/wast-printer@1.9.0": - version "1.9.0" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.9.0.tgz#4935d54c85fef637b00ce9f52377451d00d47899" - integrity sha512-2J0nE95rHXHyQ24cWjMKJ1tqB/ds8z/cyeOZxJhcb+rW+SQASVjuznUSmdz5GpVJTzU8JkhYut0D3siFDD6wsA== +"@xhmikosr/decompress-tar@^7.0.0": + version "7.0.0" + resolved "https://registry.yarnpkg.com/@xhmikosr/decompress-tar/-/decompress-tar-7.0.0.tgz#ae1ecc723bde8547ff65540018765875712d400b" + integrity sha512-kyWf2hybtQVbWtB+FdRyOT+jyR5jxCNZPLqvQGB7djZj75lrpLUPEmRbyo86AtJ5OEtivpYaNWjCkqSJ8xtRWw== dependencies: - "@webassemblyjs/ast" "1.9.0" - "@webassemblyjs/wast-parser" "1.9.0" - "@xtuc/long" "4.2.2" + file-type "^18.5.0" + is-stream "^3.0.0" + tar-stream "^3.1.4" -"@whatwg-node/events@^0.0.2": - version "0.0.2" - resolved "https://registry.yarnpkg.com/@whatwg-node/events/-/events-0.0.2.tgz#7b7107268d2982fc7b7aff5ee6803c64018f84dd" - integrity sha512-WKj/lI4QjnLuPrim0cfO7i+HsDSXHxNv1y0CrJhdntuO3hxWZmnXCwNDnwOvry11OjRin6cgWNF+j/9Pn8TN4w== - -"@whatwg-node/fetch@^0.8.0", "@whatwg-node/fetch@^0.8.1", "@whatwg-node/fetch@^0.8.2", "@whatwg-node/fetch@^0.8.4": - version "0.8.5" - resolved "https://registry.yarnpkg.com/@whatwg-node/fetch/-/fetch-0.8.5.tgz#441936a43d9ec421d42396a7ab5337f034b8271f" - integrity sha512-pNvoYGPa0hjbVqs+r0blMjaWlrMeb0snwRCTAEdng5Jm00PY9wO4K8m99BmfLn6WED0FKOXTlF53+en/3xybqw== - dependencies: - "@peculiar/webcrypto" "^1.4.0" - "@whatwg-node/node-fetch" "^0.3.3" - busboy "^1.6.0" - urlpattern-polyfill "^7.0.0" - web-streams-polyfill "^3.2.1" +"@xhmikosr/decompress-tarbz2@^7.0.0": + version "7.0.0" + resolved "https://registry.yarnpkg.com/@xhmikosr/decompress-tarbz2/-/decompress-tarbz2-7.0.0.tgz#eea242c59e7d52f9bccc91e1a51d4b34ed048792" + integrity sha512-3QnjipYkRgh3Dee1MWDgKmANWxOQBVN4e1IwiGNe2fHYfMYTeSkVvWREt87UIoSucKUh3E95v8uGFttgTknZcA== + dependencies: + "@xhmikosr/decompress-tar" "^7.0.0" + file-type "^18.5.0" + is-stream "^3.0.0" + seek-bzip "^1.0.6" + unbzip2-stream "^1.4.3" -"@whatwg-node/node-fetch@^0.3.3": - version "0.3.5" - resolved "https://registry.yarnpkg.com/@whatwg-node/node-fetch/-/node-fetch-0.3.5.tgz#a0e76ef72c33b0c81728421ce6d7d97257541ecb" - integrity sha512-96crxTZn6L+xFefEKkeAZrGmZ7WUXDYUzAfBf1VtrdS5YozLnFbj9/CNZ8S2LdRS2iL3pMSCvE1xD1wiIAXkAA== +"@xhmikosr/decompress-targz@^7.0.0": + version "7.0.0" + resolved "https://registry.yarnpkg.com/@xhmikosr/decompress-targz/-/decompress-targz-7.0.0.tgz#b80c913056903b162088b85619f632914f514f74" + integrity sha512-7BNHJl92g9OLhw89zqcFS67V1LAtm4Ex02j6OiQzuE8P7Yy9lQcyBuEL3x6v436grLdL+BcFjgbmhWxnem4GHw== dependencies: - "@whatwg-node/events" "^0.0.2" - busboy "^1.6.0" - fast-querystring "^1.1.1" - fast-url-parser "^1.1.3" - tslib "^2.3.1" + "@xhmikosr/decompress-tar" "^7.0.0" + file-type "^18.5.0" + is-stream "^3.0.0" -"@xtuc/ieee754@^1.2.0": - version "1.2.0" - resolved "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790" - integrity sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA== +"@xhmikosr/decompress-unzip@^6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@xhmikosr/decompress-unzip/-/decompress-unzip-6.0.0.tgz#d617956a1e762c5396cef8340973dd60ba24c9dd" + integrity sha512-R1HAkjXLS7RAL74YFLxYY9zYflCcYGssld9KKFDu87PnJ4h4btdhzXfSC8J5i5A2njH3oYIoCzx03RIGTH07Sg== + dependencies: + file-type "^18.5.0" + get-stream "^6.0.1" + yauzl "^2.10.0" -"@xtuc/long@4.2.2": - version "4.2.2" - resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d" - integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ== +"@xhmikosr/decompress@^9.0.1": + version "9.0.1" + resolved "https://registry.yarnpkg.com/@xhmikosr/decompress/-/decompress-9.0.1.tgz#e35977739da39bc664e0b49015b402a7cf9b1d91" + integrity sha512-9Lvlt6Qdpo9SaRQyRIXCo3lgU++eMZ68lzgjcTwtuKDrlwT635+5zsHZ1yrSx/Blc5IDuVLlPkBPj5CZkx+2+Q== + dependencies: + "@xhmikosr/decompress-tar" "^7.0.0" + "@xhmikosr/decompress-tarbz2" "^7.0.0" + "@xhmikosr/decompress-targz" "^7.0.0" + "@xhmikosr/decompress-unzip" "^6.0.0" + graceful-fs "^4.2.11" + make-dir "^4.0.0" + strip-dirs "^3.0.0" + +"@xhmikosr/downloader@^13.0.0": + version "13.0.1" + resolved "https://registry.yarnpkg.com/@xhmikosr/downloader/-/downloader-13.0.1.tgz#8478b36606d2108eb86bff419e1df36d84cc262d" + integrity sha512-mBvWew1kZJHfNQVVfVllMjUDwCGN9apPa0t4/z1zaUJ9MzpXjRL3w8fsfJKB8gHN/h4rik9HneKfDbh2fErN+w== + dependencies: + "@xhmikosr/archive-type" "^6.0.1" + "@xhmikosr/decompress" "^9.0.1" + content-disposition "^0.5.4" + ext-name "^5.0.0" + file-type "^18.5.0" + filenamify "^5.1.1" + get-stream "^6.0.1" + got "^12.6.1" + merge-options "^3.0.4" + p-event "^5.0.1" "@yarnpkg/lockfile@^1.1.0": version "1.1.0" resolved "https://registry.yarnpkg.com/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz#e77a97fbd345b76d83245edcd17d393b1b41fb31" integrity sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ== +"@zk-kit/baby-jubjub@0.1.1", "@zk-kit/baby-jubjub@^0.1.1": + version "0.1.1" + resolved "https://registry.yarnpkg.com/@zk-kit/baby-jubjub/-/baby-jubjub-0.1.1.tgz#8da922d1c0138ca8668c6ba1134ec04f51b24804" + integrity sha512-eWpUSpKKpllGZXE6mdS1IVuegRjY2Yu+3Qccyfg0+gMI8+p0ruioMM/MCK3tg2lRIUJTVd+16UghVcK0145yWg== + dependencies: + "@zk-kit/utils" "0.1.0" + +"@zk-kit/circuits@^0.3.0": + version "0.3.0" + resolved "https://registry.yarnpkg.com/@zk-kit/circuits/-/circuits-0.3.0.tgz#716d932e9b09f33c71c7ff940a507e519ce0a6f4" + integrity sha512-v46KHC3sBRXUJbYi8d5PTAm3zCdBeArvWw3de+A2LcW/C9beYqBo8QJ/h6NWKZWOgpwqvCHzJa5HvyG6x3lIZQ== + dependencies: + circomlib "^2.0.5" + +"@zk-kit/eddsa-poseidon@^0.5.1": + version "0.5.1" + resolved "https://registry.yarnpkg.com/@zk-kit/eddsa-poseidon/-/eddsa-poseidon-0.5.1.tgz#7fef431f441f5385f82e6005cdf83d72d298e8c2" + integrity sha512-sPyoyjwg9EZ+tHLGxOG+FDj9XJK1knVjm27nTMV4ZSiQIf0427QWnLhOk7b6zMvFmEpBWTG9gneJ5pr3jzJ4zg== + dependencies: + "@zk-kit/baby-jubjub" "0.1.1" + "@zk-kit/utils" "0.1.0" + +"@zk-kit/poseidon-cipher@^0.2.1": + version "0.2.1" + resolved "https://registry.yarnpkg.com/@zk-kit/poseidon-cipher/-/poseidon-cipher-0.2.1.tgz#74cd80144b6755eff8e92643c4ef3f828f5822c5" + integrity sha512-/k7lUzYPuzFmdjBCvl8yTE4aDCnqxoVC46Txa9Z0i7rb+ilXHp2EEwfig/G7moTukSiOB3hywF3im/QGs3cYHg== + dependencies: + "@zk-kit/baby-jubjub" "0.1.1" + "@zk-kit/utils" "0.1.0" + +"@zk-kit/utils@0.1.0": + version "0.1.0" + resolved "https://registry.yarnpkg.com/@zk-kit/utils/-/utils-0.1.0.tgz#6c134c22541efc6e634d4a89884c8bfe209b2da1" + integrity sha512-MZmuw2w2StB7XOSNg1TW4VwnBJ746UDmdXTvxwDO/U85UZfGfM3zb53gG35qz5sWpQo/DjfoKqaScmh6HUtQpA== + JSONStream@1.3.2: version "1.3.2" resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.2.tgz#c102371b6ec3a7cf3b847ca00c20bb0fce4c6dea" @@ -4534,6 +5012,16 @@ abab@^2.0.6: resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.6.tgz#41b80f2c871d19686216b82309231cfd3cb3d291" integrity sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA== +abbrev@1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8" + integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q== + +abbrev@1.0.x: + version "1.0.9" + resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.0.9.tgz#91b4792588a7738c25f35dd6f63752a2f8776135" + integrity sha512-LEyx4aLEC3x6T0UguF6YILf+ntvmOaWsVfENmIW0E9H09vKlLDGelMjjSm0jkDHALj8A8quZ/HapKNigzwge+Q== + abort-controller@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/abort-controller/-/abort-controller-3.0.0.tgz#eaf54d53b62bae4138e809ca225c8439a6efb392" @@ -4541,11 +5029,6 @@ abort-controller@^3.0.0: dependencies: event-target-shim "^5.0.0" -abortcontroller-polyfill@^1.7.3: - version "1.7.5" - resolved "https://registry.yarnpkg.com/abortcontroller-polyfill/-/abortcontroller-polyfill-1.7.5.tgz#6738495f4e901fbb57b6c0611d0c75f76c485bed" - integrity sha512-JMJ5soJWP18htbbxJjG7bG6yuI6pRhgJ0scHHTfkUjf6wjP912xZWvM+A4sJK3gqd9E8fcPbDnOefbA9Th/FIQ== - abstract-level@^1.0.0, abstract-level@^1.0.2, abstract-level@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/abstract-level/-/abstract-level-1.0.3.tgz#78a67d3d84da55ee15201486ab44c09560070741" @@ -4617,6 +5100,11 @@ abstract-leveldown@~6.2.1: level-supports "~1.0.0" xtend "~4.0.0" +abstract-logging@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/abstract-logging/-/abstract-logging-2.0.1.tgz#6b0c371df212db7129b57d2e7fcf282b8bf1c839" + integrity sha512-2BjRTZxTPvheOvGbBslFSYOUkr+SjPtOnrLP33f+VIWLzezQpZcqVg7ja3L4dBXmzzgwT+a029jRx5PCi3JuiA== + accepts@~1.3.8: version "1.3.8" resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.8.tgz#0bf0be125b67014adcb0b0921e62db7bffe16b2e" @@ -4633,30 +5121,35 @@ acorn-globals@^7.0.0: acorn "^8.1.0" acorn-walk "^8.0.2" +acorn-import-attributes@^1.9.2: + version "1.9.2" + resolved "https://registry.yarnpkg.com/acorn-import-attributes/-/acorn-import-attributes-1.9.2.tgz#bc3765bca6ec0c5c69d2293afd582216215279b0" + integrity sha512-O+nfJwNolEA771IYJaiLWK1UAwjNsQmZbTRqqwBYxCgVQTmpFEMvBw6LOIQV0Me339L5UMVYFyRohGnGlQDdIQ== + acorn-jsx@^5.2.0, acorn-jsx@^5.3.2: version "5.3.2" resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937" integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ== acorn-walk@^8.0.2, acorn-walk@^8.1.1, acorn-walk@^8.2.0: - version "8.2.0" - resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1" - integrity sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA== - -acorn@^6.4.1: - version "6.4.2" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.2.tgz#35866fd710528e92de10cf06016498e47e39e1e6" - integrity sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ== + version "8.3.2" + resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.3.2.tgz#7703af9415f1b6db9315d6895503862e231d34aa" + integrity sha512-cjkyv4OtNCIeqhHrfS81QWXoCBPExR/J62oyEqepVw8WaQeSqpW2uhuLPh1m9eWhDuOo/jUXVTlifvesOWp/4A== acorn@^7.1.1, acorn@^7.4.1: version "7.4.1" resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa" integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A== -acorn@^8.1.0, acorn@^8.4.1, acorn@^8.8.0, acorn@^8.8.1, acorn@^8.8.2: - 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.1.0, acorn@^8.10.0, acorn@^8.11.2, acorn@^8.11.3, acorn@^8.4.1, acorn@^8.6.0, acorn@^8.8.1, acorn@^8.9.0: + version "8.11.3" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.11.3.tgz#71e0b14e13a4ec160724b38fb7b0f233b1b81d7a" + integrity sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg== + +address@^1.0.1: + version "1.2.2" + resolved "https://registry.yarnpkg.com/address/-/address-1.2.2.tgz#2b5248dac5485a6390532c6a517fda2e3faac89e" + integrity sha512-4B/qKCfeE/ODUaAUpSwfzazo5x29WD4r3vXiWsB7I2mSDAihwEqKO+g8GELZUQSSAo5e1XTYh3ZVfLyxBc12nA== adm-zip@^0.4.16: version "0.4.16" @@ -4668,6 +5161,11 @@ aes-js@3.0.0: resolved "https://registry.yarnpkg.com/aes-js/-/aes-js-3.0.0.tgz#e21df10ad6c2053295bcbb8dab40b09dbea87e4d" integrity sha512-H7wUZRn8WpTq9jocdxQ2c8x2sKo9ZVmzfRE13GiNJXfp7NcKYEdvl3vspKjXox6RIG2VtaRe4JFvxG4rqp2Zuw== +aes-js@4.0.0-beta.5: + version "4.0.0-beta.5" + resolved "https://registry.yarnpkg.com/aes-js/-/aes-js-4.0.0-beta.5.tgz#8d2452c52adedebc3a3e28465d858c11ca315873" + integrity sha512-G965FqalsNyrPqgEGON7nIx1e/OVENSgiEIzyC63haUMuvNnwIgIjMs52hlTCKhkBny7A2ORNlfY9Zu+jmGk1Q== + aes-js@^3.1.1: version "3.1.2" resolved "https://registry.yarnpkg.com/aes-js/-/aes-js-3.1.2.tgz#db9aabde85d5caabbfc0d4f2a4446960f627146a" @@ -4680,6 +5178,13 @@ agent-base@6: dependencies: debug "4" +agent-base@^7.0.2, agent-base@^7.1.0: + version "7.1.0" + resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-7.1.0.tgz#536802b76bc0b34aa50195eb2442276d613e3434" + integrity sha512-o/zjMZRhJxny7OyEF+Op8X+efiELC7k7yOjMzgfzVqOzXqkBkWI79YoTdOtsuWd5BWhAGAuOY/Xa6xpiaWXiNg== + dependencies: + debug "^4.3.4" + aggregate-error@^3.0.0: version "3.1.0" resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a" @@ -4688,17 +5193,27 @@ aggregate-error@^3.0.0: clean-stack "^2.0.0" indent-string "^4.0.0" -ajv-errors@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/ajv-errors/-/ajv-errors-1.0.1.tgz#f35986aceb91afadec4102fbd85014950cefa64d" - integrity sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ== +aggregate-error@^4.0.0: + version "4.0.1" + resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-4.0.1.tgz#25091fe1573b9e0be892aeda15c7c66a545f758e" + integrity sha512-0poP0T7el6Vq3rstR8Mn4V/IQrpBLO6POkUSrN7RhyY+GF/InCFShQzsQ39T25gkHhLgSLByyAz+Kjb+c2L98w== + dependencies: + clean-stack "^4.0.0" + indent-string "^5.0.0" + +ajv-errors@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/ajv-errors/-/ajv-errors-3.0.0.tgz#e54f299f3a3d30fe144161e5f0d8d51196c527bc" + integrity sha512-V3wD15YHfHz6y0KdhYFjyy9vWtEVALT9UrxfN3zqlI6dMioHnJrqOYfyPKol3oqrnCM9uwkcdCwkJ0WUcbLMTQ== -ajv-keywords@^3.1.0, ajv-keywords@^3.4.1, ajv-keywords@^3.5.2: - version "3.5.2" - resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d" - integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ== +ajv-formats@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/ajv-formats/-/ajv-formats-2.1.1.tgz#6e669400659eb74973bbf2e33327180a0996b520" + integrity sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA== + dependencies: + ajv "^8.0.0" -ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.3, ajv@^6.12.4, ajv@^6.12.6: +ajv@^6.12.3, ajv@^6.12.4: version "6.12.6" resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4" integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g== @@ -4708,7 +5223,7 @@ ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.3, ajv@^6.12.4, ajv@^6.12.6: json-schema-traverse "^0.4.1" uri-js "^4.2.2" -ajv@^8.0.1: +ajv@^8.0.0, ajv@^8.0.1, ajv@^8.10.0, ajv@^8.11.0, ajv@^8.11.2, ajv@^8.12.0: version "8.12.0" resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.12.0.tgz#d1a0527323e22f53562c567c00991577dfbe19d1" integrity sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA== @@ -4718,33 +5233,68 @@ ajv@^8.0.1: require-from-string "^2.0.2" uri-js "^4.2.2" +all-node-versions@^11.3.0: + version "11.3.0" + resolved "https://registry.yarnpkg.com/all-node-versions/-/all-node-versions-11.3.0.tgz#ace1c8c9598bb900ba296450ccf0281aabaff7a4" + integrity sha512-psMkc5s3qpr+QMfires9bC4azRYciPWql1wqZKMsYRh1731qefQDH2X4+O19xSBX6u0Ra/8Y5diG6y/fEmqKsw== + dependencies: + fetch-node-website "^7.3.0" + filter-obj "^5.1.0" + get-stream "^6.0.0" + global-cache-dir "^4.3.1" + is-plain-obj "^4.1.0" + path-exists "^5.0.0" + semver "^7.3.7" + write-file-atomic "^4.0.1" + +amdefine@>=0.0.4: + version "1.0.1" + resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5" + integrity sha512-S2Hw0TtNkMJhIabBwIojKL9YHO5T0n5eNqWJ7Lrlel/zDbftQpxpapi8tZs3X1HWa+u+QeydGmzzNU0m09+Rcg== + +ansi-align@^3.0.0, ansi-align@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/ansi-align/-/ansi-align-3.0.1.tgz#0cdf12e111ace773a86e9a1fad1225c43cb19a59" + integrity sha512-IOfwwBF5iczOjp/WeY4YxyjqAFMQoZufdQWDd19SEExbVLNXqvpzSJ/M7Za4/sCPmQ0+GRquoA7bGcINcxew6w== + dependencies: + string-width "^4.1.0" + ansi-colors@4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348" integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA== -ansi-colors@^3.2.1: - version "3.2.4" - resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.4.tgz#e3a3da4bfbae6c86a9c285625de124a234026fbf" - integrity sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA== - ansi-colors@^4.1.1: version "4.1.3" resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.3.tgz#37611340eb2243e70cc604cad35d63270d48781b" integrity sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw== -ansi-escapes@^3.1.0: +ansi-escapes@6.2.0, ansi-escapes@^6.0.0: + version "6.2.0" + resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-6.2.0.tgz#8a13ce75286f417f1963487d86ba9f90dccf9947" + integrity sha512-kzRaCqXnpzWs+3z5ABPQiVke+iq0KXkHo8xiWV4RPTi5Yli0l97BEQuhXV1s7+aSU/fu1kUuxgS4MsQ0fRuygw== + dependencies: + type-fest "^3.0.0" + +ansi-escapes@^3.2.0: version "3.2.0" resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz#8780b98ff9dbf5638152d1f1fe5c1d7b4442976b" integrity sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ== -ansi-escapes@^4.2.1, ansi-escapes@^4.3.0, ansi-escapes@^4.3.2: +ansi-escapes@^4.2.1, ansi-escapes@^4.3.0, ansi-escapes@^4.3.1, ansi-escapes@^4.3.2: version "4.3.2" resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.2.tgz#6b2291d1db7d98b6521d5f1efa42d0f3a9feb65e" integrity sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ== dependencies: type-fest "^0.21.3" +ansi-escapes@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-5.0.0.tgz#b6a0caf0eef0c41af190e9a749e0c00ec04bb2a6" + integrity sha512-5GFMVX8HqE/TB+FuBJGuO5XG0WrsA6ptUqoODaT/n9mmUaZFkqnBueB4leqGBCmrUHnCnC4PCZTCd0E7QQ83bA== + dependencies: + type-fest "^1.0.2" + ansi-regex@^2.0.0: version "2.1.1" resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df" @@ -4765,6 +5315,16 @@ ansi-regex@^5.0.1: resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304" integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ== +ansi-regex@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-6.0.1.tgz#3183e38fae9a65d7cb5e53945cd5897d0260a06a" + integrity sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA== + +ansi-styles@6.2.1, ansi-styles@^6.0.0, ansi-styles@^6.1.0: + version "6.2.1" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-6.2.1.tgz#0e62320cf99c21afff3b3012192546aacbfb05c5" + integrity sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug== + ansi-styles@^2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe" @@ -4784,16 +5344,23 @@ ansi-styles@^4.0.0, ansi-styles@^4.1.0, ansi-styles@^4.3.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== + +ansi-to-html@0.7.2: + version "0.7.2" + resolved "https://registry.yarnpkg.com/ansi-to-html/-/ansi-to-html-0.7.2.tgz#a92c149e4184b571eb29a0135ca001a8e2d710cb" + integrity sha512-v6MqmEpNlxF+POuyhKkidusCHWWkaLcGRURzivcU3I9tv7k4JVhFcnukrM5Rlk2rUywdZuzYAZ+kbZqWCnfN3g== + dependencies: + entities "^2.2.0" + ansicolors@~0.3.2: version "0.3.2" resolved "https://registry.yarnpkg.com/ansicolors/-/ansicolors-0.3.2.tgz#665597de86a9ffe3aa9bfbe6cae5c6ea426b4979" integrity sha512-QXu7BPrP29VllRxH8GwB7x5iX5qWKAAMLqKQGWTeLWVlNHNOpVMJ91dsxQAIWXpjuW5wqvxu3Jd/nRjrJ+0pqg== -antlr4@^4.11.0: - version "4.12.0" - resolved "https://registry.yarnpkg.com/antlr4/-/antlr4-4.12.0.tgz#e2323fbb057c77068a174914b0533398aeaba56a" - integrity sha512-23iB5IzXJZRZeK9TigzUyrNc9pSmNqAerJRBcNq1ETrmttMWRgaYZzC561IgEO3ygKsDJTYDTozABXa4b/fTQQ== - antlr4ts@^0.5.0-alpha.4: version "0.5.0-alpha.4" resolved "https://registry.yarnpkg.com/antlr4ts/-/antlr4ts-0.5.0-alpha.4.tgz#71702865a87478ed0b40c0709f422cf14d51652a" @@ -4817,15 +5384,7 @@ any-signal@^3.0.0: resolved "https://registry.yarnpkg.com/any-signal/-/any-signal-3.0.1.tgz#49cae34368187a3472e31de28fb5cb1430caa9a6" integrity sha512-xgZgJtKEa9YmDqXodIgl7Fl1C8yNXr8w6gXjqK3LW4GcEiYT+6AQfJSE/8SPsEpLLmcvbv8YU+qet94UewHxqg== -anymatch@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb" - integrity sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw== - dependencies: - micromatch "^3.1.4" - normalize-path "^2.1.1" - -anymatch@~3.1.1, anymatch@~3.1.2: +anymatch@^3.1.3, anymatch@~3.1.2: version "3.1.3" resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.3.tgz#790c58b19ba1720a84205b57c618d5ad8524973e" integrity sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw== @@ -4833,23 +5392,60 @@ anymatch@~3.1.1, anymatch@~3.1.2: normalize-path "^3.0.0" picomatch "^2.0.4" -apisauce@^1.0.1: - version "1.1.5" - resolved "https://registry.yarnpkg.com/apisauce/-/apisauce-1.1.5.tgz#31d41a5cf805e401266cec67faf1a50f4aeae234" - integrity sha512-gKC8qb/bDJsPsnEXLZnXJ7gVx7dh87CEVNeIwv1dvaffnXoh5GHwac5pWR1P2broLiVj/fqFMQvLDDt/RhjiqA== +apisauce@^2.1.5: + version "2.1.6" + resolved "https://registry.yarnpkg.com/apisauce/-/apisauce-2.1.6.tgz#94887f335bf3d735305fc895c8a191c9c2608a7f" + integrity sha512-MdxR391op/FucS2YQRfB/NMRyCnHEPDd4h17LRIuVYi0BpGmMhpxc0shbOpfs5ahABuBEffNCGal5EcsydbBWg== dependencies: - axios "^0.21.2" - ramda "^0.25.0" + axios "^0.21.4" app-module-path@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/app-module-path/-/app-module-path-2.2.0.tgz#641aa55dfb7d6a6f0a8141c4b9c0aa50b6c24dd5" integrity sha512-gkco+qxENJV+8vFcDiiFhuoSvRXb2a/QPqpSoWhVz829VNJfOTnELbBmPmNKFxf3xdNnw4DWCkzkDaavcX/1YQ== -aproba@^1.1.1: - version "1.2.0" - resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a" - integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw== +"aproba@^1.0.3 || ^2.0.0": + version "2.0.0" + resolved "https://registry.yarnpkg.com/aproba/-/aproba-2.0.0.tgz#52520b8ae5b569215b354efc0caa3fe1e45a8adc" + integrity sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ== + +archiver-utils@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/archiver-utils/-/archiver-utils-4.0.1.tgz#66ad15256e69589a77f706c90c6dbcc1b2775d2a" + integrity sha512-Q4Q99idbvzmgCTEAAhi32BkOyq8iVI5EwdO0PmBDSGIzzjYNdcFn7Q7k3OzbLy4kLUPXfJtG6fO2RjftXbobBg== + dependencies: + glob "^8.0.0" + graceful-fs "^4.2.0" + lazystream "^1.0.0" + lodash "^4.17.15" + normalize-path "^3.0.0" + readable-stream "^3.6.0" + +archiver@^6.0.0: + version "6.0.1" + resolved "https://registry.yarnpkg.com/archiver/-/archiver-6.0.1.tgz#d56968d4c09df309435adb5a1bbfc370dae48133" + integrity sha512-CXGy4poOLBKptiZH//VlWdFuUC1RESbdZjGjILwBuZ73P7WkAUN0htfSfBq/7k6FRFlpu7bg4JOkj1vU9G6jcQ== + dependencies: + archiver-utils "^4.0.1" + async "^3.2.4" + buffer-crc32 "^0.2.1" + readable-stream "^3.6.0" + readdir-glob "^1.1.2" + tar-stream "^3.0.0" + zip-stream "^5.0.1" + +archy@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/archy/-/archy-1.0.0.tgz#f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40" + integrity sha512-Xg+9RwCg/0p32teKdGMPTPnVXKD0w3DfHnFTficozsAgsvq2XenPJq/MYpzzQ/v8zrOyJn6Ds39VA4JIDwFfqw== + +are-we-there-yet@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-2.0.0.tgz#372e0e7bd279d8e94c653aaa1f67200884bf3e1c" + integrity sha512-Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw== + dependencies: + delegates "^1.0.0" + readable-stream "^3.6.0" arg@^4.1.0: version "4.1.3" @@ -4861,7 +5457,7 @@ arg@^5.0.2: resolved "https://registry.yarnpkg.com/arg/-/arg-5.0.2.tgz#c81433cc427c92c4dcf4865142dbca6f15acd59c" integrity sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg== -argparse@^1.0.10, argparse@^1.0.7: +argparse@^1.0.7: version "1.0.10" resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911" integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg== @@ -4902,6 +5498,16 @@ array-back@^2.0.0: dependencies: typical "^2.6.1" +array-back@^3.0.1, array-back@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/array-back/-/array-back-3.1.0.tgz#b8859d7a508871c9a7b2cf42f99428f65e96bfb0" + integrity sha512-TkuxA4UCOvxuDK6NZYXCalszEzj+TLszyASooky+i742l9TqsOdYCMJJupxRic61hwquNtppB3hgcuq9SVSH1Q== + +array-back@^4.0.1, array-back@^4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/array-back/-/array-back-4.0.2.tgz#8004e999a6274586beeb27342168652fdb89fa1e" + integrity sha512-NbdMezxqf94cnNfWLL7V/im0Ub+Anbb0IoZhvzie8+4HJ4nMQuzHuy49FkGYCJK2yAloZ3meiB6AVMClbrI1vg== + array-buffer-byte-length@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/array-buffer-byte-length/-/array-buffer-byte-length-1.0.0.tgz#fabe8bc193fea865f317fe7807085ee0dee5aead" @@ -4915,27 +5521,61 @@ array-flatten@1.1.1: resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2" integrity sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg== +array-timsort@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/array-timsort/-/array-timsort-1.0.3.tgz#3c9e4199e54fb2b9c3fe5976396a21614ef0d926" + integrity sha512-/+3GRL7dDAGEfM6TseQk/U+mi18TU2Ms9I3UlLdUMhz2hbvGNTKdj9xniwXfUqgYhHxRx0+8UnKkvlNwVU+cWQ== + array-union@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d" integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw== +array-uniq@1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6" + integrity sha512-MNha4BWQ6JbwhFhj03YK552f7cb3AzoE8SzeljgChvL1dl3IcvggXVz1DilzySZkCja+CXuZbdW7yATchWn8/Q== + array-unique@^0.3.2: version "0.3.2" resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428" integrity sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ== -array.prototype.reduce@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/array.prototype.reduce/-/array.prototype.reduce-1.0.5.tgz#6b20b0daa9d9734dd6bc7ea66b5bbce395471eac" - integrity sha512-kDdugMl7id9COE8R7MHF5jWk7Dqt/fs4Pv+JXoICnYwqpjjjbUurz6w5fT5IG6brLdJhv6/VoHB0H7oyIBXd+Q== +array.prototype.findlast@^1.2.2: + version "1.2.3" + resolved "https://registry.yarnpkg.com/array.prototype.findlast/-/array.prototype.findlast-1.2.3.tgz#4e4b375de5adf4897fed155e2d2771564865cc3b" + integrity sha512-kcBubumjciBg4JKp5KTKtI7ec7tRefPk88yjkWJwaVKYd9QfTaxcsOxoMNKd7iBr447zCfDV0z1kOF47umv42g== dependencies: call-bind "^1.0.2" - define-properties "^1.1.4" - es-abstract "^1.20.4" + define-properties "^1.2.0" + es-abstract "^1.22.1" + es-shim-unscopables "^1.0.0" + get-intrinsic "^1.2.1" + +array.prototype.reduce@^1.0.6: + version "1.0.6" + resolved "https://registry.yarnpkg.com/array.prototype.reduce/-/array.prototype.reduce-1.0.6.tgz#63149931808c5fc1e1354814923d92d45f7d96d5" + integrity sha512-UW+Mz8LG/sPSU8jRDCjVr6J/ZKAGpHfwrZ6kWTG5qCxIEiXdVshqGnu5vEZA8S1y6X4aCSbQZ0/EEsfvEvBiSg== + dependencies: + call-bind "^1.0.2" + define-properties "^1.2.0" + es-abstract "^1.22.1" es-array-method-boxes-properly "^1.0.0" is-string "^1.0.7" +arraybuffer.prototype.slice@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.2.tgz#98bd561953e3e74bb34938e77647179dfe6e9f12" + integrity sha512-yMBKppFur/fbHu9/6USUe03bZ4knMYiwFBcyiaXB8Go0qNehwX6inYPzK9U0NeQvGxKthcmHcaR8P5MStSRBAw== + dependencies: + array-buffer-byte-length "^1.0.0" + call-bind "^1.0.2" + define-properties "^1.2.0" + es-abstract "^1.22.1" + get-intrinsic "^1.2.1" + is-array-buffer "^3.0.2" + is-shared-array-buffer "^1.0.2" + arrify@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d" @@ -4946,11 +5586,21 @@ arrify@^2.0.0: resolved "https://registry.yarnpkg.com/arrify/-/arrify-2.0.1.tgz#c9655e9331e0abcd588d2a7cad7e9956f66701fa" integrity sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug== +arrify@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/arrify/-/arrify-3.0.0.tgz#ccdefb8eaf2a1d2ab0da1ca2ce53118759fd46bc" + integrity sha512-tLkvA81vQG/XqE2mjDkGQHoOINtMHtysSnemrmoGe6PydDPMRbVugqyk4A6V/WDWEfm3l+0d8anA9r8cv/5Jaw== + asap@~2.0.3, asap@~2.0.6: version "2.0.6" resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46" integrity sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA== +ascii-table@0.0.9: + version "0.0.9" + resolved "https://registry.yarnpkg.com/ascii-table/-/ascii-table-0.0.9.tgz#06a6604d6a55d4bf41a9a47d9872d7a78da31e73" + integrity sha512-xpkr6sCDIYTPqzvjG8M3ncw1YOTaloWZOyrUmicoEifBEKzQzt+ooUpRpQ/AbOoJfO/p2ZKiyp79qHThzJDulQ== + asn1.js@^5.2.0: version "5.4.1" resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-5.4.1.tgz#11a980b84ebb91781ce35b0fdc2ee294e3783f07" @@ -5010,23 +5660,16 @@ assert-plus@1.0.0, assert-plus@^1.0.0: resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525" integrity sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw== -assert@^1.1.1: - version "1.5.0" - resolved "https://registry.yarnpkg.com/assert/-/assert-1.5.0.tgz#55c109aaf6e0aefdb3dc4b71240c70bf574b18eb" - integrity sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA== - dependencies: - object-assign "^4.1.1" - util "0.10.3" - assert@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/assert/-/assert-2.0.0.tgz#95fc1c616d48713510680f2eaf2d10dd22e02d32" - integrity sha512-se5Cd+js9dXJnu6Ag2JFc00t+HmHOen+8Q+L7O9zI0PqQXr20uk2J0XQqMxZEeo5U50o8Nvmmx7dZrl+Ufr35A== + version "2.1.0" + resolved "https://registry.yarnpkg.com/assert/-/assert-2.1.0.tgz#6d92a238d05dc02e7427c881fb8be81c8448b2dd" + integrity sha512-eLHpSK/Y4nhMJ07gDaAzoX/XAKS8PSaojml3M0DM4JpV1LAi5JOJ/p6H/XWrl8L+DzVEvVCW1z3vWAaB9oTsQw== dependencies: - es6-object-assign "^1.1.0" - is-nan "^1.2.1" - object-is "^1.0.1" - util "^0.12.0" + call-bind "^1.0.2" + is-nan "^1.3.2" + object-is "^1.1.5" + object.assign "^4.1.4" + util "^0.12.5" assertion-error@^1.1.0: version "1.1.0" @@ -5038,21 +5681,16 @@ assign-symbols@^1.0.0: resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367" integrity sha512-Q+JC7Whu8HhmTdBph/Tq59IoRtoy6KAm5zzPv00WdujX82lbAL8K7WVjne7vdCsAmbF4AYaDOPyO3k0kl8qIrw== -ast-parents@^0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/ast-parents/-/ast-parents-0.0.1.tgz#508fd0f05d0c48775d9eccda2e174423261e8dd3" - integrity sha512-XHusKxKz3zoYk1ic8Un640joHbFMhbqneyoZfoKnEGtf2ey9Uh/IdpcQplODdO/kENaMIWsD0nJm4+wX3UNLHA== +ast-module-types@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/ast-module-types/-/ast-module-types-5.0.0.tgz#32b2b05c56067ff38e95df66f11d6afd6c9ba16b" + integrity sha512-JvqziE0Wc0rXQfma0HZC/aY7URXHFuZV84fJRtP8u+lhp0JYCNd5wJzVXP45t0PH0Mej3ynlzvdyITYIu0G4LQ== astral-regex@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31" integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ== -async-each@^1.0.1: - version "1.0.6" - resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.6.tgz#52f1d9403818c179b7561e11a5d1b77eb2160e77" - integrity sha512-c646jH1avxr+aVpndVMeAfYw7wAa6idufrlN3LPA4PmKS0QEGp6PIC9nwz0WQkkvBGAMEki3pFdtxaF39J9vvg== - async-eventemitter@^0.2.2: version "0.2.4" resolved "https://registry.yarnpkg.com/async-eventemitter/-/async-eventemitter-0.2.4.tgz#f5e7c8ca7d3e46aab9ec40a292baf686a0bafaca" @@ -5065,6 +5703,16 @@ async-limiter@~1.0.0: resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.1.tgz#dd379e94f0db8310b08291f9d64c3209766617fd" integrity sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ== +async-sema@^3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/async-sema/-/async-sema-3.1.1.tgz#e527c08758a0f8f6f9f15f799a173ff3c40ea808" + integrity sha512-tLRNUXati5MFePdAk8dw7Qt7DpxPB60ofAgn8WRhW6a2rcimZnYBP9oxHiv0OHy+Wz7kPMG+t4LGdt31+4EmGg== + +async@1.x, async@^1.4.2, async@~1.5: + version "1.5.2" + resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a" + integrity sha512-nSVgobk4rv61R9PUSDtYt7mPVB2olxNR5RWJcAsH676/ef11bUZwvu7+RGYrYauVdDPcO519v68wRhXQtxsV9w== + async@2.6.2: version "2.6.2" resolved "https://registry.yarnpkg.com/async/-/async-2.6.2.tgz#18330ea7e6e313887f5d2f2a904bac6fe4dd5381" @@ -5072,22 +5720,22 @@ async@2.6.2: dependencies: lodash "^4.17.11" -async@^1.4.2: - version "1.5.2" - resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a" - integrity sha512-nSVgobk4rv61R9PUSDtYt7mPVB2olxNR5RWJcAsH676/ef11bUZwvu7+RGYrYauVdDPcO519v68wRhXQtxsV9w== +async@3.2.3: + version "3.2.3" + resolved "https://registry.yarnpkg.com/async/-/async-3.2.3.tgz#ac53dafd3f4720ee9e8a160628f18ea91df196c9" + integrity sha512-spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g== -async@^2.0.1, async@^2.1.2, async@^2.4.0, async@^2.5.0, async@^2.6.1: +async@^2.0.1, async@^2.1.2, async@^2.4.0, async@^2.5.0, async@^2.6.1, async@^2.6.4: version "2.6.4" resolved "https://registry.yarnpkg.com/async/-/async-2.6.4.tgz#706b7ff6084664cd7eae713f6f965433b5504221" integrity sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA== dependencies: lodash "^4.17.14" -async@^3.2.3: - version "3.2.4" - resolved "https://registry.yarnpkg.com/async/-/async-3.2.4.tgz#2d22e00f8cddeb5fde5dd33522b56d1cf569a81c" - integrity sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ== +async@^3.2.3, async@^3.2.4: + version "3.2.5" + resolved "https://registry.yarnpkg.com/async/-/async-3.2.5.tgz#ebd52a8fdaf7a2289a24df399f8d8485c8a46b66" + integrity sha512-baNZyqaaLhyLVKm/DlvdW051MSgO6b8eVfIezl9E5PqWxFgzLm/wQntEW4zOytVburDEr0JlALEpdOFwvErLsg== asynckit@^0.4.0: version "0.4.0" @@ -5115,13 +5763,13 @@ auto-bind@~4.0.0: integrity sha512-Hdw8qdNiqdJ8LqT0iK0sVzkFbzg6fhnQqqfWhBDxcHZvU75+B+ayzTy8x+k5Ix0Y92XOhOUlx74ps+bA6BeYMQ== autoprefixer@^10.4.13: - version "10.4.14" - resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.4.14.tgz#e28d49902f8e759dd25b153264e862df2705f79d" - integrity sha512-FQzyfOsTlwVzjHxKEqRIAdJx9niO6VCBCoEwax/VLSoQF29ggECcPuBqUMZ+u8jCZOPSy8b8/8KnuFbp0SaFZQ== + version "10.4.16" + resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.4.16.tgz#fad1411024d8670880bdece3970aa72e3572feb8" + integrity sha512-7vd3UC6xKp0HLfua5IjZlcXvGAGy7cBAXTg2lyQ/8WpNhd6SiZ8Be+xm3FyBSYJx5GKcpRCzBh7RH4/0dnY+uQ== dependencies: - browserslist "^4.21.5" - caniuse-lite "^1.0.30001464" - fraction.js "^4.2.0" + browserslist "^4.21.10" + caniuse-lite "^1.0.30001538" + fraction.js "^4.3.6" normalize-range "^0.1.2" picocolors "^1.0.0" postcss-value-parser "^4.2.0" @@ -5131,6 +5779,15 @@ available-typed-arrays@^1.0.5: resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz#92f95616501069d07d10edb2fc37d3e1c65123b7" integrity sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw== +avvio@^8.2.0: + version "8.2.1" + resolved "https://registry.yarnpkg.com/avvio/-/avvio-8.2.1.tgz#b5a482729847abb84d5aadce06511c04a0a62f82" + integrity sha512-TAlMYvOuwGyLK3PfBb5WKBXZmXz2fVCgv23d6zZFdle/q3gPjmxBaeuC0pY0Dzs5PWMSgfqqEZkrye19GlDTgw== + dependencies: + archy "^1.0.0" + debug "^4.0.0" + fastq "^1.6.1" + aws-sign2@~0.7.0: version "0.7.0" resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8" @@ -5141,17 +5798,26 @@ aws4@^1.8.0: resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.12.0.tgz#ce1c9d143389679e253b314241ea9aa5cec980d3" integrity sha512-NmWvPnx0F1SfrQbYwOi7OeaNGokp9XhzNioJ/CSBs8Qa4vxug81mhJEAVZwxXuBmYB5KDRfMq/F3RR0BIU7sWg== -axios@^0.21.1, axios@^0.21.2, axios@^0.21.4: +axios@^0.21.1, axios@^0.21.4: version "0.21.4" resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.4.tgz#c67b90dc0568e5c1cf2b0b858c43ba28e2eda575" integrity sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg== dependencies: follow-redirects "^1.14.0" -b4a@^1.0.1: - version "1.6.3" - resolved "https://registry.yarnpkg.com/b4a/-/b4a-1.6.3.tgz#cce6e8a2f0d0774e5fe8062086827e979970266d" - integrity sha512-aX6/FqpWQve8VN9kyTExy7GlmwNShvxcCWWD5QVR3ZbRlyBGtCrG5Autu95xxSPH4CRs+5PSV4d7PRnWpmqFlA== +axios@^1.5.1: + version "1.6.5" + resolved "https://registry.yarnpkg.com/axios/-/axios-1.6.5.tgz#2c090da14aeeab3770ad30c3a1461bc970fb0cd8" + integrity sha512-Ii012v05KEVuUoFWmMW/UQv9aRIc3ZwkWDcM+h5Il8izZCtRVpDUfwpoFf7eOtajT3QiGR4yDUx7lPqHJULgbg== + dependencies: + follow-redirects "^1.15.4" + form-data "^4.0.0" + proxy-from-env "^1.1.0" + +b4a@^1.0.1, b4a@^1.6.4: + version "1.6.4" + resolved "https://registry.yarnpkg.com/b4a/-/b4a-1.6.4.tgz#ef1c1422cae5ce6535ec191baeed7567443f36c9" + integrity sha512-fpWrvyVHEKyeEvbKZTVOeZF3VSKKWtJxFIxX/jaVPf+cLbGUSitjb49pHLqPV2BUNNZ0LcoeEGfE/YCpyDYHIw== babel-code-frame@^6.26.0: version "6.26.0" @@ -5314,16 +5980,6 @@ babel-helpers@^6.24.1: babel-runtime "^6.22.0" babel-template "^6.24.1" -babel-loader@^8.1.0: - version "8.3.0" - resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.3.0.tgz#124936e841ba4fe8176786d6ff28add1f134d6a8" - integrity sha512-H8SvsMF+m9t15HNLMipppzkC+Y2Yq+v3SonZyU70RBL/h1gxPkH08Ot8pEE9Z4Kd+czyWJClmFS8qzIP9OZ04Q== - dependencies: - find-cache-dir "^3.3.1" - loader-utils "^2.0.0" - make-dir "^3.1.0" - schema-utils "^2.6.5" - babel-messages@^6.23.0: version "6.23.0" resolved "https://registry.yarnpkg.com/babel-messages/-/babel-messages-6.23.0.tgz#f3cdf4703858035b2a2951c6ec5edf6c62f2630e" @@ -5338,30 +5994,6 @@ babel-plugin-check-es2015-constants@^6.22.0: dependencies: babel-runtime "^6.22.0" -babel-plugin-polyfill-corejs2@^0.3.3: - version "0.3.3" - resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.3.tgz#5d1bd3836d0a19e1b84bbf2d9640ccb6f951c122" - integrity sha512-8hOdmFYFSZhqg2C/JgLUQ+t52o5nirNwaWM2B9LWteozwIvM14VSwdsCAUET10qT+kmySAlseadmfeeSWFCy+Q== - dependencies: - "@babel/compat-data" "^7.17.7" - "@babel/helper-define-polyfill-provider" "^0.3.3" - semver "^6.1.1" - -babel-plugin-polyfill-corejs3@^0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.6.0.tgz#56ad88237137eade485a71b52f72dbed57c6230a" - integrity sha512-+eHqR6OPcBhJOGgsIar7xoAB1GcSwVUA3XjAd7HJNzOXT4wv6/H7KIdA/Nc60cvUlDbKApmqNvD1B1bzOt4nyA== - dependencies: - "@babel/helper-define-polyfill-provider" "^0.3.3" - core-js-compat "^3.25.1" - -babel-plugin-polyfill-regenerator@^0.4.1: - version "0.4.1" - resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.4.1.tgz#390f91c38d90473592ed43351e801a9d3e0fd747" - integrity sha512-NtQGmyQDXjQqQ+IzRkBVwEOz9lQ4zxAQZgoAYEtU9dJjnl1Oc98qnN7jcp+bE7O7aYzVpavXE3/VKXNzUbh7aw== - dependencies: - "@babel/helper-define-polyfill-provider" "^0.3.3" - babel-plugin-syntax-async-functions@^6.8.0: version "6.13.0" resolved "https://registry.yarnpkg.com/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz#cad9cad1191b5ad634bf30ae0872391e0647be95" @@ -5744,7 +6376,7 @@ babylon@^6.18.0: resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.18.0.tgz#af2f3b88fa6f5c1e4c634d1a0f8eac4f55b395e3" integrity sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ== -backoff@^2.5.0: +backoff@2.5.0, backoff@^2.5.0: version "2.5.0" resolved "https://registry.yarnpkg.com/backoff/-/backoff-2.5.0.tgz#f616eda9d3e4b66b8ca7fca79f695722c5f8e26f" integrity sha512-wC5ihrnUXmR2douXmXLCe5O3zg3GKIyvRi/hi58a/XyRxVI+3/yM0PYueQOZXPXQ9pxBislYkw+sF9b7C/RuMA== @@ -5768,7 +6400,7 @@ base32.js@~0.1.0: resolved "https://registry.yarnpkg.com/base32.js/-/base32.js-0.1.0.tgz#b582dec693c2f11e893cf064ee6ac5b6131a2202" integrity sha512-n3TkB02ixgBOhTvANakDb4xaMXnYUVkNoRFJjQflcqMQhyEKxEHdj3E6N8t8sUQ0mjH/3/JxzlXuz3ul/J90pQ== -base64-js@^1.0.2, base64-js@^1.3.0, base64-js@^1.3.1: +base64-js@^1.3.0, base64-js@^1.3.1: version "1.5.1" resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a" integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA== @@ -5798,30 +6430,49 @@ bech32@1.1.4: resolved "https://registry.yarnpkg.com/bech32/-/bech32-1.1.4.tgz#e38c9f37bf179b8eb16ae3a772b40c356d4832e9" integrity sha512-s0IrSOzLlbvX7yp4WBfPITzpAU8sqQcpsmwXDiKwrG4r491vwCO/XpejasRNl0piBMe/DvP4Tz0mIS/X1DPJBQ== -big-integer@^1.6.42, big-integer@^1.6.48: - version "1.6.51" - resolved "https://registry.yarnpkg.com/big-integer/-/big-integer-1.6.51.tgz#0df92a5d9880560d3ff2d5fd20245c889d130686" - integrity sha512-GPEid2Y9QU1Exl1rpO9B2IPJGHPSupF5GnVIP0blYvNOMer2bTvSWs1jGOUg04hTmu67nmLsQ9TBo1puaotBHg== +before-after-hook@^2.2.0: + version "2.2.3" + resolved "https://registry.yarnpkg.com/before-after-hook/-/before-after-hook-2.2.3.tgz#c51e809c81a4e354084422b9b26bad88249c517c" + integrity sha512-NzUnlZexiaH/46WDhANlyR2bXRopNg4F/zuSA3OpZnllCUgRaOF2znDioDWrmbNVsuZk6l9pMquQB38cfBZwkQ== -big.js@^5.2.2: - version "5.2.2" - resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328" - integrity sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ== +better-ajv-errors@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/better-ajv-errors/-/better-ajv-errors-1.2.0.tgz#6412d58fa4d460ff6ccbd9e65c5fef9781cc5286" + integrity sha512-UW+IsFycygIo7bclP9h5ugkNH8EjCSgqyFB/yQ4Hqqa1OEYDtb0uFIkYE0b6+CjkgJYVM5UKI/pJPxjYe9EZlA== + dependencies: + "@babel/code-frame" "^7.16.0" + "@humanwhocodes/momoa" "^2.0.2" + chalk "^4.1.2" + jsonpointer "^5.0.0" + leven "^3.1.0 < 4" -bigint-crypto-utils@^3.0.23: - version "3.2.2" - resolved "https://registry.yarnpkg.com/bigint-crypto-utils/-/bigint-crypto-utils-3.2.2.tgz#e30a49ec38357c6981cd3da5aaa6480b1f752ee4" - integrity sha512-U1RbE3aX9ayCUVcIPHuPDPKcK3SFOXf93J1UK/iHlJuQB7bhagPIX06/CLpLEsDThJ7KA4Dhrnzynl+d2weTiw== +better-opn@3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/better-opn/-/better-opn-3.0.2.tgz#f96f35deaaf8f34144a4102651babcf00d1d8817" + integrity sha512-aVNobHnJqLiUelTaHat9DZ1qM2w0C0Eym4LPI/3JxOnSokGVdsl1T1kN7TFvsEAD8G47A6VKQ0TVHqbBnYMJlQ== + dependencies: + open "^8.0.4" -bignumber.js@^9.0.0: - version "9.1.1" - resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-9.1.1.tgz#c4df7dc496bd849d4c9464344c1aa74228b4dac6" - integrity sha512-pHm4LsMJ6lzgNGVfZHjMoO8sdoRhOzOH4MLmY65Jg70bpxCKu5iOHNJyfF6OyvYw7t8Fpf35RuzUyqnQsj8Vig== +bfj@^7.0.2: + version "7.1.0" + resolved "https://registry.yarnpkg.com/bfj/-/bfj-7.1.0.tgz#c5177d522103f9040e1b12980fe8c38cf41d3f8b" + integrity sha512-I6MMLkn+anzNdCUp9hMRyui1HaNEUCco50lxbvNS4+EyXg8lN3nJ48PjPWtbH8UVS9CuMoaKE9U2V3l29DaRQw== + dependencies: + bluebird "^3.7.2" + check-types "^11.2.3" + hoopy "^0.1.4" + jsonpath "^1.1.1" + tryer "^1.0.1" -binary-extensions@^1.0.0: - version "1.13.1" - resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.13.1.tgz#598afe54755b2868a5330d2aff9d4ebb53209b65" - integrity sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw== +bigint-crypto-utils@^3.0.23, bigint-crypto-utils@^3.2.2: + version "3.3.0" + resolved "https://registry.yarnpkg.com/bigint-crypto-utils/-/bigint-crypto-utils-3.3.0.tgz#72ad00ae91062cf07f2b1def9594006c279c1d77" + integrity sha512-jOTSb+drvEDxEq6OuUybOAv/xxoh3cuYRUIPyu8sSHQNKM303UQ2R1DAo45o1AkcIXw6fzbaFI1+xGGdaXs2lg== + +bignumber.js@^9.0.0: + version "9.1.2" + resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-9.1.2.tgz#b7c4242259c008903b13707983b5f4bbd31eda0c" + integrity sha512-2/mKyZH9K85bzOEfhXDBFZTGd1CTs+5IHpeFQo9luiBG7hghdC851Pj2WAhb6E3R6b9tZj/XKhbg4fum+Kepug== binary-extensions@^2.0.0: version "2.2.0" @@ -5852,7 +6503,7 @@ binaryen@77.0.0-nightly.20190407: resolved "https://registry.yarnpkg.com/binaryen/-/binaryen-77.0.0-nightly.20190407.tgz#fbe4f8ba0d6bd0809a84eb519d2d5b5ddff3a7d1" integrity sha512-1mxYNvQ0xywMe582K7V6Vo2zzhZZxMTeGHH8aE/+/AND8f64D8Q1GThVY3RVRwGY/4p+p95ccw9Xbw2ovFXRIg== -bindings@^1.2.1, bindings@^1.5.0: +bindings@^1.4.0, bindings@^1.5.0: version "1.5.0" resolved "https://registry.yarnpkg.com/bindings/-/bindings-1.5.0.tgz#10353c9e945334bc0511a6d90b38fbc7c9c504df" integrity sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ== @@ -5878,7 +6529,7 @@ bl@^1.0.0: readable-stream "^2.3.5" safe-buffer "^5.1.1" -bl@^4.0.0, bl@^4.1.0: +bl@^4.0.0, bl@^4.0.3, bl@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/bl/-/bl-4.1.0.tgz#451535264182bec2fbbc83a62ab98cf11d9f7b3a" integrity sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w== @@ -5887,14 +6538,14 @@ bl@^4.0.0, bl@^4.1.0: inherits "^2.0.4" readable-stream "^3.4.0" -blake-hash@^1.1.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/blake-hash/-/blake-hash-1.1.1.tgz#b6251600d7812dd5097f96cb341ceae245bf9d12" - integrity sha512-V93H+FEJuXXZi1eEsMtbcBFP9oL5Ept7SLw3cbXYlPC3nocm9Fr4m18ZhbhdJrZVS9J/Z0oNE4L3oDZvmorHNA== +bl@^5.0.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/bl/-/bl-5.1.0.tgz#183715f678c7188ecef9fe475d90209400624273" + integrity sha512-tv1ZJHLfTDnXE6tMHv73YgSJaWR2AFuPwMntBe7XL/GBFHnT0CLnsHMogfk5+GzCDC5ZWarSCYaIGATZt9dNsQ== dependencies: - bindings "^1.2.1" - inherits "^2.0.3" - nan "^2.2.1" + buffer "^6.0.3" + inherits "^2.0.4" + readable-stream "^3.4.0" blake-hash@^2.0.0: version "2.0.0" @@ -5913,12 +6564,6 @@ blake2b-wasm@^2.4.0: b4a "^1.0.1" nanoassert "^2.0.0" -"blake2b-wasm@https://github.com/jbaylina/blake2b-wasm.git": - version "2.1.0" - resolved "https://github.com/jbaylina/blake2b-wasm.git#0d5f024b212429c7f50a7f533aa3a2406b5b42b3" - dependencies: - nanoassert "^1.0.0" - blake2b@^2.1.3: version "2.1.4" resolved "https://registry.yarnpkg.com/blake2b/-/blake2b-2.1.4.tgz#817d278526ddb4cd673bfb1af16d1ad61e393ba3" @@ -5939,11 +6584,16 @@ blob-to-it@^1.0.1: dependencies: browser-readablestream-to-it "^1.0.3" -bluebird@^3.5.0, bluebird@^3.5.2, bluebird@^3.5.5: +bluebird@^3.5.0, bluebird@^3.7.2: version "3.7.2" resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f" integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg== +blueimp-md5@^2.10.0: + version "2.19.0" + resolved "https://registry.yarnpkg.com/blueimp-md5/-/blueimp-md5-2.19.0.tgz#b53feea5498dcb53dc6ec4b823adb84b729c4af0" + integrity sha512-DRQrD6gJyy8FbiE4s+bDoXS9hiW3Vbx5uCdwvcCf3zLHL+Iv7LtGHLpr+GZV8rHG8tK766FGYBwRbu8pELTt+w== + bn.js@4.11.6: version "4.11.6" resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.6.tgz#53344adb14617a13f6e8dd2ce28905d1c0ba3215" @@ -5954,7 +6604,7 @@ bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.10.0, bn.js@^4.11.0, bn.js@^4.11.6, bn.js@^ resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.12.0.tgz#775b3f278efbb9718eec7361f483fb36fbbfea88" integrity sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA== -bn.js@^5.0.0, bn.js@^5.1.1, bn.js@^5.1.2, bn.js@^5.2.0, bn.js@^5.2.1: +bn.js@^5.0.0, bn.js@^5.1.2, bn.js@^5.2.0, bn.js@^5.2.1: version "5.2.1" resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-5.2.1.tgz#0bc527a6a0d18d0aa8d5b0538ce4a77dccfa7b70" integrity sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ== @@ -5977,7 +6627,7 @@ body-parser@1.20.1: type-is "~1.6.18" unpipe "1.0.0" -body-parser@^1.16.0, body-parser@^1.19.0: +body-parser@^1.16.0: version "1.20.2" resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.2.tgz#6feb0e21c4724d06de7ff38da36dad4f57a747fd" integrity sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA== @@ -6013,6 +6663,34 @@ borc@^2.1.2: json-text-sequence "~0.1.0" readable-stream "^3.6.0" +boxen@7.1.1, boxen@^7.0.0: + version "7.1.1" + resolved "https://registry.yarnpkg.com/boxen/-/boxen-7.1.1.tgz#f9ba525413c2fec9cdb88987d835c4f7cad9c8f4" + integrity sha512-2hCgjEmP8YLWQ130n2FerGv7rYpfBmnmp9Uy2Le1vge6X3gZIfSmEzP5QTDElFxcvVcXlEn8Aq6MU/PZygIOog== + dependencies: + ansi-align "^3.0.1" + camelcase "^7.0.1" + chalk "^5.2.0" + cli-boxes "^3.0.0" + string-width "^5.1.2" + type-fest "^2.13.0" + widest-line "^4.0.1" + wrap-ansi "^8.1.0" + +boxen@^5.1.2: + version "5.1.2" + resolved "https://registry.yarnpkg.com/boxen/-/boxen-5.1.2.tgz#788cb686fc83c1f486dfa8a40c68fc2b831d2b50" + integrity sha512-9gYgQKXx+1nP8mP7CzFyaUARhg7D3n1dF/FnErWmu9l6JvGpNUN278h0aSb+QjoiKSWG+iZ3uHrcqk0qrY9RQQ== + dependencies: + ansi-align "^3.0.0" + camelcase "^6.2.0" + chalk "^4.1.0" + cli-boxes "^2.2.1" + string-width "^4.2.2" + type-fest "^0.20.2" + widest-line "^3.1.0" + wrap-ansi "^7.0.0" + brace-expansion@^1.1.7: version "1.1.11" resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" @@ -6028,7 +6706,7 @@ brace-expansion@^2.0.1: dependencies: balanced-match "^1.0.0" -braces@^2.3.1, braces@^2.3.2: +braces@^2.3.1: version "2.3.2" resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729" integrity sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w== @@ -6114,7 +6792,7 @@ browserify-des@^1.0.0: inherits "^2.0.1" safe-buffer "^5.1.2" -browserify-rsa@^4.0.0, browserify-rsa@^4.0.1: +browserify-rsa@^4.0.0, browserify-rsa@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/browserify-rsa/-/browserify-rsa-4.1.0.tgz#b2fd06b5b75ae297f7ce2dc651f918f5be158c8d" integrity sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog== @@ -6123,19 +6801,19 @@ browserify-rsa@^4.0.0, browserify-rsa@^4.0.1: randombytes "^2.0.1" browserify-sign@^4.0.0: - version "4.2.1" - resolved "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.2.1.tgz#eaf4add46dd54be3bb3b36c0cf15abbeba7956c3" - integrity sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg== + version "4.2.2" + resolved "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.2.2.tgz#e78d4b69816d6e3dd1c747e64e9947f9ad79bc7e" + integrity sha512-1rudGyeYY42Dk6texmv7c4VcQ0EsvVbLwZkA+AQB7SxvXxmcD93jcHie8bzecJ+ChDlmAm2Qyu0+Ccg5uhZXCg== dependencies: - bn.js "^5.1.1" - browserify-rsa "^4.0.1" + bn.js "^5.2.1" + browserify-rsa "^4.1.0" create-hash "^1.2.0" create-hmac "^1.1.7" - elliptic "^6.5.3" + elliptic "^6.5.4" inherits "^2.0.4" - parse-asn1 "^5.1.5" - readable-stream "^3.6.0" - safe-buffer "^5.2.0" + parse-asn1 "^5.1.6" + readable-stream "^3.6.2" + safe-buffer "^5.2.1" browserify-zlib@^0.2.0: version "0.2.0" @@ -6152,17 +6830,17 @@ browserslist@^3.2.6: caniuse-lite "^1.0.30000844" electron-to-chromium "^1.3.47" -browserslist@^4.21.3, browserslist@^4.21.5: - version "4.21.5" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.5.tgz#75c5dae60063ee641f977e00edd3cfb2fb7af6a7" - integrity sha512-tUkiguQGW7S3IhB7N+c2MV/HZPSCPAAiYBZXLsBhFB/PCy6ZKKsZrmBayHV9fdGV/ARIfJ14NkxKzRDjvp7L6w== +browserslist@^4.21.10, browserslist@^4.22.2: + version "4.22.2" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.22.2.tgz#704c4943072bd81ea18997f3bd2180e89c77874b" + integrity sha512-0UgcrvQmBDvZHFGdYUehrCNIazki7/lUP3kkoi/r3YB2amZbFM9J43ZRkJTXBUZK4gmx56+Sqk9+Vs9mwZx9+A== dependencies: - caniuse-lite "^1.0.30001449" - electron-to-chromium "^1.4.284" - node-releases "^2.0.8" - update-browserslist-db "^1.0.10" + caniuse-lite "^1.0.30001565" + electron-to-chromium "^1.4.601" + node-releases "^2.0.14" + update-browserslist-db "^1.0.13" -bs58@^4.0.0: +bs58@^4.0.0, bs58@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/bs58/-/bs58-4.0.1.tgz#be161e76c354f6f788ae4071f63f34e8c4f0a42a" integrity sha512-Ok3Wdf5vOIlBrgCvTq96gBkJw+JUEzdBgyaza5HLtPm7yTHkjRy8+JzNyHF7BHa0bNWOQIp3m5YF0nnFcOIKLw== @@ -6198,6 +6876,11 @@ buffer-alloc@^1.2.0: buffer-alloc-unsafe "^1.1.0" buffer-fill "^1.0.0" +buffer-crc32@^0.2.1, buffer-crc32@~0.2.3: + version "0.2.13" + resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242" + integrity sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ== + buffer-equal-constant-time@1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz#f8e71132f7ffe6e01a5c9697a4c6f3e48d5cc819" @@ -6213,6 +6896,15 @@ buffer-from@^1.0.0: resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5" integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ== +"buffer-polyfill@npm:buffer@^6.0.3", buffer@^6.0.1, buffer@^6.0.3: + name buffer-polyfill + version "6.0.3" + resolved "https://registry.yarnpkg.com/buffer/-/buffer-6.0.3.tgz#2ace578459cc8fbe2a70aaa8f52ee63b6a74c6c6" + integrity sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA== + dependencies: + base64-js "^1.3.1" + ieee754 "^1.2.1" + buffer-to-arraybuffer@^0.0.5: version "0.0.5" resolved "https://registry.yarnpkg.com/buffer-to-arraybuffer/-/buffer-to-arraybuffer-0.0.5.tgz#6064a40fa76eb43c723aba9ef8f6e1216d10511a" @@ -6230,15 +6922,6 @@ buffer-xor@^2.0.1: dependencies: safe-buffer "^5.1.1" -buffer@^4.3.0: - version "4.9.2" - resolved "https://registry.yarnpkg.com/buffer/-/buffer-4.9.2.tgz#230ead344002988644841ab0244af8c44bbe3ef8" - integrity sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg== - dependencies: - base64-js "^1.0.2" - ieee754 "^1.1.4" - isarray "^1.0.0" - buffer@^5.0.5, buffer@^5.2.1, buffer@^5.4.2, buffer@^5.4.3, buffer@^5.5.0, buffer@^5.6.0, buffer@^5.7.1: version "5.7.1" resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0" @@ -6247,26 +6930,30 @@ buffer@^5.0.5, buffer@^5.2.1, buffer@^5.4.2, buffer@^5.4.3, buffer@^5.5.0, buffe base64-js "^1.3.1" ieee754 "^1.1.13" -buffer@^6.0.1, buffer@^6.0.3: - version "6.0.3" - resolved "https://registry.yarnpkg.com/buffer/-/buffer-6.0.3.tgz#2ace578459cc8fbe2a70aaa8f52ee63b6a74c6c6" - integrity sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA== - dependencies: - base64-js "^1.3.1" - ieee754 "^1.2.1" - bufferutil@^4.0.1: - version "4.0.7" - resolved "https://registry.yarnpkg.com/bufferutil/-/bufferutil-4.0.7.tgz#60c0d19ba2c992dd8273d3f73772ffc894c153ad" - integrity sha512-kukuqc39WOHtdxtw4UScxF/WVnMFVSQVKhtx3AjZJzhd0RGZZldcrfSEbVsWWe6KNH253574cq5F+wpv0G9pJw== + version "4.0.8" + resolved "https://registry.yarnpkg.com/bufferutil/-/bufferutil-4.0.8.tgz#1de6a71092d65d7766c4d8a522b261a6e787e8ea" + integrity sha512-4T53u4PdgsXqKaIctwF8ifXlRTTmEPJ8iEPWFdGZvcf7sbwYo6FKFEX9eNNAnzFZ7EzJAQ3CJeOtCRA4rDp7Pw== dependencies: node-gyp-build "^4.3.0" +builtin-modules@^3.3.0: + version "3.3.0" + resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-3.3.0.tgz#cae62812b89801e9656336e46223e030386be7b6" + integrity sha512-zhaCDicdLuWN5UbN5IMnFqNMhNfo919sH85y2/ea+5Yg9TsTkeZxpL+JLbp6cgYFS4sRLp3YV4S6yDuqVWHYOw== + builtin-status-codes@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8" integrity sha512-HpGFw18DgFWlncDfjTa2rcQ4W88O1mC8e8yZ2AvQY5KDaktSTwo+KRf6nHK6FRI5FyRyb/5T6+TSxfP7QyGsmQ== +builtins@^5.0.0: + version "5.0.1" + resolved "https://registry.yarnpkg.com/builtins/-/builtins-5.0.1.tgz#87f6db9ab0458be728564fa81d876d8d74552fa9" + integrity sha512-qwVpFEHNfhYJIzNRBvd2C1kyo6jz3ZSMPyyuR47OPdiKWlbYnZNyDWuyR175qDnAJLiCo5fBBqPb3RiXgWlkOQ== + dependencies: + semver "^7.0.0" + busboy@^1.6.0: version "1.6.0" resolved "https://registry.yarnpkg.com/busboy/-/busboy-1.6.0.tgz#966ea36a9502e43cdb9146962523b92f531f6893" @@ -6274,6 +6961,11 @@ busboy@^1.6.0: dependencies: streamsearch "^1.1.0" +byline@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/byline/-/byline-5.0.0.tgz#741c5216468eadc457b03410118ad77de8c1ddb1" + integrity sha512-s6webAy+R4SR8XVuJWt2V2rGvhnrhxN+9S15GNuTK3wKPOXFF6RNc+8ug2XhH+2s4f+uudG4kUVYmYOQWL2g0Q== + bytes@3.1.2, bytes@^3.1.0: version "3.1.2" resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.2.tgz#8b0beeb98605adf1b128fa4386403c009e0221a5" @@ -6299,27 +6991,6 @@ cac@^6.7.12: resolved "https://registry.yarnpkg.com/cac/-/cac-6.7.14.tgz#804e1e6f506ee363cb0e3ccbb09cad5dd9870959" integrity sha512-b6Ilus+c3RrdDk+JhLKUAQfzzgLEPy6wcXqS7f/xe1EETvsDP6GORG7SFuOs6cID5YkqchW/LXZbX5bc8j7ZcQ== -cacache@^12.0.2: - version "12.0.4" - resolved "https://registry.yarnpkg.com/cacache/-/cacache-12.0.4.tgz#668bcbd105aeb5f1d92fe25570ec9525c8faa40c" - integrity sha512-a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ== - dependencies: - bluebird "^3.5.5" - chownr "^1.1.1" - figgy-pudding "^3.5.1" - glob "^7.1.4" - graceful-fs "^4.1.15" - infer-owner "^1.0.3" - lru-cache "^5.1.1" - mississippi "^3.0.0" - mkdirp "^0.5.1" - move-concurrently "^1.0.1" - promise-inflight "^1.0.1" - rimraf "^2.6.3" - ssri "^6.0.1" - unique-filename "^1.1.1" - y18n "^4.0.0" - cache-base@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2" @@ -6340,10 +7011,23 @@ cacheable-lookup@^5.0.3: resolved "https://registry.yarnpkg.com/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz#5a6b865b2c44357be3d5ebc2a467b032719a7005" integrity sha512-2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA== -cacheable-lookup@^6.0.4: - version "6.1.0" - resolved "https://registry.yarnpkg.com/cacheable-lookup/-/cacheable-lookup-6.1.0.tgz#0330a543471c61faa4e9035db583aad753b36385" - integrity sha512-KJ/Dmo1lDDhmW2XDPMo+9oiy/CeqosPguPCrgcVzKyZrL6pM1gU2GmPY/xo6OQPTUaA/c0kwHuywB4E6nmT9ww== +cacheable-lookup@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/cacheable-lookup/-/cacheable-lookup-7.0.0.tgz#3476a8215d046e5a3202a9209dd13fec1f933a27" + integrity sha512-+qJyx4xiKra8mZrcwhjMRMUhD5NR1R8esPkzIYxX96JiecFoxAXFuz/GpR3+ev4PE1WamHip78wV0vcmPQtp8w== + +cacheable-request@^10.2.8: + version "10.2.14" + resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-10.2.14.tgz#eb915b665fda41b79652782df3f553449c406b9d" + integrity sha512-zkDT5WAF4hSSoUgyfg5tFIxz8XQK+25W/TLVojJTMKBaxevLBBtLxgqguAuVQB8PVW79FVjHcU+GJ9tVbDZ9mQ== + dependencies: + "@types/http-cache-semantics" "^4.0.2" + get-stream "^6.0.1" + http-cache-semantics "^4.1.1" + keyv "^4.5.3" + mimic-response "^4.0.0" + normalize-url "^8.0.0" + responselike "^3.0.0" cacheable-request@^6.0.0: version "6.1.0" @@ -6359,9 +7043,9 @@ cacheable-request@^6.0.0: responselike "^1.0.2" cacheable-request@^7.0.2: - version "7.0.2" - resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-7.0.2.tgz#ea0d0b889364a25854757301ca12b2da77f91d27" - integrity sha512-pouW8/FmiPQbuGpkXQ9BAPv/Mo5xDGANgSNXzTzJ8DrKGuXOssM4wIQRjfanNRh3Yu5cfYPvcorqbhg2KIJtew== + version "7.0.4" + resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-7.0.4.tgz#7a33ebf08613178b403635be7b899d3e69bbe817" + integrity sha512-v+p6ongsrp0yTGbJXjgxPow2+DL93DASP4kXCDKb8/bwRtt9OEF3whggkkDkGNzgcWy2XaF4a8nZglC7uElscg== dependencies: clone-response "^1.0.2" get-stream "^5.1.0" @@ -6371,6 +7055,11 @@ cacheable-request@^7.0.2: normalize-url "^6.0.1" responselike "^2.0.0" +cachedir@^2.3.0: + version "2.4.0" + resolved "https://registry.yarnpkg.com/cachedir/-/cachedir-2.4.0.tgz#7fef9cf7367233d7c88068fe6e34ed0d355a610d" + integrity sha512-9EtFOZR8g22CL7BWjJ9BUx1+A/djkofnyW3aOXZORNW2kxoUpx2h+uN2cOqwPmFhnpVmxg+KW2OjOSgChTEvsQ== + cachedown@1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/cachedown/-/cachedown-1.0.0.tgz#d43f036e4510696b31246d7db31ebf0f7ac32d15" @@ -6379,13 +7068,19 @@ cachedown@1.0.0: abstract-leveldown "^2.4.1" lru-cache "^3.2.0" -call-bind@^1.0.0, call-bind@^1.0.2, call-bind@~1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c" - integrity sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA== +call-bind@^1.0.0, call-bind@^1.0.2, call-bind@^1.0.4, call-bind@^1.0.5, call-bind@~1.0.2: + version "1.0.5" + resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.5.tgz#6fa2b7845ce0ea49bf4d8b9ef64727a2c2e2e513" + integrity sha512-C3nQxfFZxFRVoJoGKKI8y3MOEo129NQ+FgQ08iye+Mk4zNZZGdjfs06bVTr+DBSlA66Q2VEcMki/cUCP4SercQ== dependencies: - function-bind "^1.1.1" - get-intrinsic "^1.0.2" + function-bind "^1.1.2" + get-intrinsic "^1.2.1" + set-function-length "^1.1.1" + +callsite@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/callsite/-/callsite-1.0.0.tgz#280398e5d664bd74038b6f0905153e6e8af1bc20" + integrity sha512-0vdNRFXn5q+dtOqjfFtmtlI9N2eVZ7LMyEV2iKC5mEEFvSg/69Ml6b/WU2qF8W1nLRa0wiSrDT3Y5jOHZCwKPQ== callsites@^3.0.0: version "3.1.0" @@ -6414,25 +7109,25 @@ camelcase-keys@^6.2.2: map-obj "^4.0.0" quick-lru "^4.0.1" -camelcase@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-3.0.0.tgz#32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a" - integrity sha512-4nhGqUkc4BqbBBB4Q6zLuD7lzzrHYrjKGeYaEji/3tFR5VdJu9v+LilhGIVe8wxEJPPOeWo7eg8dwY13TZ1BNg== - camelcase@^5.0.0, camelcase@^5.3.1: version "5.3.1" resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320" integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg== -camelcase@^6.0.0: +camelcase@^6.0.0, camelcase@^6.2.0: version "6.3.0" resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a" integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA== -caniuse-lite@^1.0.30000844, caniuse-lite@^1.0.30001449, caniuse-lite@^1.0.30001464: - version "1.0.30001480" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001480.tgz#9bbd35ee44c2480a1e3a3b9f4496f5066817164a" - integrity sha512-q7cpoPPvZYgtyC4VaBSN0Bt+PJ4c4EYRf0DrduInOz2SkFpHD5p3LnvEpqBp7UnJn+8x1Ogl1s38saUxe+ihQQ== +camelcase@^7.0.1: + version "7.0.1" + resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-7.0.1.tgz#f02e50af9fd7782bc8b88a3558c32fd3a388f048" + integrity sha512-xlx1yCK2Oc1APsPXDL2LdlNP6+uu8OCDdhOBSVT279M/S+y75O30C2VuD8T2ogdePBBl7PfPF4504tnLgX3zfw== + +caniuse-lite@^1.0.30000844, caniuse-lite@^1.0.30001538, caniuse-lite@^1.0.30001565: + version "1.0.30001576" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001576.tgz#893be772cf8ee6056d6c1e2d07df365b9ec0a5c4" + integrity sha512-ff5BdakGe2P3SQsMsiqmt1Lc8221NR1VzHj5jXN5vBny9A6fpze94HiVV/n7XRosOlsShJcvMv5mdnpjOGCEgg== capital-case@^1.0.4: version "1.0.4" @@ -6474,24 +7169,31 @@ cbor@^8.1.0: nofilter "^3.1.0" cborg@^1.5.4, cborg@^1.6.0: - version "1.10.1" - resolved "https://registry.yarnpkg.com/cborg/-/cborg-1.10.1.tgz#24cfe52c69ec0f66f95e23dc57f2086954c8d718" - integrity sha512-et6Qm8MOUY2kCWa5GKk2MlBVoPjHv0hQBmlzI/Z7+5V3VJCeIkGehIB3vWknNsm2kOkAIs6wEKJFJo8luWQQ/w== + version "1.10.2" + resolved "https://registry.yarnpkg.com/cborg/-/cborg-1.10.2.tgz#83cd581b55b3574c816f82696307c7512db759a1" + integrity sha512-b3tFPA9pUr2zCUiCfRd2+wok2/LBSNUMKOuRRok+WlvvAgEt/PlbgPTsZUcwCOs53IJvLgTp0eotwtosE6njug== -chai@^4.2.0, chai@^4.3.7: - version "4.3.7" - resolved "https://registry.yarnpkg.com/chai/-/chai-4.3.7.tgz#ec63f6df01829088e8bf55fca839bcd464a8ec51" - integrity sha512-HLnAzZ2iupm25PlN0xFreAlBA5zaBSv3og0DdeGA4Ar6h6rJ3A0rolRUKJhSF2V10GZKDgWF/VmAEsNWjCRB+A== +chai-as-promised@^7.1.1: + version "7.1.1" + resolved "https://registry.yarnpkg.com/chai-as-promised/-/chai-as-promised-7.1.1.tgz#08645d825deb8696ee61725dbf590c012eb00ca0" + integrity sha512-azL6xMoi+uxu6z4rhWQ1jbdUhOMhis2PvscD/xjLqNMkv3BPPp2JyyuTHOrf9BOosGpNQ11v6BKv/g57RXbiaA== dependencies: - assertion-error "^1.1.0" check-error "^1.0.2" - deep-eql "^4.1.2" - get-func-name "^2.0.0" - loupe "^2.3.1" + +chai@^4.2.0, chai@^4.3.6, chai@^4.3.7: + version "4.4.1" + resolved "https://registry.yarnpkg.com/chai/-/chai-4.4.1.tgz#3603fa6eba35425b0f2ac91a009fe924106e50d1" + integrity sha512-13sOfMv2+DWduEU+/xbun3LScLoqN17nBeTLUsmDfKdoiC1fr0n9PU4guu4AhRcOVFk/sW8LyZWHuhWtQZiF+g== + dependencies: + assertion-error "^1.1.0" + check-error "^1.0.3" + deep-eql "^4.1.3" + get-func-name "^2.0.2" + loupe "^2.3.6" pathval "^1.1.1" - type-detect "^4.0.5" + type-detect "^4.0.8" -chalk@3.0.0, chalk@^3.0.0: +chalk@3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/chalk/-/chalk-3.0.0.tgz#3f73c2bf526591f574cc492c51e2456349f844e4" integrity sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg== @@ -6499,6 +7201,11 @@ chalk@3.0.0, chalk@^3.0.0: ansi-styles "^4.1.0" supports-color "^7.1.0" +chalk@5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-5.2.0.tgz#249623b7d66869c673699fb66d65723e54dfcfb3" + integrity sha512-ree3Gqw/nazQAPuJJEy+avdl7QfZMcUvmHIKgEZkGL+xOBzRvup5Hxo6LHuMceSxOabuJLJm5Yp/92R9eMmMvA== + chalk@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98" @@ -6510,7 +7217,7 @@ chalk@^1.1.3: strip-ansi "^3.0.0" supports-color "^2.0.0" -chalk@^2.0.0, chalk@^2.4.1, chalk@^2.4.2: +chalk@^2.4.1, chalk@^2.4.2: version "2.4.2" resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== @@ -6519,7 +7226,7 @@ chalk@^2.0.0, chalk@^2.4.1, chalk@^2.4.2: escape-string-regexp "^1.0.5" supports-color "^5.3.0" -chalk@^4.0.0, chalk@^4.0.2, chalk@^4.1.0, chalk@^4.1.1, chalk@^4.1.2: +chalk@^4, chalk@^4.0.0, chalk@^4.0.2, chalk@^4.1.0, chalk@^4.1.1, chalk@^4.1.2: version "4.1.2" resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01" integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA== @@ -6527,6 +7234,11 @@ chalk@^4.0.0, chalk@^4.0.2, chalk@^4.1.0, chalk@^4.1.1, chalk@^4.1.2: ansi-styles "^4.1.0" supports-color "^7.1.0" +chalk@^5.0.0, chalk@^5.0.1, chalk@^5.2.0: + version "5.3.0" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-5.3.0.tgz#67c20a7ebef70e7f3970a01f90fa210cb6860385" + integrity sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w== + change-case-all@1.0.14: version "1.0.14" resolved "https://registry.yarnpkg.com/change-case-all/-/change-case-all-1.0.14.tgz#bac04da08ad143278d0ac3dda7eccd39280bfba1" @@ -6582,10 +7294,22 @@ chardet@^0.7.0: resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e" integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA== -check-error@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/check-error/-/check-error-1.0.2.tgz#574d312edd88bb5dd8912e9286dd6c0aed4aac82" - integrity sha512-BrgHpW9NURQgzoNyjfq0Wu6VFO6D7IZEmJNdtgNqpzGG8RuNFHt2jQxWlAs4HMe119chBnv+34syEZtc6IhLtA== +"charenc@>= 0.0.1": + version "0.0.2" + resolved "https://registry.yarnpkg.com/charenc/-/charenc-0.0.2.tgz#c0a1d2f3a7092e03774bfa83f14c0fc5790a8667" + integrity sha512-yrLQ/yVUFXkzg7EDQsPieE/53+0RlaWTs+wBrvW36cyilJ2SaDWfl4Yj7MtLTXleV9uEKefbAGUPv2/iWSooRA== + +check-error@^1.0.2, check-error@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/check-error/-/check-error-1.0.3.tgz#a6502e4312a7ee969f646e83bb3ddd56281bd694" + integrity sha512-iKEoDYaRmd1mxM90a2OEfWhjsjPpYPuQ+lMYsoxB126+t8fw7ySEO48nmDg5COTjxDI65/Y2OWpeEHk3ZOe8zg== + dependencies: + get-func-name "^2.0.2" + +check-types@^11.2.3: + version "11.2.3" + resolved "https://registry.yarnpkg.com/check-types/-/check-types-11.2.3.tgz#1ffdf68faae4e941fce252840b1787b8edc93b71" + integrity sha512-+67P1GkJRaxQD6PKK0Et9DhwQB+vGg3PM5+aavopCpZT1lj9jeqfvpgTLAWErNj8qApkkmXlu/Ug74kmhagkXg== checkpoint-store@^1.1.0: version "1.1.0" @@ -6594,22 +7318,12 @@ checkpoint-store@^1.1.0: dependencies: functional-red-black-tree "^1.0.1" -chokidar@3.5.1: - version "3.5.1" - resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.1.tgz#ee9ce7bbebd2b79f49f304799d5468e31e14e68a" - integrity sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw== - dependencies: - anymatch "~3.1.1" - braces "~3.0.2" - glob-parent "~5.1.0" - is-binary-path "~2.1.0" - is-glob "~4.0.1" - normalize-path "~3.0.0" - readdirp "~3.5.0" - optionalDependencies: - fsevents "~2.3.1" +child_process@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/child_process/-/child_process-1.0.2.tgz#b1f7e7fc73d25e7fd1d455adc94e143830182b5a" + integrity sha512-Wmza/JzL0SiWz7kl6MhIKT5ceIlnFPJX+lwUGj7Clhy5MMldsSoJR0+uvRzOS5Kv45Mq7t1PoE8TsOA9bzvb6g== -chokidar@3.5.3, "chokidar@>=3.0.0 <4.0.0", chokidar@^3.4.0, chokidar@^3.4.1, chokidar@^3.5.3: +chokidar@3.5.3, "chokidar@>=3.0.0 <4.0.0", chokidar@^3.4.0, chokidar@^3.5.3: version "3.5.3" resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd" integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw== @@ -6624,25 +7338,6 @@ chokidar@3.5.3, "chokidar@>=3.0.0 <4.0.0", chokidar@^3.4.0, chokidar@^3.4.1, cho optionalDependencies: fsevents "~2.3.2" -chokidar@^2.1.8: - version "2.1.8" - resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.8.tgz#804b3a7b6a99358c3c5c61e71d8728f041cff917" - integrity sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg== - dependencies: - anymatch "^2.0.0" - async-each "^1.0.1" - braces "^2.3.2" - glob-parent "^3.1.0" - inherits "^2.0.3" - is-binary-path "^1.0.0" - is-glob "^4.0.0" - normalize-path "^3.0.0" - path-is-absolute "^1.0.0" - readdirp "^2.2.1" - upath "^1.1.1" - optionalDependencies: - fsevents "^1.2.7" - chownr@^1.0.1, chownr@^1.1.1, chownr@^1.1.4: version "1.1.4" resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b" @@ -6653,16 +7348,21 @@ chownr@^2.0.0: resolved "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece" integrity sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ== -chrome-trace-event@^1.0.2: - version "1.0.3" - resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz#1015eced4741e15d06664a957dbbf50d041e26ac" - integrity sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg== +ci-info@3.8.0: + version "3.8.0" + resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.8.0.tgz#81408265a5380c929f0bc665d62256628ce9ef91" + integrity sha512-eXTggHWSooYhq49F2opQhuHWgzucfF2YgODK4e1566GQs5BIfP30B0oenwBJHfWxAs2fyPB1s7Mg949zLf61Yw== ci-info@^2.0.0: version "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.9.0" + resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.9.0.tgz#4279a62028a7b1f262f3473fc9605f5e218c59b4" + integrity sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ== + cids@^0.7.1, cids@~0.7.0: version "0.7.5" resolved "https://registry.yarnpkg.com/cids/-/cids-0.7.5.tgz#60a08138a99bfb69b6be4ceb63bfef7a396b28b2" @@ -6693,94 +7393,65 @@ cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3: inherits "^2.0.1" safe-buffer "^5.0.1" -circom@0.5.33: - version "0.5.33" - resolved "https://registry.yarnpkg.com/circom/-/circom-0.5.33.tgz#6943d5799adf5388989bfbb3ef8f502fb1b4f662" - integrity sha512-UdL8fr6GckhQ4VoWjIvuYwCHneJe8z/AyJpDxgKLyuaX51ijd4gBP6jlwHDbQJsha2aU2GR9qgDsxd0jfari1Q== - dependencies: - chai "^4.2.0" - circom_runtime "0.1.8" - fastfile "0.0.18" - ffiasm "0.1.1" - ffjavascript "0.2.22" - ffwasm "0.0.7" - fnv-plus "^1.3.1" - r1csfile "0.0.16" - tmp-promise "^2.0.2" - wasmbuilder "0.0.10" - -circom@0.5.38: - version "0.5.38" - resolved "https://registry.yarnpkg.com/circom/-/circom-0.5.38.tgz#c099fb196085837575fb266f37b0516b1ec56eb5" - integrity sha512-PFlXto8gDysUlwk6z/GYbn1Mv5BtW9BI4769N9gSP0/7KDNSqLNyVmL4DgMLc67/EpG4qJLGch3SdgzQD+/cfw== - dependencies: - chai "^4.2.0" - circom_runtime "0.1.12" - fastfile "0.0.18" - ffiasm "0.1.1" - ffjavascript "0.2.22" - ffwasm "0.0.7" - fnv-plus "^1.3.1" - r1csfile "0.0.16" - tmp-promise "^2.0.2" - wasmbuilder "0.0.10" - -circom_runtime@0.1.12: - version "0.1.12" - resolved "https://registry.yarnpkg.com/circom_runtime/-/circom_runtime-0.1.12.tgz#e1a302c6fe8cec390f035c2e7a8496cfa7cfb4a2" - integrity sha512-R+QT9HS9w71cmGmWIn+PSyD3aHyR5JZBiVvxOjCfn12wwnpuFwBjdMG7he+v8h/oQD1mDRAu2KrBeL4mAt5s4A== +circom_runtime@0.1.21: + version "0.1.21" + resolved "https://registry.yarnpkg.com/circom_runtime/-/circom_runtime-0.1.21.tgz#0ee93bb798b5afb8ecec30725ed14d94587a999b" + integrity sha512-qTkud630B/GK8y76hnOaaS1aNuF6prfV0dTrkeRsiJKnlP1ryQbP2FWLgDOPqn6aKyaPlam+Z+DTbBhkEzh8dA== dependencies: - ffjavascript "0.2.34" - fnv-plus "^1.3.1" + ffjavascript "0.2.56" -circom_runtime@0.1.13: - version "0.1.13" - resolved "https://registry.yarnpkg.com/circom_runtime/-/circom_runtime-0.1.13.tgz#90f86f35d989c48d4c27595b94664ea6918fbede" - integrity sha512-vmv19/0p5OTe5uCI7PWqPtB5vPoYWjczqKYnabaC5HOxX99R4K1MuNqEXsNEAoEfZrmfAQd7vXLcATN9NVnsPA== +circom_runtime@0.1.24: + version "0.1.24" + resolved "https://registry.yarnpkg.com/circom_runtime/-/circom_runtime-0.1.24.tgz#60ca8a31c3675802fbab5a0bcdeb02556e510733" + integrity sha512-H7/7I2J/cBmRnZm9docOCGhfxzS61BEm4TMCWcrZGsWNBQhePNfQq88Oj2XpUfzmBTCd8pRvRb3Mvazt3TMrJw== dependencies: - ffjavascript "0.2.35" - fnv-plus "^1.3.1" + ffjavascript "0.2.60" -circom_runtime@0.1.8: - version "0.1.8" - resolved "https://registry.yarnpkg.com/circom_runtime/-/circom_runtime-0.1.8.tgz#d967a1618fe5290849f9c0bbffb6b97b95c0f1c8" - integrity sha512-5ZmzCyidkNPb1zZsJGRXTuWcJ6kW6+gRBtHgf2tFqTh5dUyWVVPH0Zg7AsU2ijPr1AmYZUlme0yORUZK5HrjOA== +circom_tester@^0.0.19: + version "0.0.19" + resolved "https://registry.yarnpkg.com/circom_tester/-/circom_tester-0.0.19.tgz#e8bed494d080f8186bd0ac6571755d00ccec83bd" + integrity sha512-SNHaBsGxcBH6XsVWfsRbRPA7NF8m8AMKJI9dtJJCFGUtOTT2+zsoIqAwi50z6XCnO4TtjyXq7AeXa1PLHqT0tw== dependencies: - ffjavascript "0.2.10" + chai "^4.3.6" + child_process "^1.0.2" + ffjavascript "^0.2.56" fnv-plus "^1.3.1" + r1csfile "^0.0.41" + snarkjs "0.5.0" + tmp-promise "^3.0.3" + util "^0.12.4" -circomlib@0.5.1: - version "0.5.1" - resolved "https://registry.yarnpkg.com/circomlib/-/circomlib-0.5.1.tgz#97927e240e48028bdb8bdedd179f233de9fa7131" - integrity sha512-faPGgzJWhp5SCWSPYtWfnteaCS1UVhEomdLEF+QbbTy4kF4sAij5+G1z4EzC67q4sp8VYSTv7czH8z08U4haeA== +circomkit@^0.0.24: + version "0.0.24" + resolved "https://registry.yarnpkg.com/circomkit/-/circomkit-0.0.24.tgz#11db0ba17da9f5bd3e58bc87d5b39bb8375e3bf8" + integrity sha512-lw5Kj6zAWS8NYZjlDCGEDeA1e0/Vpa6t6W3GT0AxfhswUoqK0Nu3sz5hu8ZQ+Efh0Ss3eLoD0y+9sOkySEwgEA== dependencies: - blake-hash "^1.1.0" - blake2b "^2.1.3" - circom "0.5.33" - ffjavascript "0.1.0" - web3-utils "^1.3.0" + chai "^4.3.7" + circom_tester "^0.0.19" + loglevel "^1.8.1" + snarkjs "^0.7.0" -circomlibjs@0.0.2: - version "0.0.2" - resolved "https://registry.yarnpkg.com/circomlibjs/-/circomlibjs-0.0.2.tgz#f52b564b3b81fbf3c99478fa7d5d220d0a82cbf4" - integrity sha512-fI6E6AjIRhwuow/q2+RoVOHQfHe+7JKujs3htvU6FgH+K7j/7bOr4wJnuW4I2e/ZWMugqPh4/YFNsffGl9ZTNw== +circomlib@^2.0.5: + version "2.0.5" + resolved "https://registry.yarnpkg.com/circomlib/-/circomlib-2.0.5.tgz#183c703e53ed7d011811842dbeeeb9819f4cc1d6" + integrity sha512-O7NQ8OS+J4eshBuoy36z/TwQU0YHw8W3zxZcs4hVwpEll3e4hDm3mgkIPqItN8FDeLEKZFK3YeT/+k8TiLF3/A== + +circomlibjs@^0.1.7: + version "0.1.7" + resolved "https://registry.yarnpkg.com/circomlibjs/-/circomlibjs-0.1.7.tgz#9f5a7d9a23323744b11ee456b05b0cd81f48b554" + integrity sha512-GRAUoAlKAsiiTa+PA725G9RmEmJJRc8tRFxw/zKktUxlQISGznT4hH4ESvW8FNTsrGg/nNd06sGP/Wlx0LUHVg== dependencies: blake-hash "^2.0.0" blake2b "^2.1.3" - ffjavascript "^0.2.38" - web3 "^1.6.0" - web3-utils "^1.6.0" + ethers "^5.5.1" + ffjavascript "^0.2.45" -circomlibjs@0.0.8: - version "0.0.8" - resolved "https://registry.yarnpkg.com/circomlibjs/-/circomlibjs-0.0.8.tgz#c2d1130d2d99fbb22f3d40ac19f347d768eace76" - integrity sha512-oZFYapLO0mfiA+i2GU/V7bRNEEPjVcwV4M444nU5lNsdSJpqLwD57m9zxTD5m/KeY7WQ3lEAC9NNKEPQHu7s1w== +citty@^0.1.4, citty@^0.1.5: + version "0.1.5" + resolved "https://registry.yarnpkg.com/citty/-/citty-0.1.5.tgz#fe37ceae5dc764af75eb2fece99d2bf527ea4e50" + integrity sha512-AS7n5NSc0OQVMV9v6wt3ByujNIrne0/cTjiC2MYqhvao57VNfiuVksTSr2p17nVOhEr2KtqiAkGwHcgMC/qUuQ== dependencies: - blake-hash "^2.0.0" - blake2b "^2.1.3" - ffjavascript "^0.2.38" - web3 "^1.6.0" - web3-utils "^1.6.0" + consola "^3.2.3" class-is@^1.1.0: version "1.1.0" @@ -6808,6 +7479,15 @@ classic-level@^1.2.0: napi-macros "^2.2.2" node-gyp-build "^4.3.0" +clean-deep@3.4.0: + version "3.4.0" + resolved "https://registry.yarnpkg.com/clean-deep/-/clean-deep-3.4.0.tgz#c465c4de1003ae13a1a859e6c69366ab96069f75" + integrity sha512-Lo78NV5ItJL/jl+B5w0BycAisaieJGXK1qYi/9m4SjR8zbqmrUtO7Yhro40wEShGmmxs/aJLI/A+jNhdkXK8mw== + dependencies: + lodash.isempty "^4.4.0" + lodash.isplainobject "^4.0.6" + lodash.transform "^4.6.0" + clean-stack@^2.0.0: version "2.2.0" resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b" @@ -6820,6 +7500,30 @@ clean-stack@^3.0.1: dependencies: escape-string-regexp "4.0.0" +clean-stack@^4.0.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-4.2.0.tgz#c464e4cde4ac789f4e0735c5d75beb49d7b30b31" + integrity sha512-LYv6XPxoyODi36Dp976riBtSY27VmFo+MKqEU9QCCWyTrdEPDog+RWA7xQWHi6Vbp61j5c4cdzzX1NidnwtUWg== + dependencies: + escape-string-regexp "5.0.0" + +cli-boxes@^2.2.1: + version "2.2.1" + resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-2.2.1.tgz#ddd5035d25094fce220e9cab40a45840a440318f" + integrity sha512-y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw== + +cli-boxes@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-3.0.0.tgz#71a10c716feeba005e4504f36329ef0b17cf3145" + integrity sha512-/lzGpEWL/8PfI0BmBOPRwp0c/wFNX1RdUML3jK/RcSBA9T8mZDdQpqYBKtCFTOfQbwPqWEOpjqW+Fnayc0969g== + +cli-cursor@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5" + integrity sha512-8lgKz8LmCRYZZQDpRyT2m5rKJ08TnU4tR9FFFW2rxpxR1FzWi4PQ/NfyODchAatHaUgnSPVcx/R5w6NuTBzFiw== + dependencies: + restore-cursor "^2.0.0" + cli-cursor@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-3.1.0.tgz#264305a7ae490d1d03bf0c9ba7c925d1753af307" @@ -6827,28 +7531,36 @@ cli-cursor@^3.1.0: dependencies: restore-cursor "^3.1.0" -cli-progress@^3.12.0: +cli-cursor@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-4.0.0.tgz#3cecfe3734bf4fe02a8361cbdc0f6fe28c6a57ea" + integrity sha512-VGtlMu3x/4DOtIUwEkRezxUZ2lBacNJCHash0N0WeZDBS+7Ux1dm3XWAgWYxLJFMMdOeXMHXorshEFhbMSGelg== + dependencies: + restore-cursor "^4.0.0" + +cli-progress@^3.11.2, cli-progress@^3.12.0: version "3.12.0" resolved "https://registry.yarnpkg.com/cli-progress/-/cli-progress-3.12.0.tgz#807ee14b66bcc086258e444ad0f19e7d42577942" integrity sha512-tRkV3HJ1ASwm19THiiLIXLO7Im7wlTuKnvkYaTkyoAPefqjNg7W7DHKUlGRxy9vxDvbyCYQkQozvptuMkGCg8A== dependencies: string-width "^4.2.3" -cli-spinners@^2.2.0, cli-spinners@^2.5.0: - version "2.8.0" - resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.8.0.tgz#e97a3e2bd00e6d85aa0c13d7f9e3ce236f7787fc" - integrity sha512-/eG5sJcvEIwxcdYM86k5tPwn0MUzkX5YY3eImTGpJOZgVe4SdTMY14vQpcxgBzJ0wXwAYrS8E+c3uHeK4JNyzQ== +cli-spinners@^2.2.0, cli-spinners@^2.5.0, cli-spinners@^2.6.1: + version "2.9.2" + resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.9.2.tgz#1773a8f4b9c4d6ac31563df53b3fc1d79462fe41" + integrity sha512-ywqV+5MmyL4E7ybXgKys4DugZbX0FC6LnwrhjuykIjnK9k8OQacQ7axGKnjDXWNhns0xot3bZI5h55H8yo9cJg== -cli-table3@^0.6.0: - version "0.6.3" - resolved "https://registry.yarnpkg.com/cli-table3/-/cli-table3-0.6.3.tgz#61ab765aac156b52f222954ffc607a6f01dbeeb2" - integrity sha512-w5Jac5SykAeZJKntOxJCrm63Eg5/4dhMWIcuTbo9rpE+brgaSZo0RuNJZeOyMgsUdhDeojvgyQLmjI+K50ZGyg== +cli-table3@0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/cli-table3/-/cli-table3-0.6.0.tgz#b7b1bc65ca8e7b5cef9124e13dc2b21e2ce4faee" + integrity sha512-gnB85c3MGC7Nm9I/FkiasNBOKjOiO1RNuXXarQms37q4QMpWdlbBgD/VnOStA2faG1dpXMv31RFApjX1/QdgWQ== dependencies: + object-assign "^4.1.0" string-width "^4.2.0" optionalDependencies: - "@colors/colors" "1.5.0" + colors "^1.1.2" -cli-table3@~0.5.0: +cli-table3@^0.5.0: version "0.5.1" resolved "https://registry.yarnpkg.com/cli-table3/-/cli-table3-0.5.1.tgz#0252372d94dfc40dbd8df06005f48f31f656f202" integrity sha512-7Qg2Jrep1S/+Q3EceiZtQcDPWxhAvBw+ERf1162v4sikJrvojMHFqXt8QIVha8UlH9rgU0BeWPytZ9/TzYqlUw== @@ -6858,6 +7570,15 @@ cli-table3@~0.5.0: optionalDependencies: colors "^1.1.2" +cli-table3@^0.6.0: + version "0.6.3" + resolved "https://registry.yarnpkg.com/cli-table3/-/cli-table3-0.6.3.tgz#61ab765aac156b52f222954ffc607a6f01dbeeb2" + integrity sha512-w5Jac5SykAeZJKntOxJCrm63Eg5/4dhMWIcuTbo9rpE+brgaSZo0RuNJZeOyMgsUdhDeojvgyQLmjI+K50ZGyg== + dependencies: + string-width "^4.2.0" + optionalDependencies: + "@colors/colors" "1.5.0" + cli-truncate@2.1.0, cli-truncate@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-2.1.0.tgz#c39e28bf05edcde5be3b98992a22deed5a2b93c7" @@ -6866,19 +7587,32 @@ cli-truncate@2.1.0, cli-truncate@^2.1.0: slice-ansi "^3.0.0" string-width "^4.2.0" +cli-truncate@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-3.1.0.tgz#3f23ab12535e3d73e839bb43e73c9de487db1389" + integrity sha512-wfOBkjXteqSnI59oPcJkcPl/ZmwvMMOj340qUIY1SKZCv0B9Cf4D4fAucRkIKQmsIuYK3x1rrgU7MeGRruiuiA== + dependencies: + slice-ansi "^5.0.0" + string-width "^5.0.0" + +cli-width@^2.0.0: + version "2.2.1" + resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.1.tgz#b0433d0b4e9c847ef18868a4ef16fd5fc8271c48" + integrity sha512-GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw== + cli-width@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-3.0.0.tgz#a2f48437a2caa9a22436e794bf071ec9e61cedf6" integrity sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw== -cliui@^3.2.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/cliui/-/cliui-3.2.0.tgz#120601537a916d29940f934da3b48d585a39213d" - integrity sha512-0yayqDxWQbqk3ojkYqUKqaAQ6AfNKeKWRNA8kR0WXzAsdHpP4BIaOmMAG87JGuO6qcobyW4GjxHd9PmhEd+T9w== +clipboardy@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/clipboardy/-/clipboardy-4.0.0.tgz#e73ced93a76d19dd379ebf1f297565426dffdca1" + integrity sha512-5mOlNS0mhX0707P2I0aZ2V/cmHUEO/fL7VFLqszkhUsxt7RwnmrInf/eEQKlf5GzvYeHIjT+Ov1HRfNmymlG0w== dependencies: - string-width "^1.0.1" - strip-ansi "^3.0.1" - wrap-ansi "^2.0.0" + execa "^8.0.1" + is-wsl "^3.1.0" + is64bit "^2.0.0" cliui@^5.0.0: version "5.0.0" @@ -6933,10 +7667,10 @@ clone@^1.0.2: resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e" integrity sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg== -code-point-at@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" - integrity sha512-RpAVKQA5T63xEj6/giIbUEtZwJ4UFIc3ZtvEkiaUERylqe8xb5IvqcgOurZLahv93CLKfxcw5YI+DZcUBRyLXA== +cluster-key-slot@^1.1.0: + version "1.1.2" + resolved "https://registry.yarnpkg.com/cluster-key-slot/-/cluster-key-slot-1.1.2.tgz#88ddaa46906e303b5de30d3153b7d9fe0a0c19ac" + integrity sha512-RMr0FhtfXemyinomL4hrWcYJxmX6deFdCxpJzhDttxgO1+bcCnkk+9drydLVDmAMG7NE6aN/fl4F7ucU/90gAA== collection-visit@^1.0.0: version "1.0.0" @@ -6946,7 +7680,7 @@ collection-visit@^1.0.0: map-visit "^1.0.0" object-visit "^1.0.0" -color-convert@^1.9.0: +color-convert@^1.9.0, color-convert@^1.9.3: version "1.9.3" resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8" integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg== @@ -6965,31 +7699,86 @@ color-name@1.1.3: resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" integrity sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw== -color-name@^1.1.4, color-name@~1.1.4: +color-name@^1.0.0, color-name@^1.1.4, color-name@~1.1.4: version "1.1.4" resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== +color-string@^1.6.0, color-string@^1.9.0: + version "1.9.1" + resolved "https://registry.yarnpkg.com/color-string/-/color-string-1.9.1.tgz#4467f9146f036f855b764dfb5bf8582bf342c7a4" + integrity sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg== + dependencies: + color-name "^1.0.0" + simple-swizzle "^0.2.2" + +color-support@^1.1.2: + version "1.1.3" + resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2" + integrity sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg== + +color@^3.1.3: + version "3.2.1" + resolved "https://registry.yarnpkg.com/color/-/color-3.2.1.tgz#3544dc198caf4490c3ecc9a790b54fe9ff45e164" + integrity sha512-aBl7dZI9ENN6fUGC7mWpMTPNHmWUSNan9tuWN6ahh5ZLNk9baLJOnSMlrQkHcrfFgz2/RigjUVAjdx36VcemKA== + dependencies: + color-convert "^1.9.3" + color-string "^1.6.0" + +color@^4.2.3: + version "4.2.3" + resolved "https://registry.yarnpkg.com/color/-/color-4.2.3.tgz#d781ecb5e57224ee43ea9627560107c0e0c6463a" + integrity sha512-1rXeuUUiGGrykh+CeBdu5Ie7OJwinCgQY0bc7GCRxy5xVHy+moaqkpL/jqQq0MtQOeYcrqEz4abc5f0KtU7W4A== + dependencies: + color-convert "^2.0.1" + color-string "^1.9.0" + colorette@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.4.0.tgz#5190fbb87276259a86ad700bff2c6d6faa3fca40" integrity sha512-Y2oEozpomLn7Q3HFP7dpww7AtMJplbM9lGZP6RDfHqmbeRjiwRg4n6VM6j4KLmRke85uWEI7JqF17f3pqdRA0g== -colorette@^2.0.16: +colorette@^2.0.16, colorette@^2.0.20: version "2.0.20" resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.20.tgz#9eb793e6833067f7235902fcd3b09917a000a95a" integrity sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w== -colors@1.3.3: - version "1.3.3" - resolved "https://registry.yarnpkg.com/colors/-/colors-1.3.3.tgz#39e005d546afe01e01f9c4ca8fa50f686a01205d" - integrity sha512-mmGt/1pZqYRjMxB1axhTo16/snVZ5krrKkcmMeVKxzECMMXoCgnvTPp10QgHfcbQZw8Dq2jMNG6je4JlWU0gWg== +colors-option@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/colors-option/-/colors-option-3.0.0.tgz#51f5d0d2b511a01859cdd70eaa9ed43ca4abf108" + integrity sha512-DP3FpjsiDDvnQC1OJBsdOJZPuy7r0o6sepY2T5M3L/d2nrE23O/ErFkEqyY3ngVL1ZhTj/H0pCMNObZGkEOaaQ== + dependencies: + chalk "^5.0.0" + filter-obj "^3.0.0" + is-plain-obj "^4.0.0" + jest-validate "^27.3.1" -colors@^1.1.2: +colors-option@^4.4.0: + version "4.5.0" + resolved "https://registry.yarnpkg.com/colors-option/-/colors-option-4.5.0.tgz#f307605fcf2ac8165fb15510852717c58ef60ec4" + integrity sha512-Soe5lerRg3erMRgYC0EC696/8dMCGpBzcQchFfi55Yrkja8F+P7cUt0LVTIg7u5ob5BexLZ/F1kO+ejmv+nq8w== + dependencies: + chalk "^5.0.1" + is-plain-obj "^4.1.0" + +colors@1.0.x: + version "1.0.3" + resolved "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz#0433f44d809680fdeb60ed260f1b0c262e82a40b" + integrity sha512-pFGrxThWcWQ2MsAz6RtgeWe4NK2kUE1WfsrvvlctdII745EW9I0yflqhe7++M5LEc7bV2c/9/5zc8sFcpL0Drw== + +colors@1.4.0, colors@^1.1.2: version "1.4.0" resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78" integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA== +colorspace@1.1.x: + version "1.1.4" + resolved "https://registry.yarnpkg.com/colorspace/-/colorspace-1.1.4.tgz#8d442d1186152f60453bf8070cd66eb364e59243" + integrity sha512-BgvKJiuVu1igBUF2kEjRCZXol6wiiGbY5ipL/oVPwm0BL9sIpMIzM8IK7vwuxIIzOXMV3Ey5w+vxhm0rR/TN8w== + dependencies: + color "^3.1.3" + text-hex "1.0.x" + combined-stream@^1.0.6, combined-stream@^1.0.8, combined-stream@~1.0.6: version "1.0.8" resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f" @@ -7011,17 +7800,42 @@ command-line-args@^4.0.7: find-replace "^1.0.3" typical "^2.6.1" +command-line-args@^5.1.1: + version "5.2.1" + resolved "https://registry.yarnpkg.com/command-line-args/-/command-line-args-5.2.1.tgz#c44c32e437a57d7c51157696893c5909e9cec42e" + integrity sha512-H4UfQhZyakIjC74I9d34fGYDwk3XpSr17QhEd0Q3I9Xq1CETHo4Hcuo87WyWHpAF1aSLjLRf5lD9ZGX2qStUvg== + dependencies: + array-back "^3.1.0" + find-replace "^3.0.0" + lodash.camelcase "^4.3.0" + typical "^4.0.0" + +command-line-usage@^6.1.0: + version "6.1.3" + resolved "https://registry.yarnpkg.com/command-line-usage/-/command-line-usage-6.1.3.tgz#428fa5acde6a838779dfa30e44686f4b6761d957" + integrity sha512-sH5ZSPr+7UStsloltmDh7Ce5fb8XPlHyoPzTpyyMuYCtervL65+ubVZ6Q61cFtFl62UyJlc8/JwERRbAFPUqgw== + dependencies: + array-back "^4.0.2" + chalk "^2.4.2" + table-layout "^1.0.2" + typical "^5.2.0" + +commander@10.0.1, commander@^10.0.1: + version "10.0.1" + resolved "https://registry.yarnpkg.com/commander/-/commander-10.0.1.tgz#881ee46b4f77d1c1dccc5823433aa39b022cbe06" + integrity sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug== + commander@3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/commander/-/commander-3.0.2.tgz#6837c3fb677ad9933d1cfba42dd14d5117d6b39e" integrity sha512-Gar0ASD4BDyKC4hl4DwHqDrmvjoxWKZigVnAbn5H1owvm4CxCPdb0HQDehwNYMJpla5+M2tPmPARzhtYuwpHow== -commander@^10.0.0: - version "10.0.1" - resolved "https://registry.yarnpkg.com/commander/-/commander-10.0.1.tgz#881ee46b4f77d1c1dccc5823433aa39b022cbe06" - integrity sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug== +commander@^12.0.0: + version "12.0.0" + resolved "https://registry.yarnpkg.com/commander/-/commander-12.0.0.tgz#b929db6df8546080adfd004ab215ed48cf6f2592" + integrity sha512-MwVNWlYjDTtOjX5PiD7o5pK0UrFU/OYgcJfjjK4RaHZETNtjJqrZa9Y9ds88+A+f+d5lv+561eZ+yCKoS3gbAA== -commander@^2.15.0, commander@^2.20.0, commander@^2.20.3: +commander@^2.15.0, commander@^2.20.3, commander@^2.8.1: version "2.20.3" resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== @@ -7031,37 +7845,68 @@ commander@^4.0.0: resolved "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz#9fd602bd936294e9e9ef46a3f4d6964044b18068" integrity sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA== +commander@^7.2.0: + version "7.2.0" + resolved "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7" + integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw== + commander@^8.2.0: version "8.3.0" resolved "https://registry.yarnpkg.com/commander/-/commander-8.3.0.tgz#4837ea1b2da67b9c616a67afbb0fafee567bca66" integrity sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww== -commander@^9.0.0: +commander@^9.3.0: version "9.5.0" resolved "https://registry.yarnpkg.com/commander/-/commander-9.5.0.tgz#bc08d1eb5cedf7ccb797a96199d41c7bc3e60d30" integrity sha512-KRs7WVDKg86PWiuAqhDrAQnTXZKraVcCc6vFdL14qrZ/DcWwuRo7VoiYXalXO7S5GKpqYiVEwCbgFDfxNHKJBQ== +comment-json@4.2.3: + version "4.2.3" + resolved "https://registry.yarnpkg.com/comment-json/-/comment-json-4.2.3.tgz#50b487ebbf43abe44431f575ebda07d30d015365" + integrity sha512-SsxdiOf064DWoZLH799Ata6u7iV658A11PlWtZATDlXPpKGJnbJZ5Z24ybixAi+LUUqJ/GKowAejtC5GFUG7Tw== + dependencies: + array-timsort "^1.0.3" + core-util-is "^1.0.3" + esprima "^4.0.1" + has-own-prop "^2.0.0" + repeat-string "^1.6.1" + +common-path-prefix@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/common-path-prefix/-/common-path-prefix-3.0.0.tgz#7d007a7e07c58c4b4d5f433131a19141b29f11e0" + integrity sha512-QE33hToZseCH3jS0qN96O/bSh3kaw/h+Tq7ngyY9eWDUnTlTNUyqfqvCXioLe5Na5jFsL78ra/wuBU4iuEgd4w== + common-tags@1.8.2: version "1.8.2" resolved "https://registry.yarnpkg.com/common-tags/-/common-tags-1.8.2.tgz#94ebb3c076d26032745fd54face7f688ef5ac9c6" integrity sha512-gk/Z852D2Wtb//0I+kRFNKKE9dIIVirjoqPoA1wJU+XePVXZfGeBpk45+A1rKO4Q43prqWBNY/MiIeRLbPWUaA== -commondir@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b" - integrity sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg== - component-emitter@^1.2.1: - version "1.3.0" - resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0" - integrity sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg== + version "1.3.1" + resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.1.tgz#ef1d5796f7d93f135ee6fb684340b26403c97d17" + integrity sha512-T0+barUSQRTUQASh8bx02dl+DhF54GtIDY13Y3m9oWTklKbb3Wv974meRpeZ3lp1JpLVECWWNHC4vaG2XHXouQ== + +compress-commons@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/compress-commons/-/compress-commons-5.0.1.tgz#e46723ebbab41b50309b27a0e0f6f3baed2d6590" + integrity sha512-MPh//1cERdLtqwO3pOFLeXtpuai0Y2WCd5AhtKxznqM7WtaMYaOEMSgn45d9D10sIHSfIKE603HlOp8OPGrvag== + dependencies: + crc-32 "^1.2.0" + crc32-stream "^5.0.0" + normalize-path "^3.0.0" + readable-stream "^3.6.0" + +computeds@^0.0.1: + version "0.0.1" + resolved "https://registry.yarnpkg.com/computeds/-/computeds-0.0.1.tgz#215b08a4ba3e08a11ff6eee5d6d8d7166a97ce2e" + integrity sha512-7CEBgcMjVmitjYo5q8JTJVra6X5mQ20uTThdK+0kR7UEaDrAWEQcRiBtWJzga4eRpP6afNwwLsX2SET2JhVB1Q== concat-map@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg== -concat-stream@^1.5.0, concat-stream@^1.5.1, concat-stream@^1.6.0, concat-stream@^1.6.2, concat-stream@~1.6.2: +concat-stream@^1.5.1, concat-stream@^1.6.0, concat-stream@^1.6.2, concat-stream@~1.6.2: version "1.6.2" resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34" integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw== @@ -7071,18 +7916,54 @@ concat-stream@^1.5.0, concat-stream@^1.5.1, concat-stream@^1.6.0, concat-stream@ readable-stream "^2.2.2" typedarray "^0.0.6" -config@^3.2.4: - version "3.3.9" - resolved "https://registry.yarnpkg.com/config/-/config-3.3.9.tgz#27fae95b43e0e1d5723e54143c090954d8e49572" - integrity sha512-G17nfe+cY7kR0wVpc49NCYvNtelm/pPy8czHoFkAgtV1lkmcp7DHtWCdDu+C9Z7gb2WVqa9Tm3uF9aKaPbCfhg== +concordance@5.0.4: + version "5.0.4" + resolved "https://registry.yarnpkg.com/concordance/-/concordance-5.0.4.tgz#9896073261adced72f88d60e4d56f8efc4bbbbd2" + integrity sha512-OAcsnTEYu1ARJqWVGwf4zh4JDfHZEaSNlNccFmt8YjB2l/n19/PF2viLINHc57vO4FKIAFl2FWASIGZZWZ2Kxw== dependencies: - json5 "^2.2.3" + date-time "^3.1.0" + esutils "^2.0.3" + fast-diff "^1.2.0" + js-string-escape "^1.0.1" + lodash "^4.17.15" + md5-hex "^3.0.1" + semver "^7.3.2" + well-known-symbols "^2.0.0" + +config-chain@^1.1.11: + version "1.1.13" + resolved "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.13.tgz#fad0795aa6a6cdaff9ed1b68e9dff94372c232f4" + integrity sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ== + dependencies: + ini "^1.3.4" + proto-list "~1.2.1" + +configstore@6.0.0, configstore@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/configstore/-/configstore-6.0.0.tgz#49eca2ebc80983f77e09394a1a56e0aca8235566" + integrity sha512-cD31W1v3GqUlQvbBCGcXmd2Nj9SvLDOP1oQ0YFuLETufzSPaKp11rYBsSOm7rCsW3OnIRAFM3OxRhceaXNYHkA== + dependencies: + dot-prop "^6.0.1" + graceful-fs "^4.2.6" + unique-string "^3.0.0" + write-file-atomic "^3.0.3" + xdg-basedir "^5.0.1" + +consola@^3.2.3: + version "3.2.3" + resolved "https://registry.yarnpkg.com/consola/-/consola-3.2.3.tgz#0741857aa88cfa0d6fd53f1cff0375136e98502f" + integrity sha512-I5qxpzLv+sJhTVEoLYNcTW+bThDCPsit0vLNKShZx6rLtpilNpmmeTPaeqJb9ZE9dV3DGaeby6Vuhrw38WjeyQ== console-browserify@^1.1.0: version "1.2.0" resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.2.0.tgz#67063cef57ceb6cf4993a2ab3a55840ae8c49336" integrity sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA== +console-control-strings@^1.0.0, console-control-strings@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e" + integrity sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ== + constant-case@^3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/constant-case/-/constant-case-3.0.4.tgz#3b84a9aeaf4cf31ec45e6bf5de91bdfb0589faf1" @@ -7097,7 +7978,7 @@ constants-browserify@^1.0.0: resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75" integrity sha512-xFxOwqIzR/e1k1gLiWEophSCMqXcwVHIH7akf7b/vxcUeGunlj3hvZaaqxwHsTgn+IndtkQJgSztIDWeumWJDQ== -content-disposition@0.5.4: +content-disposition@0.5.4, content-disposition@^0.5.3, content-disposition@^0.5.4: version "0.5.4" resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.4.tgz#8b82b4efac82512a02bb0b1dcec9d2c5e8eb5bfe" integrity sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ== @@ -7113,22 +7994,32 @@ content-hash@^2.5.2: multicodec "^0.5.5" multihashes "^0.4.15" -content-type@~1.0.4, content-type@~1.0.5: +content-type@1.0.5, content-type@~1.0.4, content-type@~1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.5.tgz#8b773162656d1d1086784c8f23a54ce6d73d7918" integrity sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA== -convert-source-map@^1.5.1, convert-source-map@^1.7.0: +convert-source-map@^1.5.1: 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-es@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/cookie-es/-/cookie-es-1.0.0.tgz#4759684af168dfc54365b2c2dda0a8d7ee1e4865" + integrity sha512-mWYvfOLrfEc996hlKcdABeIiPHUPC6DM2QYZdGGOvhOTbA3tjm2eBwqlJpoFdjC89NI4Qt6h0Pu06Mp+1Pj5OQ== + cookie-signature@1.0.6: version "1.0.6" resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c" integrity sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ== -cookie@0.5.0: +cookie@0.5.0, cookie@^0.5.0: version "0.5.0" resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.5.0.tgz#d1f5d71adec6558c58f389987c366aa47e994f8b" integrity sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw== @@ -7143,34 +8034,30 @@ cookiejar@^2.1.1: resolved "https://registry.yarnpkg.com/cookiejar/-/cookiejar-2.1.4.tgz#ee669c1fea2cf42dc31585469d193fef0d65771b" integrity sha512-LDx6oHrK+PhzLKJU9j5S7/Y3jM/mUHvD/DeI1WQmJn652iPC5Y4TBzC9l+5OMOXlyTTA+SmVUPm0HQUwpD5Jqw== -copy-concurrently@^1.0.0: - version "1.0.5" - resolved "https://registry.yarnpkg.com/copy-concurrently/-/copy-concurrently-1.0.5.tgz#92297398cae34937fcafd6ec8139c18051f0b5e0" - integrity sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A== - dependencies: - aproba "^1.1.1" - fs-write-stream-atomic "^1.0.8" - iferr "^0.1.5" - mkdirp "^0.5.1" - rimraf "^2.5.4" - run-queue "^1.0.0" - copy-descriptor@^0.1.0: version "0.1.1" resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d" integrity sha512-XgZ0pFcakEUlbwQEVNg3+QAis1FyTL3Qel9FYy8pSkQqoG3PNoT0bOCQtOXcOkur21r2Eq2kI+IE+gsmAEVlYw== -core-js-compat@^3.25.1: - version "3.30.1" - resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.30.1.tgz#961541e22db9c27fc48bfc13a3cafa8734171dfe" - integrity sha512-d690npR7MC6P0gq4npTl5n2VQeNAmUrJ90n+MHiKS7W2+xno4o3F5GDEuylSdi6EJ3VssibSGXOa1r3YXD3Mhw== +copy-template-dir@1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/copy-template-dir/-/copy-template-dir-1.4.0.tgz#cb2bd62415abe963a53bb867bb24379df3998112" + integrity sha512-xkXSJhvKz4MfLbVkZ7GyCaFo4ciB3uKI/HHzkGwj1eyTH5+7RTFxW5CE0irWAZgV5oFcO9hd6+NVXAtY9hlo7Q== dependencies: - browserslist "^4.21.5" + end-of-stream "^1.1.0" + graceful-fs "^4.1.3" + maxstache "^1.0.0" + maxstache-stream "^1.0.0" + mkdirp "^0.5.1" + noop2 "^2.0.0" + pump "^1.0.0" + readdirp "^2.0.0" + run-parallel "^1.1.4" core-js-pure@^3.0.1: - version "3.30.1" - resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.30.1.tgz#7d93dc89e7d47b8ef05d7e79f507b0e99ea77eec" - integrity sha512-nXBEVpmUnNRhz83cHd9JRQC52cTMcuXAmR56+9dSMpRdpeA4I1PX6yjmhd71Eyc/wXNsdBdUDIj1QTIeZpU5Tg== + version "3.35.0" + resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.35.0.tgz#4660033304a050215ae82e476bd2513a419fbb34" + integrity sha512-f+eRYmkou59uh7BPcyJ8MC76DiGhspj1KMxVIcF24tzP8NA9HVa1uC7BTW2tgx7E1QVCzDzsgp7kArrzhlz8Ew== core-js@^2.4.0, core-js@^2.5.0: version "2.6.12" @@ -7182,7 +8069,7 @@ core-util-is@1.0.2: resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" integrity sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ== -core-util-is@~1.0.0: +core-util-is@^1.0.3, core-util-is@~1.0.0: version "1.0.3" resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85" integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ== @@ -7195,16 +8082,16 @@ cors@^2.8.1: object-assign "^4" vary "^1" -cosmiconfig@6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-6.0.0.tgz#da4fee853c52f6b1e6935f41c1a2fc50bd4a9982" - integrity sha512-xb3ZL6+L8b9JLLCx3ZdoZy4+2ECphCMo2PwqgP1tlfVq6M6YReyzBJtvWWtbDSpNr9hn96pkCiZqUcFEc+54Qg== +cosmiconfig@7.0.1: + version "7.0.1" + resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.0.1.tgz#714d756522cace867867ccb4474c5d01bbae5d6d" + integrity sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ== dependencies: "@types/parse-json" "^4.0.0" - import-fresh "^3.1.0" + import-fresh "^3.2.1" parse-json "^5.0.0" path-type "^4.0.0" - yaml "^1.7.2" + yaml "^1.10.0" cosmiconfig@8.0.0: version "8.0.0" @@ -7227,21 +8114,52 @@ cosmiconfig@^7.0.0, cosmiconfig@^7.0.1: path-type "^4.0.0" yaml "^1.10.0" -cosmiconfig@^8.0.0: - version "8.1.3" - resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-8.1.3.tgz#0e614a118fcc2d9e5afc2f87d53cd09931015689" - integrity sha512-/UkO2JKI18b5jVMJUp0lvKFMpa/Gye+ZgZjKD+DGEN9y7NRcf/nK1A0sp67ONmKtnDCNMS44E6jrk0Yc3bDuUw== +cp-file@^10.0.0: + version "10.0.0" + resolved "https://registry.yarnpkg.com/cp-file/-/cp-file-10.0.0.tgz#bbae9ecb9f505951b862880d2901e1f56de7a4dc" + integrity sha512-vy2Vi1r2epK5WqxOLnskeKeZkdZvTKfFZQCplE3XWsP+SUJyd5XAUFC9lFgTjjXJF2GMne/UML14iEmkAaDfFg== dependencies: - import-fresh "^3.2.1" - js-yaml "^4.1.0" - parse-json "^5.0.0" - path-type "^4.0.0" + graceful-fs "^4.2.10" + nested-error-stacks "^2.1.1" + p-event "^5.0.1" + +cp-file@^9.1.0: + version "9.1.0" + resolved "https://registry.yarnpkg.com/cp-file/-/cp-file-9.1.0.tgz#e98e30db72d57d47b5b1d444deb70d05e5684921" + integrity sha512-3scnzFj/94eb7y4wyXRWwvzLFaQp87yyfTnChIjlfYrVqp5lVO3E2hIJMeQIltUT0K2ZAB3An1qXcBmwGyvuwA== + dependencies: + graceful-fs "^4.1.2" + make-dir "^3.0.0" + nested-error-stacks "^2.0.0" + p-event "^4.1.0" + +cpy@^9.0.0: + version "9.0.1" + resolved "https://registry.yarnpkg.com/cpy/-/cpy-9.0.1.tgz#7f3ad0ad5bafe0bc70645c4bb567969927cadb9f" + integrity sha512-D9U0DR5FjTCN3oMTcFGktanHnAG5l020yvOCR1zKILmAyPP7I/9pl6NFgRbDcmSENtbK1sQLBz1p9HIOlroiNg== + dependencies: + arrify "^3.0.0" + cp-file "^9.1.0" + globby "^13.1.1" + junk "^4.0.0" + micromatch "^4.0.4" + nested-error-stacks "^2.1.0" + p-filter "^3.0.0" + p-map "^5.3.0" crc-32@^1.2.0: version "1.2.2" resolved "https://registry.yarnpkg.com/crc-32/-/crc-32-1.2.2.tgz#3cad35a934b8bf71f25ca524b6da51fb7eace2ff" integrity sha512-ROmzCKrTnOwybPcJApAA6WBWij23HVfGVNKqqrZpuyZOHqK2CwHSvpGuyt/UNNvaIjEd8X5IFGp4Mh+Ie1IHJQ== +crc32-stream@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/crc32-stream/-/crc32-stream-5.0.0.tgz#a97d3a802c8687f101c27cc17ca5253327354720" + integrity sha512-B0EPa1UK+qnpBZpG+7FgPCu0J2ETLpXq09o9BkLkEAhdB6Z61Qo4pJ3JYu0c+Qi+/SAL7QThqnzS06pmSSyZaw== + dependencies: + crc-32 "^1.2.0" + readable-stream "^3.4.0" + create-ecdh@^4.0.0: version "4.0.4" resolved "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.4.tgz#d6e7f4bffa66736085a0762fd3a632684dabcc4e" @@ -7278,6 +8196,20 @@ create-require@^1.1.0, create-require@^1.1.1: resolved "https://registry.yarnpkg.com/create-require/-/create-require-1.1.1.tgz#c1d7e8f1e5f6cfc9ff65f9cd352d37348756c333" integrity sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ== +cron-parser@4.8.1: + version "4.8.1" + resolved "https://registry.yarnpkg.com/cron-parser/-/cron-parser-4.8.1.tgz#47062ea63d21d78c10ddedb08ea4c5b6fc2750fb" + integrity sha512-jbokKWGcyU4gl6jAfX97E1gDpY12DJ1cLJZmoDzaAln/shZ+S3KBFBuA2Q6WeUN4gJf/8klnV1EfvhA2lK5IRQ== + dependencies: + luxon "^3.2.1" + +cron-parser@^4.1.0: + version "4.9.0" + resolved "https://registry.yarnpkg.com/cron-parser/-/cron-parser-4.9.0.tgz#0340694af3e46a0894978c6f52a6dbb5c0f11ad5" + integrity sha512-p0SaNjrHOnQeR8/VnfGbmg9te2kfyYSQ7Sc/j/6DtPL3JQvKxmjO9TSjNFpujqV3vEYYBvNNvXSxzyksBWAx1Q== + dependencies: + luxon "^3.2.1" + cross-fetch@^2.1.0, cross-fetch@^2.1.1: version "2.2.6" resolved "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-2.2.6.tgz#2ef0bb39a24ac034787965c457368a28730e220a" @@ -7287,11 +8219,20 @@ cross-fetch@^2.1.0, cross-fetch@^2.1.1: whatwg-fetch "^2.0.4" cross-fetch@^3.1.4, cross-fetch@^3.1.5: - version "3.1.5" - resolved "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-3.1.5.tgz#e1389f44d9e7ba767907f7af8454787952ab534f" - integrity sha512-lvb1SBsI0Z7GDwmuid+mU3kWVBwTVUbe7S0H52yaaAdQOXq2YktTCZdlAcNKFzE6QtRz0snpw9bNiPeOIkkQvw== + version "3.1.8" + resolved "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-3.1.8.tgz#0327eba65fd68a7d119f8fb2bf9334a1a7956f82" + integrity sha512-cvA+JwZoU0Xq+h6WkMvAUqPEYy92Obet6UdKLfW60qn99ftItKjB5T+BkyWOFWe2pUyfQ+IJHmpOTznqk1M6Kg== + dependencies: + node-fetch "^2.6.12" + +cross-spawn@7.0.3, cross-spawn@^7.0.0, cross-spawn@^7.0.2, cross-spawn@^7.0.3: + version "7.0.3" + resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" + integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w== dependencies: - node-fetch "2.6.7" + path-key "^3.1.0" + shebang-command "^2.0.0" + which "^2.0.1" cross-spawn@^6.0.5: version "6.0.5" @@ -7304,14 +8245,10 @@ 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: - version "7.0.3" - resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" - integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w== - dependencies: - path-key "^3.1.0" - shebang-command "^2.0.0" - which "^2.0.1" +"crypt@>= 0.0.1": + version "0.0.2" + resolved "https://registry.yarnpkg.com/crypt/-/crypt-0.0.2.tgz#88d7ff7ec0dfb86f713dc87bbb42d044d3e6c41b" + integrity sha512-mCxBlsHFYh9C+HVpiEacem8FEBnMXgU9gy4zmNC+SXAZNB/1idgp/aulFJ4FgCi7GPEVbfyng092GqL2k2rmow== crypto-browserify@3.12.0, crypto-browserify@^3.11.0: version "3.12.0" @@ -7330,16 +8267,67 @@ crypto-browserify@3.12.0, crypto-browserify@^3.11.0: randombytes "^2.0.0" randomfill "^1.0.3" -crypto-js@^4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/crypto-js/-/crypto-js-4.1.1.tgz#9e485bcf03521041bd85844786b83fb7619736cf" - integrity sha512-o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw== +crypto-js@^4.1.1: + version "4.2.0" + resolved "https://registry.yarnpkg.com/crypto-js/-/crypto-js-4.2.0.tgz#4d931639ecdfd12ff80e8186dba6af2c2e856631" + integrity sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q== + +crypto-random-string@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-4.0.0.tgz#5a3cc53d7dd86183df5da0312816ceeeb5bb1fc2" + integrity sha512-x8dy3RnvYdlUcPOjkEHqozhiwzKNSq7GcPuXFbnyMOCHxX8V3OgIg/pYuabl2sbUPfIJaeAQB7PMOK8DFIdoRA== + dependencies: + type-fest "^1.0.1" + +css-select@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/css-select/-/css-select-5.1.0.tgz#b8ebd6554c3637ccc76688804ad3f6a6fdaea8a6" + integrity sha512-nwoRF1rvRRnnCqqY7updORDsuqKzqYJ28+oSMaJMMgOauh3fvwHqMS7EZpIPqK8GL+g9mKxF1vP/ZjSeNjEVHg== + dependencies: + boolbase "^1.0.0" + css-what "^6.1.0" + domhandler "^5.0.2" + domutils "^3.0.1" + nth-check "^2.0.1" + +css-tree@^2.3.1: + version "2.3.1" + resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-2.3.1.tgz#10264ce1e5442e8572fc82fbe490644ff54b5c20" + integrity sha512-6Fv1DV/TYw//QF5IzQdqsNDjx/wc8TrMBZsqjL9eW01tWb7R7k/mq+/VXfJCl7SoD5emsJop9cOByJZfs8hYIw== + dependencies: + mdn-data "2.0.30" + source-map-js "^1.0.1" + +css-tree@~2.2.0: + version "2.2.1" + resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-2.2.1.tgz#36115d382d60afd271e377f9c5f67d02bd48c032" + integrity sha512-OA0mILzGc1kCOCSJerOeqDxDQ4HOh+G8NbOJFOTgOCzpw7fCBubk0fEyxp8AgOL/jvLgYA/uV0cMbe43ElF1JA== + dependencies: + mdn-data "2.0.28" + source-map-js "^1.0.1" + +css-what@^6.1.0: + version "6.1.0" + resolved "https://registry.yarnpkg.com/css-what/-/css-what-6.1.0.tgz#fb5effcf76f1ddea2c81bdfaa4de44e79bac70f4" + integrity sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw== cssesc@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee" integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg== +cssfilter@0.0.10: + version "0.0.10" + resolved "https://registry.yarnpkg.com/cssfilter/-/cssfilter-0.0.10.tgz#c6d2672632a2e5c83e013e6864a42ce8defd20ae" + integrity sha512-FAaLDaplstoRsDR8XGYH51znUN0UY7nMc6Z9/fvE8EXGwvJE9hu7W2vHwx1+bd6gCYnln9nLbzxFTrcO9YQDZw== + +csso@^5.0.5: + version "5.0.5" + resolved "https://registry.yarnpkg.com/csso/-/csso-5.0.5.tgz#f9b7fe6cc6ac0b7d90781bb16d5e9874303e2ca6" + integrity sha512-0LrrStPOdJj+SPCCrGhzryycLjwcgUSHBtxNA8aIDxf0GLsRh1cKYhB00Gd1lDOS4yGH69+SNn13+TWbVHETFQ== + dependencies: + css-tree "~2.2.0" + cssom@^0.5.0: version "0.5.0" resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.5.0.tgz#d254fa92cd8b6fbd83811b9fbaed34663cc17c36" @@ -7357,15 +8345,20 @@ cssstyle@^2.3.0: dependencies: cssom "~0.3.6" -csstype@^2.6.8: - version "2.6.21" - resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.21.tgz#2efb85b7cc55c80017c66a5ad7cbd931fda3a90e" - integrity sha512-Z1PhmomIfypOpoMjRQB70jfvy/wxT50qW08YXO5lMIJkrdq4yOTR+AW7FqutScmB9NkLwxo+jU+kZLbofZZq/w== +csstype@^3.1.3: + version "3.1.3" + resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.3.tgz#d80ff294d114fb0e6ac500fbf85b60137d7eff81" + integrity sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw== + +cycle@1.0.x: + version "1.0.3" + resolved "https://registry.yarnpkg.com/cycle/-/cycle-1.0.3.tgz#21e80b2be8580f98b468f379430662b046c34ad2" + integrity sha512-TVF6svNzeQCOpjCqsy0/CSy8VgObG3wXusJ73xW2GbG5rGx7lC8zxDSURicsXI2UsGdi2L0QNRCi745/wUDvsA== cyclist@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-1.0.1.tgz#596e9698fd0c80e12038c2b82d6eb1b35b6224d9" - integrity sha512-NJGVKPS81XejHcLhaLJS7plab0fK3slPh11mESeeDq2W4ZI5kUKK/LRRdVDvjJseojbPB7ZwjnyOybg3Igea/A== + version "1.0.2" + resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-1.0.2.tgz#673b5f233bf34d8e602b949429f8171d9121bea3" + integrity sha512-0sVXIohTfLqVIW3kb/0n6IiWF3Ifj5nm2XaSrLq2DI6fKIGa2fYAZdk917rUneaeLVpYfFcyXE2ft0fe3remsA== d@1, d@^1.0.1: version "1.0.1" @@ -7382,6 +8375,11 @@ dashdash@^1.12.0: dependencies: assert-plus "^1.0.0" +data-uri-to-buffer@^4.0.0: + version "4.0.1" + resolved "https://registry.yarnpkg.com/data-uri-to-buffer/-/data-uri-to-buffer-4.0.1.tgz#d8feb2b2881e6a4f58c2e08acfd0e2834e26222e" + integrity sha512-0R9ikRb668HB7QDxT1vkpuUBtqc53YyAwMwGeUFKRojY/NWKvdZ+9UYtRfGmhqNbRkTSVpMbmyhXipFFv2cb/A== + data-urls@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-3.0.2.tgz#9cf24a477ae22bcef5cd5f6f0bfbc1d2d3be9143" @@ -7391,7 +8389,7 @@ data-urls@^3.0.2: whatwg-mimetype "^3.0.0" whatwg-url "^11.0.0" -dataloader@2.2.2, dataloader@^2.2.2: +dataloader@^2.2.2: version "2.2.2" resolved "https://registry.yarnpkg.com/dataloader/-/dataloader-2.2.2.tgz#216dc509b5abe39d43a9b9d97e6e5e473dfbe3e0" integrity sha512-8YnDaaf7N3k/q5HnTJVuzSyLETjoZjVmHc4AeKAzOvKHEFQKcn64OKBfzHYtE9zGjctNM7V9I0MfnUVLpi7M5g== @@ -7433,11 +8431,23 @@ datastore-level@~0.14.0: interface-datastore "^0.8.0" level "^5.0.1" +date-time@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/date-time/-/date-time-3.1.0.tgz#0d1e934d170579f481ed8df1e2b8ff70ee845e1e" + integrity sha512-uqCUKXE5q1PNBXjPqvwhwJf9SwMoAHBgWJ6DcrnS5o+W2JOiIILl0JEdVD8SGujrNS02GGxgwAg2PN2zONgtjg== + dependencies: + time-zone "^1.0.0" + de-indent@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/de-indent/-/de-indent-1.0.2.tgz#b2038e846dc33baa5796128d0804b455b8c1e21d" integrity sha512-e/1zu3xH5MQryN2zdVaF0OrdNLUbvWxzMbi+iNA6Bky7l1RoP8a2fIbRocyHclXt/arDrrR6lL3TqFD9pMQTsg== +death@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/death/-/death-1.1.0.tgz#01aa9c401edd92750514470b8266390c66c67318" + integrity sha512-vsV6S4KVHvTGxbEcij7hkWRv0It+sGGWVOM67dQde/o5Xjnr+KmLjxWJii2uEObIrt1CcM9w0Yaovx+iOlIL+w== + debounce@^1.2.0: version "1.2.1" resolved "https://registry.yarnpkg.com/debounce/-/debounce-1.2.1.tgz#38881d8f4166a5c5848020c11827b834bcb3e0a5" @@ -7457,27 +8467,27 @@ debug@3.2.6: dependencies: ms "^2.1.1" -debug@4, debug@4.3.4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.3, debug@^4.3.4: +debug@4, debug@4.3.4, debug@^4.0.0, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.3, debug@^4.3.4: version "4.3.4" resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== dependencies: ms "2.1.2" -debug@4.3.1: - version "4.3.1" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz#f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee" - integrity sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ== - dependencies: - ms "2.1.2" - -debug@^3.1.0, debug@^3.2.6: +debug@^3.2.6: version "3.2.7" resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a" integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ== dependencies: ms "^2.1.1" +decache@4.6.2: + version "4.6.2" + resolved "https://registry.yarnpkg.com/decache/-/decache-4.6.2.tgz#c1df1325a2f36d53922e08f33380f083148199cd" + integrity sha512-2LPqkLeu8XWHU8qNCS3kcF6sCcb5zIzvWaAHYSvPfwhdd7mHuah29NssMzrTYyHN4F5oFy2ko9OBYxegtU0FEw== + dependencies: + callsite "^1.0.0" + decamelize-keys@^1.1.0: version "1.1.1" resolved "https://registry.yarnpkg.com/decamelize-keys/-/decamelize-keys-1.1.1.tgz#04a2d523b2f18d80d0158a43b895d56dff8d19d8" @@ -7486,7 +8496,7 @@ decamelize-keys@^1.1.0: decamelize "^1.1.0" map-obj "^1.0.0" -decamelize@^1.1.0, decamelize@^1.1.1, decamelize@^1.2.0: +decamelize@^1.1.0, decamelize@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" integrity sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA== @@ -7520,7 +8530,7 @@ decompress-response@^6.0.0: dependencies: mimic-response "^3.1.0" -deep-eql@^4.1.2: +deep-eql@^4.0.1, deep-eql@^4.1.3: version "4.1.3" resolved "https://registry.yarnpkg.com/deep-eql/-/deep-eql-4.1.3.tgz#7c7775513092f7df98d8df9996dd085eb668cc6d" integrity sha512-WaEtAOpRA1MQ0eohqZjpGD8zdI0Ovsm8mmFhaDN8dvDZzyoUMcYDnf5Y6iu7HTXxf8JDS23qWa4a+hKCDyOPzw== @@ -7528,22 +8538,32 @@ deep-eql@^4.1.2: type-detect "^4.0.0" deep-equal@~1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.1.1.tgz#b5c98c942ceffaf7cb051e24e1434a25a2e6076a" - integrity sha512-yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g== + version "1.1.2" + resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.1.2.tgz#78a561b7830eef3134c7f6f3a3d6af272a678761" + integrity sha512-5tdhKF6DbU7iIzrIOa1AOUt39ZRm13cmL1cGEh//aqR8x9+tNfbywRf0n5FD/18OKMdo7DNEtrX2t22ZAkI+eg== dependencies: - is-arguments "^1.0.4" - is-date-object "^1.0.1" - is-regex "^1.0.4" - object-is "^1.0.1" + is-arguments "^1.1.1" + is-date-object "^1.0.5" + is-regex "^1.1.4" + object-is "^1.1.5" object-keys "^1.1.1" - regexp.prototype.flags "^1.2.0" + regexp.prototype.flags "^1.5.1" + +deep-extend@^0.6.0, deep-extend@~0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac" + integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA== deep-is@^0.1.3, deep-is@~0.1.3: version "0.1.4" resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831" integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ== +deepmerge@^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.4" resolved "https://registry.yarnpkg.com/defaults/-/defaults-1.0.4.tgz#b0b02062c1e2aa62ff5d9528f0f98baa90978d7a" @@ -7584,11 +8604,26 @@ deferred-leveldown@~5.3.0: abstract-leveldown "~6.2.1" inherits "^2.0.3" -define-properties@^1.1.3, define-properties@^1.1.4: - version "1.2.0" - resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.2.0.tgz#52988570670c9eacedd8064f4a990f2405849bd5" - integrity sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA== +define-data-property@^1.0.1, define-data-property@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/define-data-property/-/define-data-property-1.1.1.tgz#c35f7cd0ab09883480d12ac5cb213715587800b3" + integrity sha512-E7uGkTzkk1d0ByLeSc6ZsFS79Axg+m1P/VsgYsxHgiuc3tFSj+MjMIwe90FC4lOAZzNBdY7kkO2P2wKdsQ1vgQ== + dependencies: + get-intrinsic "^1.2.1" + gopd "^1.0.1" + has-property-descriptors "^1.0.0" + +define-lazy-prop@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz#3f7ae421129bcaaac9bc74905c98a0009ec9ee7f" + integrity sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og== + +define-properties@^1.1.3, define-properties@^1.2.0, define-properties@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.2.1.tgz#10781cc616eb951a80a034bafcaa7377f6af2b6c" + integrity sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg== dependencies: + define-data-property "^1.0.1" has-property-descriptors "^1.0.0" object-keys "^1.1.1" @@ -7619,6 +8654,11 @@ defined@~1.0.1: resolved "https://registry.yarnpkg.com/defined/-/defined-1.0.1.tgz#c0b9db27bfaffd95d6f61399419b893df0f91ebf" integrity sha512-hsBd2qSVCRE+5PmNdHt1uzyrFu5d3RwmFDKzyNZMFq/EwDNJF7Ee5+D5oEKF0hU6LhtoUF1macFvOe4AskQC1Q== +defu@^6.1.3, defu@^6.1.4: + version "6.1.4" + resolved "https://registry.yarnpkg.com/defu/-/defu-6.1.4.tgz#4e0c9cf9ff68fe5f3d7f2765cc1a012dfdcb0479" + integrity sha512-mEQCMmwJu317oSz8CwdIOdwf3xMif1ttiM8LTufzc3g6kR+9Pe236twL8j3IYT1F7GfRgGcW6MWxzZjLIkuHIg== + delay@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/delay/-/delay-5.0.0.tgz#137045ef1b96e5071060dd5be60bf9334436bd1d" @@ -7629,29 +8669,54 @@ delayed-stream@~1.0.0: resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" integrity sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ== +delegates@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a" + integrity sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ== + delimit-stream@0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/delimit-stream/-/delimit-stream-0.1.0.tgz#9b8319477c0e5f8aeb3ce357ae305fc25ea1cd2b" integrity sha512-a02fiQ7poS5CnjiJBAsjGLPp5EwVoGHNeu9sziBd9huppRfsAFIpv5zNLv0V1gbop53ilngAf5Kf331AwcoRBQ== +denque@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/denque/-/denque-2.1.0.tgz#e93e1a6569fb5e66f16a3c2a2964617d349d6ab1" + integrity sha512-HVQE3AAb/pxF8fQAoiqpvg9i3evqug3hoiwakOyZAwJm+6vZehbkYXZ0l4JxS+I3QxM97v5aaRNhj8v5oBhekw== + depd@2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df" integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw== +depd@~1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9" + integrity sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ== + dependency-graph@^0.11.0: version "0.11.0" resolved "https://registry.yarnpkg.com/dependency-graph/-/dependency-graph-0.11.0.tgz#ac0ce7ed68a54da22165a85e97a01d53f5eb2e27" integrity sha512-JeMq7fEshyepOWDfcfHK06N3MhyPhz++vtqWhMT5O9A3K42rdsEDpfdVqjaqaAhsw6a+ZqeDvQVtD0hFHQWrzg== +deprecation@^2.0.0: + version "2.3.1" + resolved "https://registry.yarnpkg.com/deprecation/-/deprecation-2.3.1.tgz#6368cbdb40abf3373b525ac87e4a260c3a700919" + integrity sha512-xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ== + des.js@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/des.js/-/des.js-1.0.1.tgz#5382142e1bdc53f85d86d53e5f4aa7deb91e0843" - integrity sha512-Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA== + version "1.1.0" + resolved "https://registry.yarnpkg.com/des.js/-/des.js-1.1.0.tgz#1d37f5766f3bbff4ee9638e871a8768c173b81da" + integrity sha512-r17GxjhUCjSRy8aiJpr8/UadFIzMzJGexI3Nmz4ADi9LYSFx4gTBp80+NaX/YsXWWLhpZ7v/v/ubEc/bCNfKwg== dependencies: inherits "^2.0.1" minimalistic-assert "^1.0.0" +destr@^2.0.1, destr@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/destr/-/destr-2.0.2.tgz#8d3c0ee4ec0a76df54bc8b819bca215592a8c218" + integrity sha512-65AlobnZMiCET00KaFFjUefxDX0khFA/E4myqZ7a6Sq1yZtR8+FVIvilVX66vF2uobSumxooYZChiRPCKNqhmg== + destroy@1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.2.0.tgz#4803735509ad8be552934c67df614f94e66fa015" @@ -7674,6 +8739,89 @@ detect-indent@^6.0.0: resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-6.1.0.tgz#592485ebbbf6b3b1ab2be175c8393d04ca0d57e6" integrity sha512-reYkTUJAZb9gUuZ2RvVCNhVHdg62RHnJ7WJl8ftMi4diZ6NWlciOzQN88pUhSELEwflJht4oQDv0F0BMlwaYtA== +detect-libc@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b" + integrity sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg== + +detect-libc@^2.0.0, detect-libc@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.0.2.tgz#8ccf2ba9315350e1241b88d0ac3b0e1fbd99605d" + integrity sha512-UX6sGumvvqSaXgdKGUsgZWqcUyIXZ/vZTrlRT/iobiKhGL0zL4d3osHj3uqllWJK+i+sixDS/3COVEOFbupFyw== + +detect-port@^1.3.0: + version "1.5.1" + resolved "https://registry.yarnpkg.com/detect-port/-/detect-port-1.5.1.tgz#451ca9b6eaf20451acb0799b8ab40dff7718727b" + integrity sha512-aBzdj76lueB6uUst5iAs7+0H/oOjqI5D16XUWxlWMIMROhcM0rfsNVk93zTngq1dDNpoXRr++Sus7ETAExppAQ== + dependencies: + address "^1.0.1" + debug "4" + +detective-amd@^5.0.2: + version "5.0.2" + resolved "https://registry.yarnpkg.com/detective-amd/-/detective-amd-5.0.2.tgz#579900f301c160efe037a6377ec7e937434b2793" + integrity sha512-XFd/VEQ76HSpym80zxM68ieB77unNuoMwopU2TFT/ErUk5n4KvUTwW4beafAVUugrjV48l4BmmR0rh2MglBaiA== + dependencies: + ast-module-types "^5.0.0" + escodegen "^2.0.0" + get-amd-module-type "^5.0.1" + node-source-walk "^6.0.1" + +detective-cjs@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/detective-cjs/-/detective-cjs-5.0.1.tgz#836ad51c6de4863efc7c419ec243694f760ff8b2" + integrity sha512-6nTvAZtpomyz/2pmEmGX1sXNjaqgMplhQkskq2MLrar0ZAIkHMrDhLXkRiK2mvbu9wSWr0V5/IfiTrZqAQMrmQ== + dependencies: + ast-module-types "^5.0.0" + node-source-walk "^6.0.0" + +detective-es6@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/detective-es6/-/detective-es6-4.0.1.tgz#38d5d49a6d966e992ef8f2d9bffcfe861a58a88a" + integrity sha512-k3Z5tB4LQ8UVHkuMrFOlvb3GgFWdJ9NqAa2YLUU/jTaWJIm+JJnEh4PsMc+6dfT223Y8ACKOaC0qcj7diIhBKw== + dependencies: + node-source-walk "^6.0.1" + +detective-postcss@^6.1.3: + version "6.1.3" + resolved "https://registry.yarnpkg.com/detective-postcss/-/detective-postcss-6.1.3.tgz#51a2d4419327ad85d0af071c7054c79fafca7e73" + integrity sha512-7BRVvE5pPEvk2ukUWNQ+H2XOq43xENWbH0LcdCE14mwgTBEAMoAx+Fc1rdp76SmyZ4Sp48HlV7VedUnP6GA1Tw== + dependencies: + is-url "^1.2.4" + postcss "^8.4.23" + postcss-values-parser "^6.0.2" + +detective-sass@^5.0.3: + version "5.0.3" + resolved "https://registry.yarnpkg.com/detective-sass/-/detective-sass-5.0.3.tgz#63e54bc9b32f4bdbd9d5002308f9592a3d3a508f" + integrity sha512-YsYT2WuA8YIafp2RVF5CEfGhhyIVdPzlwQgxSjK+TUm3JoHP+Tcorbk3SfG0cNZ7D7+cYWa0ZBcvOaR0O8+LlA== + dependencies: + gonzales-pe "^4.3.0" + node-source-walk "^6.0.1" + +detective-scss@^4.0.3: + version "4.0.3" + resolved "https://registry.yarnpkg.com/detective-scss/-/detective-scss-4.0.3.tgz#79758baa0158f72bfc4481eb7e21cc3b5f1ea6eb" + integrity sha512-VYI6cHcD0fLokwqqPFFtDQhhSnlFWvU614J42eY6G0s8c+MBhi9QAWycLwIOGxlmD8I/XvGSOUV1kIDhJ70ZPg== + dependencies: + gonzales-pe "^4.3.0" + node-source-walk "^6.0.1" + +detective-stylus@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/detective-stylus/-/detective-stylus-4.0.0.tgz#ce97b6499becdc291de7b3c11df8c352c1eee46e" + integrity sha512-TfPotjhszKLgFBzBhTOxNHDsutIxx9GTWjrL5Wh7Qx/ydxKhwUrlSFeLIn+ZaHPF+h0siVBkAQSuy6CADyTxgQ== + +detective-typescript@^11.1.0: + version "11.1.0" + resolved "https://registry.yarnpkg.com/detective-typescript/-/detective-typescript-11.1.0.tgz#2deea5364cae1f0d9d3688bc596e662b049438cc" + integrity sha512-Mq8egjnW2NSCkzEb/Az15/JnBI/Ryyl6Po0Y+0mABTFvOS6DAyUGRZqz1nyhu4QJmWWe0zaGs/ITIBeWkvCkGw== + dependencies: + "@typescript-eslint/typescript-estree" "^5.59.5" + ast-module-types "^5.0.0" + node-source-walk "^6.0.1" + typescript "^5.0.4" + didyoumean@^1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/didyoumean/-/didyoumean-1.2.2.tgz#989346ffe9e839b4555ecf5666edea0d3e8ad037" @@ -7698,6 +8846,13 @@ diffie-hellman@^5.0.0: miller-rabin "^4.0.0" randombytes "^2.0.0" +difflib@^0.2.4: + version "0.2.4" + resolved "https://registry.yarnpkg.com/difflib/-/difflib-0.2.4.tgz#b5e30361a6db023176d562892db85940a718f47e" + integrity sha512-9YVwmMb0wQHQNr5J9m6BSj6fk4pfGITGQOOs+D9Fl+INODWFOfvhIU1hNv6GgR1RBoC/9NJcwu77zShxV0kT7w== + dependencies: + heap ">= 0.2.0" + dijkstrajs@^1.0.1: version "1.0.3" resolved "https://registry.yarnpkg.com/dijkstrajs/-/dijkstrajs-1.0.3.tgz#4c8dbdea1f0f6478bff94d9c49c784d623e4fc23" @@ -7724,16 +8879,6 @@ dns-over-http-resolver@^1.2.3: native-fetch "^3.0.0" receptacle "^1.3.2" -dns-over-http-resolver@^2.1.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/dns-over-http-resolver/-/dns-over-http-resolver-2.1.1.tgz#a3ff3fd7614cea7a4b72594eaf12fb3c85080456" - integrity sha512-Lm/eXB7yAQLJ5WxlBGwYfBY7utduXPZykcSmcG6K7ozM0wrZFvxZavhT6PqI0kd/5CUTfev/RrEFQqyU4CGPew== - dependencies: - debug "^4.3.1" - native-fetch "^4.0.2" - receptacle "^1.3.2" - undici "^5.12.0" - docker-compose@0.23.19: version "0.23.19" resolved "https://registry.yarnpkg.com/docker-compose/-/docker-compose-0.23.19.tgz#9947726e2fe67bdfa9e8efe1ff15aa0de2e10eb8" @@ -7767,20 +8912,29 @@ doctrine@^3.0.0: dependencies: esutils "^2.0.2" +dom-serializer@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-2.0.0.tgz#e41b802e1eedf9f6cae183ce5e622d789d7d8e53" + integrity sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg== + dependencies: + domelementtype "^2.3.0" + domhandler "^5.0.2" + entities "^4.2.0" + dom-walk@^0.1.0: version "0.1.2" resolved "https://registry.yarnpkg.com/dom-walk/-/dom-walk-0.1.2.tgz#0c548bef048f4d1f2a97249002236060daa3fd84" integrity sha512-6QvTW9mrGeIegrFXdtQi9pk7O/nSK6lSdXW2eqUspN5LWD7UTji2Fqw5V2YLjBpHEoU9Xl/eUWNpDeZvoyOv2w== -domain-browser@^1.1.1: - version "1.2.0" - resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.2.0.tgz#3d31f50191a6749dd1375a7f522e823d42e54eda" - integrity sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA== - domain-browser@^4.22.0: - version "4.22.0" - resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-4.22.0.tgz#6ddd34220ec281f9a65d3386d267ddd35c491f9f" - integrity sha512-IGBwjF7tNk3cwypFNH/7bfzBcgSCbaMOD3GsaY1AU/JRrnHnYgEM0+9kQt52iZxjNsjBtJYtao146V+f8jFZNw== + version "4.23.0" + resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-4.23.0.tgz#427ebb91efcb070f05cffdfb8a4e9a6c25f8c94b" + integrity sha512-ArzcM/II1wCCujdCNyQjXrAFwS4mrLh4C7DZWlaI8mdh7h3BfKdNd3bKXITfl2PT9FtfQqaGvhi1vPRQPimjGA== + +domelementtype@^2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.3.0.tgz#5c45e8e869952626331d7aab326d01daf65d589d" + integrity sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw== domexception@^4.0.0: version "4.0.0" @@ -7789,6 +8943,22 @@ domexception@^4.0.0: dependencies: webidl-conversions "^7.0.0" +domhandler@^5.0.2, domhandler@^5.0.3: + version "5.0.3" + resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-5.0.3.tgz#cc385f7f751f1d1fc650c21374804254538c7d31" + integrity sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w== + dependencies: + domelementtype "^2.3.0" + +domutils@^3.0.1: + version "3.1.0" + resolved "https://registry.yarnpkg.com/domutils/-/domutils-3.1.0.tgz#c47f551278d3dc4b0b1ab8cbb42d751a6f0d824e" + integrity sha512-H78uMmQtI2AhgDJjWeQmHwJJ2bLPD3GMmO7Zja/ZZh84wkm+4ut+IUnUdRa8uCGX88DiVx1j6FRe1XfxEgjEZA== + dependencies: + dom-serializer "^2.0.0" + domelementtype "^2.3.0" + domhandler "^5.0.3" + dot-case@^3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/dot-case/-/dot-case-3.0.4.tgz#9b2b670d00a431667a8a75ba29cd1b98809ce751" @@ -7805,11 +8975,35 @@ dot-object@^2.1.4: commander "^4.0.0" glob "^7.1.5" -dotenv@^16.0.0: +dot-prop@7.2.0, dot-prop@^7.0.0, dot-prop@^7.2.0: + version "7.2.0" + resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-7.2.0.tgz#468172a3529779814d21a779c1ba2f6d76609809" + integrity sha512-Ol/IPXUARn9CSbkrdV4VJo7uCy1I3VuSiWCaFSg+8BdUOzF9n3jefIpcgAydvUZbTdEBZs2vEiTiS9m61ssiDA== + dependencies: + type-fest "^2.11.2" + +dot-prop@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-6.0.1.tgz#fc26b3cf142b9e59b74dbd39ed66ce620c681083" + integrity sha512-tE7ztYzXHIeyvc7N+hR3oi7FIbf/NIjVP9hmAt3yMXzrQ072/fpjGLx2GxNxGxUl5V73MEqYzioOMoVhGMJ5cA== + dependencies: + is-obj "^2.0.0" + +dotenv@16.0.3: version "16.0.3" resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-16.0.3.tgz#115aec42bac5053db3c456db30cc243a5a836a07" integrity sha512-7GO6HghkA5fYG9TYnNxi14/7K9f5occMlp3zXAuSxn7CKCxt9xbNWG7yF8hTCSUchlfWSe3uLmlPfigevRItzQ== +dotenv@^16.0.0, dotenv@^16.3.1: + version "16.3.1" + resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-16.3.1.tgz#369034de7d7e5b120972693352a3bf112172cc3e" + integrity sha512-IPzF4w4/Rd94bA9imS68tZBaYyBWSCE47V1RGuMrB94iyTOIEwRmVL2x/4An+6mETpLrKJ5hQkB8W4kFAadeIQ== + +dotenv@^16.4.5: + version "16.4.5" + resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-16.4.5.tgz#cdd3b3b604cb327e286b4762e13502f717cb099f" + integrity sha512-ZmdL2rui+eB2YwhsWzjInR8LldtZHGDoQ1ugH85ppHKwpUHL7j7rN0Ti9NCnGiQbhaZ11FpR+7ao1dNsmduNUg== + dotenv@^8.2.0: version "8.6.0" resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-8.6.0.tgz#061af664d19f7f4d8fc6e4ff9b584ce237adcb8b" @@ -7823,25 +9017,15 @@ dotignore@~0.1.2: minimatch "^3.0.4" dset@^3.1.2: - version "3.1.2" - resolved "https://registry.yarnpkg.com/dset/-/dset-3.1.2.tgz#89c436ca6450398396dc6538ea00abc0c54cd45a" - integrity sha512-g/M9sqy3oHe477Ar4voQxWtaPIFw1jTdKZuomOjhCcBx9nHUNn0pu6NopuFFrTh/TRZIKEj+76vLWFu9BNKk+Q== + version "3.1.3" + resolved "https://registry.yarnpkg.com/dset/-/dset-3.1.3.tgz#c194147f159841148e8e34ca41f638556d9542d2" + integrity sha512-20TuZZHCEZ2O71q9/+8BwKwZ0QtD9D8ObhrihJPr+vLLYlSuAU3/zL4cSlgbfeoGHTjCSJBa7NGcrF9/Bx/WJQ== duplexer3@^0.1.4: version "0.1.5" resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.5.tgz#0b5e4d7bad5de8901ea4440624c8e1d20099217e" integrity sha512-1A8za6ws41LQgv9HrE/66jyC5yuSjQ3L/KOpFtoBilsAK2iA2wuS5rTt1OCzIvtS2V7nVmedsUU+DGRcjBmOYA== -duplexify@^3.4.2, duplexify@^3.6.0: - version "3.7.1" - resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.7.1.tgz#2a4df5317f6ccfd91f86d6fd25d8d8a103b88309" - integrity sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g== - dependencies: - end-of-stream "^1.0.0" - inherits "^2.0.1" - readable-stream "^2.0.0" - stream-shift "^1.0.0" - duplexify@^4.1.2: version "4.1.2" resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-4.1.2.tgz#18b4f8d28289132fa0b9573c898d9f903f81c7b0" @@ -7852,6 +9036,11 @@ duplexify@^4.1.2: readable-stream "^3.1.1" stream-shift "^1.0.0" +eastasianwidth@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/eastasianwidth/-/eastasianwidth-0.2.0.tgz#696ce2ec0aa0e6ea93a397ffcf24aa7840c827cb" + integrity sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA== + ecc-jsbn@~0.1.1: version "0.1.2" resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9" @@ -7872,12 +9061,14 @@ ee-first@1.1.1: resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow== -ejs@^2.6.1: - version "2.7.4" - resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.7.4.tgz#48661287573dcc53e366c7a1ae52c3a120eec9ba" - integrity sha512-7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA== +ejs@3.1.8: + version "3.1.8" + resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.8.tgz#758d32910c78047585c7ef1f92f9ee041c1c190b" + integrity sha512-/sXZeMlhS0ArkfX2Aw780gJzXSMPnKjtspYZv+f3NiKLlubezAHDU5+9xz6gd3/NhG3txQCo6xlglmTS+oTGEQ== + dependencies: + jake "^10.8.5" -ejs@^3.0.1, ejs@^3.1.8: +ejs@^3.1.6, ejs@^3.1.8: version "3.1.9" resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.9.tgz#03c9e8777fe12686a9effcef22303ca3d8eeb361" integrity sha512-rC+QVNMJWv+MtPgkt0y+0rVEIdbtxVADApW9JXrUVlzHetgcyczP/E7DJmWJ4fJCZF2cPcBk0laWO9ZHMG3DmQ== @@ -7891,10 +9082,10 @@ electron-fetch@^1.7.2: dependencies: encoding "^0.1.13" -electron-to-chromium@^1.3.47, electron-to-chromium@^1.4.284: - version "1.4.368" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.368.tgz#75901f97d3e23da2e66feb1e61fbb8e70ac96430" - integrity sha512-e2aeCAixCj9M7nJxdB/wDjO6mbYX+lJJxSJCXDzlr5YPGYVofuJwGN9nKg2o6wWInjX6XmxRinn3AeJMK81ltw== +electron-to-chromium@^1.3.47, electron-to-chromium@^1.4.601: + version "1.4.630" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.630.tgz#1d9f4169653784997bec98975e11a2c05214ce39" + integrity sha512-osHqhtjojpCsACVnuD11xO5g9xaCyw7Qqn/C2KParkMv42i8jrJJgx3g7mkHfpxwhy9MnOJr8+pKOdZ7qzgizg== elliptic@6.5.4, elliptic@^6.4.0, elliptic@^6.5.2, elliptic@^6.5.3, elliptic@^6.5.4: version "6.5.4" @@ -7919,10 +9110,15 @@ emoji-regex@^8.0.0: resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A== -emojis-list@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-3.0.0.tgz#5570662046ad29e2e916e71aae260abdff4f6a78" - integrity sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q== +emoji-regex@^9.2.2: + version "9.2.2" + resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-9.2.2.tgz#840c8803b0d8047f4ff0cf963176b32d4ef3ed72" + integrity sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg== + +enabled@2.0.x: + version "2.0.0" + resolved "https://registry.yarnpkg.com/enabled/-/enabled-2.0.0.tgz#f9dd92ec2d6f4bbc0d5d1e64e21d61cd4665e7c2" + integrity sha512-AKrN98kuwOzMIdAizXGI86UFBoo26CL21UM763y1h/GMSJ4/OHU9k2YlsmBpyScFo/wbLzWQJBMCW4+IO3/+OQ== encode-utf8@^1.0.3: version "1.0.3" @@ -7969,30 +9165,27 @@ end-of-stream@^1.0.0, end-of-stream@^1.1.0, end-of-stream@^1.4.1: dependencies: once "^1.4.0" -enhanced-resolve@^4.5.0: - version "4.5.0" - resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.5.0.tgz#2f3cfd84dbe3b487f18f2db2ef1e064a571ca5ec" - integrity sha512-Nv9m36S/vxpsI+Hc4/ZGRs0n9mXqSWGGq49zxb/cJfPAQMbUtttJAlNPS4AQzaBdw/pKskw5bMbekT/Y7W/Wlg== - dependencies: - graceful-fs "^4.1.2" - memory-fs "^0.5.0" - tapable "^1.0.0" - -enquirer@2.3.4: - version "2.3.4" - resolved "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.4.tgz#c608f2e1134c7f68c1c9ee056de13f9b31076de9" - integrity sha512-pkYrrDZumL2VS6VBGDhqbajCM2xpkUNLuKfGPjfKaSIBKYopQbqEFyrOkRMIb2HDR/rO1kGhEt/5twBwtzKBXw== - dependencies: - ansi-colors "^3.2.1" - -enquirer@^2.3.0, enquirer@^2.3.6: +enquirer@2.3.6: version "2.3.6" resolved "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.6.tgz#2a7fe5dd634a1e4125a975ec994ff5456dc3734d" integrity sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg== dependencies: ansi-colors "^4.1.1" -entities@^4.4.0: +enquirer@^2.3.0, enquirer@^2.3.6: + version "2.4.1" + resolved "https://registry.yarnpkg.com/enquirer/-/enquirer-2.4.1.tgz#93334b3fbd74fc7097b224ab4a8fb7e40bf4ae56" + integrity sha512-rRqJg/6gd538VHvR3PSrdRBb/1Vy2YfzHqzvbhGIQpDRKIa4FgV/54b5Q1xYSxOOwKvjXweS26E0Q+nAMwp2pQ== + dependencies: + ansi-colors "^4.1.1" + strip-ansi "^6.0.1" + +entities@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/entities/-/entities-2.2.0.tgz#098dc90ebb83d8dffa089d55256b351d34c4da55" + integrity sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A== + +entities@^4.2.0, entities@^4.4.0, entities@^4.5.0: version "4.5.0" resolved "https://registry.yarnpkg.com/entities/-/entities-4.5.0.tgz#5d268ea5e7113ec74c4d033b79ea5a35a488fb48" integrity sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw== @@ -8002,11 +9195,21 @@ entities@~3.0.1: resolved "https://registry.yarnpkg.com/entities/-/entities-3.0.1.tgz#2b887ca62585e96db3903482d336c1006c3001d4" integrity sha512-WiyBqoomrwMdFG1e0kqvASYfnlb0lp8M5o5Fw2OFq1hNZxxcNk8Ik0Xm7LxzBhuidnZB/UtBqVCgUz3kBOP51Q== +env-paths@3.0.0, env-paths@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-3.0.0.tgz#2f1e89c2f6dbd3408e1b1711dd82d62e317f58da" + integrity sha512-dtJUTepzMW3Lm/NPxRf3wP4642UWhjL2sQxc+ym2YMj1m/H2zDNQOlezafzkHwn6sMstjHTwG6iQQsctDW/b1A== + env-paths@^2.2.0: version "2.2.1" resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.1.tgz#420399d416ce1fbe9bc0a07c62fa68d67fd0f8f2" integrity sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A== +envinfo@7.8.1: + version "7.8.1" + resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.8.1.tgz#06377e3e5f4d379fea7ac592d5ad8927e0c4d475" + integrity sha512-/o+BXHmB7ocbHEAs6F2EnG0ogybVVUdkRunTT2glZU9XAaGmhqskrvKwqXuDfNjEO0LZKWdejEEpnq8aM0tOaw== + err-code@^1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/err-code/-/err-code-1.1.2.tgz#06e0116d3028f6aef4806849eb0ea6a748ae6960" @@ -8022,39 +9225,47 @@ err-code@^3.0.1: resolved "https://registry.yarnpkg.com/err-code/-/err-code-3.0.1.tgz#a444c7b992705f2b120ee320b09972eef331c920" integrity sha512-GiaH0KJUewYok+eeY05IIgjtAe4Yltygk9Wqp1V5yVWLdhf0hYZchRjNIT9bb0mSwRcIusT3cx7PJUf3zEIfUA== -errno@^0.1.3, errno@~0.1.1, errno@~0.1.7: +errno@~0.1.1: version "0.1.8" resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.8.tgz#8bb3e9c7d463be4976ff888f76b4809ebc2e811f" integrity sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A== dependencies: prr "~1.0.1" -error-ex@^1.2.0, error-ex@^1.3.1: +error-ex@^1.3.1: version "1.3.2" resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf" integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g== dependencies: is-arrayish "^0.2.1" -es-abstract@^1.19.0, es-abstract@^1.20.4: - version "1.21.2" - resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.21.2.tgz#a56b9695322c8a185dc25975aa3b8ec31d0e7eff" - integrity sha512-y/B5POM2iBnIxCiernH1G7rC9qQoM77lLIMQLuob0zhp8C56Po81+2Nj0WFKnd0pNReDTnkYryc+zhOzpEIROg== +error-stack-parser@^2.0.2, error-stack-parser@^2.0.3: + version "2.1.4" + resolved "https://registry.yarnpkg.com/error-stack-parser/-/error-stack-parser-2.1.4.tgz#229cb01cdbfa84440bfa91876285b94680188286" + integrity sha512-Sk5V6wVazPhq5MhpO+AUxJn5x7XSXGl1R93Vn7i+zS15KDVxQijejNCrz8340/2bgLBjR9GtEG8ZVKONDjcqGQ== + dependencies: + stackframe "^1.3.4" + +es-abstract@^1.22.1: + version "1.22.3" + resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.22.3.tgz#48e79f5573198de6dee3589195727f4f74bc4f32" + integrity sha512-eiiY8HQeYfYH2Con2berK+To6GrK2RxbPawDkGq4UiCQQfZHb6wX9qQqkbpPqaxQFcl8d9QzZqo0tGE0VcrdwA== dependencies: array-buffer-byte-length "^1.0.0" + arraybuffer.prototype.slice "^1.0.2" available-typed-arrays "^1.0.5" - call-bind "^1.0.2" + call-bind "^1.0.5" es-set-tostringtag "^2.0.1" es-to-primitive "^1.2.1" - function.prototype.name "^1.1.5" - get-intrinsic "^1.2.0" + function.prototype.name "^1.1.6" + get-intrinsic "^1.2.2" get-symbol-description "^1.0.0" globalthis "^1.0.3" gopd "^1.0.1" - has "^1.0.3" has-property-descriptors "^1.0.0" has-proto "^1.0.1" has-symbols "^1.0.3" + hasown "^2.0.0" internal-slot "^1.0.5" is-array-buffer "^3.0.2" is-callable "^1.2.7" @@ -8062,33 +9273,49 @@ es-abstract@^1.19.0, es-abstract@^1.20.4: is-regex "^1.1.4" is-shared-array-buffer "^1.0.2" is-string "^1.0.7" - is-typed-array "^1.1.10" + is-typed-array "^1.1.12" is-weakref "^1.0.2" - object-inspect "^1.12.3" + object-inspect "^1.13.1" object-keys "^1.1.1" object.assign "^4.1.4" - regexp.prototype.flags "^1.4.3" + regexp.prototype.flags "^1.5.1" + safe-array-concat "^1.0.1" safe-regex-test "^1.0.0" - string.prototype.trim "^1.2.7" - string.prototype.trimend "^1.0.6" - string.prototype.trimstart "^1.0.6" + string.prototype.trim "^1.2.8" + string.prototype.trimend "^1.0.7" + string.prototype.trimstart "^1.0.7" + typed-array-buffer "^1.0.0" + typed-array-byte-length "^1.0.0" + typed-array-byte-offset "^1.0.0" typed-array-length "^1.0.4" unbox-primitive "^1.0.2" - which-typed-array "^1.1.9" + which-typed-array "^1.1.13" es-array-method-boxes-properly@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/es-array-method-boxes-properly/-/es-array-method-boxes-properly-1.0.0.tgz#873f3e84418de4ee19c5be752990b2e44718d09e" integrity sha512-wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA== +es-module-lexer@^1.0.0: + version "1.4.1" + resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-1.4.1.tgz#41ea21b43908fe6a287ffcbe4300f790555331f5" + integrity sha512-cXLGjP0c4T3flZJKQSuziYoq7MlT+rnvfZjfp7h+I7K9BNX54kP9nyWvdbwjQ4u1iWbOL4u96fgeZLToQlZC7w== + es-set-tostringtag@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/es-set-tostringtag/-/es-set-tostringtag-2.0.1.tgz#338d502f6f674301d710b80c8592de8a15f09cd8" - integrity sha512-g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg== + version "2.0.2" + resolved "https://registry.yarnpkg.com/es-set-tostringtag/-/es-set-tostringtag-2.0.2.tgz#11f7cc9f63376930a5f20be4915834f4bc74f9c9" + integrity sha512-BuDyupZt65P9D2D2vA/zqcI3G5xRsklm5N3xCwuiy+/vKy8i0ifdsQP1sLgO4tZDSCaQUSnmC48khknGMV3D2Q== dependencies: - get-intrinsic "^1.1.3" - has "^1.0.3" + get-intrinsic "^1.2.2" has-tostringtag "^1.0.0" + hasown "^2.0.0" + +es-shim-unscopables@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/es-shim-unscopables/-/es-shim-unscopables-1.0.2.tgz#1f6942e71ecc7835ed1c8a83006d8771a63a3763" + integrity sha512-J3yBRXCzDu4ULnQwxyToo/OjdMx6akgVC7K6few0a7F/0wLtmKKN7I73AH5T2836UuXRqN7Qg+IIUw/+YJksRw== + dependencies: + hasown "^2.0.0" es-to-primitive@^1.2.1: version "1.2.1" @@ -8117,12 +9344,7 @@ es6-iterator@^2.0.3: es5-ext "^0.10.35" es6-symbol "^3.1.1" -es6-object-assign@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/es6-object-assign/-/es6-object-assign-1.1.0.tgz#c2c3582656247c39ea107cb1e6652b6f9f24523c" - integrity sha512-MEl9uirslVwqQU369iHNWZXsI8yaZYGg/D65aOgZkeyFJwHYSxilf7rQzXKI7DdDuBPrBXbfk3sl9hJhmd5AUw== - -es6-promise@^4.0.3, es6-promise@^4.2.8: +es6-promise@^4.0.3: version "4.2.8" resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.8.tgz#4eb21594c972bc40553d276e510539143db53e0a" integrity sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w== @@ -8134,6 +9356,11 @@ es6-promisify@^5.0.0: dependencies: es6-promise "^4.0.3" +es6-promisify@^6.0.0: + version "6.1.1" + resolved "https://registry.yarnpkg.com/es6-promisify/-/es6-promisify-6.1.1.tgz#46837651b7b06bf6fff893d03f29393668d01621" + integrity sha512-HBL8I3mIki5C1Cc9QjKUenHtnG0A5/xA8Q/AllRcfiwl2CZFXGK7ddBiCoRwAix4i2KxcQfjtIVcrVbB3vbmwg== + es6-symbol@^3.1.1, es6-symbol@^3.1.3: version "3.1.3" resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.3.tgz#bad5d3c1bcdac28269f4cb331e431c78ac705d18" @@ -8142,167 +9369,73 @@ es6-symbol@^3.1.1, es6-symbol@^3.1.3: d "^1.0.1" ext "^1.1.2" -esbuild-android-64@0.15.18: - version "0.15.18" - resolved "https://registry.yarnpkg.com/esbuild-android-64/-/esbuild-android-64-0.15.18.tgz#20a7ae1416c8eaade917fb2453c1259302c637a5" - integrity sha512-wnpt3OXRhcjfIDSZu9bnzT4/TNTDsOUvip0foZOUBG7QbSt//w3QV4FInVJxNhKc/ErhUxc5z4QjHtMi7/TbgA== - -esbuild-android-arm64@0.15.18: - version "0.15.18" - resolved "https://registry.yarnpkg.com/esbuild-android-arm64/-/esbuild-android-arm64-0.15.18.tgz#9cc0ec60581d6ad267568f29cf4895ffdd9f2f04" - integrity sha512-G4xu89B8FCzav9XU8EjsXacCKSG2FT7wW9J6hOc18soEHJdtWu03L3TQDGf0geNxfLTtxENKBzMSq9LlbjS8OQ== - -esbuild-darwin-64@0.15.18: - version "0.15.18" - resolved "https://registry.yarnpkg.com/esbuild-darwin-64/-/esbuild-darwin-64-0.15.18.tgz#428e1730ea819d500808f220fbc5207aea6d4410" - integrity sha512-2WAvs95uPnVJPuYKP0Eqx+Dl/jaYseZEUUT1sjg97TJa4oBtbAKnPnl3b5M9l51/nbx7+QAEtuummJZW0sBEmg== - -esbuild-darwin-arm64@0.15.18: - version "0.15.18" - resolved "https://registry.yarnpkg.com/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.15.18.tgz#b6dfc7799115a2917f35970bfbc93ae50256b337" - integrity sha512-tKPSxcTJ5OmNb1btVikATJ8NftlyNlc8BVNtyT/UAr62JFOhwHlnoPrhYWz09akBLHI9nElFVfWSTSRsrZiDUA== - -esbuild-freebsd-64@0.15.18: - version "0.15.18" - resolved "https://registry.yarnpkg.com/esbuild-freebsd-64/-/esbuild-freebsd-64-0.15.18.tgz#4e190d9c2d1e67164619ae30a438be87d5eedaf2" - integrity sha512-TT3uBUxkteAjR1QbsmvSsjpKjOX6UkCstr8nMr+q7zi3NuZ1oIpa8U41Y8I8dJH2fJgdC3Dj3CXO5biLQpfdZA== - -esbuild-freebsd-arm64@0.15.18: - version "0.15.18" - resolved "https://registry.yarnpkg.com/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.15.18.tgz#18a4c0344ee23bd5a6d06d18c76e2fd6d3f91635" - integrity sha512-R/oVr+X3Tkh+S0+tL41wRMbdWtpWB8hEAMsOXDumSSa6qJR89U0S/PpLXrGF7Wk/JykfpWNokERUpCeHDl47wA== - -esbuild-linux-32@0.15.18: - version "0.15.18" - resolved "https://registry.yarnpkg.com/esbuild-linux-32/-/esbuild-linux-32-0.15.18.tgz#9a329731ee079b12262b793fb84eea762e82e0ce" - integrity sha512-lphF3HiCSYtaa9p1DtXndiQEeQDKPl9eN/XNoBf2amEghugNuqXNZA/ZovthNE2aa4EN43WroO0B85xVSjYkbg== - -esbuild-linux-64@0.15.18: - version "0.15.18" - resolved "https://registry.yarnpkg.com/esbuild-linux-64/-/esbuild-linux-64-0.15.18.tgz#532738075397b994467b514e524aeb520c191b6c" - integrity sha512-hNSeP97IviD7oxLKFuii5sDPJ+QHeiFTFLoLm7NZQligur8poNOWGIgpQ7Qf8Balb69hptMZzyOBIPtY09GZYw== - -esbuild-linux-arm64@0.15.18: - version "0.15.18" - resolved "https://registry.yarnpkg.com/esbuild-linux-arm64/-/esbuild-linux-arm64-0.15.18.tgz#5372e7993ac2da8f06b2ba313710d722b7a86e5d" - integrity sha512-54qr8kg/6ilcxd+0V3h9rjT4qmjc0CccMVWrjOEM/pEcUzt8X62HfBSeZfT2ECpM7104mk4yfQXkosY8Quptug== - -esbuild-linux-arm@0.15.18: - version "0.15.18" - resolved "https://registry.yarnpkg.com/esbuild-linux-arm/-/esbuild-linux-arm-0.15.18.tgz#e734aaf259a2e3d109d4886c9e81ec0f2fd9a9cc" - integrity sha512-UH779gstRblS4aoS2qpMl3wjg7U0j+ygu3GjIeTonCcN79ZvpPee12Qun3vcdxX+37O5LFxz39XeW2I9bybMVA== - -esbuild-linux-mips64le@0.15.18: - version "0.15.18" - resolved "https://registry.yarnpkg.com/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.15.18.tgz#c0487c14a9371a84eb08fab0e1d7b045a77105eb" - integrity sha512-Mk6Ppwzzz3YbMl/ZZL2P0q1tnYqh/trYZ1VfNP47C31yT0K8t9s7Z077QrDA/guU60tGNp2GOwCQnp+DYv7bxQ== - -esbuild-linux-ppc64le@0.15.18: - version "0.15.18" - resolved "https://registry.yarnpkg.com/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.15.18.tgz#af048ad94eed0ce32f6d5a873f7abe9115012507" - integrity sha512-b0XkN4pL9WUulPTa/VKHx2wLCgvIAbgwABGnKMY19WhKZPT+8BxhZdqz6EgkqCLld7X5qiCY2F/bfpUUlnFZ9w== - -esbuild-linux-riscv64@0.15.18: - version "0.15.18" - resolved "https://registry.yarnpkg.com/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.15.18.tgz#423ed4e5927bd77f842bd566972178f424d455e6" - integrity sha512-ba2COaoF5wL6VLZWn04k+ACZjZ6NYniMSQStodFKH/Pu6RxzQqzsmjR1t9QC89VYJxBeyVPTaHuBMCejl3O/xg== - -esbuild-linux-s390x@0.15.18: - version "0.15.18" - resolved "https://registry.yarnpkg.com/esbuild-linux-s390x/-/esbuild-linux-s390x-0.15.18.tgz#21d21eaa962a183bfb76312e5a01cc5ae48ce8eb" - integrity sha512-VbpGuXEl5FCs1wDVp93O8UIzl3ZrglgnSQ+Hu79g7hZu6te6/YHgVJxCM2SqfIila0J3k0csfnf8VD2W7u2kzQ== - -esbuild-netbsd-64@0.15.18: - version "0.15.18" - resolved "https://registry.yarnpkg.com/esbuild-netbsd-64/-/esbuild-netbsd-64-0.15.18.tgz#ae75682f60d08560b1fe9482bfe0173e5110b998" - integrity sha512-98ukeCdvdX7wr1vUYQzKo4kQ0N2p27H7I11maINv73fVEXt2kyh4K4m9f35U1K43Xc2QGXlzAw0K9yoU7JUjOg== - -esbuild-openbsd-64@0.15.18: - version "0.15.18" - resolved "https://registry.yarnpkg.com/esbuild-openbsd-64/-/esbuild-openbsd-64-0.15.18.tgz#79591a90aa3b03e4863f93beec0d2bab2853d0a8" - integrity sha512-yK5NCcH31Uae076AyQAXeJzt/vxIo9+omZRKj1pauhk3ITuADzuOx5N2fdHrAKPxN+zH3w96uFKlY7yIn490xQ== - -esbuild-sunos-64@0.15.18: - version "0.15.18" - resolved "https://registry.yarnpkg.com/esbuild-sunos-64/-/esbuild-sunos-64-0.15.18.tgz#fd528aa5da5374b7e1e93d36ef9b07c3dfed2971" - integrity sha512-On22LLFlBeLNj/YF3FT+cXcyKPEI263nflYlAhz5crxtp3yRG1Ugfr7ITyxmCmjm4vbN/dGrb/B7w7U8yJR9yw== - -esbuild-windows-32@0.15.18: - version "0.15.18" - resolved "https://registry.yarnpkg.com/esbuild-windows-32/-/esbuild-windows-32-0.15.18.tgz#0e92b66ecdf5435a76813c4bc5ccda0696f4efc3" - integrity sha512-o+eyLu2MjVny/nt+E0uPnBxYuJHBvho8vWsC2lV61A7wwTWC3jkN2w36jtA+yv1UgYkHRihPuQsL23hsCYGcOQ== - -esbuild-windows-64@0.15.18: - version "0.15.18" - resolved "https://registry.yarnpkg.com/esbuild-windows-64/-/esbuild-windows-64-0.15.18.tgz#0fc761d785414284fc408e7914226d33f82420d0" - integrity sha512-qinug1iTTaIIrCorAUjR0fcBk24fjzEedFYhhispP8Oc7SFvs+XeW3YpAKiKp8dRpizl4YYAhxMjlftAMJiaUw== - -esbuild-windows-arm64@0.15.18: - version "0.15.18" - resolved "https://registry.yarnpkg.com/esbuild-windows-arm64/-/esbuild-windows-arm64-0.15.18.tgz#5b5bdc56d341d0922ee94965c89ee120a6a86eb7" - integrity sha512-q9bsYzegpZcLziq0zgUi5KqGVtfhjxGbnksaBFYmWLxeV/S1fK4OLdq2DFYnXcLMjlZw2L0jLsk1eGoB522WXQ== - -esbuild@^0.15.9: - version "0.15.18" - resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.15.18.tgz#ea894adaf3fbc036d32320a00d4d6e4978a2f36d" - integrity sha512-x/R72SmW3sSFRm5zrrIjAhCeQSAWoni3CmHEqfQrZIQTM3lVCdehdwuIqaOtfC2slvpdlLa62GYoN8SxT23m6Q== +esbuild@0.19.11: + version "0.19.11" + resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.19.11.tgz#4a02dca031e768b5556606e1b468fe72e3325d96" + integrity sha512-HJ96Hev2hX/6i5cDVwcqiJBBtuo9+FeIJOtZ9W1kA5M6AMJRHUZlpYZ1/SbEwtO0ioNAW8rUooVpC/WehY2SfA== optionalDependencies: - "@esbuild/android-arm" "0.15.18" - "@esbuild/linux-loong64" "0.15.18" - esbuild-android-64 "0.15.18" - esbuild-android-arm64 "0.15.18" - esbuild-darwin-64 "0.15.18" - esbuild-darwin-arm64 "0.15.18" - esbuild-freebsd-64 "0.15.18" - esbuild-freebsd-arm64 "0.15.18" - esbuild-linux-32 "0.15.18" - esbuild-linux-64 "0.15.18" - esbuild-linux-arm "0.15.18" - esbuild-linux-arm64 "0.15.18" - esbuild-linux-mips64le "0.15.18" - esbuild-linux-ppc64le "0.15.18" - esbuild-linux-riscv64 "0.15.18" - esbuild-linux-s390x "0.15.18" - esbuild-netbsd-64 "0.15.18" - esbuild-openbsd-64 "0.15.18" - esbuild-sunos-64 "0.15.18" - esbuild-windows-32 "0.15.18" - esbuild-windows-64 "0.15.18" - esbuild-windows-arm64 "0.15.18" - -esbuild@^0.17.5: - version "0.17.17" - resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.17.17.tgz#fa906ab11b11d2ed4700f494f4f764229b25c916" - integrity sha512-/jUywtAymR8jR4qsa2RujlAF7Krpt5VWi72Q2yuLD4e/hvtNcFQ0I1j8m/bxq238pf3/0KO5yuXNpuLx8BE1KA== + "@esbuild/aix-ppc64" "0.19.11" + "@esbuild/android-arm" "0.19.11" + "@esbuild/android-arm64" "0.19.11" + "@esbuild/android-x64" "0.19.11" + "@esbuild/darwin-arm64" "0.19.11" + "@esbuild/darwin-x64" "0.19.11" + "@esbuild/freebsd-arm64" "0.19.11" + "@esbuild/freebsd-x64" "0.19.11" + "@esbuild/linux-arm" "0.19.11" + "@esbuild/linux-arm64" "0.19.11" + "@esbuild/linux-ia32" "0.19.11" + "@esbuild/linux-loong64" "0.19.11" + "@esbuild/linux-mips64el" "0.19.11" + "@esbuild/linux-ppc64" "0.19.11" + "@esbuild/linux-riscv64" "0.19.11" + "@esbuild/linux-s390x" "0.19.11" + "@esbuild/linux-x64" "0.19.11" + "@esbuild/netbsd-x64" "0.19.11" + "@esbuild/openbsd-x64" "0.19.11" + "@esbuild/sunos-x64" "0.19.11" + "@esbuild/win32-arm64" "0.19.11" + "@esbuild/win32-ia32" "0.19.11" + "@esbuild/win32-x64" "0.19.11" + +esbuild@^0.18.10: + version "0.18.20" + resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.18.20.tgz#4709f5a34801b43b799ab7d6d82f7284a9b7a7a6" + integrity sha512-ceqxoedUrcayh7Y7ZX6NdbbDzGROiyVBgC4PriJThBKSVPWnnFHZAkfI1lJT8QFkOwH4qOS2SJkS4wvpGl8BpA== optionalDependencies: - "@esbuild/android-arm" "0.17.17" - "@esbuild/android-arm64" "0.17.17" - "@esbuild/android-x64" "0.17.17" - "@esbuild/darwin-arm64" "0.17.17" - "@esbuild/darwin-x64" "0.17.17" - "@esbuild/freebsd-arm64" "0.17.17" - "@esbuild/freebsd-x64" "0.17.17" - "@esbuild/linux-arm" "0.17.17" - "@esbuild/linux-arm64" "0.17.17" - "@esbuild/linux-ia32" "0.17.17" - "@esbuild/linux-loong64" "0.17.17" - "@esbuild/linux-mips64el" "0.17.17" - "@esbuild/linux-ppc64" "0.17.17" - "@esbuild/linux-riscv64" "0.17.17" - "@esbuild/linux-s390x" "0.17.17" - "@esbuild/linux-x64" "0.17.17" - "@esbuild/netbsd-x64" "0.17.17" - "@esbuild/openbsd-x64" "0.17.17" - "@esbuild/sunos-x64" "0.17.17" - "@esbuild/win32-arm64" "0.17.17" - "@esbuild/win32-ia32" "0.17.17" - "@esbuild/win32-x64" "0.17.17" + "@esbuild/android-arm" "0.18.20" + "@esbuild/android-arm64" "0.18.20" + "@esbuild/android-x64" "0.18.20" + "@esbuild/darwin-arm64" "0.18.20" + "@esbuild/darwin-x64" "0.18.20" + "@esbuild/freebsd-arm64" "0.18.20" + "@esbuild/freebsd-x64" "0.18.20" + "@esbuild/linux-arm" "0.18.20" + "@esbuild/linux-arm64" "0.18.20" + "@esbuild/linux-ia32" "0.18.20" + "@esbuild/linux-loong64" "0.18.20" + "@esbuild/linux-mips64el" "0.18.20" + "@esbuild/linux-ppc64" "0.18.20" + "@esbuild/linux-riscv64" "0.18.20" + "@esbuild/linux-s390x" "0.18.20" + "@esbuild/linux-x64" "0.18.20" + "@esbuild/netbsd-x64" "0.18.20" + "@esbuild/openbsd-x64" "0.18.20" + "@esbuild/sunos-x64" "0.18.20" + "@esbuild/win32-arm64" "0.18.20" + "@esbuild/win32-ia32" "0.18.20" + "@esbuild/win32-x64" "0.18.20" escalade@^3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40" integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw== +escape-goat@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/escape-goat/-/escape-goat-4.0.0.tgz#9424820331b510b0666b98f7873fe11ac4aa8081" + integrity sha512-2Sd4ShcWxbx6OY1IHyla/CVNwvg7XwZVoXZHcSu9w9SReNP1EzzD5T8NWKIR38fIqEns9kDWKUQTXXAmlDrdPg== + escape-html@~1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988" @@ -8313,32 +9446,60 @@ 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@5.0.0, escape-string-regexp@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-5.0.0.tgz#4683126b500b61762f2dbebace1806e8be31b1c8" + integrity sha512-/veY75JbMK4j1yjvuUxuVsiS/hr/4iHs9FTT6cgTexxdE0Ly/glccBAkloH/DofkjRbZU3bnoj38mOmhkZ0lHw== + escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" integrity sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg== -escape-string-regexp@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-5.0.0.tgz#4683126b500b61762f2dbebace1806e8be31b1c8" - integrity sha512-/veY75JbMK4j1yjvuUxuVsiS/hr/4iHs9FTT6cgTexxdE0Ly/glccBAkloH/DofkjRbZU3bnoj38mOmhkZ0lHw== +escodegen@1.8.x: + version "1.8.1" + resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.8.1.tgz#5a5b53af4693110bebb0867aa3430dd3b70a1018" + integrity sha512-yhi5S+mNTOuRvyW4gWlg5W1byMaQGWWSYHXsuFZ7GBo7tpyOwi2EdzMP/QWxh9hwkD2m+wDVHJsxhRIj+v/b/A== + dependencies: + esprima "^2.7.1" + estraverse "^1.9.1" + esutils "^2.0.2" + optionator "^0.8.1" + optionalDependencies: + source-map "~0.2.0" + +escodegen@^1.8.1: + version "1.14.3" + resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.3.tgz#4e7b81fba61581dc97582ed78cab7f0e8d63f503" + integrity sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw== + dependencies: + esprima "^4.0.1" + estraverse "^4.2.0" + esutils "^2.0.2" + optionator "^0.8.1" + optionalDependencies: + source-map "~0.6.1" escodegen@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-2.0.0.tgz#5e32b12833e8aa8fa35e1bf0befa89380484c7dd" - integrity sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw== + version "2.1.0" + resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-2.1.0.tgz#ba93bbb7a43986d29d6041f99f5262da773e2e17" + integrity sha512-2NlIDTwUWJN0mRPQOdtQBzbUHvdGY2P1VXSyU83Q3xKxM7WHX2Ql8dKq782Q9TgQUNOLEzEYu9bzLNj1q88I5w== dependencies: esprima "^4.0.1" estraverse "^5.2.0" esutils "^2.0.2" - optionator "^0.8.1" optionalDependencies: source-map "~0.6.1" +eslint-config-prettier@9.0.0: + version "9.0.0" + resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-9.0.0.tgz#eb25485946dd0c66cd216a46232dc05451518d1f" + integrity sha512-IcJsTkJae2S35pRsRAwoCE+925rJJStOdkKnLVgtE+tEpqU0EVVM7OqrwxqgptKdX29NUwC82I5pXsGFIgSevw== + eslint-config-prettier@^8.3.0, eslint-config-prettier@^8.5.0: - version "8.8.0" - resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.8.0.tgz#bfda738d412adc917fd7b038857110efe98c9348" - integrity sha512-wLbQiFre3tdGgpDv67NQKnJuTlcUVYHas3k+DZCc2U2BadthoEY4B7hLPvAxaqdyOGCzuLfii2fqGph10va7oA== + version "8.10.0" + resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.10.0.tgz#3a06a662130807e2502fc3ff8b4143d8a0658e11" + integrity sha512-SM8AMJdeQqRYT9O9zguiruQZaN7+z+E4eAP9oiLNGKMtomwaB1E9dcgUD6ZAn/eQAb52USbvezbiljfZUhbJcg== eslint-plugin-prettier@^4.0.0: version "4.2.1" @@ -8348,26 +9509,18 @@ eslint-plugin-prettier@^4.0.0: prettier-linter-helpers "^1.0.0" eslint-plugin-vue@^9.8.0: - version "9.11.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-9.11.0.tgz#99a247455c02181f24d9240d422380fd16dd630c" - integrity sha512-bBCJAZnkBV7ATH4Z1E7CvN3nmtS4H7QUU3UBxPdo8WohRU+yHjnQRALpTbxMVcz0e4Mx3IyxIdP5HYODMxK9cQ== + version "9.20.1" + resolved "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-9.20.1.tgz#7ed78846898574b2cd26939f28b0b87798a7b528" + integrity sha512-GyCs8K3lkEvoyC1VV97GJhP1SvqsKCiWGHnbn0gVUYiUhaH2+nB+Dv1uekv1THFMPbBfYxukrzQdltw950k+LQ== dependencies: - "@eslint-community/eslint-utils" "^4.3.0" + "@eslint-community/eslint-utils" "^4.4.0" natural-compare "^1.4.0" - nth-check "^2.0.1" - postcss-selector-parser "^6.0.9" - semver "^7.3.5" - vue-eslint-parser "^9.0.1" + nth-check "^2.1.1" + postcss-selector-parser "^6.0.13" + semver "^7.5.4" + vue-eslint-parser "^9.4.0" xml-name-validator "^4.0.0" -eslint-scope@^4.0.3: - version "4.0.3" - resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-4.0.3.tgz#ca03833310f6889a3264781aa82e63eb9cfe7848" - integrity sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg== - dependencies: - esrecurse "^4.1.0" - estraverse "^4.1.1" - eslint-scope@^5.1.1: version "5.1.1" resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c" @@ -8376,10 +9529,10 @@ eslint-scope@^5.1.1: esrecurse "^4.3.0" estraverse "^4.1.1" -eslint-scope@^7.1.1, eslint-scope@^7.2.0: - version "7.2.0" - resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.2.0.tgz#f21ebdafda02352f103634b96dd47d9f81ca117b" - integrity sha512-DYj5deGlHBfMt15J7rdtyKNq/Nqlv5KfU4iodrQ019XESsRnwXH9KAE0y3cwtUHDo2ob7CypAnCqefh6vioWRw== +eslint-scope@^7.1.1, eslint-scope@^7.2.2: + version "7.2.2" + resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.2.2.tgz#deb4f92563390f32006894af62a22dba1c46423f" + integrity sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg== dependencies: esrecurse "^4.3.0" estraverse "^5.2.0" @@ -8396,32 +9549,32 @@ eslint-visitor-keys@^1.1.0, eslint-visitor-keys@^1.3.0: resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz#30ebd1ef7c2fdff01c3a4f151044af25fab0523e" integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ== -eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.0: - version "3.4.0" - resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.0.tgz#c7f0f956124ce677047ddbc192a68f999454dedc" - integrity sha512-HPpKPUBQcAsZOsHAFwTtIKcYlCje62XB7SEAcxjtmW6TD1WVpkS6i6/hOVtTZIl4zGj/mBqpFVGvaDneik+VoQ== +eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1, eslint-visitor-keys@^3.4.3: + version "3.4.3" + resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz#0cd72fe8550e3c2eae156a96a4dddcd1c8ac5800" + integrity sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag== -eslint@^8.28.0: - version "8.38.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.38.0.tgz#a62c6f36e548a5574dd35728ac3c6209bd1e2f1a" - integrity sha512-pIdsD2jwlUGf/U38Jv97t8lq6HpaU/G9NKbYmpWpZGw3LdTNhZLbJePqxOXGB5+JEKfOPU/XLxYxFh03nr1KTg== +eslint@8.48.0: + version "8.48.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.48.0.tgz#bf9998ba520063907ba7bfe4c480dc8be03c2155" + integrity sha512-sb6DLeIuRXxeM1YljSe1KEx9/YYeZFQWcV8Rq9HfigmdDEugjLEVEa1ozDjL6YDjBpQHPJxJzze+alxi4T3OLg== dependencies: "@eslint-community/eslint-utils" "^4.2.0" - "@eslint-community/regexpp" "^4.4.0" - "@eslint/eslintrc" "^2.0.2" - "@eslint/js" "8.38.0" - "@humanwhocodes/config-array" "^0.11.8" + "@eslint-community/regexpp" "^4.6.1" + "@eslint/eslintrc" "^2.1.2" + "@eslint/js" "8.48.0" + "@humanwhocodes/config-array" "^0.11.10" "@humanwhocodes/module-importer" "^1.0.1" "@nodelib/fs.walk" "^1.2.8" - ajv "^6.10.0" + ajv "^6.12.4" chalk "^4.0.0" cross-spawn "^7.0.2" debug "^4.3.2" doctrine "^3.0.0" escape-string-regexp "^4.0.0" - eslint-scope "^7.1.1" - eslint-visitor-keys "^3.4.0" - espree "^9.5.1" + eslint-scope "^7.2.2" + eslint-visitor-keys "^3.4.3" + espree "^9.6.1" esquery "^1.4.2" esutils "^2.0.2" fast-deep-equal "^3.1.3" @@ -8429,45 +9582,43 @@ eslint@^8.28.0: find-up "^5.0.0" glob-parent "^6.0.2" globals "^13.19.0" - grapheme-splitter "^1.0.4" + graphemer "^1.4.0" ignore "^5.2.0" - import-fresh "^3.0.0" imurmurhash "^0.1.4" is-glob "^4.0.0" is-path-inside "^3.0.3" - js-sdsl "^4.1.4" js-yaml "^4.1.0" json-stable-stringify-without-jsonify "^1.0.1" levn "^0.4.1" lodash.merge "^4.6.2" minimatch "^3.1.2" natural-compare "^1.4.0" - optionator "^0.9.1" + optionator "^0.9.3" strip-ansi "^6.0.1" - strip-json-comments "^3.1.0" text-table "^0.2.0" -eslint@^8.31.0: - version "8.39.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.39.0.tgz#7fd20a295ef92d43809e914b70c39fd5a23cf3f1" - integrity sha512-mwiok6cy7KTW7rBpo05k6+p4YVZByLNjAZ/ACB9DRCu4YDRwjXI01tWHp6KAUWelsBetTxKK/2sHB0vdS8Z2Og== +eslint@^8.28.0, eslint@^8.31.0: + version "8.56.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.56.0.tgz#4957ce8da409dc0809f99ab07a1b94832ab74b15" + integrity sha512-Go19xM6T9puCOWntie1/P997aXxFsOi37JIHRWI514Hc6ZnaHGKY9xFhrU65RT6CcBEzZoGG1e6Nq+DT04ZtZQ== dependencies: "@eslint-community/eslint-utils" "^4.2.0" - "@eslint-community/regexpp" "^4.4.0" - "@eslint/eslintrc" "^2.0.2" - "@eslint/js" "8.39.0" - "@humanwhocodes/config-array" "^0.11.8" + "@eslint-community/regexpp" "^4.6.1" + "@eslint/eslintrc" "^2.1.4" + "@eslint/js" "8.56.0" + "@humanwhocodes/config-array" "^0.11.13" "@humanwhocodes/module-importer" "^1.0.1" "@nodelib/fs.walk" "^1.2.8" - ajv "^6.10.0" + "@ungap/structured-clone" "^1.2.0" + ajv "^6.12.4" chalk "^4.0.0" cross-spawn "^7.0.2" debug "^4.3.2" doctrine "^3.0.0" escape-string-regexp "^4.0.0" - eslint-scope "^7.2.0" - eslint-visitor-keys "^3.4.0" - espree "^9.5.1" + eslint-scope "^7.2.2" + eslint-visitor-keys "^3.4.3" + espree "^9.6.1" esquery "^1.4.2" esutils "^2.0.2" fast-deep-equal "^3.1.3" @@ -8475,22 +9626,19 @@ eslint@^8.31.0: find-up "^5.0.0" glob-parent "^6.0.2" globals "^13.19.0" - grapheme-splitter "^1.0.4" + graphemer "^1.4.0" ignore "^5.2.0" - import-fresh "^3.0.0" imurmurhash "^0.1.4" is-glob "^4.0.0" is-path-inside "^3.0.3" - js-sdsl "^4.1.4" js-yaml "^4.1.0" json-stable-stringify-without-jsonify "^1.0.1" levn "^0.4.1" lodash.merge "^4.6.2" minimatch "^3.1.2" natural-compare "^1.4.0" - optionator "^0.9.1" + optionator "^0.9.3" strip-ansi "^6.0.1" - strip-json-comments "^3.1.0" text-table "^0.2.0" espree@^6.0.0: @@ -8502,14 +9650,24 @@ espree@^6.0.0: acorn-jsx "^5.2.0" eslint-visitor-keys "^1.1.0" -espree@^9.3.1, espree@^9.5.1: - version "9.5.1" - resolved "https://registry.yarnpkg.com/espree/-/espree-9.5.1.tgz#4f26a4d5f18905bf4f2e0bd99002aab807e96dd4" - integrity sha512-5yxtHSZXRSW5pvv3hAlXM5+/Oswi1AUFqBmbibKb5s6bp3rGIDkyXU6xCoyuuLhijr4SFwPrXRoZjz0AZDN9tg== +espree@^9.3.1, espree@^9.6.0, espree@^9.6.1: + version "9.6.1" + resolved "https://registry.yarnpkg.com/espree/-/espree-9.6.1.tgz#a2a17b8e434690a5432f2f8018ce71d331a48c6f" + integrity sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ== dependencies: - acorn "^8.8.0" + acorn "^8.9.0" acorn-jsx "^5.3.2" - eslint-visitor-keys "^3.4.0" + eslint-visitor-keys "^3.4.1" + +esprima@1.2.2: + version "1.2.2" + resolved "https://registry.yarnpkg.com/esprima/-/esprima-1.2.2.tgz#76a0fd66fcfe154fd292667dc264019750b1657b" + integrity sha512-+JpPZam9w5DuJ3Q67SqsMGtiHKENSMRVoxvArfJZK01/BfLEObtZ6orJa/MtoGNR/rfMgp5837T41PAmTwAv/A== + +esprima@2.7.x, esprima@^2.7.1: + version "2.7.3" + resolved "https://registry.yarnpkg.com/esprima/-/esprima-2.7.3.tgz#96e3b70d5779f6ad49cd032673d1c312767ba581" + integrity sha512-OarPfz0lFCiW4/AV2Oy1Rp9qu0iusTKqykwTspGCZtPxmF81JR4MmIebvF1F9+UOKth2ZubLQ4XGGaU+hSn99A== esprima@^4.0.0, esprima@^4.0.1, esprima@~4.0.0: version "4.0.1" @@ -8523,14 +9681,19 @@ esquery@^1.4.0, esquery@^1.4.2: dependencies: estraverse "^5.1.0" -esrecurse@^4.1.0, esrecurse@^4.3.0: +esrecurse@^4.3.0: version "4.3.0" resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921" integrity sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag== dependencies: estraverse "^5.2.0" -estraverse@^4.1.1: +estraverse@^1.9.1: + version "1.9.3" + resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-1.9.3.tgz#af67f2dc922582415950926091a4005d29c9bb44" + integrity sha512-25w1fMXQrGdoquWnScXZGckOv+Wes+JDnuN/+7ex3SauFRS72r2lFDec0EKPt2YD1wUJ/IrfEex+9yp4hfSOJA== + +estraverse@^4.1.1, estraverse@^4.2.0: version "4.3.0" resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d" integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw== @@ -8540,17 +9703,17 @@ estraverse@^5.1.0, estraverse@^5.2.0: resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123" integrity sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA== -estree-walker@^2.0.1, estree-walker@^2.0.2: +estree-walker@2.0.2, estree-walker@^2.0.1, estree-walker@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-2.0.2.tgz#52f010178c2a4c117a7757cfe942adb7d2da4cac" integrity sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w== -esutils@^2.0.2: +esutils@^2.0.2, esutils@^2.0.3: version "2.0.3" resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64" integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g== -etag@~1.8.1: +etag@1.8.1, etag@^1.8.1, etag@~1.8.1: version "1.8.1" resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887" integrity sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg== @@ -8568,7 +9731,7 @@ eth-block-tracker@^3.0.0: pify "^2.3.0" tape "^4.6.3" -eth-ens-namehash@2.0.8, eth-ens-namehash@^2.0.8: +eth-ens-namehash@2.0.8: version "2.0.8" resolved "https://registry.yarnpkg.com/eth-ens-namehash/-/eth-ens-namehash-2.0.8.tgz#229ac46eca86d52e0c991e7cb2aef83ff0f68bcf" integrity sha512-VWEI1+KJfz4Km//dadyvBBoBeSQ0MHTXPvr8UIXiLW6IanxvAV+DmlZAijZwAyggqGUfwQBeHf7tc9wzc1piSw== @@ -8576,6 +9739,25 @@ eth-ens-namehash@2.0.8, eth-ens-namehash@^2.0.8: idna-uts46-hx "^2.3.1" js-sha3 "^0.5.7" +eth-gas-reporter@^0.2.25: + version "0.2.27" + resolved "https://registry.yarnpkg.com/eth-gas-reporter/-/eth-gas-reporter-0.2.27.tgz#928de8548a674ed64c7ba0bf5795e63079150d4e" + integrity sha512-femhvoAM7wL0GcI8ozTdxfuBtBFJ9qsyIAsmKVjlWAHUbdnnXHt+lKzz/kmldM5lA9jLuNHGwuIxorNpLbR1Zw== + dependencies: + "@solidity-parser/parser" "^0.14.0" + axios "^1.5.1" + cli-table3 "^0.5.0" + colors "1.4.0" + ethereum-cryptography "^1.0.3" + ethers "^5.7.2" + fs-readdir-recursive "^1.1.0" + lodash "^4.17.14" + markdown-table "^1.1.3" + mocha "^10.2.0" + req-cwd "^2.0.0" + sha1 "^1.1.1" + sync-request "^6.0.0" + eth-json-rpc-infura@^3.1.0: version "3.2.1" resolved "https://registry.yarnpkg.com/eth-json-rpc-infura/-/eth-json-rpc-infura-3.2.1.tgz#26702a821067862b72d979c016fd611502c6057f" @@ -8735,16 +9917,15 @@ ethereum-cryptography@^1.0.3, ethereum-cryptography@^1.1.2: "@scure/bip32" "1.1.5" "@scure/bip39" "1.1.1" -ethereum-waffle@^3.4.4: - version "3.4.4" - resolved "https://registry.yarnpkg.com/ethereum-waffle/-/ethereum-waffle-3.4.4.tgz#1378b72040697857b7f5e8f473ca8f97a37b5840" - integrity sha512-PA9+jCjw4WC3Oc5ocSMBj5sXvueWQeAbvCA+hUlb6oFgwwKyq5ka3bWQ7QZcjzIX+TdFkxP4IbFmoY2D8Dkj9Q== +ethereum-cryptography@^2.0.0, ethereum-cryptography@^2.1.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/ethereum-cryptography/-/ethereum-cryptography-2.1.2.tgz#18fa7108622e56481157a5cb7c01c0c6a672eb67" + integrity sha512-Z5Ba0T0ImZ8fqXrJbpHcbpAvIswRte2wGNR/KePnu8GbbvgJ47lMxT/ZZPG6i9Jaht4azPDop4HaM00J0J59ug== dependencies: - "@ethereum-waffle/chai" "^3.4.4" - "@ethereum-waffle/compiler" "^3.4.4" - "@ethereum-waffle/mock-contract" "^3.4.4" - "@ethereum-waffle/provider" "^3.4.4" - ethers "^5.0.1" + "@noble/curves" "1.1.0" + "@noble/hashes" "1.3.1" + "@scure/bip32" "1.3.1" + "@scure/bip39" "1.2.1" ethereumjs-abi@0.6.5: version "0.6.5" @@ -8888,7 +10069,7 @@ ethereumjs-util@^5.0.0, ethereumjs-util@^5.0.1, ethereumjs-util@^5.1.1, ethereum rlp "^2.0.0" safe-buffer "^5.1.1" -ethereumjs-util@^7.0.2, ethereumjs-util@^7.1.0, ethereumjs-util@^7.1.1, ethereumjs-util@^7.1.2, ethereumjs-util@^7.1.5: +ethereumjs-util@^7.0.2, ethereumjs-util@^7.1.0, ethereumjs-util@^7.1.4: version "7.1.5" resolved "https://registry.yarnpkg.com/ethereumjs-util/-/ethereumjs-util-7.1.5.tgz#9ecf04861e4fbbeed7465ece5f23317ad1129181" integrity sha512-SDl5kKrQAudFBUe5OJM9Ac6WmMyYmXX/6sTmLZ3ffG2eY6ZIGBes3pEDxNN6V72WyOw4CPD5RomKdsa8DAAwLg== @@ -8952,22 +10133,7 @@ ethereumjs-wallet@0.6.5: utf8 "^3.0.0" uuid "^3.3.2" -ethers@^4.0.45: - version "4.0.49" - resolved "https://registry.yarnpkg.com/ethers/-/ethers-4.0.49.tgz#0eb0e9161a0c8b4761be547396bbe2fb121a8894" - integrity sha512-kPltTvWiyu+OktYy1IStSO16i2e7cS9D9OxZ81q2UUaiNPVrm/RTcbxamCXF9VUSKzJIdJV68EAIhTEVBalRWg== - dependencies: - aes-js "3.0.0" - bn.js "^4.11.9" - elliptic "6.5.4" - hash.js "1.1.3" - js-sha3 "0.5.7" - scrypt-js "2.0.4" - setimmediate "1.0.4" - uuid "2.0.1" - xmlhttprequest "1.8.0" - -ethers@^5.0.1, ethers@^5.0.2, ethers@^5.0.3, ethers@^5.5.2, ethers@^5.7.1, ethers@^5.7.2: +ethers@^5.0.3, ethers@^5.5.1, ethers@^5.7.1, ethers@^5.7.2: version "5.7.2" resolved "https://registry.yarnpkg.com/ethers/-/ethers-5.7.2.tgz#3a7deeabbb8c030d4126b24f84e525466145872e" integrity sha512-wswUsmWo1aOK8rR7DIKiWSw9DbLWe6x98Jrn8wcTflTVvaXhAMaB5zGAXy0GYQEQp9iO1iSHWVyARQm11zUtyg== @@ -9003,6 +10169,32 @@ ethers@^5.0.1, ethers@^5.0.2, ethers@^5.0.3, ethers@^5.5.2, ethers@^5.7.1, ether "@ethersproject/web" "5.7.1" "@ethersproject/wordlists" "5.7.0" +ethers@^6.11.1: + version "6.11.1" + resolved "https://registry.yarnpkg.com/ethers/-/ethers-6.11.1.tgz#96aae00b627c2e35f9b0a4d65c7ab658259ee6af" + integrity sha512-mxTAE6wqJQAbp5QAe/+o+rXOID7Nw91OZXvgpjDa1r4fAbq2Nu314oEZSbjoRLacuCzs7kUC3clEvkCQowffGg== + dependencies: + "@adraffy/ens-normalize" "1.10.1" + "@noble/curves" "1.2.0" + "@noble/hashes" "1.3.2" + "@types/node" "18.15.13" + aes-js "4.0.0-beta.5" + tslib "2.4.0" + ws "8.5.0" + +ethers@^6.9.2: + version "6.10.0" + resolved "https://registry.yarnpkg.com/ethers/-/ethers-6.10.0.tgz#20f3c63c60d59a993f8090ad423d8a3854b3b1cd" + integrity sha512-nMNwYHzs6V1FR3Y4cdfxSQmNgZsRj1RiTU25JwvnJLmyzw9z3SKxNc2XKDuiXXo/v9ds5Mp9m6HBabgYQQ26tA== + dependencies: + "@adraffy/ens-normalize" "1.10.0" + "@noble/curves" "1.2.0" + "@noble/hashes" "1.3.2" + "@types/node" "18.15.13" + aes-js "4.0.0-beta.5" + tslib "2.4.0" + ws "8.5.0" + ethjs-unit@0.1.6: version "0.1.6" resolved "https://registry.yarnpkg.com/ethjs-unit/-/ethjs-unit-0.1.6.tgz#c665921e476e87bce2a9d588a6fe0405b2c41699" @@ -9029,11 +10221,16 @@ eventemitter3@4.0.4: resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.4.tgz#b5463ace635a083d018bdc7c917b4c5f10a85384" integrity sha512-rlaVLnVxtxvoyLsQQFBx53YmXHDxRIzzTLbdfxqi4yocpSjAxXwkU0cScM5JgSKMqEhrZpnvQ2D9gjylR0AimQ== -eventemitter3@^4.0.4: +eventemitter3@^4.0.0, eventemitter3@^4.0.4: version "4.0.7" resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f" integrity sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw== +eventemitter3@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-5.0.1.tgz#53f5ffd0a492ac800721bb42c66b841de96423c4" + integrity sha512-GWkBvjiSZK87ELrYOSESUYeVIc9mvLLf/nXalMOS5dYrgZq9o5OVkbZAVM06CVxYsCwH9BDZFPlQTlPA1j4ahA== + events@^3.0.0, events@^3.3.0: version "3.3.0" resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400" @@ -9047,23 +10244,7 @@ evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3: md5.js "^1.3.4" safe-buffer "^5.1.1" -execa@^3.0.0: - version "3.4.0" - resolved "https://registry.yarnpkg.com/execa/-/execa-3.4.0.tgz#c08ed4550ef65d858fac269ffc8572446f37eb89" - integrity sha512-r9vdGQk4bmCuK1yKQu1KTwcT2zwfWdbdaXfCtAh+5nU/4fSX+JAb7vZGvI5naJrQlvONrEB20jeruESI69530g== - dependencies: - cross-spawn "^7.0.0" - get-stream "^5.0.0" - human-signals "^1.1.1" - is-stream "^2.0.0" - merge-stream "^2.0.0" - npm-run-path "^4.0.0" - onetime "^5.1.0" - p-finally "^2.0.0" - signal-exit "^3.0.2" - strip-final-newline "^2.0.0" - -execa@^5.1.1: +execa@5.1.1, execa@^5.1.1: version "5.1.1" resolved "https://registry.yarnpkg.com/execa/-/execa-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd" integrity sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg== @@ -9073,10 +10254,40 @@ execa@^5.1.1: 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" + npm-run-path "^4.0.1" + onetime "^5.1.2" + signal-exit "^3.0.3" + strip-final-newline "^2.0.0" + +execa@^6.0.0: + version "6.1.0" + resolved "https://registry.yarnpkg.com/execa/-/execa-6.1.0.tgz#cea16dee211ff011246556388effa0818394fb20" + integrity sha512-QVWlX2e50heYJcCPG0iWtf8r0xjEYfz/OYLGDYH+IyjWezzPNxz63qNFOu0l4YftGWuizFVZHHs8PrLU5p2IDA== + dependencies: + cross-spawn "^7.0.3" + get-stream "^6.0.1" + human-signals "^3.0.1" + is-stream "^3.0.0" + merge-stream "^2.0.0" + npm-run-path "^5.1.0" + onetime "^6.0.0" + signal-exit "^3.0.7" + strip-final-newline "^3.0.0" + +execa@^8.0.1: + version "8.0.1" + resolved "https://registry.yarnpkg.com/execa/-/execa-8.0.1.tgz#51f6a5943b580f963c3ca9c6321796db8cc39b8c" + integrity sha512-VyhnebXciFV2DESc+p6B+y0LjSm0krU4OgJN44qFAhBY0TJ+1V61tYD2+wHusZ6F9n5K+vl8k0sTy7PEfV4qpg== + dependencies: + cross-spawn "^7.0.3" + get-stream "^8.0.1" + human-signals "^5.0.0" + is-stream "^3.0.0" + merge-stream "^2.0.0" + npm-run-path "^5.1.0" + onetime "^6.0.0" + signal-exit "^4.1.0" + strip-final-newline "^3.0.0" expand-brackets@^2.1.4: version "2.1.4" @@ -9091,14 +10302,19 @@ expand-brackets@^2.1.4: snapdragon "^0.8.1" to-regex "^3.0.1" -express-logging@^1.1.1: +expand-template@^2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/expand-template/-/expand-template-2.0.3.tgz#6e14b3fcee0f3a6340ecb57d2e8918692052a47c" + integrity sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg== + +express-logging@1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/express-logging/-/express-logging-1.1.1.tgz#62839618cbab5bb3610f1a1c1485352fe9d26c2a" integrity sha512-1KboYwxxCG5kwkJHR5LjFDTD1Mgl8n4PIMcCuhhd/1OqaxlC68P3QKbvvAbZVUtVgtlxEdTgSUwf6yxwzRCuuA== dependencies: on-headers "^1.0.0" -express@^4.14.0, express@^4.17.1: +express@4.18.2, express@^4.14.0: version "4.18.2" resolved "https://registry.yarnpkg.com/express/-/express-4.18.2.tgz#3fabe08296e930c796c19e3c516979386ba9fd59" integrity sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ== @@ -9135,6 +10351,21 @@ express@^4.14.0, express@^4.17.1: utils-merge "1.0.1" vary "~1.1.2" +ext-list@^2.0.0: + version "2.2.2" + resolved "https://registry.yarnpkg.com/ext-list/-/ext-list-2.2.2.tgz#0b98e64ed82f5acf0f2931babf69212ef52ddd37" + integrity sha512-u+SQgsubraE6zItfVA0tBuCBhfU9ogSRnsvygI7wht9TS510oLkBRXBsqopeUG/GBOIQyKZO9wjTqIu/sf5zFA== + dependencies: + mime-db "^1.28.0" + +ext-name@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/ext-name/-/ext-name-5.0.0.tgz#70781981d183ee15d13993c8822045c506c8f0a6" + integrity sha512-yblEwXAbGv1VQDmow7s38W77hzAgJAO50ztBLMcUyUBfxv1HC+LGwtiEN+Co6LtlqT/5uwVOxsD4TNIilWhwdQ== + dependencies: + ext-list "^2.0.0" + sort-keys-length "^1.0.0" + ext@^1.1.2: version "1.7.0" resolved "https://registry.yarnpkg.com/ext/-/ext-1.7.0.tgz#0ea4383c0103d60e70be99e9a7f11027a33c4f5f" @@ -9195,6 +10426,17 @@ extract-files@^9.0.0: resolved "https://registry.yarnpkg.com/extract-files/-/extract-files-9.0.0.tgz#8a7744f2437f81f5ed3250ed9f1550de902fe54a" integrity sha512-CvdFfHkC95B4bBBk36hcEmvdR2awOdhhVUYH6S/zrVj3477zven/fJMYg7121h4T1xHZC+tetUpubpAhxwI7hQ== +extract-zip@2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-2.0.1.tgz#663dca56fe46df890d5f131ef4a06d22bb8ba13a" + integrity sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg== + dependencies: + debug "^4.1.1" + get-stream "^5.1.0" + yauzl "^2.10.0" + optionalDependencies: + "@types/yauzl" "^2.9.1" + extsprintf@1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05" @@ -9205,7 +10447,7 @@ extsprintf@^1.2.0: resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.1.tgz#8d172c064867f235c0c84a596806d279bf4bcc07" integrity sha512-Wrk35e8ydCKDj/ArClo1VrPVmN8zph5V4AtHwIuHhvMXsKf73UT3BOD+azBIW+3wOJ4FhEH7zyaJCFvChjYvMA== -eyes@^0.1.8: +eyes@0.1.x, eyes@^0.1.8: version "0.1.8" resolved "https://registry.yarnpkg.com/eyes/-/eyes-0.1.8.tgz#62cf120234c683785d902348a800ef3e0cc20bc0" integrity sha512-GipyPsXO1anza0AOZdy69Im7hGFCNB7Y/NGjDlZGJ3GJJLtwNSb2vrzYrTYJRrRloVx7pl+bhUaTB8yiccPvFQ== @@ -9217,6 +10459,11 @@ fake-merkle-patricia-tree@^1.0.1: dependencies: checkpoint-store "^1.1.0" +fast-content-type-parse@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/fast-content-type-parse/-/fast-content-type-parse-1.1.0.tgz#4087162bf5af3294d4726ff29b334f72e3a1092c" + integrity sha512-fBHHqSTFLVnR61C+gltJuE5GkVQMV0S2nqUO8TJ+5Z3qAKG8vAx4FKai1s5jq/inV1+sREynIWSuQ6HgoSXpDQ== + fast-decode-uri-component@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/fast-decode-uri-component/-/fast-decode-uri-component-1.0.1.tgz#46f8b6c22b30ff7a81357d4f59abfae938202543" @@ -9228,19 +10475,24 @@ fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3: integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q== fast-diff@^1.1.2, fast-diff@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.2.0.tgz#73ee11982d86caaf7959828d519cfe927fac5f03" - integrity sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w== + version "1.3.0" + resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.3.0.tgz#ece407fa550a64d638536cd727e129c61616e0f0" + integrity sha512-VxPP4NqbUjj6MaAOafWeUn2cXWLcCtljklUtZf0Ind4XQ+QPtmA0b18zZy0jIQx+ExRVCR/ZQpBmik5lXshNsw== -fast-fifo@^1.0.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/fast-fifo/-/fast-fifo-1.2.0.tgz#2ee038da2468e8623066dee96958b0c1763aa55a" - integrity sha512-NcvQXt7Cky1cNau15FWy64IjuO8X0JijhTBBrJj1YlxlDfRkJXNaK9RFUjwpfDPzMdv7wB38jr53l9tkNLxnWg== +fast-equals@^3.0.1: + version "3.0.3" + resolved "https://registry.yarnpkg.com/fast-equals/-/fast-equals-3.0.3.tgz#8e6cb4e51ca1018d87dd41982ef92758b3e4197f" + integrity sha512-NCe8qxnZFARSHGztGMZOO/PC1qa5MIFB5Hp66WdzbCRAz8U8US3bx1UTgLS49efBQPcUtO9gf5oVEY8o7y/7Kg== + +fast-fifo@^1.0.0, fast-fifo@^1.1.0, fast-fifo@^1.2.0: + version "1.3.2" + resolved "https://registry.yarnpkg.com/fast-fifo/-/fast-fifo-1.3.2.tgz#286e31de96eb96d38a97899815740ba2a4f3640c" + integrity sha512-/d9sfos4yxzpwkDkuN7k2SqFKtYNmCTzgfEpz82x34IM9/zc8KGxQoXg1liNC/izpRM/MBdt44Nmx41ZWqk+FQ== -fast-glob@^3.2.12, fast-glob@^3.2.5, fast-glob@^3.2.9: - version "3.2.12" - resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.12.tgz#7f39ec99c2e6ab030337142da9e0c18f37afae80" - integrity sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w== +fast-glob@^3.0.3, fast-glob@^3.2.12, fast-glob@^3.2.5, fast-glob@^3.2.9, fast-glob@^3.3.0, fast-glob@^3.3.2: + version "3.3.2" + resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.3.2.tgz#a904501e57cfdd2ffcded45e99a54fef55e46129" + integrity sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow== dependencies: "@nodelib/fs.stat" "^2.0.2" "@nodelib/fs.walk" "^1.2.3" @@ -9253,28 +10505,58 @@ fast-json-stable-stringify@^2.0.0: resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633" integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw== +fast-json-stringify@^5.7.0: + version "5.10.0" + resolved "https://registry.yarnpkg.com/fast-json-stringify/-/fast-json-stringify-5.10.0.tgz#9ac9f30b327873338204b5e13dc502ac57511d3b" + integrity sha512-fu1BhzPzgOdvK+sVhSPFzm06DQl0Dwbo+NQxWm21k03ili2wsJExXbGZ9qsD4Lsn7zFGltF8h9I1fuhk4JPnrQ== + dependencies: + "@fastify/deepmerge" "^1.0.0" + ajv "^8.10.0" + ajv-formats "^2.1.1" + fast-deep-equal "^3.1.3" + fast-uri "^2.1.0" + json-schema-ref-resolver "^1.0.1" + rfdc "^1.2.0" + fast-levenshtein@^2.0.6, fast-levenshtein@~2.0.6: version "2.0.6" resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" integrity sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw== -fast-querystring@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/fast-querystring/-/fast-querystring-1.1.1.tgz#f4c56ef56b1a954880cfd8c01b83f9e1a3d3fda2" - integrity sha512-qR2r+e3HvhEFmpdHMv//U8FnFlnYjaC6QKDuaXALDkw2kvHO8WDjxH+f/rHGR4Me4pnk8p9JAkRNTjYHAKRn2Q== +fast-levenshtein@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-3.0.0.tgz#37b899ae47e1090e40e3fd2318e4d5f0142ca912" + integrity sha512-hKKNajm46uNmTlhHSyZkmToAc56uZJwYq7yrciZjqOxnlfQwERDQJmHPUp7m1m9wx8vgOe8IaCKZ5Kv2k1DdCQ== + dependencies: + fastest-levenshtein "^1.0.7" + +fast-querystring@^1.0.0, fast-querystring@^1.1.1: + version "1.1.2" + resolved "https://registry.yarnpkg.com/fast-querystring/-/fast-querystring-1.1.2.tgz#a6d24937b4fc6f791b4ee31dcb6f53aeafb89f53" + integrity sha512-g6KuKWmFXc0fID8WWH0jit4g0AGBoJhCkJMb1RmbsSEUNvQ+ZC8D6CUZ+GtF8nMzSPXnhiePyyqqipzNNEnHjg== dependencies: fast-decode-uri-component "^1.0.1" -fast-redact@^3.0.0: - version "3.1.2" - resolved "https://registry.yarnpkg.com/fast-redact/-/fast-redact-3.1.2.tgz#d58e69e9084ce9fa4c1a6fa98a3e1ecf5d7839aa" - integrity sha512-+0em+Iya9fKGfEQGcd62Yv6onjBmmhV1uh86XVfOU8VwAe6kaFdQCWI9s0/Nnugx5Vd9tdbZ7e6gE2tR9dzXdw== +fast-redact@^3.0.0, fast-redact@^3.1.1: + version "3.3.0" + resolved "https://registry.yarnpkg.com/fast-redact/-/fast-redact-3.3.0.tgz#7c83ce3a7be4898241a46560d51de10f653f7634" + integrity sha512-6T5V1QK1u4oF+ATxs1lWUmlEk6P2T9HqJG3e2DnHOdVgZy2rFJBoEnrIedcTXlkAHU/zKC+7KETJ+KGGKwxgMQ== + +fast-safe-stringify@^2.0.7, fast-safe-stringify@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/fast-safe-stringify/-/fast-safe-stringify-2.1.1.tgz#c406a83b6e70d9e35ce3b30a81141df30aeba884" + integrity sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA== fast-text-encoding@^1.0.0: version "1.0.6" resolved "https://registry.yarnpkg.com/fast-text-encoding/-/fast-text-encoding-1.0.6.tgz#0aa25f7f638222e3396d72bf936afcf1d42d6867" integrity sha512-VhXlQgj9ioXCqGstD37E/HBeqEGV/qOD/kmbVG8h5xKBYvM1L3lR1Zn4555cQ8GkYbJa8aJSipLPndE1k6zK2w== +fast-uri@^2.0.0, fast-uri@^2.1.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/fast-uri/-/fast-uri-2.3.0.tgz#bdae493942483d299e7285dcb4627767d42e2793" + integrity sha512-eel5UKGn369gGEWOqBShmFJWfq/xSJvsgDzgLYC845GneayWvXBf0lJCBn5qTABfewy1ZDPoaR5OZCP+kssfuw== + fast-url-parser@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/fast-url-parser/-/fast-url-parser-1.1.3.tgz#f4af3ea9f34d8a271cf58ad2b3759f431f0b318d" @@ -9287,20 +10569,47 @@ fast-write-atomic@~0.2.0: resolved "https://registry.yarnpkg.com/fast-write-atomic/-/fast-write-atomic-0.2.1.tgz#7ee8ef0ce3c1f531043c09ae8e5143361ab17ede" integrity sha512-WvJe06IfNYlr+6cO3uQkdKdy3Cb1LlCJSF8zRs2eT8yuhdbSlR9nIt+TgQ92RUxiRrQm+/S7RARnMfCs5iuAjw== -fastfile@0.0.18: - version "0.0.18" - resolved "https://registry.yarnpkg.com/fastfile/-/fastfile-0.0.18.tgz#2b69bbbfd2fcccc9bc8099c27de1379b89756a4b" - integrity sha512-q03PTKc+wptis4WmuFOwPNQx2p5myFUrl/dMgRlW9mymc1Egyc14JPHgiGnWK+sJ0+dBl2Vwtfh5GfSQltYOpw== +fastest-levenshtein@1.0.16, fastest-levenshtein@^1.0.7: + version "1.0.16" + resolved "https://registry.yarnpkg.com/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz#210e61b6ff181de91ea9b3d1b84fdedd47e034e5" + integrity sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg== -fastfile@0.0.19: - version "0.0.19" - resolved "https://registry.yarnpkg.com/fastfile/-/fastfile-0.0.19.tgz#02cef9ade123b0a74adb794f4a1abcfa5719fd46" - integrity sha512-tz9nWR5KYb6eR2odFQ7oxqEkx8F3YQZ6NBJoJR92YEG3DqYOqyxMck8PKvTVNKx3uwvOqGnLXNScnqpdHRdHGQ== +fastfile@0.0.20: + version "0.0.20" + resolved "https://registry.yarnpkg.com/fastfile/-/fastfile-0.0.20.tgz#794a143d58cfda2e24c298e5ef619c748c8a1879" + integrity sha512-r5ZDbgImvVWCP0lA/cGNgQcZqR+aYdFx3u+CtJqUE510pBUVGMn4ulL/iRTI4tACTYsNJ736uzFxEBXesPAktA== -fastq@^1.6.0: - version "1.15.0" - resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.15.0.tgz#d04d07c6a2a68fe4599fea8d2e103a937fae6b3a" - integrity sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw== +fastify-plugin@^4.0.0: + version "4.5.1" + resolved "https://registry.yarnpkg.com/fastify-plugin/-/fastify-plugin-4.5.1.tgz#44dc6a3cc2cce0988bc09e13f160120bbd91dbee" + integrity sha512-stRHYGeuqpEZTL1Ef0Ovr2ltazUT9g844X5z/zEBFLG8RYlpDiOCIG+ATvYEp+/zmc7sN29mcIMp8gvYplYPIQ== + +fastify@4.17.0: + version "4.17.0" + resolved "https://registry.yarnpkg.com/fastify/-/fastify-4.17.0.tgz#b2c8245e572edef0b02a167d2d411a3c8a46d01a" + integrity sha512-tzuY1tgWJo2Y6qEKwmLhFvACUmr68Io2pqP/sDKU71KRM6A6R3DrCDqLGqANbeLZcKUfdfY58ut35CGqemcTgg== + dependencies: + "@fastify/ajv-compiler" "^3.5.0" + "@fastify/error" "^3.0.0" + "@fastify/fast-json-stringify-compiler" "^4.3.0" + abstract-logging "^2.0.1" + avvio "^8.2.0" + fast-content-type-parse "^1.0.0" + fast-json-stringify "^5.7.0" + find-my-way "^7.6.0" + light-my-request "^5.6.1" + pino "^8.5.0" + process-warning "^2.0.0" + proxy-addr "^2.0.7" + rfdc "^1.3.0" + secure-json-parse "^2.5.0" + semver "^7.3.7" + tiny-lru "^11.0.1" + +fastq@^1.6.0, fastq@^1.6.1: + version "1.16.0" + resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.16.0.tgz#83b9a9375692db77a822df081edb6a9cf6839320" + integrity sha512-ifCoaXsDrsdkWTtiNJX5uzHDsrck5TzfKKDcuFFTIrrc/BS076qgEIfoIy1VeZqViznfKiysPYTh/QeHtnIsYA== dependencies: reusify "^1.0.4" @@ -9317,9 +10626,9 @@ fbjs-css-vars@^1.0.0: integrity sha512-b2XGFAFdWZWg0phtAWLHCk836A1Xann+I+Dgd3Gk64MHKZO44FfoD1KxyvbSh0qZsIoXQGGlVztIY+oitJPpRQ== fbjs@^3.0.0: - version "3.0.4" - resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-3.0.4.tgz#e1871c6bd3083bac71ff2da868ad5067d37716c6" - integrity sha512-ucV0tDODnGV3JCnnkmoszb5lf4bNpzjv80K41wd4k798Etq+UYD0y0TIfalLjZoKgjive6/adkRnszwapiDgBQ== + version "3.0.5" + resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-3.0.5.tgz#aa0edb7d5caa6340011790bd9249dbef8a81128d" + integrity sha512-ztsSx77JBtkuMrEypfhgc3cI0+0h+svqeie7xHbh1k/IKdcydnvadp/mUaGgjAOXQmQSxsqgaRhS3q9fy+1kxg== dependencies: cross-fetch "^3.1.5" fbjs-css-vars "^1.0.0" @@ -9327,97 +10636,108 @@ fbjs@^3.0.0: object-assign "^4.1.0" promise "^7.1.1" setimmediate "^1.0.5" - ua-parser-js "^0.7.30" + ua-parser-js "^1.0.35" -fetch-ponyfill@^4.0.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/fetch-ponyfill/-/fetch-ponyfill-4.1.0.tgz#ae3ce5f732c645eab87e4ae8793414709b239893" - integrity sha512-knK9sGskIg2T7OnYLdZ2hZXn0CtDrAIBxYQLpmEf0BqfdWnwmM1weccUl5+4EdA44tzNSFAuxITPbXtPehUB3g== +fd-slicer@~1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.1.0.tgz#25c7c89cb1f9077f8891bbe61d8f390eae256f1e" + integrity sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g== dependencies: - node-fetch "~1.7.1" + pend "~1.2.0" -ffiasm@0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/ffiasm/-/ffiasm-0.1.1.tgz#34ca6a00a875b5a926f66fd46e79530194e9c312" - integrity sha512-irMMHiR9JJ7BVBrAhtliUawxVdPYSdyl81taUYJ4C1mJ0iw2ueThE/qtr0J8B83tsIY8HJvh0lg5F+6ClK4xpA== - dependencies: - big-integer "^1.6.48" - ejs "^3.0.1" - yargs "^15.3.1" +fdir@^6.0.1: + version "6.1.1" + resolved "https://registry.yarnpkg.com/fdir/-/fdir-6.1.1.tgz#316b58145a05223b75c8b371e80bb3bad8f1441e" + integrity sha512-QfKBVg453Dyn3mr0Q0O+Tkr1r79lOTAKSi9f/Ot4+qVEwxWhav2Z+SudrG9vQjM2aYRMQQZ2/Q1zdA8ACM1pDg== -ffjavascript@0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/ffjavascript/-/ffjavascript-0.1.0.tgz#456256c259654cc1ce864c6762b0e76ee1714100" - integrity sha512-dmKlUasSfvUcxBm8nCSKl2x7EFJsXA7OVP8XLFA03T2+6mAc3IiVLC2ambEVOcMOhyhl0vJfVZjM9f9d38D1rw== - dependencies: - big-integer "^1.6.48" +fecha@^4.2.0: + version "4.2.3" + resolved "https://registry.yarnpkg.com/fecha/-/fecha-4.2.3.tgz#4d9ccdbc61e8629b259fdca67e65891448d569fd" + integrity sha512-OP2IUU6HeYKJi3i0z4A19kHMQoLVs4Hc+DPqqxI2h/DPZHTm/vjsfC6P0b4jCMy14XizLBqvndQ+UilD7707Jw== -ffjavascript@0.2.10: - version "0.2.10" - resolved "https://registry.yarnpkg.com/ffjavascript/-/ffjavascript-0.2.10.tgz#b0bf88d69be0b51e0bd28e1966c4a6fb29a86682" - integrity sha512-GQI6gHYYG5/iD4Kt3VzezzK7fARJzP0zkc82V/+JAdjfeKBXhDSo5rpKFuK3cDcrdW0Fu2emuYNMEAuFqhEQvQ== +fetch-blob@^3.1.2, fetch-blob@^3.1.4: + version "3.2.0" + resolved "https://registry.yarnpkg.com/fetch-blob/-/fetch-blob-3.2.0.tgz#f09b8d4bbd45adc6f0c20b7e787e793e309dcce9" + integrity sha512-7yAQpD2UMJzLi1Dqv7qFYnPbaPx7ZfFK6PiIxQ4PfkGPyNyl2Ugx+a/umUonmKqjhM4DnfbMvdX6otXq83soQQ== dependencies: - big-integer "^1.6.48" - wasmcurves "0.0.5" - worker-threads "^1.0.0" + node-domexception "^1.0.0" + web-streams-polyfill "^3.0.3" -ffjavascript@0.2.22: - version "0.2.22" - resolved "https://registry.yarnpkg.com/ffjavascript/-/ffjavascript-0.2.22.tgz#101f33db330b0f6a0c10dec22ebf5725618a8a7d" - integrity sha512-EsVqap2Txm17bKW0z/jXCX3M7rQ++nQUAJY8alWDpyhjRj90xjl6GLeVSKZQ8rOFDQ/SFFXcEB8w9X8Boxid+w== +fetch-node-website@^7.3.0: + version "7.3.0" + resolved "https://registry.yarnpkg.com/fetch-node-website/-/fetch-node-website-7.3.0.tgz#89823c96087935eeb2e80ce0e7a6557d27761bb7" + integrity sha512-/wayUHbdVUWrD72aqRNNrr6+MHnCkumZgNugN0RfiWJpbNJUdAkMk4Z18MGayGZVVqYXR1RWrV+bIFEt5HuBZg== dependencies: - big-integer "^1.6.48" - wasmcurves "0.0.12" - worker-threads "^1.0.0" + cli-progress "^3.11.2" + colors-option "^4.4.0" + figures "^5.0.0" + got "^12.3.1" + is-plain-obj "^4.1.0" -ffjavascript@0.2.34: - version "0.2.34" - resolved "https://registry.yarnpkg.com/ffjavascript/-/ffjavascript-0.2.34.tgz#e0607d1635ad06e8519268af475bc90deac60fbd" - integrity sha512-fq/qfJluC4spiOD1lp5jfckZVnS0o0kI5eKXVLw7UKwIwbNr+NBMBveBVcidSfMizF87T6wb7NBtLSdckQiAnQ== +fetch-ponyfill@^4.0.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/fetch-ponyfill/-/fetch-ponyfill-4.1.0.tgz#ae3ce5f732c645eab87e4ae8793414709b239893" + integrity sha512-knK9sGskIg2T7OnYLdZ2hZXn0CtDrAIBxYQLpmEf0BqfdWnwmM1weccUl5+4EdA44tzNSFAuxITPbXtPehUB3g== dependencies: - big-integer "^1.6.48" - mocha "^8.2.1" - wasmcurves "0.0.14" - worker-threads "^1.0.0" + node-fetch "~1.7.1" -ffjavascript@0.2.35: - version "0.2.35" - resolved "https://registry.yarnpkg.com/ffjavascript/-/ffjavascript-0.2.35.tgz#9166d95173b1c0a743b455bb03a72b581922a42e" - integrity sha512-xnC51tWbi0ah4SH+02jEfJyO+P+NiZWnxQrLDLtBYY1Dv3QM5ydxzd+gxnLEfWdT8i1bMM5pIh5P25l6fNCaVQ== +ffjavascript@0.2.56: + version "0.2.56" + resolved "https://registry.yarnpkg.com/ffjavascript/-/ffjavascript-0.2.56.tgz#3509f98fcbd3e44ea93cd23519071b76d6eae433" + integrity sha512-em6G5Lrj7ucIqj4TYEgyoHs/j99Urwwqa4+YxEVY2hggnpRimVj+noX5pZQTxI1pvtiekZI4rG65JBf0xraXrg== dependencies: - big-integer "^1.6.48" - wasmcurves "0.0.14" - web-worker "^1.0.0" + wasmbuilder "0.0.16" + wasmcurves "0.2.0" + web-worker "^1.2.0" -ffjavascript@^0.2.30, ffjavascript@^0.2.38, ffjavascript@^0.2.39: - version "0.2.57" - resolved "https://registry.yarnpkg.com/ffjavascript/-/ffjavascript-0.2.57.tgz#ba1be96015b2688192e49f2f4de2cc5150fd8594" - integrity sha512-V+vxZ/zPNcthrWmqfe/1YGgqdkTamJeXiED0tsk7B84g40DKlrTdx47IqZuiygqAVG6zMw4qYuvXftIJWsmfKQ== +ffjavascript@0.2.60: + version "0.2.60" + resolved "https://registry.yarnpkg.com/ffjavascript/-/ffjavascript-0.2.60.tgz#4d8ae613d6bf4e98b3cc29ba10c626f5853854cf" + integrity sha512-T/9bnEL5xAZRDbQoEMf+pM9nrhK+C3JyZNmqiWub26EQorW7Jt+jR54gpqDhceA4Nj0YctPQwYnl8xa52/A26A== dependencies: wasmbuilder "0.0.16" - wasmcurves "0.2.0" + wasmcurves "0.2.2" web-worker "^1.2.0" -ffwasm@0.0.7: - version "0.0.7" - resolved "https://registry.yarnpkg.com/ffwasm/-/ffwasm-0.0.7.tgz#23bb9a3537ecc87c0f24fcfb3a9ddd0e86855fff" - integrity sha512-17cTLzv7HHAKqZbX8MvHxjSrR0yDdn1sh4TVsTbAvO9e6klhFicnyoVXc/sCuViV/M8g65sCmVrAmoPCZp1YkQ== +ffjavascript@0.2.63, ffjavascript@^0.2.45, ffjavascript@^0.2.48, ffjavascript@^0.2.56: + version "0.2.63" + resolved "https://registry.yarnpkg.com/ffjavascript/-/ffjavascript-0.2.63.tgz#0c1216a1f123dc9181df69e144473704d2f115eb" + integrity sha512-dBgdsfGks58b66JnUZeZpGxdMIDQ4QsD3VYlRJyFVrKQHb2kJy4R2gufx5oetrTxXPT+aEjg0dOvOLg1N0on4A== dependencies: - big-integer "^1.6.48" - wasmbuilder "0.0.10" + wasmbuilder "0.0.16" + wasmcurves "0.2.2" + web-worker "1.2.0" -figgy-pudding@^3.5.1: - version "3.5.2" - resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.2.tgz#b4eee8148abb01dcf1d1ac34367d59e12fa61d6e" - integrity sha512-0btnI/H8f2pavGMN8w40mlSKOfTK2SVJmBfBeVIj3kNw0swwgzyRq0d5TJVOwodFmtvpPeWPN/MCcfuWF0Ezbw== +figures@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/figures/-/figures-2.0.0.tgz#3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962" + integrity sha512-Oa2M9atig69ZkfwiApY8F2Yy+tzMbazyvqv21R0NsSC8floSOC09BbT1ITWAdoMGQvJ/aZnR1KMwdx9tvHnTNA== + dependencies: + escape-string-regexp "^1.0.5" -figures@^3.0.0: +figures@^3.0.0, figures@^3.2.0: version "3.2.0" resolved "https://registry.yarnpkg.com/figures/-/figures-3.2.0.tgz#625c18bd293c604dc4a8ddb2febf0c88341746af" integrity sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg== dependencies: escape-string-regexp "^1.0.5" +figures@^4.0.0: + version "4.0.1" + resolved "https://registry.yarnpkg.com/figures/-/figures-4.0.1.tgz#27b26609907bc888b3e3b0ef5403643f80aa2518" + integrity sha512-rElJwkA/xS04Vfg+CaZodpso7VqBknOYbzi6I76hI4X80RUjkSxO2oAyPmGbuXUppywjqndOrQDl817hDnI++w== + dependencies: + escape-string-regexp "^5.0.0" + is-unicode-supported "^1.2.0" + +figures@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/figures/-/figures-5.0.0.tgz#126cd055052dea699f8a54e8c9450e6ecfc44d5f" + integrity sha512-ej8ksPF4x6e5wvK9yevct0UCXh8TTFlWGVLlgjZuoBH1HwjIfKE/IdL5mq89sFA7zELi1VhKpmtDnrs7zWyeyg== + dependencies: + escape-string-regexp "^5.0.0" + is-unicode-supported "^1.2.0" + file-entry-cache@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz#211b2dd9659cb0394b073e7323ac3c933d522027" @@ -9425,18 +10745,41 @@ file-entry-cache@^6.0.1: dependencies: flat-cache "^3.0.4" +file-type@^18.5.0: + version "18.7.0" + resolved "https://registry.yarnpkg.com/file-type/-/file-type-18.7.0.tgz#cddb16f184d6b94106cfc4bb56978726b25cb2a2" + integrity sha512-ihHtXRzXEziMrQ56VSgU7wkxh55iNchFkosu7Y9/S+tXHdKyrGjVK0ujbqNnsxzea+78MaLhN6PGmfYSAv1ACw== + dependencies: + readable-web-to-node-stream "^3.0.2" + strtok3 "^7.0.0" + token-types "^5.0.1" + file-uri-to-path@1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz#553a7b8446ff6f684359c445f1e37a05dacc33dd" integrity sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw== -filelist@^1.0.1: +filelist@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/filelist/-/filelist-1.0.4.tgz#f78978a1e944775ff9e62e744424f215e58352b5" integrity sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q== dependencies: minimatch "^5.0.1" +filename-reserved-regex@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/filename-reserved-regex/-/filename-reserved-regex-3.0.0.tgz#3d5dd6d4e2d73a3fed2ebc4cd0b3448869a081f7" + integrity sha512-hn4cQfU6GOT/7cFHXBqeBg2TbrMBgdD0kcjLhvSQYYwm3s4B6cjvBfb7nBALJLAXqmU5xajSa7X2NnUud/VCdw== + +filenamify@^5.1.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/filenamify/-/filenamify-5.1.1.tgz#a1ccc5ae678a5e34f578afcb9b72898264d166d2" + integrity sha512-M45CbrJLGACfrPOkrTp3j2EcO9OBkKUYME0eiqOCa7i2poaklU0jhlIaMlr8ijLorT0uLAzrn3qXOp5684CkfA== + dependencies: + filename-reserved-regex "^3.0.0" + strip-outer "^2.0.0" + trim-repeated "^2.0.0" + fill-range@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7" @@ -9459,6 +10802,16 @@ filter-obj@^1.1.0: resolved "https://registry.yarnpkg.com/filter-obj/-/filter-obj-1.1.0.tgz#9b311112bc6c6127a16e016c6c5d7f19e0805c5b" integrity sha512-8rXg1ZnX7xzy2NGDVkBVaAy+lSlPNwad13BtgSlLuxfIslyt5Vg64U7tFcCt4WS1R0hvtnQybT/IyCkGZ3DpXQ== +filter-obj@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/filter-obj/-/filter-obj-3.0.0.tgz#dba2f9e64e921758ed9a51028ca2ed02d4cccbcf" + integrity sha512-oQZM+QmVni8MsYzcq9lgTHD/qeLqaG8XaOPOW7dzuSafVxSUlH1+1ZDefj2OD9f2XsmG5lFl2Euc9NI4jgwFWg== + +filter-obj@^5.0.0, filter-obj@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/filter-obj/-/filter-obj-5.1.0.tgz#5bd89676000a713d7db2e197f660274428e524ed" + integrity sha512-qWeTREPoT7I0bifpPUXtxkZJ1XJzxWtfoWWkdVGqa+eCr3SHW/Ocp89o8vLvbUuQnadybJpjOKu4V+RwO6sGng== + finalhandler@1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.2.0.tgz#7d23fe5731b207b4640e4fcd00aec1f9207a7b32" @@ -9472,23 +10825,14 @@ finalhandler@1.2.0: statuses "2.0.1" unpipe "~1.0.0" -find-cache-dir@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-2.1.0.tgz#8d0f94cd13fe43c6c7c261a0d86115ca918c05f7" - integrity sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ== - dependencies: - commondir "^1.0.1" - make-dir "^2.0.0" - pkg-dir "^3.0.0" - -find-cache-dir@^3.3.1: - version "3.3.2" - resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.3.2.tgz#b30c5b6eff0730731aea9bbd9dbecbd80256d64b" - integrity sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig== +find-my-way@^7.6.0: + version "7.7.0" + resolved "https://registry.yarnpkg.com/find-my-way/-/find-my-way-7.7.0.tgz#d7b51ca6046782bcddd5a8435e99ad057e5a8876" + integrity sha512-+SrHpvQ52Q6W9f3wJoJBbAQULJuNEEQwBvlvYwACDhBTLOTMiQ0HYWh4+vC3OivGP2ENcTI1oKlFA2OepJNjhQ== dependencies: - commondir "^1.0.1" - make-dir "^3.0.2" - pkg-dir "^4.1.0" + fast-deep-equal "^3.1.3" + fast-querystring "^1.0.0" + safe-regex2 "^2.0.0" find-replace@^1.0.3: version "1.0.3" @@ -9498,6 +10842,13 @@ find-replace@^1.0.3: array-back "^1.0.4" test-value "^2.1.0" +find-replace@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/find-replace/-/find-replace-3.0.0.tgz#3e7e23d3b05167a76f770c9fbd5258b0def68c38" + integrity sha512-6Tb2myMioCAgv5kfvP5/PkZZ/ntTpVK39fHY7WkWBgvbeE+VHd/tZuZ4mrC+bxh4cfOZeYKVPaJIZtZXV7GNCQ== + dependencies: + array-back "^3.0.1" + find-up@5.0.0, find-up@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc" @@ -9506,13 +10857,13 @@ find-up@5.0.0, find-up@^5.0.0: locate-path "^6.0.0" path-exists "^4.0.0" -find-up@^1.0.0: - version "1.1.2" - resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f" - integrity sha512-jvElSjyuo4EMQGoTwo1uJU5pQMwTW5lS1x05zzfJuTIyLR3zwO27LYrxNg+dlvKpGOuGy/MzBdXh80g0ve5+HA== +find-up@6.3.0, find-up@^6.0.0, find-up@^6.3.0: + version "6.3.0" + resolved "https://registry.yarnpkg.com/find-up/-/find-up-6.3.0.tgz#2abab3d3280b2dc7ac10199ef324c4e002c8c790" + integrity sha512-v2ZsoEuVHYy8ZIlYqwPe/39Cy+cFDzp4dXPaxNvkEuouymu+2Jbz0PxpKarJHYJTmv2HWT3O382qY8l4jMWthw== dependencies: - path-exists "^2.0.0" - pinkie-promise "^2.0.0" + locate-path "^7.1.0" + path-exists "^5.0.0" find-up@^2.1.0: version "2.1.0" @@ -9528,7 +10879,7 @@ find-up@^3.0.0: dependencies: locate-path "^3.0.0" -find-up@^4.0.0, find-up@^4.1.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== @@ -9544,19 +10895,13 @@ find-yarn-workspace-root@^1.2.1: fs-extra "^4.0.3" micromatch "^3.1.4" -find-yarn-workspace-root@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/find-yarn-workspace-root/-/find-yarn-workspace-root-2.0.0.tgz#f47fb8d239c900eb78179aa81b66673eac88f7bd" - integrity sha512-1IMnbjt4KzsQfnhnzNd8wUEgXZ44IzZaZmnLYx7D5FZlaHt2gW20Cri8Q+E/t5tIj4+epTBub+2Zxu/vNILzqQ== - dependencies: - micromatch "^4.0.2" - flat-cache@^3.0.4: - version "3.0.4" - resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.0.4.tgz#61b0338302b2fe9f957dcc32fc2a87f1c3048b11" - integrity sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg== + version "3.2.0" + resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.2.0.tgz#2c0c2d5040c99b1632771a9d105725c0115363ee" + integrity sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw== dependencies: - flatted "^3.1.0" + flatted "^3.2.9" + keyv "^4.5.3" rimraf "^3.0.2" flat@^5.0.2: @@ -9564,17 +10909,17 @@ flat@^5.0.2: resolved "https://registry.yarnpkg.com/flat/-/flat-5.0.2.tgz#8ca6fe332069ffa9d324c327198c598259ceb241" integrity sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ== -flatted@^3.1.0: - version "3.2.7" - resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.7.tgz#609f39207cb614b89d0765b477cb2d437fbf9787" - integrity sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ== +flatted@^3.2.9: + version "3.2.9" + resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.9.tgz#7eb4c67ca1ba34232ca9d2d93e9886e611ad7daf" + integrity sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ== floating-vue@^2.0.0-beta.20: - version "2.0.0-beta.20" - resolved "https://registry.yarnpkg.com/floating-vue/-/floating-vue-2.0.0-beta.20.tgz#c96df528afb952cdeee54f17183333ac6558628f" - integrity sha512-N68otcpp6WwcYC7zP8GeJqNZVdfvS7tEY88lwmuAHeqRgnfWx1Un8enzLxROyVnBDZ3TwUoUdj5IFg+bUT7JeA== + version "2.0.0" + resolved "https://registry.yarnpkg.com/floating-vue/-/floating-vue-2.0.0.tgz#1b14d019366386cc1906346191d2fa15dbdfa38b" + integrity sha512-YSffLYOjoaaPPBZc7VQR2qMCQ7xeXuh7i8a2u8WOdSmkjTtKtZpj2aaJnLtZRHmehrMHyCgtSxLu8jFNNX2sVw== dependencies: - "@floating-ui/dom" "^0.1.10" + "@floating-ui/dom" "~1.1.1" vue-resize "^2.0.0-alpha.1" flow-stoplight@^1.0.0: @@ -9582,30 +10927,42 @@ flow-stoplight@^1.0.0: resolved "https://registry.yarnpkg.com/flow-stoplight/-/flow-stoplight-1.0.0.tgz#4a292c5bcff8b39fa6cc0cb1a853d86f27eeff7b" integrity sha512-rDjbZUKpN8OYhB0IE/vY/I8UWO/602IIJEU/76Tv4LvYnwHCk0BCsvz4eRr9n+FQcri7L5cyaXOo0+/Kh4HisA== -flush-write-stream@^1.0.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/flush-write-stream/-/flush-write-stream-1.1.1.tgz#8dd7d873a1babc207d94ead0c2e0e44276ebf2e8" - integrity sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w== +flush-write-stream@2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/flush-write-stream/-/flush-write-stream-2.0.0.tgz#6f58e776154f5eefacff92a6e5a681c88ac50f7c" + integrity sha512-uXClqPxT4xW0lcdSBheb2ObVU+kuqUk3Jk64EwieirEXZx9XUrVwp/JuBfKAWaM4T5Td/VL7QLDWPXp/MvGm/g== dependencies: inherits "^2.0.3" - readable-stream "^2.3.6" + readable-stream "^3.1.1" + +fn.name@1.x.x: + version "1.1.0" + resolved "https://registry.yarnpkg.com/fn.name/-/fn.name-1.1.0.tgz#26cad8017967aea8731bc42961d04a3d5988accc" + integrity sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw== fnv-plus@^1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/fnv-plus/-/fnv-plus-1.3.1.tgz#c34cb4572565434acb08ba257e4044ce2b006d67" integrity sha512-Gz1EvfOneuFfk4yG458dJ3TLJ7gV19q3OM/vVvvHf7eT02Hm1DleB4edsia6ahbKgAYxO9gvyQ1ioWZR+a00Yw== -focus-trap@^7.4.0: - version "7.4.0" - resolved "https://registry.yarnpkg.com/focus-trap/-/focus-trap-7.4.0.tgz#20f760a497f593b01d2e446168009c1f12ab0385" - integrity sha512-yI7FwUqU4TVb+7t6PaQ3spT/42r/KLEi8mtdGoQo2li/kFzmu9URmalTvw7xCCJtSOyhBxscvEAmvjeN9iHARg== +focus-trap@^7.5.4: + version "7.5.4" + resolved "https://registry.yarnpkg.com/focus-trap/-/focus-trap-7.5.4.tgz#6c4e342fe1dae6add9c2aa332a6e7a0bbd495ba2" + integrity sha512-N7kHdlgsO/v+iD/dMoJKtsSqs5Dz/dXZVebRgJw23LDk+jMi/974zyiOYDziY2JPp8xivq9BmUGwIJMiuSBi7w== dependencies: - tabbable "^6.1.1" + tabbable "^6.2.0" + +folder-walker@3.2.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/folder-walker/-/folder-walker-3.2.0.tgz#98e00e59773f43416a6dcf0926d4c9436f65121d" + integrity sha512-VjAQdSLsl6AkpZNyrQJfO7BXLo4chnStqb055bumZMbRUPpVuPN3a4ktsnRCmrFZjtMlYLkyXiR5rAs4WOpC4Q== + dependencies: + from2 "^2.1.0" -follow-redirects@^1.12.1, follow-redirects@^1.14.0: - version "1.15.2" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.2.tgz#b460864144ba63f2681096f274c4e57026da2c13" - integrity sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA== +follow-redirects@^1.0.0, follow-redirects@^1.12.1, follow-redirects@^1.14.0, follow-redirects@^1.15.4: + version "1.15.5" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.5.tgz#54d4d6d062c0fa7d9d17feb008461550e3ba8020" + integrity sha512-vSFWUON1B+yAw1VN4xMfxgn5fTUiaOzAJCKBwIIgT/+7CuGy9+r+5gITvP62j3RmaD5Ph65UaERdOSRGUzZtgw== for-each@^0.3.3, for-each@~0.3.3: version "0.3.3" @@ -9619,17 +10976,25 @@ for-in@^1.0.2: resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80" integrity sha512-7EwmXrOjyL+ChxMhmG5lnW9MPt1aIeZEwKhQzoBUdTV0N3zuwWDZYVJatDvZ2OyzPUvdIAZDsCetk3coyMfcnQ== +foreground-child@^3.1.0: + version "3.1.1" + resolved "https://registry.yarnpkg.com/foreground-child/-/foreground-child-3.1.1.tgz#1d173e776d75d2772fed08efe4a0de1ea1b12d0d" + integrity sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg== + dependencies: + cross-spawn "^7.0.0" + signal-exit "^4.0.1" + forever-agent@~0.6.1: version "0.6.1" resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91" integrity sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw== -form-data-encoder@1.7.1: - version "1.7.1" - resolved "https://registry.yarnpkg.com/form-data-encoder/-/form-data-encoder-1.7.1.tgz#ac80660e4f87ee0d3d3c3638b7da8278ddb8ec96" - integrity sha512-EFRDrsMm/kyqbTQocNvRXMLjc7Es2Vk+IQFx/YW7hkUH1eBl4J1fqiP34l74Yt0pFLCNpc06fkbVk00008mzjg== +form-data-encoder@^2.1.2: + version "2.1.4" + resolved "https://registry.yarnpkg.com/form-data-encoder/-/form-data-encoder-2.1.4.tgz#261ea35d2a70d48d30ec7a9603130fa5515e9cd5" + integrity sha512-yDYSgNMraqvnxiEXO4hi88+YZxaHC6QKzb5N84iRCTDeRO7ZALpir/lVmf/uXUhnwUr2O4HU8s/n6x+yNjQkHw== -form-data@^2.2.0: +form-data@^2.2.0, form-data@^2.3.3: version "2.5.1" resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.5.1.tgz#f2cbec57b5e59e23716e128fe44d4e5dd23895f4" integrity sha512-m21N3WOmEEURgk6B9GLOE4RuWOFf28Lhh9qGYeNlGq4VDXUlJy2th2slBNU8Gp8EzloYZOibZJ7t5ecIrFSjVA== @@ -9665,6 +11030,13 @@ form-data@~2.3.2: combined-stream "^1.0.6" mime-types "^2.1.12" +formdata-polyfill@^4.0.10: + version "4.0.10" + resolved "https://registry.yarnpkg.com/formdata-polyfill/-/formdata-polyfill-4.0.10.tgz#24807c31c9d402e002ab3d8c720144ceb8848423" + integrity sha512-buewHzMvYL29jdeQTVILecSaZKnt/RJWjoZCF5OW60Z67/GmSLBkOFM7qh1PI3zFNtJbaZL5eQu1vLfazOwj4g== + dependencies: + fetch-blob "^3.1.2" + forwarded@0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.2.0.tgz#2269936428aad4c15c7ebe9779a84bf0b2a81811" @@ -9680,10 +11052,10 @@ fp-ts@^1.0.0: resolved "https://registry.yarnpkg.com/fp-ts/-/fp-ts-1.19.5.tgz#3da865e585dfa1fdfd51785417357ac50afc520a" integrity sha512-wDNqTimnzs8QqpldiId9OavWK2NptormjXnRJTQecNjzwfyp6P/8s/zG8e4h3ja3oqkKaY72UlTjQYt/1yXf9A== -fraction.js@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/fraction.js/-/fraction.js-4.2.0.tgz#448e5109a313a3527f5a3ab2119ec4cf0e0e2950" - integrity sha512-MhLuK+2gUcnZe8ZHlaaINnQLl0xRIGRfcGk2yl8xoQAfHrSsL3rYu6FCmBdkdbhc9EPlwyGHewaRsvwRMJtAlA== +fraction.js@^4.3.6: + version "4.3.7" + resolved "https://registry.yarnpkg.com/fraction.js/-/fraction.js-4.3.7.tgz#06ca0085157e42fda7f9e726e79fefc4068840f7" + integrity sha512-ZsDfxO51wGAXREY55a7la9LScWpwv9RxIrYABrlvOFBlH/ShPnrtsXeuUIfXKKOVicNxQ+o8JTbJvjS4M89yew== fragment-cache@^0.2.1: version "0.2.1" @@ -9697,7 +11069,14 @@ fresh@0.5.2: resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7" integrity sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q== -from2@^2.1.0: +from2-array@0.0.4: + version "0.0.4" + resolved "https://registry.yarnpkg.com/from2-array/-/from2-array-0.0.4.tgz#eafc16b65f6e2719bcd57fdc1869005ac1332cd6" + integrity sha512-0G0cAp7sYLobH7ALsr835x98PU/YeVF7wlwxdWbCUaea7wsa7lJfKZUAo6p2YZGZ8F94luCuqHZS3JtFER6uPg== + dependencies: + from2 "^2.0.3" + +from2@^2.0.3, from2@^2.1.0: version "2.3.0" resolved "https://registry.yarnpkg.com/from2/-/from2-2.3.0.tgz#8bfb5502bde4a4d36cfdeea007fcca21d7e382af" integrity sha512-OMcX/4IC/uqEPVgGeyfN22LJk6AZrMkRZHxcHBMBvHScDGgwTm2GT2Wkgtocyd3JfZffjj2kYUDXXII0Fk9W0g== @@ -9758,10 +11137,10 @@ fs-extra@^8.1.0: jsonfile "^4.0.0" universalify "^0.1.0" -fs-jetpack@^2.2.2: - version "2.4.0" - resolved "https://registry.yarnpkg.com/fs-jetpack/-/fs-jetpack-2.4.0.tgz#6080c4ab464a019d37a404baeb47f32af8835026" - integrity sha512-S/o9Dd7K9A7gicVU32eT8G0kHcmSu0rCVdP79P0MWInKFb8XpTc8Syhoo66k9no+HDshtlh4pUJTws8X+8fdFQ== +fs-jetpack@4.3.1: + version "4.3.1" + resolved "https://registry.yarnpkg.com/fs-jetpack/-/fs-jetpack-4.3.1.tgz#cdfd4b64e6bfdec7c7dc55c76b39efaa7853bb20" + integrity sha512-dbeOK84F6BiQzk2yqqCVwCPWTxAvVGJ3fMQc6E2wuEohS28mR6yHngbrKuVCK1KHRx/ccByDylqu4H5PCP2urQ== dependencies: minimatch "^3.0.2" rimraf "^2.6.3" @@ -9780,60 +11159,52 @@ fs-minipass@^2.0.0: dependencies: minipass "^3.0.0" -fs-write-stream-atomic@^1.0.8: - version "1.0.10" - resolved "https://registry.yarnpkg.com/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz#b47df53493ef911df75731e70a9ded0189db40c9" - integrity sha512-gehEzmPn2nAwr39eay+x3X34Ra+M2QlVUTLhkXPjWdeO8RF9kszk116avgBJM3ZyNHgHXBNx+VmPaFC36k0PzA== - dependencies: - graceful-fs "^4.1.2" - iferr "^0.1.5" - imurmurhash "^0.1.4" - readable-stream "1 || 2" +fs-readdir-recursive@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/fs-readdir-recursive/-/fs-readdir-recursive-1.1.0.tgz#e32fc030a2ccee44a6b5371308da54be0b397d27" + integrity sha512-GNanXlVr2pf02+sPN40XN8HG+ePaNcvM0q5mZBd668Obwb0yD5GiUbZOFgwn8kGMY6I3mdyDJzieUy3PTYyTRA== fs.realpath@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw== -fsevents@^1.2.7: - version "1.2.13" - resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.13.tgz#f325cb0455592428bcf11b383370ef70e3bfcc38" - integrity sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw== - dependencies: - bindings "^1.5.0" - nan "^2.12.1" - -fsevents@~2.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.3.2: + version "2.3.3" + resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.3.tgz#cac6407785d03675a2a5e1a5305c697b347d90d6" + integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw== -function-bind@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" - integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A== +function-bind@^1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.2.tgz#2c02d864d97f3ea6c8830c464cbd11ab6eab7a1c" + integrity sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA== -function.prototype.name@^1.1.5: - version "1.1.5" - resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.5.tgz#cce0505fe1ffb80503e6f9e46cc64e46a12a9621" - integrity sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA== +function.prototype.name@^1.1.6: + version "1.1.6" + resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.6.tgz#cdf315b7d90ee77a4c6ee216c3c3362da07533fd" + integrity sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg== dependencies: call-bind "^1.0.2" - define-properties "^1.1.3" - es-abstract "^1.19.0" - functions-have-names "^1.2.2" + define-properties "^1.2.0" + es-abstract "^1.22.1" + functions-have-names "^1.2.3" functional-red-black-tree@^1.0.1, functional-red-black-tree@~1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327" integrity sha512-dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g== -functions-have-names@^1.2.2: +functions-have-names@^1.2.3: version "1.2.3" resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.3.tgz#0404fe4ee2ba2f607f0e0ec3c80bae994133b834" integrity sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ== -ganache-core@^2.13.2, ganache-core@^2.7.0: +fuzzy@0.1.3: + version "0.1.3" + resolved "https://registry.yarnpkg.com/fuzzy/-/fuzzy-0.1.3.tgz#4c76ec2ff0ac1a36a9dccf9a00df8623078d4ed8" + integrity sha512-/gZffu4ykarLrCiP3Ygsa86UAo1E5vEVlvTrpkKywXSbP9Xhln3oSp9QSV57gEq3JFFpGJ4GZ+5zdEp3FcUh4w== + +ganache-core@^2.7.0: version "2.13.2" resolved "https://registry.yarnpkg.com/ganache-core/-/ganache-core-2.13.2.tgz#27e6fc5417c10e6e76e2e646671869d7665814a3" integrity sha512-tIF5cR+ANQz0+3pHWxHjIwHqFXcVo0Mb+kcsNhglNFALcYo49aQpnS9dqHartqPfMFjiHh/qFoD3mYK0d/qGgw== @@ -9870,6 +11241,21 @@ ganache-core@^2.13.2, ganache-core@^2.7.0: ethereumjs-wallet "0.6.5" web3 "1.2.11" +gauge@^3.0.0: + version "3.0.2" + resolved "https://registry.yarnpkg.com/gauge/-/gauge-3.0.2.tgz#03bf4441c044383908bcfa0656ad91803259b395" + integrity sha512-+5J6MS/5XksCuXq++uFRsnUd7Ovu1XenbeuIuNRJxYWjgQbPuFhT14lAvsWfqfAmnwluf1OwMjz39HjfLPci0Q== + dependencies: + aproba "^1.0.3 || ^2.0.0" + color-support "^1.1.2" + console-control-strings "^1.0.0" + has-unicode "^2.0.1" + object-assign "^4.1.1" + signal-exit "^3.0.0" + string-width "^4.2.3" + strip-ansi "^6.0.1" + wide-align "^1.1.2" + gaxios@^4.0.0: version "4.3.3" resolved "https://registry.yarnpkg.com/gaxios/-/gaxios-4.3.3.tgz#d44bdefe52d34b6435cc41214fdb160b64abfc22" @@ -9894,29 +11280,33 @@ gensync@^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" - integrity sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w== +get-amd-module-type@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/get-amd-module-type/-/get-amd-module-type-5.0.1.tgz#bef38ea3674e1aa1bda9c59c8b0da598582f73f2" + integrity sha512-jb65zDeHyDjFR1loOVk0HQGM5WNwoGB8aLWy3LKCieMKol0/ProHkhO2X1JxojuN10vbz1qNn09MJ7tNp7qMzw== + dependencies: + ast-module-types "^5.0.0" + node-source-walk "^6.0.1" get-caller-file@^2.0.1, get-caller-file@^2.0.5: version "2.0.5" resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== -get-func-name@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/get-func-name/-/get-func-name-2.0.0.tgz#ead774abee72e20409433a066366023dd6887a41" - integrity sha512-Hm0ixYtaSZ/V7C8FJrtZIuBBI+iSgL+1Aq82zSu8VQNB4S3Gk8e7Qs3VwBDJAhmRZcFqkl3tQu36g/Foh5I5ig== +get-func-name@^2.0.1, get-func-name@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/get-func-name/-/get-func-name-2.0.2.tgz#0d7cf20cd13fda808669ffa88f4ffc7a3943fc41" + integrity sha512-8vXOvuE167CtIc3OyItco7N/dpRtBbYOsPsXCz7X/PMnlGjYjSGuZJgM1Y7mmew7BKf9BqvLX2tnOVy1BBUsxQ== -get-intrinsic@^1.0.2, get-intrinsic@^1.1.1, get-intrinsic@^1.1.3, get-intrinsic@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.0.tgz#7ad1dc0535f3a2904bba075772763e5051f6d05f" - integrity sha512-L049y6nFOuom5wGyRc3/gdTLO94dySVKRACj1RmJZBQXlbTMhtNIgkWkUHq+jYmZvKf14EW1EoJnnjbmoHij0Q== +get-intrinsic@^1.0.2, get-intrinsic@^1.1.1, get-intrinsic@^1.1.3, get-intrinsic@^1.2.0, get-intrinsic@^1.2.1, get-intrinsic@^1.2.2: + version "1.2.2" + resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.2.tgz#281b7622971123e1ef4b3c90fd7539306da93f3b" + integrity sha512-0gSo4ml/0j98Y3lngkFEot/zhiCeWsbYIlZ+uZOVgzLyLaUw7wxUL+nCTP0XJvJg1AXulJRI3UJi8GsbDuxdGA== dependencies: - function-bind "^1.1.1" - has "^1.0.3" + function-bind "^1.1.2" + has-proto "^1.0.1" has-symbols "^1.0.3" + hasown "^2.0.0" get-iterator@^1.0.2: version "1.0.2" @@ -9928,16 +11318,36 @@ get-own-enumerable-property-symbols@^3.0.0: resolved "https://registry.yarnpkg.com/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.2.tgz#b5fde77f22cbe35f390b4e089922c50bce6ef664" integrity sha512-I0UBV/XOz1XkIJHEUDMZAbzCThU/H8DxmSfmdGcKPnVhu2VfFqr34jr9777IyaTYvxjedWhqVIilEDsCdP5G6g== +get-package-name@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/get-package-name/-/get-package-name-2.2.0.tgz#34d8438b5aa8b887a7c54cdf09854471cc8836de" + integrity sha512-LmCKVxioe63Fy6KDAQ/mmCSOSSRUE/x4zdrMD+7dU8quF3bGpzvP8mOmq4Dgce3nzU9AgkVDotucNOOg7c27BQ== + 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-please@^3.1.2: + version "3.1.2" + resolved "https://registry.yarnpkg.com/get-port-please/-/get-port-please-3.1.2.tgz#502795e56217128e4183025c89a48c71652f4e49" + integrity sha512-Gxc29eLs1fbn6LQ4jSU4vXjlwyZhF5HsGuMAa7gqBP4Rw4yxxltyDUuF5MBclFzDTXO+ACchGQoeela4DSfzdQ== + +get-port@5.1.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/get-port/-/get-port-5.1.1.tgz#0469ed07563479de6efb986baf053dcd7d4e3193" + integrity sha512-g/Q1aTSDOxFpchXC4i8ZWvxA1lnPqx/JHqcpIw0/LX9T8x/GBbi6YnlN5nhaKIFkT8oFsscUKgDJYxfwfS6QsQ== + get-port@^3.1.0: version "3.2.0" resolved "https://registry.yarnpkg.com/get-port/-/get-port-3.2.0.tgz#dd7ce7de187c06c8bf353796ac71e099f0980ebc" integrity sha512-x5UJKlgeUiNT8nyo/AcnwLnZuZNcSjSw0kogRB+Whd1fjjFq4B1hySFxSFWWSn4mIBzg3sRNUDFYc4g5gjPoLg== +get-port@^6.1.2: + version "6.1.2" + resolved "https://registry.yarnpkg.com/get-port/-/get-port-6.1.2.tgz#c1228abb67ba0e17fb346da33b15187833b9c08a" + integrity sha512-BrGGraKm2uPqurfGVj/z97/zv8dPleC6x9JBNRTrDNtCkkRF4rPwrQXFgL7+I+q8QSdU4ntLQX2D7KIxSy8nGw== + get-stream@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5" @@ -9945,7 +11355,7 @@ get-stream@^4.1.0: dependencies: pump "^3.0.0" -get-stream@^5.0.0, get-stream@^5.1.0: +get-stream@^5.1.0: version "5.2.0" resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz#4966a1795ee5ace65e706c4b7beb71257d6e22d3" integrity sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA== @@ -9957,6 +11367,11 @@ get-stream@^6.0.0, get-stream@^6.0.1: resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7" integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg== +get-stream@^8.0.1: + version "8.0.1" + resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-8.0.1.tgz#def9dfd71742cd7754a7761ed43749a27d02eca2" + integrity sha512-VaUJspBffn/LMCJVoMvSAdmscJyS1auj5Zulnn5UoYcY531UWmdwhRWkcGKnGU93m5HSXP9LP2usOryrBtQowA== + 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" @@ -9977,15 +11392,41 @@ getpass@^0.1.1: dependencies: assert-plus "^1.0.0" -glob-parent@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae" - integrity sha512-E8Ak/2+dZY6fnzlR7+ueWvhsH1SjHr4jjss4YS/h4py44jY9MhK/VFdaZJAWDz6BbL21KeteKxFSFpq8OS5gVA== +gh-release-fetch@4.0.3: + version "4.0.3" + resolved "https://registry.yarnpkg.com/gh-release-fetch/-/gh-release-fetch-4.0.3.tgz#258b6f6f247af68228510c89140751f38bd4e7a5" + integrity sha512-TOiP1nwLsH5shG85Yt6v6Kjq5JU/44jXyEpbcfPgmj3C829yeXIlx9nAEwQRaxtRF3SJinn2lz7XUkfG9W/U4g== + dependencies: + "@xhmikosr/downloader" "^13.0.0" + node-fetch "^3.3.1" + semver "^7.5.3" + +ghost-testrpc@^0.0.2: + version "0.0.2" + resolved "https://registry.yarnpkg.com/ghost-testrpc/-/ghost-testrpc-0.0.2.tgz#c4de9557b1d1ae7b2d20bbe474a91378ca90ce92" + integrity sha512-i08dAEgJ2g8z5buJIrCTduwPIhih3DP+hOCTyyryikfV8T0bNvHnGXO67i0DD1H4GBDETTclPy9njZbfluQYrQ== + dependencies: + chalk "^2.4.2" + node-emoji "^1.10.0" + +git-repo-info@2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/git-repo-info/-/git-repo-info-2.1.1.tgz#220ffed8cbae74ef8a80e3052f2ccb5179aed058" + integrity sha512-8aCohiDo4jwjOwma4FmYFd3i97urZulL8XL24nIPxuE+GZnfsAyy/g2Shqx6OjUiFKUXZM+Yy+KHnOmmA3FVcg== + +gitconfiglocal@2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/gitconfiglocal/-/gitconfiglocal-2.1.0.tgz#07c28685c55cc5338b27b5acbcfe34aeb92e43d1" + integrity sha512-qoerOEliJn3z+Zyn1HW2F6eoYJqKwS6MgC9cztTLUB/xLWX8gD/6T60pKn4+t/d6tP7JlybI7Z3z+I572CR/Vg== dependencies: - is-glob "^3.1.0" - path-dirname "^1.0.0" + ini "^1.3.2" + +github-from-package@0.0.0: + version "0.0.0" + resolved "https://registry.yarnpkg.com/github-from-package/-/github-from-package-0.0.0.tgz#97fb5d96bfde8973313f20e8288ef9a167fa64ce" + integrity sha512-SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw== -glob-parent@^5.1.2, glob-parent@~5.1.0, glob-parent@~5.1.2: +glob-parent@^5.1.2, glob-parent@~5.1.2: version "5.1.2" resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4" integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow== @@ -9999,10 +11440,10 @@ glob-parent@^6.0.2: dependencies: is-glob "^4.0.3" -glob@7.1.6: - version "7.1.6" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6" - integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA== +glob@7.1.7: + version "7.1.7" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz#3b193e9233f01d42d0b3f78294bbeeb418f94a90" + integrity sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ== dependencies: fs.realpath "^1.0.0" inflight "^1.0.4" @@ -10023,17 +11464,39 @@ glob@7.2.0: once "^1.3.0" path-is-absolute "^1.0.0" -glob@9.3.4: - version "9.3.4" - resolved "https://registry.yarnpkg.com/glob/-/glob-9.3.4.tgz#e75dee24891a80c25cc7ee1dd327e126b98679af" - integrity sha512-qaSc49hojMOv1EPM4EuyITjDSgSKI0rthoHnvE81tcOi1SCVndHko7auqxdQ14eiQG2NDBJBE86+2xIrbIvrbA== +glob@9.3.5: + version "9.3.5" + resolved "https://registry.yarnpkg.com/glob/-/glob-9.3.5.tgz#ca2ed8ca452781a3009685607fdf025a899dfe21" + integrity sha512-e1LleDykUz2Iu+MTYdkSsuWX8lvAjAcs0Xef0lNIu0S2wOAzuTxCJtcd9S3cijlwYF18EsU3rzb8jPVobxDh9Q== dependencies: fs.realpath "^1.0.0" minimatch "^8.0.2" minipass "^4.2.4" path-scurry "^1.6.1" -glob@^7.0.0, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.5, glob@~7.2.3: +glob@^10.3.10: + version "10.3.10" + resolved "https://registry.yarnpkg.com/glob/-/glob-10.3.10.tgz#0351ebb809fd187fe421ab96af83d3a70715df4b" + integrity sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g== + dependencies: + foreground-child "^3.1.0" + jackspeak "^2.3.5" + minimatch "^9.0.1" + minipass "^5.0.0 || ^6.0.2 || ^7.0.0" + path-scurry "^1.10.1" + +glob@^5.0.15: + version "5.0.15" + resolved "https://registry.yarnpkg.com/glob/-/glob-5.0.15.tgz#1bc936b9e02f4a603fcc222ecf7633d30b8b93b1" + integrity sha512-c9IPMazfRITpmAAKi22dK1VKxGDX9ehhqfABDriL/lzO92xcUKEJPQHrVA/2YHSNFB4iFlykVmWvwo48nr3OxA== + dependencies: + inflight "^1.0.4" + inherits "2" + minimatch "2 || 3" + once "^1.3.0" + path-is-absolute "^1.0.0" + +glob@^7.0.0, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.5, glob@~7.2.3: version "7.2.3" resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b" integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q== @@ -10045,7 +11508,7 @@ glob@^7.0.0, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.5, gl once "^1.3.0" path-is-absolute "^1.0.0" -glob@^8.0.1, glob@^8.0.3: +glob@^8.0.0, glob@^8.0.1, glob@^8.0.3: version "8.1.0" resolved "https://registry.yarnpkg.com/glob/-/glob-8.1.0.tgz#d388f656593ef708ee3e34640fdfb99a9fd1c33e" integrity sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ== @@ -10056,6 +11519,37 @@ glob@^8.0.1, glob@^8.0.3: minimatch "^5.0.1" once "^1.3.0" +global-cache-dir@^4.3.1: + version "4.4.0" + resolved "https://registry.yarnpkg.com/global-cache-dir/-/global-cache-dir-4.4.0.tgz#8921295d32abe0f7768e96acdf7f40a9874050b7" + integrity sha512-bk0gI6IbbphRjAaCJJn5H+T/CcEck5B3a5KBO2BXSDzjFSV+API17w8GA7YPJ6IXJiasW8M0VsEIig1PCHdfOQ== + dependencies: + cachedir "^2.3.0" + path-exists "^5.0.0" + +global-dirs@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-3.0.1.tgz#0c488971f066baceda21447aecb1a8b911d22485" + integrity sha512-NBcGGFbBA9s1VzD41QXDG+3++t9Mn5t1FpLdhESY6oKY4gYTFpX4wO3sqGUa0Srjtbfj3szX0RnemmrVRUdULA== + dependencies: + ini "2.0.0" + +global-modules@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-2.0.0.tgz#997605ad2345f27f51539bea26574421215c7780" + integrity sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A== + dependencies: + global-prefix "^3.0.0" + +global-prefix@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/global-prefix/-/global-prefix-3.0.0.tgz#fc85f73064df69f50421f47f883fe5b913ba9b97" + integrity sha512-awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg== + dependencies: + ini "^1.3.5" + kind-of "^6.0.2" + which "^1.3.1" + global@~4.4.0: version "4.4.0" resolved "https://registry.yarnpkg.com/global/-/global-4.4.0.tgz#3e7b105179006a323ed71aafca3e9c57a5cc6406" @@ -10070,9 +11564,9 @@ globals@^11.1.0: integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA== globals@^13.19.0: - version "13.20.0" - resolved "https://registry.yarnpkg.com/globals/-/globals-13.20.0.tgz#ea276a1e508ffd4f1612888f9d1bad1e2717bf82" - integrity sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ== + version "13.24.0" + resolved "https://registry.yarnpkg.com/globals/-/globals-13.24.0.tgz#8432a19d78ce0c1e833949c36adb345400bb1171" + integrity sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ== dependencies: type-fest "^0.20.2" @@ -10088,7 +11582,21 @@ globalthis@^1.0.3: dependencies: define-properties "^1.1.3" -globby@^11.0.1, globby@^11.0.3, globby@^11.1.0: +globby@^10.0.1: + version "10.0.2" + resolved "https://registry.yarnpkg.com/globby/-/globby-10.0.2.tgz#277593e745acaa4646c3ab411289ec47a0392543" + integrity sha512-7dUi7RvCoT/xast/o/dLN53oqND4yk0nsHkhRgn9w65C4PofCLOoJ39iSOg+qVDdWQPIEj+eszMHQ+aLVwwQSg== + dependencies: + "@types/glob" "^7.1.1" + array-union "^2.1.0" + dir-glob "^3.0.1" + fast-glob "^3.0.3" + glob "^7.1.3" + ignore "^5.1.1" + merge2 "^1.2.3" + slash "^3.0.0" + +globby@^11.0.3, globby@^11.1.0: version "11.1.0" resolved "https://registry.yarnpkg.com/globby/-/globby-11.1.0.tgz#bd4be98bb042f83d796f7e3811991fbe82a0d34b" integrity sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g== @@ -10100,20 +11608,32 @@ globby@^11.0.1, globby@^11.0.3, globby@^11.1.0: merge2 "^1.4.1" slash "^3.0.0" -"gluegun@https://github.com/edgeandnode/gluegun#v4.3.1-pin-colors-dep": - version "4.3.1" - resolved "https://github.com/edgeandnode/gluegun#b34b9003d7bf556836da41b57ef36eb21570620a" +globby@^13.0.0, globby@^13.1.1: + version "13.2.2" + resolved "https://registry.yarnpkg.com/globby/-/globby-13.2.2.tgz#63b90b1bf68619c2135475cbd4e71e66aa090592" + integrity sha512-Y1zNGV+pzQdh7H39l9zgB4PJqjRNqydvdYCDG4HFXM4XuvSaQQlEc91IU1yALL8gUTDomgBAfz3XJdmUS+oo0w== dependencies: - apisauce "^1.0.1" + dir-glob "^3.0.1" + fast-glob "^3.3.0" + ignore "^5.2.4" + merge2 "^1.4.1" + slash "^4.0.0" + +gluegun@5.1.6: + version "5.1.6" + resolved "https://registry.yarnpkg.com/gluegun/-/gluegun-5.1.6.tgz#74ec13193913dc610f5c1a4039972c70c96a7bad" + integrity sha512-9zbi4EQWIVvSOftJWquWzr9gLX2kaDgPkNR5dYWbM53eVvCI3iKuxLlnKoHC0v4uPoq+Kr/+F569tjoFbA4DSA== + dependencies: + apisauce "^2.1.5" app-module-path "^2.2.0" - cli-table3 "~0.5.0" - colors "1.3.3" - cosmiconfig "6.0.0" - cross-spawn "^7.0.0" - ejs "^2.6.1" - enquirer "2.3.4" - execa "^3.0.0" - fs-jetpack "^2.2.2" + cli-table3 "0.6.0" + colors "1.4.0" + cosmiconfig "7.0.1" + cross-spawn "7.0.3" + ejs "3.1.8" + enquirer "2.3.6" + execa "5.1.1" + fs-jetpack "4.3.1" lodash.camelcase "^4.3.0" lodash.kebabcase "^4.1.1" lodash.lowercase "^4.3.0" @@ -10129,12 +11649,18 @@ globby@^11.0.1, globby@^11.0.3, globby@^11.1.0: lodash.trimstart "^4.5.1" lodash.uppercase "^4.3.0" lodash.upperfirst "^4.3.1" - ora "^4.0.0" + ora "4.0.2" pluralize "^8.0.0" - ramdasauce "^2.1.0" - semver "^7.0.0" - which "^2.0.0" - yargs-parser "^16.1.0" + semver "7.3.5" + which "2.0.2" + yargs-parser "^21.0.0" + +gonzales-pe@^4.3.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/gonzales-pe/-/gonzales-pe-4.3.0.tgz#fe9dec5f3c557eead09ff868c65826be54d067b3" + integrity sha512-otgSPpUmdWJ43VXyiNgEYE4luzHCL2pz4wQ0OnDluC6Eg4Ko3Vexy/SrSynglw/eR+OhkzmqFCZa/OFa/RgAOQ== + dependencies: + minimist "^1.2.5" google-auth-library@^6.1.3: version "6.1.6" @@ -10164,34 +11690,15 @@ google-spreadsheet@^3.3.0: integrity sha512-ahmRNh14s1i3phfvbF2mxen1lohWJpUaFWgsU6P6bXu7QrmxMaim1Ys/7BU4W5yucWCzphoIrHMbrbeIR5K9mw== dependencies: axios "^0.21.4" - google-auth-library "^6.1.3" - lodash "^4.17.21" - -gopd@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/gopd/-/gopd-1.0.1.tgz#29ff76de69dac7489b7c0918a5788e56477c332c" - integrity sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA== - dependencies: - get-intrinsic "^1.1.3" - -got@12.1.0: - version "12.1.0" - resolved "https://registry.yarnpkg.com/got/-/got-12.1.0.tgz#099f3815305c682be4fd6b0ee0726d8e4c6b0af4" - integrity sha512-hBv2ty9QN2RdbJJMK3hesmSkFTjVIHyIDDbssCKnSmq62edGgImJWD10Eb1k77TiV1bxloxqcFAVK8+9pkhOig== - dependencies: - "@sindresorhus/is" "^4.6.0" - "@szmarczak/http-timer" "^5.0.1" - "@types/cacheable-request" "^6.0.2" - "@types/responselike" "^1.0.0" - cacheable-lookup "^6.0.4" - cacheable-request "^7.0.2" - decompress-response "^6.0.0" - form-data-encoder "1.7.1" - get-stream "^6.0.1" - http2-wrapper "^2.1.10" - lowercase-keys "^3.0.0" - p-cancelable "^3.0.0" - responselike "^2.0.0" + google-auth-library "^6.1.3" + lodash "^4.17.21" + +gopd@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/gopd/-/gopd-1.0.1.tgz#29ff76de69dac7489b7c0918a5788e56477c332c" + integrity sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA== + dependencies: + get-intrinsic "^1.1.3" got@9.6.0: version "9.6.0" @@ -10227,15 +11734,37 @@ got@^11.8.5: p-cancelable "^2.0.0" responselike "^2.0.0" -graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.1.9, graceful-fs@^4.2.0, graceful-fs@^4.2.4: +got@^12.0.0, got@^12.1.0, got@^12.3.1, got@^12.6.1: + version "12.6.1" + resolved "https://registry.yarnpkg.com/got/-/got-12.6.1.tgz#8869560d1383353204b5a9435f782df9c091f549" + integrity sha512-mThBblvlAF1d4O5oqyvN+ZxLAYwIJK7bpMxgYqPD9okW0C3qm5FFn7k811QrcuEBwaogR3ngOFoCfs6mRv7teQ== + dependencies: + "@sindresorhus/is" "^5.2.0" + "@szmarczak/http-timer" "^5.0.1" + cacheable-lookup "^7.0.0" + cacheable-request "^10.2.8" + decompress-response "^6.0.0" + form-data-encoder "^2.1.2" + get-stream "^6.0.1" + http2-wrapper "^2.1.10" + lowercase-keys "^3.0.0" + p-cancelable "^3.0.0" + responselike "^3.0.0" + +graceful-fs@4.2.10: + version "4.2.10" + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c" + integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA== + +graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.3, graceful-fs@^4.1.6, graceful-fs@^4.1.9, graceful-fs@^4.2.0, graceful-fs@^4.2.10, graceful-fs@^4.2.11, graceful-fs@^4.2.4, graceful-fs@^4.2.6, graceful-fs@^4.2.9: version "4.2.11" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3" integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ== -grapheme-splitter@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz#9cf3a665c6247479896834af35cf1dbb4400767e" - integrity sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ== +graphemer@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/graphemer/-/graphemer-1.4.0.tgz#fb2f1d55e0e3a1849aeffc90c4fa0dd53a0e66c6" + integrity sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag== graphql-config@^4.5.0: version "4.5.0" @@ -10270,9 +11799,9 @@ graphql-request@5.1.0: form-data "^3.0.0" graphql-request@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/graphql-request/-/graphql-request-6.0.0.tgz#9c8b6a0c341f289e049936d03cc9205300faae1c" - integrity sha512-2BmHTuglonjZvmNVw6ZzCfFlW/qkIPds0f+Qdi/Lvjsl3whJg2uvHmSvHnLWhUTEw6zcxPYAHiZoPvSVKOZ7Jw== + version "6.1.0" + resolved "https://registry.yarnpkg.com/graphql-request/-/graphql-request-6.1.0.tgz#f4eb2107967af3c7a5907eb3131c671eac89be4f" + integrity sha512-p+XPfS4q7aIpKVcgmnZKhMNqhltk20hfXtkaIkTfjjmiKMJ5xrt5c743cL03y/K7y1rg3WrIC49xGiEQ4mxdNw== dependencies: "@graphql-typed-document-node/core" "^3.2.0" cross-fetch "^3.1.5" @@ -10295,14 +11824,9 @@ graphql@15.5.0: integrity sha512-OmaM7y0kaK31NKG31q4YbD2beNYa6jBBKtMFT6gLYJljHLJr42IqJ8KX08u3Li/0ifzTU5HjmoOOrwa5BRLeDA== graphql@^16.6.0: - version "16.6.0" - resolved "https://registry.yarnpkg.com/graphql/-/graphql-16.6.0.tgz#c2dcffa4649db149f6282af726c8c83f1c7c5fdb" - integrity sha512-KPIBPDlW7NxrbT/eh4qPXz5FiFdL5UbaA0XUNz2Rp3Z3hqBSkbj0GVjwFDztsWVauZUWsbKHgMg++sk8UX0bkw== - -growl@1.10.5: - version "1.10.5" - resolved "https://registry.yarnpkg.com/growl/-/growl-1.10.5.tgz#f2735dc2283674fa67478b10181059355c369e5e" - integrity sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA== + version "16.8.1" + resolved "https://registry.yarnpkg.com/graphql/-/graphql-16.8.1.tgz#1930a965bef1170603702acdb68aedd3f3cf6f07" + integrity sha512-59LZHPdGZVh695Ud9lRzPBVTtlX9ZCV150Er2W43ro37wVof0ctenSaskPPjN7lVTIN8mSZt8PHUNKZuNQUuxw== gtoken@^5.0.4: version "5.3.2" @@ -10313,6 +11837,20 @@ gtoken@^5.0.4: google-p12-pem "^3.1.3" jws "^4.0.0" +h3@^1.10.0, h3@^1.8.2: + version "1.10.0" + resolved "https://registry.yarnpkg.com/h3/-/h3-1.10.0.tgz#55ac36deb6e250ada5ff1940b6324bc6acc4085f" + integrity sha512-Tw1kcIC+AeimwRmviiObaD5EB430Yt+lTgOxLJxNr96Vd/fGRu04EF7aKfOAcpwKCI+U2JlbxOLhycD86p3Ciw== + dependencies: + cookie-es "^1.0.0" + defu "^6.1.3" + destr "^2.0.2" + iron-webcrypto "^1.0.0" + radix3 "^1.1.0" + ufo "^1.3.2" + uncrypto "^0.1.3" + unenv "^1.8.0" + hamt-sharding@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/hamt-sharding/-/hamt-sharding-1.0.0.tgz#8c7cccb068cd871d721c21e6f09219e5e66383d1" @@ -10320,6 +11858,18 @@ hamt-sharding@^1.0.0: dependencies: sparse-array "^1.3.1" +handlebars@^4.0.1, handlebars@^4.7.7: + version "4.7.8" + resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.7.8.tgz#41c42c18b1be2365439188c77c6afae71c0cd9e9" + integrity sha512-vafaFqs8MZkRrSX7sFVUdo3ap/eNiLnb4IakshzvP56X5Nr1iGKAIqdX6tMlm6HcNRIkr6AxO5jFEoJzzpT8aQ== + dependencies: + minimist "^1.2.5" + neo-async "^2.6.2" + source-map "^0.6.1" + wordwrap "^1.0.0" + optionalDependencies: + uglify-js "^3.1.4" + har-schema@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92" @@ -10338,40 +11888,104 @@ hard-rejection@^2.1.0: resolved "https://registry.yarnpkg.com/hard-rejection/-/hard-rejection-2.1.0.tgz#1c6eda5c1685c63942766d79bb40ae773cecd883" integrity sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA== -hardhat-contract-sizer@^2.6.1: - version "2.8.0" - resolved "https://registry.yarnpkg.com/hardhat-contract-sizer/-/hardhat-contract-sizer-2.8.0.tgz#730a9bf35ed200ba57b6865bd3f459a91c90f205" - integrity sha512-jXt2Si3uIDx5z99J+gvKa0yvIw156pE4dpH9X/PvTQv652BUd+qGj7WT93PXnHXGh5qhQLkjDYeZMYNOThfjFg== +hardhat-contract-sizer@^2.10.0: + version "2.10.0" + resolved "https://registry.yarnpkg.com/hardhat-contract-sizer/-/hardhat-contract-sizer-2.10.0.tgz#72646f43bfe50e9a5702c9720c9bc3e77d93a2c9" + integrity sha512-QiinUgBD5MqJZJh1hl1jc9dNnpJg7eE/w4/4GEnrcmZJJTDbVFNe3+/3Ep24XqISSkYxRz36czcPHKHd/a0dwA== dependencies: chalk "^4.0.0" cli-table3 "^0.6.0" strip-ansi "^6.0.0" -hardhat@^2.12.5: - version "2.14.0" - resolved "https://registry.yarnpkg.com/hardhat/-/hardhat-2.14.0.tgz#b60c74861494aeb1b50803cf04cc47865a42b87a" - integrity sha512-73jsInY4zZahMSVFurSK+5TNCJTXMv+vemvGia0Ac34Mm19fYp6vEPVGF3sucbumszsYxiTT2TbS8Ii2dsDSoQ== +hardhat-gas-reporter@^1.0.8: + version "1.0.9" + resolved "https://registry.yarnpkg.com/hardhat-gas-reporter/-/hardhat-gas-reporter-1.0.9.tgz#9a2afb354bc3b6346aab55b1c02ca556d0e16450" + integrity sha512-INN26G3EW43adGKBNzYWOlI3+rlLnasXTwW79YNnUhXPDa+yHESgt639dJEs37gCjhkbNKcRRJnomXEuMFBXJg== + dependencies: + array-uniq "1.0.3" + eth-gas-reporter "^0.2.25" + sha1 "^1.1.1" + +hardhat@^2.19.4: + version "2.19.4" + resolved "https://registry.yarnpkg.com/hardhat/-/hardhat-2.19.4.tgz#5112c30295d8be2e18e55d847373c50483ed1902" + integrity sha512-fTQJpqSt3Xo9Mn/WrdblNGAfcANM6XC3tAEi6YogB4s02DmTf93A8QsGb8uR0KR8TFcpcS8lgiW4ugAIYpnbrQ== dependencies: "@ethersproject/abi" "^5.1.2" "@metamask/eth-sig-util" "^4.0.0" - "@nomicfoundation/ethereumjs-block" "5.0.1" - "@nomicfoundation/ethereumjs-blockchain" "7.0.1" - "@nomicfoundation/ethereumjs-common" "4.0.1" - "@nomicfoundation/ethereumjs-evm" "2.0.1" - "@nomicfoundation/ethereumjs-rlp" "5.0.1" - "@nomicfoundation/ethereumjs-statemanager" "2.0.1" - "@nomicfoundation/ethereumjs-trie" "6.0.1" - "@nomicfoundation/ethereumjs-tx" "5.0.1" - "@nomicfoundation/ethereumjs-util" "9.0.1" - "@nomicfoundation/ethereumjs-vm" "7.0.1" + "@nomicfoundation/ethereumjs-block" "5.0.2" + "@nomicfoundation/ethereumjs-blockchain" "7.0.2" + "@nomicfoundation/ethereumjs-common" "4.0.2" + "@nomicfoundation/ethereumjs-evm" "2.0.2" + "@nomicfoundation/ethereumjs-rlp" "5.0.2" + "@nomicfoundation/ethereumjs-statemanager" "2.0.2" + "@nomicfoundation/ethereumjs-trie" "6.0.2" + "@nomicfoundation/ethereumjs-tx" "5.0.2" + "@nomicfoundation/ethereumjs-util" "9.0.2" + "@nomicfoundation/ethereumjs-vm" "7.0.2" + "@nomicfoundation/solidity-analyzer" "^0.1.0" + "@sentry/node" "^5.18.1" + "@types/bn.js" "^5.1.0" + "@types/lru-cache" "^5.1.0" + adm-zip "^0.4.16" + aggregate-error "^3.0.0" + ansi-escapes "^4.3.0" + chalk "^2.4.2" + chokidar "^3.4.0" + ci-info "^2.0.0" + debug "^4.1.1" + enquirer "^2.3.0" + env-paths "^2.2.0" + ethereum-cryptography "^1.0.3" + ethereumjs-abi "^0.6.8" + find-up "^2.1.0" + fp-ts "1.19.3" + fs-extra "^7.0.1" + glob "7.2.0" + immutable "^4.0.0-rc.12" + io-ts "1.10.4" + keccak "^3.0.2" + lodash "^4.17.11" + mnemonist "^0.38.0" + mocha "^10.0.0" + p-map "^4.0.0" + raw-body "^2.4.1" + resolve "1.17.0" + semver "^6.3.0" + solc "0.7.3" + source-map-support "^0.5.13" + stacktrace-parser "^0.1.10" + tsort "0.0.1" + undici "^5.14.0" + uuid "^8.3.2" + ws "^7.4.6" + +hardhat@^2.20.1: + version "2.20.1" + resolved "https://registry.yarnpkg.com/hardhat/-/hardhat-2.20.1.tgz#3ad8f2b003a96c9ce80a55fec3575580ff2ddcd4" + integrity sha512-q75xDQiQtCZcTMBwjTovrXEU5ECr49baxr4/OBkIu/ULTPzlB20yk1dRWNmD2IFbAeAeXggaWvQAdpiScaHtPw== + dependencies: + "@ethersproject/abi" "^5.1.2" + "@metamask/eth-sig-util" "^4.0.0" + "@nomicfoundation/ethereumjs-block" "5.0.4" + "@nomicfoundation/ethereumjs-blockchain" "7.0.4" + "@nomicfoundation/ethereumjs-common" "4.0.4" + "@nomicfoundation/ethereumjs-evm" "2.0.4" + "@nomicfoundation/ethereumjs-rlp" "5.0.4" + "@nomicfoundation/ethereumjs-statemanager" "2.0.4" + "@nomicfoundation/ethereumjs-trie" "6.0.4" + "@nomicfoundation/ethereumjs-tx" "5.0.4" + "@nomicfoundation/ethereumjs-util" "9.0.4" + "@nomicfoundation/ethereumjs-verkle" "0.0.2" + "@nomicfoundation/ethereumjs-vm" "7.0.4" "@nomicfoundation/solidity-analyzer" "^0.1.0" "@sentry/node" "^5.18.1" "@types/bn.js" "^5.1.0" "@types/lru-cache" "^5.1.0" - abort-controller "^3.0.0" adm-zip "^0.4.16" aggregate-error "^3.0.0" ansi-escapes "^4.3.0" + boxen "^5.1.2" chalk "^2.4.2" chokidar "^3.4.0" ci-info "^2.0.0" @@ -10391,7 +12005,6 @@ hardhat@^2.12.5: mnemonist "^0.38.0" mocha "^10.0.0" p-map "^4.0.0" - qs "^6.7.0" raw-body "^2.4.1" resolve "1.17.0" semver "^6.3.0" @@ -10415,6 +12028,11 @@ has-bigints@^1.0.1, has-bigints@^1.0.2: resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.2.tgz#0871bd3e3d51626f6ca0966668ba35d5602d6eaa" integrity sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ== +has-flag@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-1.0.0.tgz#9d9e793165ce017a00f00418c43f942a7b1d11fa" + integrity sha512-DyYHfIYwAJmjAjSSPKANxI8bFY9YtFrgkAfinBojQ8YJTOuOuav64tMUJv584SES4xl74PmuaevIyaLESHdTAA== + has-flag@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" @@ -10425,19 +12043,24 @@ has-flag@^4.0.0: resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ== -has-property-descriptors@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz#610708600606d36961ed04c196193b6a607fa861" - integrity sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ== +has-own-prop@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/has-own-prop/-/has-own-prop-2.0.0.tgz#f0f95d58f65804f5d218db32563bb85b8e0417af" + integrity sha512-Pq0h+hvsVm6dDEa8x82GnLSYHOzNDt7f0ddFa3FqcQlgzEiptPqL+XrOJNavjOzSYiYWIrgeVYYgGlLmnxwilQ== + +has-property-descriptors@^1.0.0, has-property-descriptors@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/has-property-descriptors/-/has-property-descriptors-1.0.1.tgz#52ba30b6c5ec87fd89fa574bc1c39125c6f65340" + integrity sha512-VsX8eaIewvas0xnvinAe9bw4WfIeODpGYikiWYLH+dma0Jw6KHYqWiWfhQlgOVK8D6PvjubK5Uc4P0iIhIcNVg== dependencies: - get-intrinsic "^1.1.1" + get-intrinsic "^1.2.2" has-proto@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/has-proto/-/has-proto-1.0.1.tgz#1885c1305538958aff469fef37937c22795408e0" integrity sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg== -has-symbols@^1.0.1, has-symbols@^1.0.2, has-symbols@^1.0.3: +has-symbols@^1.0.2, has-symbols@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8" integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A== @@ -10449,6 +12072,11 @@ has-tostringtag@^1.0.0: dependencies: has-symbols "^1.0.2" +has-unicode@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9" + integrity sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ== + has-value@^0.3.1: version "0.3.1" resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f" @@ -10480,12 +12108,22 @@ has-values@^1.0.0: is-number "^3.0.0" kind-of "^4.0.0" -has@^1.0.3, has@~1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796" - integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw== +has-yarn@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/has-yarn/-/has-yarn-3.0.0.tgz#c3c21e559730d1d3b57e28af1f30d06fac38147d" + integrity sha512-IrsVwUHhEULx3R8f/aA8AHuEzAorplsab/v8HBzEiIukwq5i/EC+xmOW+HfP1OaDP+2JkgT1yILHN2O3UFIbcA== + +has@~1.0.3: + version "1.0.4" + resolved "https://registry.yarnpkg.com/has/-/has-1.0.4.tgz#2eb2860e000011dae4f1406a86fe80e530fb2ec6" + integrity sha512-qdSAmqLF6209RFj4VVItywPMbm3vWylknmB3nvNiUIs72xAimcM8nVYxYr7ncvZq5qzk9MKIZR8ijqD/1QuYjQ== + +hasbin@1.2.3: + version "1.2.3" + resolved "https://registry.yarnpkg.com/hasbin/-/hasbin-1.2.3.tgz#78c5926893c80215c2b568ae1fd3fcab7a2696b0" + integrity sha512-CCd8e/w2w28G8DyZvKgiHnQJ/5XXDz6qiUHnthvtag/6T5acUeN5lqq+HMoBqcmgWueWDhiCplrw0Kb1zDACRg== dependencies: - function-bind "^1.1.1" + async "~1.5" hash-base@^3.0.0: version "3.1.0" @@ -10496,14 +12134,6 @@ hash-base@^3.0.0: readable-stream "^3.6.0" safe-buffer "^5.2.0" -hash.js@1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/hash.js/-/hash.js-1.1.3.tgz#340dedbe6290187151c1ea1d777a3448935df846" - integrity sha512-/UETyP0W22QILqS+6HowevwhEFJ3MBJnwTf75Qob9Wz9t0DPuisL8kW8YZMK62dHAKE1c1p+gY1TtOLY+USEHA== - dependencies: - inherits "^2.0.3" - minimalistic-assert "^1.0.0" - hash.js@1.1.7, hash.js@^1.0.0, hash.js@^1.0.3, hash.js@^1.1.7: version "1.1.7" resolved "https://registry.yarnpkg.com/hash.js/-/hash.js-1.1.7.tgz#0babca538e8d4ee4a0f8988d68866537a003cf42" @@ -10512,6 +12142,21 @@ hash.js@1.1.7, hash.js@^1.0.0, hash.js@^1.0.3, hash.js@^1.1.7: inherits "^2.0.3" minimalistic-assert "^1.0.1" +hasha@5.2.2: + version "5.2.2" + resolved "https://registry.yarnpkg.com/hasha/-/hasha-5.2.2.tgz#a48477989b3b327aea3c04f53096d816d97522a1" + integrity sha512-Hrp5vIK/xr5SkeN2onO32H0MgNZ0f17HRNH39WfL0SYUNOTZ5Lz1TJ8Pajo/87dYGEFlLMm7mIc/k/s6Bvz9HQ== + dependencies: + is-stream "^2.0.0" + type-fest "^0.8.0" + +hasown@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.0.tgz#f4c513d454a57b7c7e1650778de226b11700546c" + integrity sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA== + dependencies: + function-bind "^1.1.2" + hat@0.0.3: version "0.0.3" resolved "https://registry.yarnpkg.com/hat/-/hat-0.0.3.tgz#bb014a9e64b3788aed8005917413d4ff3d502d8a" @@ -10535,6 +12180,11 @@ heap@0.2.6: resolved "https://registry.yarnpkg.com/heap/-/heap-0.2.6.tgz#087e1f10b046932fc8594dd9e6d378afc9d1e5ac" integrity sha512-MzzWcnfB1e4EG2vHi3dXHoBupmuXNZzx6pY6HldVS55JKKBoq3xOyzfSaZRkJp37HIhEYC78knabHff3zc4dQQ== +"heap@>= 0.2.0": + version "0.2.7" + resolved "https://registry.yarnpkg.com/heap/-/heap-0.2.7.tgz#1e6adf711d3f27ce35a81fe3b7bd576c2260a8fc" + integrity sha512-2bsegYkkHO+h/9MGbn6KWcE45cHZgPANo5LXF7EvWdT0yT2EguSVO1nDgU5c8+ZOPwp2vMNa7YFsJhVcDR9Sdg== + hey-listen@^1.0.8: version "1.0.8" resolved "https://registry.yarnpkg.com/hey-listen/-/hey-listen-1.0.8.tgz#8e59561ff724908de1aa924ed6ecc84a56a9aa68" @@ -10557,7 +12207,12 @@ home-or-tmp@^2.0.0: os-homedir "^1.0.0" os-tmpdir "^1.0.1" -hosted-git-info@^2.1.4, hosted-git-info@^2.6.0: +hoopy@^0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/hoopy/-/hoopy-0.1.4.tgz#609207d661100033a9a9402ad3dea677381c1b1d" + integrity sha512-HRcs+2mr52W0K+x8RzcLzuPPmVIKMSv97RGHy0Ea9y/mpcaK+xTrjICA04KAHi4GRzxliNqNJEFYWHghy3rSfQ== + +hosted-git-info@^2.1.4: version "2.8.9" resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9" integrity sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw== @@ -10569,6 +12224,13 @@ hosted-git-info@^4.0.1: dependencies: lru-cache "^6.0.0" +hot-shots@10.0.0: + version "10.0.0" + resolved "https://registry.yarnpkg.com/hot-shots/-/hot-shots-10.0.0.tgz#d360f9dd252da78297aca1cb08fd84a8936739c2" + integrity sha512-uy/uGpuJk7yuyiKRfZMBNkF1GAOX5O2ifO9rDCaX9jw8fu6eW9QeWC7WRPDI+O98frW1HQgV3+xwjWsZPECIzQ== + optionalDependencies: + unix-dgram "2.x" + html-encoding-sniffer@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-3.0.0.tgz#2cb1a8cf0db52414776e5b2a7a04d5dd98158de9" @@ -10586,7 +12248,7 @@ http-basic@^8.1.1: http-response-object "^3.0.1" parse-cache-control "^1.0.1" -http-cache-semantics@^4.0.0: +http-cache-semantics@^4.0.0, http-cache-semantics@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz#abe02fcb2985460bf0323be664436ec3476a6d5a" integrity sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ== @@ -10602,6 +12264,17 @@ http-errors@2.0.0: statuses "2.0.1" toidentifier "1.0.1" +http-errors@~1.8.1: + version "1.8.1" + resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.8.1.tgz#7c3f28577cbc8a207388455dbd62295ed07bd68c" + integrity sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g== + dependencies: + depd "~1.1.2" + inherits "2.0.4" + setprototypeof "1.2.0" + statuses ">= 1.5.0 < 2" + toidentifier "1.0.1" + http-https@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/http-https/-/http-https-1.0.0.tgz#2f908dd5f1db4068c058cd6e6d4ce392c913389b" @@ -10616,6 +12289,34 @@ http-proxy-agent@^5.0.0: agent-base "6" debug "4" +http-proxy-agent@^6.0.0: + version "6.1.1" + resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-6.1.1.tgz#dc04f1a84e09511740cfbd984a56f86cc42e4277" + integrity sha512-JRCz+4Whs6yrrIoIlrH+ZTmhrRwtMnmOHsHn8GFEn9O2sVfSE+DAZ3oyyGIKF8tjJEeSJmP89j7aTjVsSqsU0g== + dependencies: + agent-base "^7.1.0" + debug "^4.3.4" + +http-proxy-middleware@2.0.6: + version "2.0.6" + resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-2.0.6.tgz#e1a4dd6979572c7ab5a4e4b55095d1f32a74963f" + integrity sha512-ya/UeJ6HVBYxrgYotAZo1KvPWlgB48kUJLDePFeneHsVujFaW5WNj2NgWCAE//B1Dl02BIfYlpNgBy8Kf8Rjmw== + dependencies: + "@types/http-proxy" "^1.17.8" + http-proxy "^1.18.1" + is-glob "^4.0.1" + is-plain-obj "^3.0.0" + micromatch "^4.0.2" + +http-proxy@1.18.1, http-proxy@^1.18.1: + version "1.18.1" + resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.18.1.tgz#401541f0534884bbf95260334e72f88ee3976549" + integrity sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ== + dependencies: + eventemitter3 "^4.0.0" + follow-redirects "^1.0.0" + requires-port "^1.0.0" + http-response-object@^3.0.1: version "3.0.2" resolved "https://registry.yarnpkg.com/http-response-object/-/http-response-object-3.0.2.tgz#7f435bb210454e4360d074ef1f989d5ea8aa9810" @@ -10623,6 +12324,11 @@ http-response-object@^3.0.1: dependencies: "@types/node" "^10.0.3" +http-shutdown@^1.2.2: + version "1.2.2" + resolved "https://registry.yarnpkg.com/http-shutdown/-/http-shutdown-1.2.2.tgz#41bc78fc767637c4c95179bc492f312c0ae64c5f" + integrity sha512-S9wWkJ/VSY9/k4qcjG318bqJNruzE4HySUhFYknwmu6LBP97KLLfwNf+n4V1BHurvFNkSKLFnK/RsuUnRTf9Vw== + http-signature@~1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1" @@ -10641,9 +12347,9 @@ http2-wrapper@^1.0.0-beta.5.2: resolve-alpn "^1.0.0" http2-wrapper@^2.1.10: - version "2.2.0" - resolved "https://registry.yarnpkg.com/http2-wrapper/-/http2-wrapper-2.2.0.tgz#b80ad199d216b7d3680195077bd7b9060fa9d7f3" - integrity sha512-kZB0wxMo0sh1PehyjJUWRFEd99KC5TLjZ2cULC4f9iqJBAmKQQXEICjxl5iPJRwP40dpeHFqqhm7tYCvODpqpQ== + version "2.2.1" + resolved "https://registry.yarnpkg.com/http2-wrapper/-/http2-wrapper-2.2.1.tgz#310968153dcdedb160d8b72114363ef5fce1f64a" + integrity sha512-V5nVw1PAOgfI3Lmeaj2Exmeg7fenjhRUgz1lPSezy1CuhPYbgQtbQj4jZfEAEMlaL+vupsvhjqCyjzob0yxsmQ== dependencies: quick-lru "^5.1.1" resolve-alpn "^1.2.0" @@ -10653,7 +12359,7 @@ https-browserify@^1.0.0: resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73" integrity sha512-J+FkSdyD+0mA0N+81tMotaRMfSL9SGi+xpD3T6YApKsc3bGSXJlfXri3VyFOeYkfLRQisDk1W+jIFFKBeUBbBg== -https-proxy-agent@^5.0.0, https-proxy-agent@^5.0.1: +https-proxy-agent@5.0.1, https-proxy-agent@^5.0.0, https-proxy-agent@^5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz#c59ef224a04fe8b754f3db0063a25ea30d0005d6" integrity sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA== @@ -10661,20 +12367,33 @@ https-proxy-agent@^5.0.0, https-proxy-agent@^5.0.1: agent-base "6" debug "4" -human-signals@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3" - integrity sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw== +https-proxy-agent@^6.0.0: + version "6.2.1" + resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-6.2.1.tgz#0965ab47371b3e531cf6794d1eb148710a992ba7" + integrity sha512-ONsE3+yfZF2caH5+bJlcddtWqNI3Gvs5A38+ngvljxaBiRXRswym2c7yf8UAeFpRFKjFNHIFEHqR/OLAWJzyiA== + dependencies: + agent-base "^7.0.2" + debug "4" 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== +human-signals@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-3.0.1.tgz#c740920859dafa50e5a3222da9d3bf4bb0e5eef5" + integrity sha512-rQLskxnM/5OCldHo+wNXbpVgDn5A17CUoKX+7Sokwaknlq7CdSnphy0W39GU8dw59XiCXmFXDg4fRuckQRKewQ== + +human-signals@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-5.0.0.tgz#42665a284f9ae0dade3ba41ebc37eb4b852f3a28" + integrity sha512-AXcZb6vzzrFAUE61HnN4mpLqd/cSIwNQjtNWR0euPm6y0iqx3G4gOXaIDdtdDwZmhwe82LA6+zinmW4UBWVePQ== + humanize-duration@^3.27.3: - version "3.28.0" - resolved "https://registry.yarnpkg.com/humanize-duration/-/humanize-duration-3.28.0.tgz#f79770c0bec34d3bfd4899338cc40643bc04df72" - integrity sha512-jMAxraOOmHuPbffLVDKkEKi/NeG8dMqP8lGRd6Tbf7JgAeG33jjgPWDbXXU7ypCI0o+oNKJFgbSB9FKVdWNI2A== + version "3.31.0" + resolved "https://registry.yarnpkg.com/humanize-duration/-/humanize-duration-3.31.0.tgz#a0384d22555024cd17e6e9f8561540d37756bf4c" + integrity sha512-fRrehgBG26NNZysRlTq1S+HPtDpp3u+Jzdc/d5A4cEzOD86YLAkDaJyJg8krSdCi7CJ+s7ht3fwRj8Dl+Btd0w== husky@^6.0.0: version "6.0.0" @@ -10700,6 +12419,11 @@ iconv-lite@0.6.3, iconv-lite@^0.6.2: dependencies: safer-buffer ">= 2.1.2 < 3.0.0" +idb-keyval@^6.2.1: + version "6.2.1" + resolved "https://registry.yarnpkg.com/idb-keyval/-/idb-keyval-6.2.1.tgz#94516d625346d16f56f3b33855da11bfded2db33" + integrity sha512-8Sb3veuYCyrZL+VBt9LJfZjLUPWVvqn8tG28VqYNFCo43KHcKuq+b4EiXGeuaLAQWL2YmyDgMp2aSpH9JHsEQg== + idna-uts46-hx@^2.3.1: version "2.3.1" resolved "https://registry.yarnpkg.com/idna-uts46-hx/-/idna-uts46-hx-2.3.1.tgz#a1dc5c4df37eee522bf66d969cc980e00e8711f9" @@ -10707,20 +12431,20 @@ idna-uts46-hx@^2.3.1: dependencies: punycode "2.1.0" -ieee754@^1.1.13, ieee754@^1.1.4, ieee754@^1.2.1: +ieee754@^1.1.13, ieee754@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352" integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA== -iferr@^0.1.5: - version "0.1.5" - resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501" - integrity sha512-DUNFN5j7Tln0D+TxzloUjKB+CtVu6myn0JEFak6dG18mNt9YkQ6lzGCdafwofISZ1lLF3xRHJ98VKy9ynkcFaA== +ignore@^5.1.1, ignore@^5.2.0, ignore@^5.2.4: + version "5.3.0" + resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.3.0.tgz#67418ae40d34d6999c95ff56016759c718c82f78" + integrity sha512-g7dmpshy+gD7mh88OC9NwSGTKoc3kyLAZQRU1mt53Aw/vnvfXnbC+F/7F7QoYVKbV+KNvJx8wArewKy1vXMtlg== -ignore@^5.2.0, ignore@^5.2.4: - version "5.2.4" - resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.4.tgz#a291c0c6178ff1b960befe47fcdec301674a6324" - integrity sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ== +image-meta@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/image-meta/-/image-meta-0.2.0.tgz#ea28d05d52f5ad35f75b14f46278a44d626f48bc" + integrity sha512-ZBGjl0ZMEMeOC3Ns0wUF/5UdUmr3qQhBSCniT0LxOgGGIRHiNFOkMtIHB7EOznRU47V2AxPgiVP+s+0/UCU0Hg== immediate@^3.2.3: version "3.3.0" @@ -10738,16 +12462,16 @@ immutable@4.2.1: integrity sha512-7WYV7Q5BTs0nlQm7tl92rDYYoyELLKHoDMBKhrxEoiV4mrfVdRz8hzPiYOzH7yWjzoVEamxRuAqhxL2PLRwZYQ== immutable@^4.0.0, immutable@^4.0.0-rc.12: - version "4.3.0" - resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.3.0.tgz#eb1738f14ffb39fd068b1dbe1296117484dd34be" - integrity sha512-0AOCmOip+xgJwEVTQj1EfiDDOkPmuyllDuTuEX+DDXUgapLAsBIfkg3sxCYyCEA8mQqZrrxPUGjcOQ2JS3WLkg== + version "4.3.4" + resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.3.4.tgz#2e07b33837b4bb7662f288c244d1ced1ef65a78f" + integrity sha512-fsXeu4J4i6WNWSikpI88v/PcVflZz+6kMhUfIwc5SY+poQRPnaf5V7qds6SUyUN3cVxEzuCab7QIoLOQ+DQ1wA== immutable@~3.7.6: version "3.7.6" resolved "https://registry.yarnpkg.com/immutable/-/immutable-3.7.6.tgz#13b4d3cb12befa15482a26fe1b2ebae640071e4b" integrity sha512-AizQPcaofEtO11RZhPPHBOJRdo/20MKQF9mBLnVkBoyHi1/zXK8fzVdnEpSV9gxqtnh6Qomfp3F0xT5qP/vThw== -import-fresh@^3.0.0, import-fresh@^3.1.0, import-fresh@^3.2.1: +import-fresh@^3.2.1: version "3.3.0" resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b" integrity sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw== @@ -10760,6 +12484,11 @@ import-from@4.0.0: resolved "https://registry.yarnpkg.com/import-from/-/import-from-4.0.0.tgz#2710b8d66817d232e16f4166e319248d3d5492e2" integrity sha512-P9J71vT5nLlDeV8FHs5nNxaLbrpfAV5cF5srvbZfpwpcJoM/xZR3hiv+q+SAnuSmuGbXMWud063iIMx/V/EWZQ== +import-lazy@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-4.0.0.tgz#e8eb627483a0a43da3c03f3e35548be5cb0cc153" + integrity sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw== + imurmurhash@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" @@ -10770,10 +12499,10 @@ indent-string@^4.0.0: resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251" integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg== -infer-owner@^1.0.3: - version "1.0.4" - resolved "https://registry.yarnpkg.com/infer-owner/-/infer-owner-1.0.4.tgz#c4cefcaa8e51051c2a40ba2ce8a3d27295af9467" - integrity sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A== +indent-string@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-5.0.0.tgz#4fd2980fccaf8622d14c64d694f4cf33c81951a5" + integrity sha512-m6FAo/spmsW2Ab2fU35JTYwtOKa2yAwXSwgjSv1TJzh4Mh7mC3lzAOVLBprb72XsTrgkEIsl7YrFNAiDiRhIGg== inflight@^1.0.4: version "1.0.6" @@ -10788,20 +12517,55 @@ inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, i resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== -inherits@2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1" - integrity sha512-8nWq2nLTAwd02jTqJExUYFSD/fKq6VH9Y/oG2accc/kdI0V98Bag8d5a4gi3XHz73rDWa2PvTtvcWYquKqSENA== - inherits@2.0.3: version "2.0.3" resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" integrity sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw== +ini@2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/ini/-/ini-2.0.0.tgz#e5fd556ecdd5726be978fa1001862eacb0a94bc5" + integrity sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA== + +ini@^1.3.2, ini@^1.3.4, ini@^1.3.5, ini@~1.3.0: + version "1.3.8" + resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c" + integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew== + +inquirer-autocomplete-prompt@1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/inquirer-autocomplete-prompt/-/inquirer-autocomplete-prompt-1.4.0.tgz#e767592f747e3d5bb6336fe71fb4094352e4c317" + integrity sha512-qHgHyJmbULt4hI+kCmwX92MnSxDs/Yhdt4wPA30qnoa01OF6uTXV8yvH4hKXgdaTNmkZ9D01MHjqKYEuJN+ONw== + dependencies: + ansi-escapes "^4.3.1" + chalk "^4.0.0" + figures "^3.2.0" + run-async "^2.4.0" + rxjs "^6.6.2" + +inquirer@6.5.2, inquirer@^6.0.0: + version "6.5.2" + resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.5.2.tgz#ad50942375d036d327ff528c08bd5fab089928ca" + integrity sha512-cntlB5ghuB0iuO65Ovoi8ogLHiWGs/5yNrtUcKjFhSSiVeAIVpD7koaSU9RM8mpXw5YDi9RdYXGQMaOURB7ycQ== + dependencies: + ansi-escapes "^3.2.0" + chalk "^2.4.2" + cli-cursor "^2.1.0" + cli-width "^2.0.0" + external-editor "^3.0.3" + figures "^2.0.0" + lodash "^4.17.12" + mute-stream "0.0.7" + run-async "^2.2.0" + rxjs "^6.4.0" + string-width "^2.1.0" + strip-ansi "^5.1.0" + through "^2.3.6" + inquirer@^8.0.0: - version "8.2.5" - resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-8.2.5.tgz#d8654a7542c35a9b9e069d27e2df4858784d54f8" - integrity sha512-QAgPDQMEgrDssk1XiwwHoOGYF9BAbUcc1+j+FhEvaOt8/cKRqyLn0U5qA6F74fGhTMGxf92pOvPBeh29jQJDTQ== + version "8.2.6" + resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-8.2.6.tgz#733b74888195d8d400a67ac332011b5fae5ea562" + integrity sha512-M1WuAmb7pn9zdFRtQYk26ZBoY043Sse0wVDdk4Bppr+JOXyQYybdtvK+l9wUibhtjdjvtoiNy8tk+EgsYIUqKg== dependencies: ansi-escapes "^4.2.1" chalk "^4.1.1" @@ -10817,7 +12581,14 @@ inquirer@^8.0.0: string-width "^4.1.0" strip-ansi "^6.0.0" through "^2.3.6" - wrap-ansi "^7.0.0" + wrap-ansi "^6.0.1" + +inspect-with-kind@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/inspect-with-kind/-/inspect-with-kind-1.0.5.tgz#fce151d4ce89722c82ca8e9860bb96f9167c316c" + integrity sha512-MAQUJuIo7Xqk8EVNP+6d3CKq9c80hi4tjIbIAT6lmGW9W6WzlHiu9PS8uSuUYU+Do+j1baiFp3H25XEVxDIG2g== + dependencies: + kind-of "^6.0.2" interface-datastore@^0.8.0, interface-datastore@~0.8.0: version "0.8.3" @@ -10855,12 +12626,12 @@ interface-store@^2.0.2: integrity sha512-rScRlhDcz6k199EkHqT8NpM87ebN89ICOzILoBHgaG36/WX50N32BnU/kpZgCGPLhARRAWUUX5/cyaIjt7Kipg== internal-slot@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.5.tgz#f2a2ee21f668f8627a4667f309dc0f4fb6674986" - integrity sha512-Y+R5hJrzs52QCG2laLn4udYVnxsfny9CpOhNhUvk/SSSVyF6T27FzRbF0sroPidSu3X8oEAkOn2K804mjpt6UQ== + version "1.0.6" + resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.6.tgz#37e756098c4911c5e912b8edbf71ed3aa116f930" + integrity sha512-Xj6dv+PsbtwyPpEflsejS+oIZxmMlV44zAhG479uYu89MsjcYOhCFnNyKrkJrihbsiasQyY0afoCl/9BLR65bg== dependencies: - get-intrinsic "^1.2.0" - has "^1.0.3" + get-intrinsic "^1.2.2" + hasown "^2.0.0" side-channel "^1.0.4" interpret@^1.0.0: @@ -10875,11 +12646,6 @@ invariant@^2.2.2, invariant@^2.2.4: dependencies: loose-envify "^1.0.0" -invert-kv@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6" - integrity sha512-xgs2NH9AE66ucSq4cNG1nhSFghr5l6tdL15Pk+jl46bmmBapgoaY/AacXyaDznAqmGL99TiLSQgO/XazFSKYeQ== - io-ts@1.10.4: version "1.10.4" resolved "https://registry.yarnpkg.com/io-ts/-/io-ts-1.10.4.tgz#cd5401b138de88e4f920adbcb7026e2d1967e6e2" @@ -10887,6 +12653,21 @@ io-ts@1.10.4: dependencies: fp-ts "^1.0.0" +ioredis@^5.3.2: + version "5.3.2" + resolved "https://registry.yarnpkg.com/ioredis/-/ioredis-5.3.2.tgz#9139f596f62fc9c72d873353ac5395bcf05709f7" + integrity sha512-1DKMMzlIHM02eBBVOFQ1+AolGjs6+xEcM4PDL7NqOS6szq7H9jSaEkIUH6/a5Hl241LzW6JLSiAbNvTQjUupUA== + dependencies: + "@ioredis/commands" "^1.1.1" + cluster-key-slot "^1.1.0" + debug "^4.3.4" + denque "^2.1.0" + lodash.defaults "^4.2.0" + lodash.isarguments "^3.1.0" + redis-errors "^1.2.0" + redis-parser "^3.0.0" + standard-as-callback "^2.1.0" + ip-regex@^4.0.0: version "4.3.0" resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-4.3.0.tgz#687275ab0f57fa76978ff8f4dddc8a23d5990db5" @@ -11152,6 +12933,33 @@ ipld@^0.25.3: multicodec "^1.0.0" typical "^6.0.0" +ipx@2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/ipx/-/ipx-2.0.1.tgz#06515452b317241076b22e40763267c43efead65" + integrity sha512-+EyZiVNosYr3hu3F5+5GripTBLjKmSPTvcy3YdT4zxlhqHQJ2gUopLGxpfv9Wd11YgeiPh53ysbtG+ZNIOVF4A== + dependencies: + "@fastify/accept-negotiator" "^1.1.0" + citty "^0.1.4" + consola "^3.2.3" + defu "^6.1.3" + destr "^2.0.2" + etag "^1.8.1" + h3 "^1.8.2" + image-meta "^0.2.0" + listhen "^1.5.5" + ofetch "^1.3.3" + pathe "^1.1.1" + sharp "^0.32.6" + svgo "^3.0.2" + ufo "^1.3.1" + unstorage "^1.9.0" + xss "^1.0.14" + +iron-webcrypto@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/iron-webcrypto/-/iron-webcrypto-1.0.0.tgz#e3b689c0c61b434a0a4cb82d0aeabbc8b672a867" + integrity sha512-anOK1Mktt8U1Xi7fCM3RELTuYbnFikQY5VtrDj7kPgpejV7d43tWKhzgioO0zpkazLEL/j/iayRqnJhrGfqUsg== + is-absolute@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-absolute/-/is-absolute-1.0.0.tgz#395e1ae84b11f26ad1795e73c17378e48a301576" @@ -11160,21 +12968,14 @@ is-absolute@^1.0.0: is-relative "^1.0.0" is-windows "^1.0.1" -is-accessor-descriptor@^0.1.6: - version "0.1.6" - resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6" - integrity sha512-e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A== - dependencies: - kind-of "^3.0.2" - -is-accessor-descriptor@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz#169c2f6d3df1f992618072365c9b0ea1f6878656" - integrity sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ== +is-accessor-descriptor@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.1.tgz#3223b10628354644b86260db29b3e693f5ceedd4" + integrity sha512-YBUanLI8Yoihw923YeFUS5fs0fF2f5TSFTNiYAAzhhDscDa3lEqYuz1pDOEP5KvX94I9ey3vsqjJcLVFVU+3QA== dependencies: - kind-of "^6.0.0" + hasown "^2.0.0" -is-arguments@^1.0.4: +is-arguments@^1.0.4, is-arguments@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.1.1.tgz#15b3f88fda01f2a97fec84ca761a560f123efa9b" integrity sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA== @@ -11196,6 +12997,11 @@ is-arrayish@^0.2.1: resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d" integrity sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg== +is-arrayish@^0.3.1: + version "0.3.2" + resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.3.2.tgz#4574a2ae56f7ab206896fb431eaeed066fdf8f03" + integrity sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ== + is-bigint@^1.0.1: version "1.0.4" resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.4.tgz#08147a1875bc2b32005d41ccd8291dffc6691df3" @@ -11203,13 +13009,6 @@ is-bigint@^1.0.1: dependencies: has-bigints "^1.0.1" -is-binary-path@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-1.0.1.tgz#75f16642b480f187a711c814161fd3a4a7655898" - integrity sha512-9fRVlXc0uCxEDj1nQzaWONSpbTfx0FmJfzHF7pwlI8DkWGoHBBea4Pg5Ky0ojwwxQmnSifgbKkI06Qv0Ljgj+Q== - dependencies: - binary-extensions "^1.0.0" - is-binary-path@~2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09" @@ -11235,6 +13034,13 @@ is-buffer@^2.0.5: resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.5.tgz#ebc252e400d22ff8d77fa09888821a24a658c191" integrity sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ== +is-builtin-module@^3.1.0: + version "3.2.1" + resolved "https://registry.yarnpkg.com/is-builtin-module/-/is-builtin-module-3.2.1.tgz#f03271717d8654cfcaf07ab0463faa3571581169" + integrity sha512-BSLE3HnV2syZ0FK0iMA/yUGplUeMmNz4AW5fnTunbCIqZi4vG3WjJT9FHMy5D69xmAYBHXQhJdALdpwVxV501A== + dependencies: + builtin-modules "^3.3.0" + is-callable@^1.1.3, is-callable@^1.1.4, is-callable@^1.2.7: version "1.2.7" resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.7.tgz#3bc2a85ea742d9e36205dcacdd72ca1fdc51b055" @@ -11247,33 +13053,33 @@ is-ci@^2.0.0: dependencies: ci-info "^2.0.0" +is-ci@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-3.0.1.tgz#db6ecbed1bd659c43dac0f45661e7674103d1867" + integrity sha512-ZYvCgrefwqoQ6yTyYUbQu64HsITZ3NfKX1lzaEYdkTDcfKzzCI/wthRRYKkdjHKFVgNiXKAKm65Zo1pk2as/QQ== + dependencies: + ci-info "^3.2.0" + is-circular@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/is-circular/-/is-circular-1.0.2.tgz#2e0ab4e9835f4c6b0ea2b9855a84acd501b8366c" integrity sha512-YttjnrswnUYRVJvxCvu8z+PGMUSzC2JttP0OEXezlAEdp3EXzhf7IZ3j0gRAybJBQupedIZFhY61Tga6E0qASA== -is-core-module@^2.11.0, is-core-module@^2.5.0: - version "2.12.0" - resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.12.0.tgz#36ad62f6f73c8253fd6472517a12483cf03e7ec4" - integrity sha512-RECHCBCd/viahWmwj6enj19sKbHfJrddi/6cBDsNTKbNq0f7VeaUkBo60BqzvPqo/W54ChS62Z5qyun7cfOMqQ== - dependencies: - has "^1.0.3" - -is-data-descriptor@^0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56" - integrity sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg== +is-core-module@^2.13.0, is-core-module@^2.5.0: + version "2.13.1" + resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.13.1.tgz#ad0d7532c6fea9da1ebdc82742d74525c6273384" + integrity sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw== dependencies: - kind-of "^3.0.2" + hasown "^2.0.0" -is-data-descriptor@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz#d84876321d0e7add03990406abbbbd36ba9268c7" - integrity sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ== +is-data-descriptor@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.1.tgz#2109164426166d32ea38c405c1e0945d9e6a4eeb" + integrity sha512-bc4NlCDiCr28U4aEsQ3Qs2491gVq4V8G7MQyws968ImqjKuYtTJXrl7Vq7jsN7Ly/C3xj5KWFrY7sHNeDkAzXw== dependencies: - kind-of "^6.0.0" + hasown "^2.0.0" -is-date-object@^1.0.1: +is-date-object@^1.0.1, is-date-object@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.5.tgz#0841d5536e724c25597bf6ea62e1bd38298df31f" integrity sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ== @@ -11281,24 +13087,27 @@ is-date-object@^1.0.1: has-tostringtag "^1.0.0" is-descriptor@^0.1.0: - version "0.1.6" - resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca" - integrity sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg== + version "0.1.7" + resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.7.tgz#2727eb61fd789dcd5bdf0ed4569f551d2fe3be33" + integrity sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg== dependencies: - is-accessor-descriptor "^0.1.6" - is-data-descriptor "^0.1.4" - kind-of "^5.0.0" + is-accessor-descriptor "^1.0.1" + is-data-descriptor "^1.0.1" is-descriptor@^1.0.0, is-descriptor@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.2.tgz#3b159746a66604b04f8c81524ba365c5f14d86ec" - integrity sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg== + version "1.0.3" + resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.3.tgz#92d27cb3cd311c4977a4db47df457234a13cb306" + integrity sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw== dependencies: - is-accessor-descriptor "^1.0.0" - is-data-descriptor "^1.0.0" - kind-of "^6.0.2" + is-accessor-descriptor "^1.0.1" + is-data-descriptor "^1.0.1" + +is-docker@3.0.0, is-docker@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-3.0.0.tgz#90093aa3106277d8a77a5910dbae71747e15a200" + integrity sha512-eljcgEDlEns/7AXFosB5K/2nCM4P7FQPkGc/DWLy5rmFEWvZayGrik1d9/QIY5nJ4f9YsVvBkA6kJpHn9rISdQ== -is-docker@^2.0.0: +is-docker@^2.0.0, is-docker@^2.1.1: version "2.2.1" resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa" integrity sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ== @@ -11320,7 +13129,7 @@ is-extendable@^1.0.1: dependencies: is-plain-object "^2.0.4" -is-extglob@^2.1.0, is-extglob@^2.1.1: +is-extglob@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" integrity sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ== @@ -11335,13 +13144,6 @@ is-fn@^1.0.0: resolved "https://registry.yarnpkg.com/is-fn/-/is-fn-1.0.0.tgz#9543d5de7bcf5b08a22ec8a20bae6e286d510d8c" integrity sha512-XoFPJQmsAShb3jEQRfzf2rqXavq7fIqF/jOekp308JlThqrODnMpweVSGilKTCXELfLhltGP2AGgbQGVP8F1dg== -is-fullwidth-code-point@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb" - integrity sha512-1pqUqRjkhPJ9miNq9SwMfdvi6lBJcd6eFxvfaivQhaH3SgisfiuudvFntdKOmxuee/77l+FPjKrQjWvmPjWrRw== - dependencies: - number-is-nan "^1.0.0" - is-fullwidth-code-point@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f" @@ -11352,6 +13154,11 @@ is-fullwidth-code-point@^3.0.0: resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d" integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg== +is-fullwidth-code-point@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-4.0.0.tgz#fae3167c729e7463f8461ce512b080a49268aa88" + integrity sha512-O4L094N2/dZ7xqVdrXhh9r1KODPJpFms8B5sGdJLPy664AgvXsreZUyCQQNItZRDlYug4xStLjNp/sz3HvBowQ== + is-function@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/is-function/-/is-function-1.0.2.tgz#4f097f30abf6efadac9833b17ca5dc03f8144e08" @@ -11371,23 +13178,36 @@ is-glob@4.0.3, is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3, is-glob@~4.0.1: dependencies: is-extglob "^2.1.1" -is-glob@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a" - integrity sha512-UFpDDrPgM6qpnFNI+rh/p3bUaq9hKLZN8bMUWzxmcnZVS3omf4IPK+BrewlnWjO1WmUsMYuSjKh4UJuV4+Lqmw== - dependencies: - is-extglob "^2.1.0" - is-hex-prefixed@1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-hex-prefixed/-/is-hex-prefixed-1.0.0.tgz#7d8d37e6ad77e5d127148913c573e082d777f554" integrity sha512-WvtOiug1VFrE9v1Cydwm+FnXd3+w9GaeVUss5W4v/SLy3UW00vP+6iNF2SdnfiBoLy4bTqVdkftNGTUeOFVsbA== +is-inside-container@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-inside-container/-/is-inside-container-1.0.0.tgz#e81fba699662eb31dbdaf26766a61d4814717ea4" + integrity sha512-KIYLCCJghfHZxqjYBE7rEy0OBuTd5xCHS7tHVgvCLkx7StIoaxwNW3hCALgEUjFfeRk+MG/Qxmp/vtETEF3tRA== + dependencies: + is-docker "^3.0.0" + +is-installed-globally@^0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.4.0.tgz#9a0fd407949c30f86eb6959ef1b7994ed0b7b520" + integrity sha512-iwGqO3J21aaSkC7jWnHP/difazwS7SFeIqxv6wEtLU8Y5KlzFTjyqcSIT0d8s4+dDhKytsk9PJZ2BkS5eZwQRQ== + dependencies: + global-dirs "^3.0.0" + is-path-inside "^3.0.2" + is-interactive@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-interactive/-/is-interactive-1.0.0.tgz#cea6e6ae5c870a7b0a0004070b7b587e0252912e" integrity sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w== +is-interactive@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/is-interactive/-/is-interactive-2.0.0.tgz#40c57614593826da1100ade6059778d597f16e90" + integrity sha512-qP1vozQRI+BMOPcjFzrjXuQvdak2pHNUMZoeG2eRbiSqyvbEf/wQtEOTOX1guk6E3t36RkaqiSt8A/6YElNxLQ== + is-ip@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/is-ip/-/is-ip-3.1.0.tgz#2ae5ddfafaf05cb8008a62093cf29734f657c5d8" @@ -11395,16 +13215,17 @@ is-ip@^3.1.0: dependencies: ip-regex "^4.0.0" -is-ipfs@^7.0.3: - version "7.0.3" - resolved "https://registry.yarnpkg.com/is-ipfs/-/is-ipfs-7.0.3.tgz#e68beb321a943e0f3ce23f6e441cdba8553312a2" - integrity sha512-IwjmN5DYrWQgk75dPX9WOFDbGpStJg6SLMLXXlxwpI3/SnwAIz3PwrdnxB+s2k+RjOTn9ueFIbGWxF2VMUYmLQ== +is-ipfs@^0.6.0: + version "0.6.3" + resolved "https://registry.yarnpkg.com/is-ipfs/-/is-ipfs-0.6.3.tgz#82a5350e0a42d01441c40b369f8791e91404c497" + integrity sha512-HyRot1dvLcxImtDqPxAaY1miO6WsiP/z7Yxpg2qpaLWv5UdhAPtLvHJ4kMLM0w8GSl8AFsVF23PHe1LzuWrUlQ== dependencies: - "@multiformats/mafmt" "^11.0.3" - "@multiformats/multiaddr" "^11.0.0" - iso-url "^1.1.3" - multiformats "^10.0.1" - uint8arrays "^4.0.2" + bs58 "^4.0.1" + cids "~0.7.0" + mafmt "^7.0.0" + multiaddr "^7.2.1" + multibase "~0.6.0" + multihashes "~0.4.13" is-lower-case@^2.0.2: version "2.0.2" @@ -11413,7 +13234,7 @@ is-lower-case@^2.0.2: dependencies: tslib "^2.0.3" -is-nan@^1.2.1: +is-nan@^1.3.2: version "1.3.2" resolved "https://registry.yarnpkg.com/is-nan/-/is-nan-1.3.2.tgz#043a54adea31748b55b6cd4e09aadafa69bd9e1d" integrity sha512-E+zBKpQ2t6MEo1VsonYmluk9NxGrbzpeeLC2xIViuO2EjU2xsXsBPwTr3Ykv9l08UYEVEdWeRZNouaZqF6RN0w== @@ -11426,6 +13247,11 @@ is-negative-zero@^2.0.2: resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.2.tgz#7bf6f03a28003b8b3965de3ac26f664d765f3150" integrity sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA== +is-npm@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/is-npm/-/is-npm-6.0.0.tgz#b59e75e8915543ca5d881ecff864077cba095261" + integrity sha512-JEjxbSmtPSt1c8XTkVrlujcXdKV1/tvuQ7GwKcAlyiVLeYFQ2VHat8xfrDJsIkhCdF/tZ7CiIR3sy141c6+gPQ== + is-number-object@^1.0.4: version "1.0.7" resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.7.tgz#59d50ada4c45251784e9904f5246c742f07a42fc" @@ -11450,12 +13276,22 @@ is-obj@^1.0.1: resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f" integrity sha512-l4RyHgRqGN4Y3+9JHVrNqO+tN0rV5My76uW5/nuO4K1b6vw5G8d/cmFjP9tRfEsdhZNt0IFdZuK/c2Vr4Nb+Qg== -is-path-inside@^3.0.3: +is-obj@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-2.0.0.tgz#473fb05d973705e3fd9620545018ca8e22ef4982" + integrity sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w== + +is-path-inside@^3.0.2, is-path-inside@^3.0.3: version "3.0.3" resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283" integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ== -is-plain-obj@^1.1.0: +is-path-inside@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-4.0.0.tgz#805aeb62c47c1b12fc3fd13bfb3ed1e7430071db" + integrity sha512-lJJV/5dYS+RcL8uQdBDW9c9uWFLLBNRyFhnAKXw5tVqLlKZ4RMGZKv+YQ/IA3OhD+RpbJa1LLFM1FQPGyIXvOA== + +is-plain-obj@^1.0.0, is-plain-obj@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e" integrity sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg== @@ -11465,6 +13301,16 @@ is-plain-obj@^2.0.0, is-plain-obj@^2.1.0: resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-2.1.0.tgz#45e42e37fccf1f40da8e5f76ee21515840c09287" integrity sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA== +is-plain-obj@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-3.0.0.tgz#af6f2ea14ac5a646183a5bbdb5baabbc156ad9d7" + integrity sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA== + +is-plain-obj@^4.0.0, is-plain-obj@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-4.1.0.tgz#d65025edec3657ce032fd7db63c97883eaed71f0" + integrity sha512-+Pgi+vMuUNkJyExiMBt5IlFoMyKnr5zhJ4Uspz58WOhBF5QoIZkFyNHIbBAtHwzVAgk5RtndVNsDRN61/mmDqg== + is-plain-object@^2.0.3, is-plain-object@^2.0.4: version "2.0.4" resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677" @@ -11472,12 +13318,22 @@ is-plain-object@^2.0.3, is-plain-object@^2.0.4: dependencies: isobject "^3.0.1" +is-plain-object@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-5.0.0.tgz#4427f50ab3429e9025ea7d52e9043a9ef4159344" + integrity sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q== + is-potential-custom-element-name@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz#171ed6f19e3ac554394edf78caa05784a45bebb5" integrity sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ== -is-regex@^1.0.4, is-regex@^1.1.4, is-regex@~1.1.4: +is-promise@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-4.0.0.tgz#42ff9f84206c1991d26debf520dd5c01042dd2f3" + integrity sha512-hvpoI6korhJMnej285dSg6nu1+e6uxs7zG3BYAm5byqDsgJNWwxzM6z6iZiAgQR4TJ30JmBTOwqZUw3WlyH3AQ== + +is-regex@^1.1.4, is-regex@~1.1.4: version "1.1.4" resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958" integrity sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg== @@ -11504,6 +13360,11 @@ is-shared-array-buffer@^1.0.2: dependencies: call-bind "^1.0.2" +is-stream@3.0.0, is-stream@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-3.0.0.tgz#e6bfd7aa6bef69f4f472ce9bb681e3e57b4319ac" + integrity sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA== + is-stream@^1.0.1: version "1.1.0" resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44" @@ -11528,16 +13389,12 @@ is-symbol@^1.0.2, is-symbol@^1.0.3: dependencies: has-symbols "^1.0.2" -is-typed-array@^1.1.10, is-typed-array@^1.1.3, is-typed-array@^1.1.9: - version "1.1.10" - resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.10.tgz#36a5b5cb4189b575d1a3e4b08536bfb485801e3f" - integrity sha512-PJqgEHiWZvMpaFZ3uTc8kHPM4+4ADTlDniuQL7cU/UDA0Ql7F70yGfHph3cLNe+c9toaigv+DFzTJKhc2CtO6A== +is-typed-array@^1.1.10, is-typed-array@^1.1.12, is-typed-array@^1.1.3, is-typed-array@^1.1.9: + version "1.1.12" + resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.12.tgz#d0bab5686ef4a76f7a73097b95470ab199c57d4a" + integrity sha512-Z14TF2JNG8Lss5/HMqt0//T9JeHXttXy5pH/DBU4vi98ozO2btxzq9MwYDZYnKwU8nRsz/+GVFVRDq3DkVuSPg== dependencies: - available-typed-arrays "^1.0.5" - call-bind "^1.0.2" - for-each "^0.3.3" - gopd "^1.0.1" - has-tostringtag "^1.0.0" + which-typed-array "^1.1.11" is-typedarray@^1.0.0, is-typedarray@~1.0.0: version "1.0.0" @@ -11556,6 +13413,11 @@ is-unicode-supported@^0.1.0: resolved "https://registry.yarnpkg.com/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz#3f26c76a809593b52bfa2ecb5710ed2779b522a7" integrity sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw== +is-unicode-supported@^1.1.0, is-unicode-supported@^1.2.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/is-unicode-supported/-/is-unicode-supported-1.3.0.tgz#d824984b616c292a2e198207d4a609983842f714" + integrity sha512-43r2mRvz+8JRIKnWJ+3j8JtjRKZ6GmjzfaE/qiBJnikNnYv/6bagRJ1kUhNk8R5EX/GkobD+r+sfxCPJsiKBLQ== + is-upper-case@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/is-upper-case/-/is-upper-case-2.0.2.tgz#f1105ced1fe4de906a5f39553e7d3803fd804649" @@ -11563,16 +13425,16 @@ is-upper-case@^2.0.2: dependencies: tslib "^2.0.3" +is-url-superb@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/is-url-superb/-/is-url-superb-4.0.0.tgz#b54d1d2499bb16792748ac967aa3ecb41a33a8c2" + integrity sha512-GI+WjezhPPcbM+tqE9LnmsY5qqjwHzTvjJ36wxYX5ujNXefSUJ/T17r5bqDV8yLhcgB59KTPNOc9O9cmHTPWsA== + is-url@^1.2.4: version "1.2.4" resolved "https://registry.yarnpkg.com/is-url/-/is-url-1.2.4.tgz#04a4df46d28c4cff3d73d01ff06abeb318a1aa52" integrity sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww== -is-utf8@^0.2.0: - version "0.2.1" - resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72" - integrity sha512-rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q== - is-valid-glob@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-valid-glob/-/is-valid-glob-1.0.0.tgz#29bf3eff701be2d4d315dbacc39bc39fe8f601aa" @@ -11590,29 +13452,53 @@ is-windows@^1.0.1, is-windows@^1.0.2: resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d" integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA== -is-wsl@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-1.1.0.tgz#1f16e4aa22b04d1336b66188a66af3c600c3a66d" - integrity sha512-gfygJYZ2gLTDlmbWMI0CE2MwnFzSN/2SZfkMlItC4K/JBlsWVDB0bO6XhqcY13YXE7iMcAJnzTCJjPiTeJJ0Mw== - -is-wsl@^2.1.1, is-wsl@^2.2.0: +is-wsl@2.2.0, is-wsl@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271" integrity sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww== dependencies: is-docker "^2.0.0" +is-wsl@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-3.1.0.tgz#e1c657e39c10090afcbedec61720f6b924c3cbd2" + integrity sha512-UcVfVfaK4Sc4m7X3dUSoHoozQGBEFeDC+zVo06t98xe8CzHSZZBekNXH+tu0NalHolcJ/QAGqS46Hef7QXBIMw== + dependencies: + is-inside-container "^1.0.0" + +is-yarn-global@^0.4.0: + version "0.4.1" + resolved "https://registry.yarnpkg.com/is-yarn-global/-/is-yarn-global-0.4.1.tgz#b312d902b313f81e4eaf98b6361ba2b45cd694bb" + integrity sha512-/kppl+R+LO5VmhYSEWARUFjodS25D68gvj8W7z0I7OWhUla5xWu8KL6CtB2V0R6yqhnRgbcaREMr4EEM6htLPQ== + +is64bit@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/is64bit/-/is64bit-2.0.0.tgz#198c627cbcb198bbec402251f88e5e1a51236c07" + integrity sha512-jv+8jaWCl0g2lSBkNSVXdzfBA0npK1HGC2KtWM9FumFRoGS94g3NbCCLVnCYHLjp4GrW2KZeeSTMo5ddtznmGw== + dependencies: + system-architecture "^0.1.0" + isarray@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf" integrity sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ== -isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0: +isarray@1.0.0, isarray@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" integrity sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ== -isexe@^2.0.0: +isarray@^2.0.5: + version "2.0.5" + resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.5.tgz#8af1e4c1221244cc62459faf38940d4e644a5723" + integrity sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw== + +iserror@0.0.2, iserror@^0.0.2: + version "0.0.2" + resolved "https://registry.yarnpkg.com/iserror/-/iserror-0.0.2.tgz#bd53451fe2f668b9f2402c1966787aaa2c7c0bf5" + integrity sha512-oKGGrFVaWwETimP3SiWwjDeY27ovZoyZPHtxblC4hCq9fXxed/jasx+ATWFFjCVSRZng8VTMsN1nDnGo6zMBSw== + +isexe@2.0.0, isexe@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw== @@ -11630,7 +13516,7 @@ iso-url@^0.4.7, iso-url@~0.4.7: resolved "https://registry.yarnpkg.com/iso-url/-/iso-url-0.4.7.tgz#de7e48120dae46921079fe78f325ac9e9217a385" integrity sha512-27fFRDnPAMnHGLq36bWTpKET+eiXct3ENlCcdcMdk+mjXrb2kw3mhBUg1B7ewAC0kVzlOPhADzQgz1SE6Tglog== -iso-url@^1.1.3, iso-url@^1.1.5: +iso-url@^1.1.5: version "1.2.1" resolved "https://registry.yarnpkg.com/iso-url/-/iso-url-1.2.1.tgz#db96a49d8d9a64a1c889fc07cc525d093afb1811" integrity sha512-9JPDgCN4B7QPkLtYAAOrEuAWvP9rWvR5offAr0/SeF046wIkglqH3VXgYYP6NcsKslH80UIVgmPqNe3j7tG2ng== @@ -11652,6 +13538,14 @@ isomorphic-timers-promises@^1.0.1: resolved "https://registry.yarnpkg.com/isomorphic-timers-promises/-/isomorphic-timers-promises-1.0.1.tgz#e4137c24dbc54892de8abae3a4b5c1ffff381598" integrity sha512-u4sej9B1LPSxTGKB/HiuzvEQnXH0ECYkSVQU39koSwmFAxhlEAFl9RdTvLv4TOTQUgBS5O3O5fwUxk6byBZ+IQ== +isomorphic-unfetch@3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/isomorphic-unfetch/-/isomorphic-unfetch-3.1.0.tgz#87341d5f4f7b63843d468438128cb087b7c3e98f" + integrity sha512-geDJjpoZ8N0kWexiwkX8F9NkTsXhetLPVbZFQ+JTW239QNOwvB0gniuR1Wc6f0AMTn7/mFGyXvHTifrCp/GH8Q== + dependencies: + node-fetch "^2.6.1" + unfetch "^4.2.0" + isomorphic-ws@5.0.0, isomorphic-ws@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/isomorphic-ws/-/isomorphic-ws-5.0.0.tgz#e5529148912ecb9b451b46ed44d53dae1ce04bbf" @@ -11662,7 +13556,7 @@ isomorphic-ws@^4.0.1: resolved "https://registry.yarnpkg.com/isomorphic-ws/-/isomorphic-ws-4.0.1.tgz#55fd4cd6c5e6491e76dc125938dd863f5cd4f2dc" integrity sha512-BhBvN2MBpWTaSHdWRb/bwdZJ1WaehQ2L1KngkCkfLUGF0mAWAT1sQUQacEmQ0jXkFw/czDXPNQSL5u2/Krsz1w== -isstream@~0.1.2: +isstream@0.1.x, isstream@~0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a" integrity sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g== @@ -11732,15 +13626,24 @@ it-to-stream@^1.0.0: p-fifo "^1.0.0" readable-stream "^3.6.0" +jackspeak@^2.3.5: + version "2.3.6" + resolved "https://registry.yarnpkg.com/jackspeak/-/jackspeak-2.3.6.tgz#647ecc472238aee4b06ac0e461acc21a8c505ca8" + integrity sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ== + dependencies: + "@isaacs/cliui" "^8.0.2" + optionalDependencies: + "@pkgjs/parseargs" "^0.11.0" + jake@^10.8.5: - version "10.8.5" - resolved "https://registry.yarnpkg.com/jake/-/jake-10.8.5.tgz#f2183d2c59382cb274226034543b9c03b8164c46" - integrity sha512-sVpxYeuAhWt0OTWITwT98oyV0GsXyMlXCF+3L1SuafBVUIr/uILGRB+NqwkzhgXKvoJpDIpQvqkUALgdmQsQxw== + version "10.8.7" + resolved "https://registry.yarnpkg.com/jake/-/jake-10.8.7.tgz#63a32821177940c33f356e0ba44ff9d34e1c7d8f" + integrity sha512-ZDi3aP+fG/LchyBzUM804VjddnwfSfsdeYkwt8NcbKRvo4rFkjhs456iLFn3k2ZUWvNe4i48WACDbza8fhq2+w== dependencies: async "^3.2.3" chalk "^4.0.2" - filelist "^1.0.1" - minimatch "^3.0.4" + filelist "^1.0.4" + minimatch "^3.1.2" jayson@4.0.0: version "4.0.0" @@ -11760,36 +13663,58 @@ jayson@4.0.0: uuid "^8.3.2" ws "^7.4.5" +jest-get-type@^27.5.1: + version "27.5.1" + resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-27.5.1.tgz#3cd613c507b0f7ace013df407a1c1cd578bcb4f1" + integrity sha512-2KY95ksYSaK7DMBWQn6dQz3kqAf3BB64y2udeG+hv4KfSOb9qwcYQstTJc1KCbsix+wLZWZYN8t7nwX3GOBLRw== + +jest-validate@^27.3.1, jest-validate@^27.4.2: + version "27.5.1" + resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-27.5.1.tgz#9197d54dc0bdb52260b8db40b46ae668e04df067" + integrity sha512-thkNli0LYTmOI1tDB3FI1S1RTp/Bqyd9pTarJwL87OIBFuqEb5Apv5EaApEudYg4g86e3CT6kM0RowkhtEnCBQ== + dependencies: + "@jest/types" "^27.5.1" + camelcase "^6.2.0" + chalk "^4.0.0" + jest-get-type "^27.5.1" + leven "^3.1.0" + pretty-format "^27.5.1" + jiti@1.17.1: version "1.17.1" resolved "https://registry.yarnpkg.com/jiti/-/jiti-1.17.1.tgz#264daa43ee89a03e8be28c3d712ccc4eb9f1e8ed" integrity sha512-NZIITw8uZQFuzQimqjUxIrIcEdxYDFIe/0xYfIlVXTkiBjjyBEvgasj5bb0/cHtPRD/NziPbT312sFrkI5ALpw== -jiti@^1.17.1, jiti@^1.17.2: - version "1.18.2" - resolved "https://registry.yarnpkg.com/jiti/-/jiti-1.18.2.tgz#80c3ef3d486ebf2450d9335122b32d121f2a83cd" - integrity sha512-QAdOptna2NYiSSpv0O/BwoHBSmz4YhpzJHyi+fnMRTXFjp7B8i/YG5Z8IfusxB1ufjcD2Sre1F3R+nX3fvy7gg== +jiti@^1.17.1, jiti@^1.19.1, jiti@^1.21.0: + version "1.21.0" + resolved "https://registry.yarnpkg.com/jiti/-/jiti-1.21.0.tgz#7c97f8fe045724e136a397f7340475244156105d" + integrity sha512-gFqAIbuKyyso/3G2qhiO2OM6shY6EPP/R0+mkDbyspxKazh8BXDC5FiFsUjlczgdNz/vfra0da2y+aHrusLG/Q== jose@^4.11.4: - version "4.14.0" - resolved "https://registry.yarnpkg.com/jose/-/jose-4.14.0.tgz#c8c03579a0ba3598194c92ccca777d96adca8f48" - integrity sha512-LSA/XenLPwqk6e2L+PSUNuuY9G4NGsvjRWz6sJcUBmzTLEPJqQh46FHSUxnAQ64AWOkRO6bSXpy3yXuEKZkbIA== + version "4.15.4" + resolved "https://registry.yarnpkg.com/jose/-/jose-4.15.4.tgz#02a9a763803e3872cf55f29ecef0dfdcc218cc03" + integrity sha512-W+oqK4H+r5sITxfxpSU+MMdr/YSWGvgZMQDIsNoBDGGy4i7GBPTtvFKibQzW06n3U3TqHjhvBJsirShsEJ6eeQ== js-sdsl@^4.1.4: - version "4.4.0" - resolved "https://registry.yarnpkg.com/js-sdsl/-/js-sdsl-4.4.0.tgz#8b437dbe642daa95760400b602378ed8ffea8430" - integrity sha512-FfVSdx6pJ41Oa+CF7RDaFmTnCaFhua+SNYQX74riGOpl96x+2jQCqEfQ2bnXu/5DPCqlRuiqyvTJM0Qjz26IVg== - -js-sha3@0.5.7, js-sha3@^0.5.7: - version "0.5.7" - resolved "https://registry.yarnpkg.com/js-sha3/-/js-sha3-0.5.7.tgz#0d4ffd8002d5333aabaf4a23eed2f6374c9f28e7" - integrity sha512-GII20kjaPX0zJ8wzkTbNDYMY7msuZcTWk8S5UOh6806Jq/wz1J8/bnr8uGU0DAUmYDjj2Mr4X1cW8v/GLYnR+g== + version "4.4.2" + resolved "https://registry.yarnpkg.com/js-sdsl/-/js-sdsl-4.4.2.tgz#2e3c031b1f47d3aca8b775532e3ebb0818e7f847" + integrity sha512-dwXFwByc/ajSV6m5bcKAPwe4yDDF6D614pxmIi5odytzxRlwqF6nwoiCek80Ixc7Cvma5awClxrzFtxCQvcM8w== js-sha3@0.8.0, js-sha3@^0.8.0: version "0.8.0" resolved "https://registry.yarnpkg.com/js-sha3/-/js-sha3-0.8.0.tgz#b9b7a5da73afad7dedd0f8c463954cbde6818840" integrity sha512-gF1cRrHhIzNfToc802P800N8PpXS+evLLXfsVpowqmAFR9uwbi89WvXg2QspOmXL8QL86J4T1EpFu+yUkwJY3Q== +js-sha3@^0.5.7: + version "0.5.7" + resolved "https://registry.yarnpkg.com/js-sha3/-/js-sha3-0.5.7.tgz#0d4ffd8002d5333aabaf4a23eed2f6374c9f28e7" + integrity sha512-GII20kjaPX0zJ8wzkTbNDYMY7msuZcTWk8S5UOh6806Jq/wz1J8/bnr8uGU0DAUmYDjj2Mr4X1cW8v/GLYnR+g== + +js-string-escape@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/js-string-escape/-/js-string-escape-1.0.1.tgz#e2625badbc0d67c7533e9edc1068c587ae4137ef" + integrity sha512-Smw4xcfIQ5LVjAOuJCvN/zIodzA/BBSsluuoSykP+lUvScIi4U6RJLfwHet5cxFnCswUjISV8oAXaqaJDY3chg== + "js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" @@ -11800,7 +13725,7 @@ js-tokens@^3.0.2: resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b" integrity sha512-RjTcuD4xjtthQkaWH7dFlH85L+QaVtSoOyGdZ3g6HFhS9dFNDfLyqgm2NFe2X6cQpeFmt0452FJjFG5UameExg== -js-yaml@3.14.1, js-yaml@^3.13.1, js-yaml@^3.14.1: +js-yaml@3.14.1, js-yaml@3.x, js-yaml@^3.14.1: version "3.14.1" resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537" integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g== @@ -11808,13 +13733,6 @@ js-yaml@3.14.1, js-yaml@^3.13.1, js-yaml@^3.14.1: argparse "^1.0.7" esprima "^4.0.0" -js-yaml@4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.0.0.tgz#f426bc0ff4b4051926cd588c71113183409a121f" - integrity sha512-pqon0s+4ScYUvX30wxQi3PogGFAlUyH0awepWvwkj4jD4v+ova3RiYw8bmA6x2rDrEaj8i/oWKoRxpVNW+Re8Q== - dependencies: - argparse "^2.0.1" - js-yaml@4.1.0, js-yaml@^4.0.0, js-yaml@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602" @@ -11891,11 +13809,6 @@ json-buffer@3.0.1: resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.1.tgz#9338802a30d3b6605fbe0613e094008ca8c05a13" integrity sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ== -json-parse-better-errors@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9" - integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw== - json-parse-even-better-errors@^2.3.0: version "2.3.1" resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d" @@ -11925,6 +13838,13 @@ json-rpc-random-id@^1.0.0: resolved "https://registry.yarnpkg.com/json-rpc-random-id/-/json-rpc-random-id-1.0.1.tgz#ba49d96aded1444dbb8da3d203748acbbcdec8c8" integrity sha512-RJ9YYNCkhVDBuP4zN5BBtYAzEl03yq/jIIsyif0JY9qyJuQQZNeDK7anAPKKlyEtLSj2s8h6hNh2F8zO5q7ScA== +json-schema-ref-resolver@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/json-schema-ref-resolver/-/json-schema-ref-resolver-1.0.1.tgz#6586f483b76254784fc1d2120f717bdc9f0a99bf" + integrity sha512-EJAj1pgHc1hxF6vo2Z3s69fMjO1INq6eGHXZ8Z6wCQeldCuwxGK9Sxf4/cScGn3FZubCVUehfWtcDM/PLteCQw== + dependencies: + fast-deep-equal "^3.1.3" + json-schema-traverse@^0.4.1: version "0.4.1" resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660" @@ -11946,11 +13866,14 @@ json-stable-stringify-without-jsonify@^1.0.1: integrity sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw== json-stable-stringify@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/json-stable-stringify/-/json-stable-stringify-1.0.2.tgz#e06f23128e0bbe342dc996ed5a19e28b57b580e0" - integrity sha512-eunSSaEnxV12z+Z73y/j5N37/In40GK4GmsSy+tEHJMxknvqnA7/djeYtAgW0GsWHUfg+847WJjKaEylk2y09g== + version "1.1.0" + resolved "https://registry.yarnpkg.com/json-stable-stringify/-/json-stable-stringify-1.1.0.tgz#43d39c7c8da34bfaf785a61a56808b0def9f747d" + integrity sha512-zfA+5SuwYN2VWqN1/5HZaDzQKLJHaBVMZIIM+wuYjdptkaQsqzDdqjqf+lZZJUuJq1aanHiY8LhH8LmH+qBYJA== dependencies: + call-bind "^1.0.5" + isarray "^2.0.5" jsonify "^0.0.1" + object-keys "^1.1.1" json-stringify-safe@^5.0.1, json-stringify-safe@~5.0.1: version "5.0.1" @@ -11977,14 +13900,7 @@ json5@^0.5.1: resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821" integrity sha512-4xrs1aW+6N5DalkqSVA8fxh458CXvR99WU8WLKmq4v8eWAL86Xo3BVqyd3SkA9wEVjCMqyvvRRkshAdOnBp5rw== -json5@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.2.tgz#63d98d60f21b313b77c4d6da18bfa69d80e1d593" - integrity sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA== - dependencies: - minimist "^1.2.0" - -json5@^2.1.2, json5@^2.2.0, json5@^2.2.2, json5@^2.2.3: +json5@^2.2.0, 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== @@ -12038,6 +13954,35 @@ jsonparse@^1.2.0: resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz#3f4dae4a91fac315f71062f8521cc239f1366280" integrity sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg== +jsonpath@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/jsonpath/-/jsonpath-1.1.1.tgz#0ca1ed8fb65bb3309248cc9d5466d12d5b0b9901" + integrity sha512-l6Cg7jRpixfbgoWgkrl77dgEj8RPvND0wMH6TwQmi9Qs4TFfS9u5cUFnbeKTwj5ga5Y3BTGGNI28k117LJ009w== + dependencies: + esprima "1.2.2" + static-eval "2.0.2" + underscore "1.12.1" + +jsonpointer@^5.0.0: + version "5.0.1" + resolved "https://registry.yarnpkg.com/jsonpointer/-/jsonpointer-5.0.1.tgz#2110e0af0900fd37467b5907ecd13a7884a1b559" + integrity sha512-p/nXbhSEcu3pZRdkW1OfJhpsVtW1gd4Wa1fnQc9YLiTfAjn0312eMKimbdIQzuZl9aa9xUGaRlP9T/CJE/ditQ== + +jsonschema@^1.2.4: + version "1.4.1" + resolved "https://registry.yarnpkg.com/jsonschema/-/jsonschema-1.4.1.tgz#cc4c3f0077fb4542982973d8a083b6b34f482dab" + integrity sha512-S6cATIPVv1z0IlxdN+zUk5EPjkGCdnhN4wVSBlvoUO1tOLJootbo9CquNJmbIh4yikWHiUedhRYrNPn1arpEmQ== + +jsonwebtoken@9.0.1: + version "9.0.1" + resolved "https://registry.yarnpkg.com/jsonwebtoken/-/jsonwebtoken-9.0.1.tgz#81d8c901c112c24e497a55daf6b2be1225b40145" + integrity sha512-K8wx7eJ5TPvEjuiVSkv167EVboBDv9PZdDoF7BgeQnBLVvZWW9clr2PsQHVJDTKaEIH5JBIwHujGcHp7GgI2eg== + dependencies: + jws "^3.2.2" + lodash "^4.17.21" + ms "^2.1.1" + semver "^7.3.8" + jsprim@^1.2.2: version "1.4.2" resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.2.tgz#712c65533a15c878ba59e9ed5f0e26d5b77c5feb" @@ -12048,6 +13993,11 @@ jsprim@^1.2.2: json-schema "0.4.0" verror "1.10.0" +junk@^4.0.0: + version "4.0.1" + resolved "https://registry.yarnpkg.com/junk/-/junk-4.0.1.tgz#7ee31f876388c05177fe36529ee714b07b50fbed" + integrity sha512-Qush0uP+G8ZScpGMZvHUiRfI0YBWuB3gVBYlI0v0vvOJt5FLicco+IkP0a50LqTTQhmts/m6tP5SWE+USyIvcQ== + just-safe-get@^2.0.0: version "2.1.2" resolved "https://registry.yarnpkg.com/just-safe-get/-/just-safe-get-2.1.2.tgz#82c2df6bbb929bf4de8d46c06ef79e1a4dd98918" @@ -12058,6 +14008,15 @@ just-safe-set@^2.1.0: resolved "https://registry.yarnpkg.com/just-safe-set/-/just-safe-set-2.2.3.tgz#b717b71a7237ff9f4b9d1220128a576001a11535" integrity sha512-6zAkfGKRjB766zXv/UVSGOFKSAqakhwLQDyIR9bmIhJ/e6jS3Ci1VxYTqaiooYZZUw3VLg0sZva8PE6JX/iu2w== +jwa@^1.4.1: + version "1.4.1" + resolved "https://registry.yarnpkg.com/jwa/-/jwa-1.4.1.tgz#743c32985cb9e98655530d53641b66c8645b039a" + integrity sha512-qiLX/xhEEFKUAJ6FiBMbes3w9ATzyk5W7Hvzpa/SLYdxNtng+gcurvrI7TbACjIXlsJyr05/S1oUhZrc63evQA== + dependencies: + buffer-equal-constant-time "1.0.1" + ecdsa-sig-formatter "1.0.11" + safe-buffer "^5.0.1" + jwa@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/jwa/-/jwa-2.0.0.tgz#a7e9c3f29dae94027ebcaf49975c9345593410fc" @@ -12067,6 +14026,14 @@ jwa@^2.0.0: ecdsa-sig-formatter "1.0.11" safe-buffer "^5.0.1" +jws@^3.2.2: + version "3.2.2" + resolved "https://registry.yarnpkg.com/jws/-/jws-3.2.2.tgz#001099f3639468c9414000e99995fa52fb478304" + integrity sha512-YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA== + dependencies: + jwa "^1.4.1" + safe-buffer "^5.0.1" + jws@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/jws/-/jws-4.0.0.tgz#2d4e8cf6a318ffaa12615e9dec7e86e6c97310f4" @@ -12075,7 +14042,7 @@ jws@^4.0.0: jwa "^2.0.0" safe-buffer "^5.0.1" -jwt-decode@^3.0.0: +jwt-decode@3.1.2: version "3.1.2" resolved "https://registry.yarnpkg.com/jwt-decode/-/jwt-decode-3.1.2.tgz#3fb319f3675a2df0c2895c8f5e9fa4b67b04ed59" integrity sha512-UfpWE/VZn0iP50d8cz9NrZLM9lSWhcJ+0Gt/nm4by88UL+J1SiKN8/5dkjMmbEzwL2CAe+67GsegCbIKtbp75A== @@ -12089,14 +14056,21 @@ keccak@3.0.1: node-gyp-build "^4.2.0" keccak@^3.0.0, keccak@^3.0.2: - version "3.0.3" - resolved "https://registry.yarnpkg.com/keccak/-/keccak-3.0.3.tgz#4bc35ad917be1ef54ff246f904c2bbbf9ac61276" - integrity sha512-JZrLIAJWuZxKbCilMpNz5Vj7Vtb4scDG3dMXLOsbzBmQGyjwE61BbW7bJkfKKCShXiQZt3T6sBgALRtmd+nZaQ== + version "3.0.4" + resolved "https://registry.yarnpkg.com/keccak/-/keccak-3.0.4.tgz#edc09b89e633c0549da444432ecf062ffadee86d" + integrity sha512-3vKuW0jV8J3XNTzvfyicFR5qvxrSAGl7KIhvgOu5cmWwM7tZRj3fMbj/pfIf4be7aznbc+prBWGjywox/g2Y6Q== dependencies: node-addon-api "^2.0.0" node-gyp-build "^4.2.0" readable-stream "^3.6.0" +keep-func-props@^4.0.0: + version "4.0.1" + resolved "https://registry.yarnpkg.com/keep-func-props/-/keep-func-props-4.0.1.tgz#3a9ab077a1bcc7f98771fd534940826d44cd5df1" + integrity sha512-87ftOIICfdww3SxR5P1veq3ThBNyRPG0JGL//oaR08v0k2yTicEIHd7s0GqSJfQvlb+ybC3GiDepOweo0LDhvw== + dependencies: + mimic-fn "^4.0.0" + keyv@^3.0.0: version "3.1.0" resolved "https://registry.yarnpkg.com/keyv/-/keyv-3.1.0.tgz#ecc228486f69991e49e9476485a5be1e8fc5c4d9" @@ -12104,10 +14078,10 @@ keyv@^3.0.0: dependencies: json-buffer "3.0.0" -keyv@^4.0.0: - version "4.5.2" - resolved "https://registry.yarnpkg.com/keyv/-/keyv-4.5.2.tgz#0e310ce73bf7851ec702f2eaf46ec4e3805cce56" - integrity sha512-5MHbFaKn8cNSmVW7BYnijeAVlE4cYA/SVkifVgrh7yotnfhKmjuXpDKjrABLnT0SfHWV21P8ow07OGfRrNDg8g== +keyv@^4.0.0, keyv@^4.5.3: + version "4.5.4" + resolved "https://registry.yarnpkg.com/keyv/-/keyv-4.5.4.tgz#a879a99e29452f942439f2a405e3af8b31d4de93" + integrity sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw== dependencies: json-buffer "3.0.1" @@ -12130,12 +14104,7 @@ kind-of@^4.0.0: dependencies: is-buffer "^1.1.5" -kind-of@^5.0.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d" - integrity sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw== - -kind-of@^6.0.0, kind-of@^6.0.2, kind-of@^6.0.3: +kind-of@^6.0.2, kind-of@^6.0.3: version "6.0.3" resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd" integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw== @@ -12154,12 +14123,33 @@ klaw@^1.0.0: optionalDependencies: graceful-fs "^4.1.9" -lcid@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/lcid/-/lcid-1.0.0.tgz#308accafa0bc483a3867b4b6f2b9506251d1b835" - integrity sha512-YiGkH6EnGrDGqLMITnGjXtGmNtjoXw9SVUzcaos8RBi7Ps0VBylkq+vOcY9QE5poLasPCR849ucFUkl0UzUyOw== +kuler@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/kuler/-/kuler-2.0.0.tgz#e2c570a3800388fb44407e851531c1d670b061b3" + integrity sha512-Xq9nH7KlWZmXAtodXDDRE7vs6DU1gTU8zYDHDiWLSip45Egwq3plLHzPn27NgvzL2r1LMPC1vdqh98sQxtqj4A== + +lambda-local@2.1.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/lambda-local/-/lambda-local-2.1.2.tgz#22b0ecdc15ae400841e268991402e87566ba0554" + integrity sha512-nGTJn2JxZWcLGpNwXFmXC7UEXL7QCLieQWDiXs46vIv9y/gSPm/uHygEMCaym+HIziniAw0XIm+1VTrXCvG1Zw== + dependencies: + commander "^10.0.1" + dotenv "^16.3.1" + winston "^3.10.0" + +latest-version@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/latest-version/-/latest-version-7.0.0.tgz#843201591ea81a4d404932eeb61240fe04e9e5da" + integrity sha512-KvNT4XqAMzdcL6ka6Tl3i2lYeFDgXNCuIX+xNx6ZMVR1dFq+idXd9FLKNMOIx0t9mJ9/HudyX4oZWXZQ0UJHeg== + dependencies: + package-json "^8.1.0" + +lazystream@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/lazystream/-/lazystream-1.0.1.tgz#494c831062f1f9408251ec44db1cba29242a2638" + integrity sha512-b94GiNHQNy6JNTrt5w6zNyffMrNkXZb3KTkCZJb2V1xaEGCk093vkZ2jk3tpaeP33/OiXC+WvK9AxUebnf5nbw== dependencies: - invert-kv "^1.0.0" + readable-stream "^2.0.5" level-codec@^9.0.0: version "9.0.2" @@ -12392,6 +14382,11 @@ levelup@^4.3.2: level-supports "~1.0.0" xtend "~4.0.0" +leven@^3.1.0, "leven@^3.1.0 < 4": + 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.4.1: version "0.4.1" resolved "https://registry.yarnpkg.com/levn/-/levn-0.4.1.tgz#ae4562c007473b932a6200d403268dd2fffc6ade" @@ -12408,11 +14403,25 @@ levn@~0.3.0: prelude-ls "~1.1.2" type-check "~0.3.2" -lilconfig@^2.0.5, lilconfig@^2.0.6: +light-my-request@^5.6.1: + version "5.11.0" + resolved "https://registry.yarnpkg.com/light-my-request/-/light-my-request-5.11.0.tgz#90e446c303b3a47b59df38406d5f5c2cf224f2d1" + integrity sha512-qkFCeloXCOMpmEdZ/MV91P8AT4fjwFXWaAFz3lUeStM8RcoM1ks4J/F8r1b3r6y/H4u3ACEJ1T+Gv5bopj7oDA== + dependencies: + cookie "^0.5.0" + process-warning "^2.0.0" + set-cookie-parser "^2.4.1" + +lilconfig@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/lilconfig/-/lilconfig-2.1.0.tgz#78e23ac89ebb7e1bfbf25b18043de756548e7f52" integrity sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ== +lilconfig@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/lilconfig/-/lilconfig-3.0.0.tgz#f8067feb033b5b74dab4602a5f5029420be749bc" + integrity sha512-K2U4W2Ff5ibV7j7ydLr+zLAkIg5JJ4lPn1Ltsdt+Tz/IjQ8buJ55pZAxoP34lqIiwtF9iAvtLv3JGv7CAyAg+g== + lines-and-columns@^1.1.6: version "1.2.4" resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz#eca284f75d2965079309dc0ad9255abb2ebc1632" @@ -12445,6 +14454,41 @@ lint-staged@^11.0.0: stringify-object "3.3.0" supports-color "8.1.1" +listhen@^1.5.5: + version "1.5.6" + resolved "https://registry.yarnpkg.com/listhen/-/listhen-1.5.6.tgz#8dc8cdccef225e39c69bcc6f6bd704447b499b51" + integrity sha512-gTpEJhT5L85L0bFgmu+Boqu5rP4DwDtEb4Exq5gdQUxWRwx4jbzdInZkmyLONo5EwIcQB0k7ZpWlpCDPdL77EQ== + dependencies: + "@parcel/watcher" "^2.3.0" + "@parcel/watcher-wasm" "2.3.0" + citty "^0.1.5" + clipboardy "^4.0.0" + consola "^3.2.3" + defu "^6.1.4" + get-port-please "^3.1.2" + h3 "^1.10.0" + http-shutdown "^1.2.2" + jiti "^1.21.0" + mlly "^1.4.2" + node-forge "^1.3.1" + pathe "^1.1.1" + std-env "^3.7.0" + ufo "^1.3.2" + untun "^0.1.3" + uqr "^0.1.2" + +listr2@7.0.2: + version "7.0.2" + resolved "https://registry.yarnpkg.com/listr2/-/listr2-7.0.2.tgz#3aa3e1549dfaf3c57ab5eeaba754da3b87f33063" + integrity sha512-rJysbR9GKIalhTbVL2tYbF2hVyDnrf7pFUZBwjPaMIdadYHmeT+EVi/Bu3qd7ETQPahTotg2WRCatXwRBW554g== + dependencies: + cli-truncate "^3.1.0" + colorette "^2.0.20" + eventemitter3 "^5.0.1" + log-update "^5.0.1" + rfdc "^1.3.0" + wrap-ansi "^8.1.0" + listr2@^3.12.2: version "3.14.0" resolved "https://registry.yarnpkg.com/listr2/-/listr2-3.14.0.tgz#23101cc62e1375fd5836b248276d1d2b51fdbe9e" @@ -12474,69 +14518,42 @@ listr2@^4.0.5: wrap-ansi "^7.0.0" lit-element@^3.3.0: - version "3.3.2" - resolved "https://registry.yarnpkg.com/lit-element/-/lit-element-3.3.2.tgz#9913bf220b85065f0e5f1bb8878cc44f36b50cfa" - integrity sha512-xXAeVWKGr4/njq0rGC9dethMnYCq5hpKYrgQZYTzawt9YQhMiXfD+T1RgrdY3NamOxwq2aXlb0vOI6e29CKgVQ== + version "3.3.3" + resolved "https://registry.yarnpkg.com/lit-element/-/lit-element-3.3.3.tgz#10bc19702b96ef5416cf7a70177255bfb17b3209" + integrity sha512-XbeRxmTHubXENkV4h8RIPyr8lXc+Ff28rkcQzw3G6up2xg5E8Zu1IgOWIwBLEQsu3cOVFqdYwiVi0hv0SlpqUA== dependencies: "@lit-labs/ssr-dom-shim" "^1.1.0" "@lit/reactive-element" "^1.3.0" - lit-html "^2.7.0" + lit-html "^2.8.0" -lit-html@^2.7.0: - version "2.7.4" - resolved "https://registry.yarnpkg.com/lit-html/-/lit-html-2.7.4.tgz#6d75001977c206683685b9d76594a516afda2954" - integrity sha512-/Jw+FBpeEN+z8X6PJva5n7+0MzCVAH2yypN99qHYYkq8bI+j7I39GH+68Z/MZD6rGKDK9RpzBw7CocfmHfq6+g== +lit-html@^2.8.0: + version "2.8.0" + resolved "https://registry.yarnpkg.com/lit-html/-/lit-html-2.8.0.tgz#96456a4bb4ee717b9a7d2f94562a16509d39bffa" + integrity sha512-o9t+MQM3P4y7M7yNzqAyjp7z+mQGa4NS4CxiyLqFPyFWyc4O+nodLrkrxSaCTrla6M5YOLaT3RpbbqjszB5g3Q== dependencies: "@types/trusted-types" "^2.0.2" -lit@2.7.6: - version "2.7.6" - resolved "https://registry.yarnpkg.com/lit/-/lit-2.7.6.tgz#810007b876ed43e0c70124de91831921598b1665" - integrity sha512-1amFHA7t4VaaDe+vdQejSVBklwtH9svGoG6/dZi9JhxtJBBlqY5D1RV7iLUYY0trCqQc4NfhYYZilZiVHt7Hxg== +lit@2.8.0: + version "2.8.0" + resolved "https://registry.yarnpkg.com/lit/-/lit-2.8.0.tgz#4d838ae03059bf9cafa06e5c61d8acc0081e974e" + integrity sha512-4Sc3OFX9QHOJaHbmTMk28SYgVxLN3ePDjg7hofEft2zWlehFL3LiAuapWc4U/kYwMYJSh2hTCPZ6/LIC7ii0MA== dependencies: "@lit/reactive-element" "^1.6.0" lit-element "^3.3.0" - lit-html "^2.7.0" - -load-json-file@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0" - integrity sha512-cy7ZdNRXdablkXYNI049pthVeXFurRyb9+hA/dZzerZ0pGTx42z+y+ssxBaVV2l70t1muq5IdKhn4UtcoGUY9A== - dependencies: - graceful-fs "^4.1.2" - parse-json "^2.2.0" - pify "^2.0.0" - pinkie-promise "^2.0.0" - strip-bom "^2.0.0" - -loader-runner@^2.4.0: - version "2.4.0" - resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.4.0.tgz#ed47066bfe534d7e84c4c7b9998c2a75607d9357" - integrity sha512-Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw== - -loader-utils@^1.2.3: - version "1.4.2" - resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.2.tgz#29a957f3a63973883eb684f10ffd3d151fec01a3" - integrity sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg== - dependencies: - big.js "^5.2.2" - emojis-list "^3.0.0" - json5 "^1.0.1" - -loader-utils@^2.0.0: - version "2.0.4" - resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.4.tgz#8b5cb38b5c34a9a018ee1fc0e6a066d1dfcc528c" - integrity sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw== - dependencies: - big.js "^5.2.2" - emojis-list "^3.0.0" - json5 "^2.1.2" + lit-html "^2.8.0" local-pkg@^0.4.2, local-pkg@^0.4.3: version "0.4.3" resolved "https://registry.yarnpkg.com/local-pkg/-/local-pkg-0.4.3.tgz#0ff361ab3ae7f1c19113d9bb97b98b905dbc4963" integrity sha512-SFppqq5p42fe2qcZQqqEOiVRXl+WCP1MdT6k7BDEW1j++sp5fIY+/fdRQitvKgB5BrBcmrs5m/L0v2FrU5MY1g== +locate-path@7.2.0, locate-path@^7.0.0, locate-path@^7.1.0: + version "7.2.0" + resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-7.2.0.tgz#69cb1779bd90b35ab1e771e1f2f89a202c2a8a8a" + integrity sha512-gvVijfZvn7R+2qyPX8mAuKcFGDf6Nc61GdvGafQsHL0sBIxfKzA+usWn4GFC/bk+QdwPUD4kWFJLhElipq+0VA== + dependencies: + p-locate "^6.0.0" + locate-path@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e" @@ -12567,31 +14584,51 @@ locate-path@^6.0.0: dependencies: p-locate "^5.0.0" -lodash.assign@^4.0.3, lodash.assign@^4.0.6: - version "4.2.0" - resolved "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-4.2.0.tgz#0d99f3ccd7a6d261d19bdaeb9245005d285808e7" - integrity sha512-hFuH8TY+Yji7Eja3mGiuAxBqLagejScbG8GbG0j6o9vzn0YL14My+ktnqtZgFTosKymC9/44wP6s7xyuLfnClw== +lodash-es@^4.17.21: + version "4.17.21" + resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.21.tgz#43e626c46e6591b7750beb2b50117390c609e3ee" + integrity sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw== lodash.camelcase@^4.3.0: version "4.3.0" resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6" integrity sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA== -lodash.debounce@^4.0.8: - version "4.0.8" - resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af" - integrity sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow== +lodash.clonedeep@^4.5.0: + version "4.5.0" + resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef" + integrity sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ== + +lodash.defaults@^4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/lodash.defaults/-/lodash.defaults-4.2.0.tgz#d09178716ffea4dde9e5fb7b37f6f0802274580c" + integrity sha512-qjxPLHd3r5DnsdGacqOMU6pb/avJzdh9tFX2ymgoZE27BmjXrNy/y4LoaiTeAb+O3gL8AfpJGtqfX/ae2leYYQ== lodash.has@^4.5.2: version "4.5.2" resolved "https://registry.yarnpkg.com/lodash.has/-/lodash.has-4.5.2.tgz#d19f4dc1095058cccbe2b0cdf4ee0fe4aa37c862" integrity sha512-rnYUdIo6xRCJnQmbVFEwcxF144erlD+M3YcJUVesflU9paQaE8p+fJDcIQrlMYbxoANFL+AB9hZrzSBBk5PL+g== -lodash.isequal@4.5.0: +lodash.isarguments@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz#2f573d85c6a24289ff00663b491c1d338ff3458a" + integrity sha512-chi4NHZlZqZD18a0imDHnZPrDeBbTtVN7GXMwuGdRH9qotxAjYs3aVLKc7zNOG9eddR5Ksd8rvFEBc9SsggPpg== + +lodash.isempty@^4.4.0: + version "4.4.0" + resolved "https://registry.yarnpkg.com/lodash.isempty/-/lodash.isempty-4.4.0.tgz#6f86cbedd8be4ec987be9aaf33c9684db1b31e7e" + integrity sha512-oKMuF3xEeqDltrGMfDxAPGIVMSSRv8tbRSODbrs4KGsRRLEhrW8N8Rd4DRgB2+621hY8A8XwwrTVhXWpxFvMzg== + +lodash.isequal@4.5.0, lodash.isequal@^4.5.0: version "4.5.0" resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0" integrity sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ== +lodash.isplainobject@^4.0.6: + version "4.0.6" + resolved "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb" + integrity sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA== + lodash.kebabcase@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/lodash.kebabcase/-/lodash.kebabcase-4.1.1.tgz#8489b1cb0d29ff88195cceca448ff6d6cc295c36" @@ -12642,6 +14679,11 @@ lodash.startcase@^4.4.0: resolved "https://registry.yarnpkg.com/lodash.startcase/-/lodash.startcase-4.4.0.tgz#9436e34ed26093ed7ffae1936144350915d9add8" integrity sha512-+WKqsK294HMSc2jEbNgpHpd0JfIBhp7rEV4aqXWqFr6AlXov+SlcgB1Fv01y2kGe3Gc8nMW7VA0SrGuSkRfIEg== +lodash.transform@^4.6.0: + version "4.6.0" + resolved "https://registry.yarnpkg.com/lodash.transform/-/lodash.transform-4.6.0.tgz#12306422f63324aed8483d3f38332b5f670547a0" + integrity sha512-LO37ZnhmBVx0GvOU/caQuipEh4GN82TcWv3yHlebGDgOxbxiwwzW5Pcx2AcvpIv2WmvmSMoC492yQFNhy/l/UQ== + lodash.trim@^4.5.1: version "4.5.1" resolved "https://registry.yarnpkg.com/lodash.trim/-/lodash.trim-4.5.1.tgz#36425e7ee90be4aa5e27bcebb85b7d11ea47aa57" @@ -12677,17 +14719,23 @@ lodash@4.17.20: resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52" integrity sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA== -lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.4, lodash@~4.17.0: +lodash@4.17.21, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.4, lodash@~4.17.0: version "4.17.21" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== -log-symbols@4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-4.0.0.tgz#69b3cc46d20f448eccdb75ea1fa733d9e821c920" - integrity sha512-FN8JBzLx6CzeMrB0tg6pqlGU1wCrXW+ZXGH481kfsBqer0hToTIiHdjH4Mq8xJUbvATujKCvaREGWpGUionraA== - dependencies: - chalk "^4.0.0" +log-process-errors@^8.0.0: + version "8.0.0" + resolved "https://registry.yarnpkg.com/log-process-errors/-/log-process-errors-8.0.0.tgz#f88a9556e4914037ad97ceee24b148dc1b566dfd" + integrity sha512-+SNGqNC1gCMJfhwYzAHr/YgNT/ZJc+V2nCkvtPnjrENMeCe+B/jgShBW0lmWoh6uVV2edFAPc/IUOkDdsjTbTg== + dependencies: + colors-option "^3.0.0" + figures "^4.0.0" + filter-obj "^3.0.0" + jest-validate "^27.4.2" + map-obj "^5.0.0" + moize "^6.1.0" + semver "^7.3.5" log-symbols@4.1.0, log-symbols@^4.0.0, log-symbols@^4.1.0: version "4.1.0" @@ -12697,6 +14745,14 @@ log-symbols@4.1.0, log-symbols@^4.0.0, log-symbols@^4.1.0: chalk "^4.1.0" is-unicode-supported "^0.1.0" +log-symbols@5.1.0, log-symbols@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-5.1.0.tgz#a20e3b9a5f53fac6aeb8e2bb22c07cf2c8f16d93" + integrity sha512-l0x2DvrW294C9uDCoQe1VSU4gf529FkSZ6leBl4TiqZH/e+0R7hSfHQBNut2mNygDgHwvYHfFLn6Oxb3VWj2rA== + dependencies: + chalk "^5.0.0" + is-unicode-supported "^1.1.0" + log-symbols@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-3.0.0.tgz#f3a08516a5dea893336a7dee14d18a1cfdab77c4" @@ -12704,6 +14760,17 @@ log-symbols@^3.0.0: dependencies: chalk "^2.4.2" +log-update@5.0.1, log-update@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/log-update/-/log-update-5.0.1.tgz#9e928bf70cb183c1f0c9e91d9e6b7115d597ce09" + integrity sha512-5UtUDQ/6edw4ofyljDNcOVJQ4c7OjDro4h3y8e1GQL5iYElYclVHJ3zeWchylvMaKnDbDilC8irOVyexnA/Slw== + dependencies: + ansi-escapes "^5.0.0" + cli-cursor "^4.0.0" + slice-ansi "^5.0.0" + strip-ansi "^7.0.1" + wrap-ansi "^8.0.1" + log-update@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/log-update/-/log-update-4.0.0.tgz#589ecd352471f2a1c0c570287543a64dfd20e0a1" @@ -12714,6 +14781,23 @@ log-update@^4.0.0: slice-ansi "^4.0.0" wrap-ansi "^6.2.0" +logform@^2.3.2, logform@^2.4.0: + version "2.6.0" + resolved "https://registry.yarnpkg.com/logform/-/logform-2.6.0.tgz#8c82a983f05d6eaeb2d75e3decae7a768b2bf9b5" + integrity sha512-1ulHeNPp6k/LD8H91o7VYFBng5i1BDE7HoKxVbZiGFidS1Rj65qcywLxX+pVfAPoQJEjRdvKcusKwOupHCVOVQ== + dependencies: + "@colors/colors" "1.6.0" + "@types/triple-beam" "^1.3.2" + fecha "^4.2.0" + ms "^2.1.1" + safe-stable-stringify "^2.3.1" + triple-beam "^1.3.0" + +loglevel@^1.8.1: + version "1.8.1" + resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.8.1.tgz#5c621f83d5b48c54ae93b6156353f555963377b4" + integrity sha512-tCRIJM51SHjAayKwC+QAg8hT8vg6z7GSgLJKGvzuPb1Wc+hLzqtuVLxp6/HzSPOozuK+8ErAhy7U/sVzw8Dgfg== + logplease@^1.2.15: version "1.2.15" resolved "https://registry.yarnpkg.com/logplease/-/logplease-1.2.15.tgz#3da442e93751a5992cc19010a826b08d0293c48a" @@ -12746,12 +14830,12 @@ loose-envify@^1.0.0: dependencies: js-tokens "^3.0.0 || ^4.0.0" -loupe@^2.3.1: - version "2.3.6" - resolved "https://registry.yarnpkg.com/loupe/-/loupe-2.3.6.tgz#76e4af498103c532d1ecc9be102036a21f787b53" - integrity sha512-RaPMZKiMy8/JruncMU5Bt6na1eftNoo++R4Y+N2FrxkDVTrGvcyzFTsaGif4QTeKESheMGegbhw6iUAq+5A8zA== +loupe@^2.3.6: + version "2.3.7" + resolved "https://registry.yarnpkg.com/loupe/-/loupe-2.3.7.tgz#6e69b7d4db7d3ab436328013d37d1c8c3540c697" + integrity sha512-zSMINGVYkdpYSOBmLi0D1Uo7JU9nVdQKrHxC8eYlV+9YKK9WePqAlL7lSlorG/U2Fw1w0hTBmaa/jrQ3UbPHtA== dependencies: - get-func-name "^2.0.0" + get-func-name "^2.0.1" lower-case-first@^2.0.2: version "2.0.2" @@ -12789,6 +14873,16 @@ lru-cache@5.1.1, lru-cache@^5.1.1: dependencies: yallist "^3.0.2" +lru-cache@^10.0.0: + version "10.2.0" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.2.0.tgz#0bd445ca57363465900f4d1f9bd8db343a4d95c3" + integrity sha512-2bIM8x+VAf6JT4bKAljS1qUWgMsqZRPGJS6FSahIMPVvctcNhyVp7AJu7quxOW9jwkryBReKZY5tY5JYv2n/7Q== + +lru-cache@^10.0.2, "lru-cache@^9.1.1 || ^10.0.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.1.0.tgz#2098d41c2dc56500e6c88584aa656c84de7d0484" + integrity sha512-/1clY/ui8CzjKFyjdvwPWJUYKiFVXG2I2cY0ssG7h4+hwk+XOIX7ZSG9Q7TW8TW3Kp3BUSqgFWBLgL4PJ+Blag== + lru-cache@^3.2.0: version "3.2.0" resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-3.2.0.tgz#71789b3b7f5399bec8565dda38aa30d2a097efee" @@ -12803,11 +14897,6 @@ lru-cache@^6.0.0: dependencies: yallist "^4.0.0" -lru-cache@^9.0.0: - version "9.1.0" - resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-9.1.0.tgz#19efafa9d08d1c08eb8efd78876075f0b8b1b07b" - integrity sha512-qFXQEwchrZcMVen2uIDceR8Tii6kCJak5rzDStfEM0qA3YLMswaxIEZO0DhIbJ3aqaJiDjt+3crlplOb0tDtKQ== - lru_map@^0.3.3: version "0.3.3" resolved "https://registry.yarnpkg.com/lru_map/-/lru_map-0.3.3.tgz#b5c8351b9464cbd750335a79650a0ec0e56118dd" @@ -12823,93 +14912,95 @@ ltgt@~2.1.1: resolved "https://registry.yarnpkg.com/ltgt/-/ltgt-2.1.3.tgz#10851a06d9964b971178441c23c9e52698eece34" integrity sha512-5VjHC5GsENtIi5rbJd+feEpDKhfr7j0odoUR2Uh978g+2p93nd5o34cTjQWohXsPsCZeqoDnIqEf88mPCe0Pfw== -luxon@^3.1.1: - version "3.3.0" - resolved "https://registry.yarnpkg.com/luxon/-/luxon-3.3.0.tgz#d73ab5b5d2b49a461c47cedbc7e73309b4805b48" - integrity sha512-An0UCfG/rSiqtAIiBPO0Y9/zAnHUZxAMiCpTd5h2smgsj7GGmcenvrvww2cqNA8/4A5ZrD1gJpHN2mIHZQF+Mg== - -maci-circuits@^0.10.0: - version "0.10.0" - resolved "https://registry.yarnpkg.com/maci-circuits/-/maci-circuits-0.10.0.tgz#12a379e039241184c43fde6c3568ee399f15a029" - integrity sha512-4wiRRyG7PMjC+ijKhGAjxQufOJVX2ZQhRdpg6EIszmsfogjdae2Y/MWWlzpvEqrRWg29wDG8a+p6R2+LVKkDwQ== - dependencies: - argparse "^1.0.10" - circom "0.5.38" - circomlib "0.5.1" - n-readlines "^1.0.1" - shelljs "^0.8.3" - snarkjs "0.3.59" - -"maci-cli@npm:@clrfund/maci-cli@0.10.2": - version "0.10.2" - resolved "https://registry.yarnpkg.com/@clrfund/maci-cli/-/maci-cli-0.10.2.tgz#bf6609e65061dedf4b65e4185c19460c3f67913c" - integrity sha512-4Ey5flMN/jMDoHh5mwcAdkcx4r/Nqq7tPqB9yhPKKOuBLKWJpsoPoBHLaKXFNTmIV7ada3dcaSGSXC2P33XAbw== - dependencies: - argparse "^1.0.10" - ethers "^4.0.45" - maci-circuits "^0.10.0" - maci-config "^0.10.0" - maci-contracts "^0.10.1" - maci-core "npm:@clrfund/maci-core@^0.10.2" - maci-crypto "npm:@clrfund/maci-crypto@^0.10.2" - maci-domainobjs "npm:@clrfund/maci-domainobjs@^0.10.2" - prompt-sync "4.2.0" - source-map-support "^0.5.19" - -maci-config@^0.10.0: - version "0.10.0" - resolved "https://registry.yarnpkg.com/maci-config/-/maci-config-0.10.0.tgz#792524402c7705437cd670ca9caaaa09d6b90dca" - integrity sha512-D3ZRe0t7TDeppSiE3c4IJQqsuKNa2l2ObqF/PBWk+z+chPazehDdxKNhmSp+2LvVCwRKrOu0rwlQyzKxrdMvMA== - dependencies: - config "^3.2.4" - js-yaml "^3.13.1" - path "^0.12.7" +luxon@^3.1.1, luxon@^3.2.1: + version "3.4.4" + resolved "https://registry.yarnpkg.com/luxon/-/luxon-3.4.4.tgz#cf20dc27dc532ba41a169c43fdcc0063601577af" + integrity sha512-zobTr7akeGHnv7eBOXcRgMeCP6+uyYsczwmeRCauvpvaAltgNyTbLH/+VaEAPUeWBT+1GuNmz4wC/6jtQzbbVA== -maci-contracts@0.10.1, maci-contracts@^0.10.1: - version "0.10.1" - resolved "https://registry.yarnpkg.com/maci-contracts/-/maci-contracts-0.10.1.tgz#561316524a9b42d4e3eb3d463fc6e7efd3d186e0" - integrity sha512-t4RNznMrL5NdW1unCRkmNuzH1W8Pawk7YdmY2ov6qTa9/pc91MZeA6jQMWAo80cttTuKbls3alKhd3NeqioYdA== +maci-circuits@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/maci-circuits/-/maci-circuits-1.2.0.tgz#9b1f9c64d48e4dc3c3c7c8ffc4d0f254d60cce3e" + integrity sha512-51VMv7prUfRuko+PWDJOhwl9dLP82lAW2WHA39x+SFn1tkGAF3K3gw5TcIu7P6DQcwDblmbufn4OlrMc6jQXZg== + dependencies: + "@zk-kit/circuits" "^0.3.0" + circomkit "^0.0.24" + circomlib "^2.0.5" + maci-core "^1.2.0" + maci-crypto "^1.2.0" + maci-domainobjs "^1.2.0" + snarkjs "^0.7.3" + +maci-cli@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/maci-cli/-/maci-cli-1.2.0.tgz#caf8756d7e8dbfef61af6c7ac14068dfbc7d5db4" + integrity sha512-l3HYHvcafD6Z9ctPOBsYfZ5H/hdiS4rh0X3vEeLlncnsfKRPIpAej+2RHzsTooBH3ZvAp2f6wh+m2C9fRiU/7A== + dependencies: + "@commander-js/extra-typings" "^12.0.0" + "@nomicfoundation/hardhat-toolbox" "^4.0.0" + commander "^12.0.0" + dotenv "^16.4.5" + ethers "^6.11.1" + hardhat "^2.20.1" + maci-circuits "^1.2.0" + maci-contracts "^1.2.0" + maci-core "^1.2.0" + maci-crypto "^1.2.0" + maci-domainobjs "^1.2.0" + prompt "^1.3.0" + +maci-contracts@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/maci-contracts/-/maci-contracts-1.2.0.tgz#a724b3e757d2402442d822c34a5221660ef43b94" + integrity sha512-zLYmGzBIBTygw7FiukK9nLNFnDdEWDmizuHruXFjpawCIwH+kzBsGImRy77Rn58SOe9XORdlGZOQckEGvaT4QQ== + dependencies: + "@nomicfoundation/hardhat-ethers" "^3.0.5" + "@nomicfoundation/hardhat-toolbox" "^4.0.0" + "@openzeppelin/contracts" "^4.8.0" + circomlibjs "^0.1.7" + ethers "^6.11.1" + hardhat "^2.20.1" + maci-circuits "^1.2.0" + maci-core "^1.2.0" + maci-crypto "^1.2.0" + maci-domainobjs "^1.2.0" + solidity-docgen "^0.6.0-beta.36" + +maci-core@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/maci-core/-/maci-core-1.2.0.tgz#57ff4b92c457f42a3043fe5b34cfef98a9ac1cf5" + integrity sha512-odqIpafdQmSN0VlvaPESyPQybVcQzxxg9Zvh/DEUSiPMNHBJfHd0ke+CIUVdBN0z2pLaN9VlAFyMDf/CYEuivw== dependencies: - "@openzeppelin/contracts" "~3.2.0" - argparse "^1.0.10" - circomlib "0.5.1" - ethers "^4.0.45" - module-alias "^2.2.2" + maci-crypto "^1.2.0" + maci-domainobjs "^1.2.0" -"maci-core@npm:@clrfund/maci-core@^0.10.2": - version "0.10.2" - resolved "https://registry.yarnpkg.com/@clrfund/maci-core/-/maci-core-0.10.2.tgz#1414f59b0fd018da71dc05e44e31e374c030c527" - integrity sha512-JhRAiR6vUzwWtQw4EWlefVH1fQ7+S/mrr7xt6xbFssw4R3BNjkEQcOulG2rDyDHCIiBBWlCka2J+25LpEIY57Q== +maci-crypto@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/maci-crypto/-/maci-crypto-1.2.0.tgz#b894810fa2ab379d93f77a2518f55abfe2f22dbe" + integrity sha512-OOQvI+uDR0Q8wji9cbBqfDcwQgjoIIiv5r1pnne4ST15taxgMygep13rsA6UCU/A007rYBa93YAR3vnnBTnmrw== dependencies: - ethers "^4.0.45" - maci-config "^0.10.0" - maci-crypto "npm:@clrfund/maci-crypto@^0.10.2" - maci-domainobjs "npm:@clrfund/maci-domainobjs@^0.10.2" - module-alias "^2.2.2" + "@zk-kit/baby-jubjub" "^0.1.1" + "@zk-kit/eddsa-poseidon" "^0.5.1" + "@zk-kit/poseidon-cipher" "^0.2.1" + ethers "^6.11.1" -"maci-crypto@npm:@clrfund/maci-crypto@0.10.2", "maci-crypto@npm:@clrfund/maci-crypto@^0.10.2": - version "0.10.2" - resolved "https://registry.yarnpkg.com/@clrfund/maci-crypto/-/maci-crypto-0.10.2.tgz#9ff7d6490938ff93006524432bf177d17c88aed7" - integrity sha512-uzE5IXbE5M21FUQzPShIfFJEfVokO/6ar0jPpDTCYtWFMeFeU5I6D5betljgQZnPteMkXSriui9ExTWmkUTwjw== +maci-domainobjs@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/maci-domainobjs/-/maci-domainobjs-1.2.0.tgz#27a6a9e05b3712e54c48dd080dcfc0c1d6035f93" + integrity sha512-9ItdA/EVSVqDMOD+Foe+OkDdj/LEfpwSAtXLCxG900TeAZpI486qiAbiJoI5sR8gnoRfSvwnZGJqiB+w0BPgSQ== dependencies: - blake-hash "^1.1.0" - circomlib "0.5.1" - circomlibjs "0.0.2" - ethers "^4.0.45" - ffjavascript "0.2.35" - optimisedmt "^0.0.7" + maci-crypto "^1.2.0" -"maci-domainobjs@npm:@clrfund/maci-domainobjs@0.10.2", "maci-domainobjs@npm:@clrfund/maci-domainobjs@^0.10.2": - version "0.10.2" - resolved "https://registry.yarnpkg.com/@clrfund/maci-domainobjs/-/maci-domainobjs-0.10.2.tgz#d1cdb735ae56f286cad2baa227ff47a3178d880c" - integrity sha512-Schf4U9X6GibnK/TIeaZ5uJNtcreuP0cBdwfde/2VuA924Bo4P4MPZjXrSOvriP6KYnVt+1/REQE30nLBlVq9w== +macos-release@^3.1.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/macos-release/-/macos-release-3.2.0.tgz#dcee82b6a4932971b1538dbf6f3aabc4a903b613" + integrity sha512-fSErXALFNsnowREYZ49XCdOHF8wOPWuFOGQrAhP7x5J/BqQv+B02cNsTykGpDgRVx43EKg++6ANmTaGTtW+hUA== -magic-string@^0.25.7: - version "0.25.9" - resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.9.tgz#de7f9faf91ef8a1c91d02c2e5314c8277dbcdd1c" - integrity sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ== +mafmt@^7.0.0: + version "7.1.0" + resolved "https://registry.yarnpkg.com/mafmt/-/mafmt-7.1.0.tgz#4126f6d0eded070ace7dbbb6fb04977412d380b5" + integrity sha512-vpeo9S+hepT3k2h5iFxzEHvvR0GPBx9uKaErmnRzYNcaKb03DgOArjEMlgG4a9LcuZZ89a3I8xbeto487n26eA== dependencies: - sourcemap-codec "^1.4.8" + multiaddr "^7.3.0" magic-string@^0.26.7: version "0.26.7" @@ -12925,21 +15016,27 @@ magic-string@^0.27.0: dependencies: "@jridgewell/sourcemap-codec" "^1.4.13" -make-dir@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-2.1.0.tgz#5f0310e18b8be898cc07009295a30ae41e91e6f5" - integrity sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA== +magic-string@^0.30.3, magic-string@^0.30.5: + version "0.30.5" + resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.30.5.tgz#1994d980bd1c8835dc6e78db7cbd4ae4f24746f9" + integrity sha512-7xlpfBaQaP/T6Vh8MO/EqXSW5En6INHEvEXQiuff7Gku0PWjU3uf6w/j9o7O+SpB5fOAkrI5HeoNgwjEO0pFsA== dependencies: - pify "^4.0.1" - semver "^5.6.0" + "@jridgewell/sourcemap-codec" "^1.4.15" -make-dir@^3.0.2, make-dir@^3.1.0: +make-dir@^3.0.0, make-dir@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f" integrity sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw== dependencies: semver "^6.0.0" +make-dir@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-4.0.0.tgz#c3c2307a771277cd9638305f915c29ae741b614e" + integrity sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw== + dependencies: + semver "^7.5.3" + make-error@^1.1.1: version "1.3.6" resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2" @@ -12960,6 +15057,11 @@ map-obj@^4.0.0: resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-4.3.0.tgz#9304f906e93faae70880da102a9f1df0ea8bb05a" integrity sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ== +map-obj@^5.0.0: + version "5.0.2" + resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-5.0.2.tgz#174ad9f7e5e4e777a219126d9a734ff3e14a1c68" + integrity sha512-K6K2NgKnTXimT3779/4KxSvobxOtMmx1LBZ3NwRxT/MDIR3Br/fQ4Q+WCX5QxjyUR8zg5+RV9Tbf2c5pAWTD2A== + map-visit@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f" @@ -12973,9 +15075,9 @@ markdown-it-link-attributes@^4.0.1: integrity sha512-pg5OK0jPLg62H4k7M9mRJLT61gUp9nvG0XveKYHMOOluASo9OEF13WlXrpAp2aj35LbedAy3QOCgQCw0tkLKAQ== markdown-it@^13.0.1: - version "13.0.1" - resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-13.0.1.tgz#c6ecc431cacf1a5da531423fc6a42807814af430" - integrity sha512-lTlxriVoy2criHP0JKRhO2VDG9c2ypWCsT237eDiLqi09rmbKoUetyGHq2uOIRoRS//kfoJckS0eUzzkDR+k2Q== + version "13.0.2" + resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-13.0.2.tgz#1bc22e23379a6952e5d56217fbed881e0c94d536" + integrity sha512-FtwnEuuK+2yVU7goGn/MJ0WBZMM9ZPgU9spqlFs7/A/pDIUNSOQZhUgOqYCficIuR2QaFnrt8LHqBWsbTAoI5w== dependencies: argparse "^2.0.1" entities "~3.0.1" @@ -12983,11 +15085,38 @@ markdown-it@^13.0.1: mdurl "^1.0.1" uc.micro "^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" + integrity sha512-1RUZVgQlpJSPWYbFSpmudq5nHY1doEIv89gBtF0s4gW1GF2XorxcA/70M5vq7rLv0a6mhOUccRsqkwhwLCIQ2Q== + +maxstache-stream@^1.0.0: + version "1.0.4" + resolved "https://registry.yarnpkg.com/maxstache-stream/-/maxstache-stream-1.0.4.tgz#9c7f5cab7e5fdd2d90da86143b4e9631ea328040" + integrity sha512-v8qlfPN0pSp7bdSoLo1NTjG43GXGqk5W2NWFnOCq2GlmFFqebGzPCjLKSbShuqIOVorOtZSAy7O/S1OCCRONUw== + dependencies: + maxstache "^1.0.0" + pump "^1.0.0" + split2 "^1.0.0" + through2 "^2.0.0" + +maxstache@^1.0.0: + version "1.0.7" + resolved "https://registry.yarnpkg.com/maxstache/-/maxstache-1.0.7.tgz#2231d5180ba783d5ecfc31c45fedac7ae4276984" + integrity sha512-53ZBxHrZM+W//5AcRVewiLpDunHnucfdzZUGz54Fnvo4tE+J3p8EL66kBrs2UhBXvYKTWckWYYWBqJqoTcenqg== + mcl-wasm@^0.7.1: version "0.7.9" resolved "https://registry.yarnpkg.com/mcl-wasm/-/mcl-wasm-0.7.9.tgz#c1588ce90042a8700c3b60e40efb339fc07ab87f" integrity sha512-iJIUcQWA88IJB/5L15GnJVnSQJmf/YaxxV6zRavv83HILHaJQb6y0iFyDMdDO0gN8X37tdxmAOrH/P8B6RB8sQ== +md5-hex@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/md5-hex/-/md5-hex-3.0.1.tgz#be3741b510591434b2784d79e556eefc2c9a8e5c" + integrity sha512-BUiRtTtV39LIJwinWBjqVsU9xhdnz7/i889V859IBFpuqGAj6LuOvHv5XLbgZ2R7ptJoJaEcxkv88/h25T7Ciw== + dependencies: + blueimp-md5 "^2.10.0" + md5.js@^1.3.4: version "1.3.5" resolved "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.5.tgz#b5d07b8e3216e3e27cd728d72f70d1e6a342005f" @@ -12997,6 +15126,16 @@ md5.js@^1.3.4: inherits "^2.0.1" safe-buffer "^5.1.2" +mdn-data@2.0.28: + version "2.0.28" + resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.28.tgz#5ec48e7bef120654539069e1ae4ddc81ca490eba" + integrity sha512-aylIc7Z9y4yzHYAJNuESG3hfhC+0Ibp/MAMiaOZgNv4pmEdFyfZhhhny4MNiAfWdBQ1RQ2mfDWmM1x8SvGyp8g== + +mdn-data@2.0.30: + version "2.0.30" + resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.30.tgz#ce4df6f80af6cfbe218ecd5c552ba13c4dfa08cc" + integrity sha512-GaqWWShW4kv/G9IEucWScBx9G1/vsFZZJUO+tD26M8J8z3Kw5RDQjaoZe03YAClgeS/SWPOcb4nkFBTEi5DUEA== + mdurl@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/mdurl/-/mdurl-1.0.1.tgz#fe85b2ec75a59037f2adfec100fd6c601761152e" @@ -13031,21 +15170,10 @@ memdown@~3.0.0: ltgt "~2.2.0" safe-buffer "~5.1.1" -memory-fs@^0.4.1: - version "0.4.1" - resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.4.1.tgz#3a9a20b8462523e447cfbc7e8bb80ed667bfc552" - integrity sha512-cda4JKCxReDXFXRqOHPQscuIYg1PvxbE2S2GP45rnwfEK+vZaXC8C1OFvdHIbgw0DLzowXGVoxLaAmlgRy14GQ== - dependencies: - errno "^0.1.3" - readable-stream "^2.0.1" - -memory-fs@^0.5.0: - version "0.5.0" - resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.5.0.tgz#324c01288b88652966d161db77838720845a8e3c" - integrity sha512-jA0rdU5KoQMC0e6ppoNRtpp6vjFq6+NY7r8hywnC7V+1Xj/MtHwGIbB1QaK/dunyjWteJzmkpd7ooeWg10T7GA== - dependencies: - errno "^0.1.3" - readable-stream "^2.0.1" +memoize-one@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/memoize-one/-/memoize-one-6.0.0.tgz#b2591b871ed82948aee4727dc6abceeeac8c1045" + integrity sha512-rkpe71W0N0c0Xz6QD0eJETuWAJGnJ9afsl1srmwPrI+yBCkge5EycXXbYRyvL29zZVUWQCY7InPRCv3GDXuZNw== memory-level@^1.0.0: version "1.0.0" @@ -13103,7 +15231,7 @@ merge-stream@^2.0.0: resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60" integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w== -merge2@^1.3.0, merge2@^1.4.1: +merge2@^1.2.3, merge2@^1.3.0, merge2@^1.4.1: version "1.4.1" resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae" integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg== @@ -13136,15 +15264,30 @@ merkle-patricia-tree@^2.1.2, merkle-patricia-tree@^2.3.2: semaphore ">=1.0.1" meros@^1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/meros/-/meros-1.2.1.tgz#056f7a76e8571d0aaf3c7afcbe7eb6407ff7329e" - integrity sha512-R2f/jxYqCAGI19KhAvaxSOxALBMkaXWH2a7rOyqQw+ZmizX5bKkEYWLzdhC+U82ZVVPVp6MCXe3EkVligh+12g== + version "1.3.0" + resolved "https://registry.yarnpkg.com/meros/-/meros-1.3.0.tgz#c617d2092739d55286bf618129280f362e6242f2" + integrity sha512-2BNGOimxEz5hmjUG2FwoxCt5HN7BXdaWyFqEwxPTrJzVdABtrL4TiHTcsWSFAxPQ/tOnEaQEJh3qWq71QRMY+w== methods@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee" integrity sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w== +micro-api-client@^3.3.0: + version "3.3.0" + resolved "https://registry.yarnpkg.com/micro-api-client/-/micro-api-client-3.3.0.tgz#52dd567d322f10faffe63d19d4feeac4e4ffd215" + integrity sha512-y0y6CUB9RLVsy3kfgayU28746QrNMpSm9O/AYGNsBgOkJr/X/Jk0VLGoO8Ude7Bpa8adywzF+MzXNZRFRsNPhg== + +micro-ftch@^0.3.1: + version "0.3.1" + resolved "https://registry.yarnpkg.com/micro-ftch/-/micro-ftch-0.3.1.tgz#6cb83388de4c1f279a034fb0cf96dfc050853c5f" + integrity sha512-/0LLxhzP0tfiR5hcQebtudP56gUurs2CLkGarnCiB/OqEyUFQ6U3paQi/tgLv0hBJYt2rnr9MNpxz4fiiugstg== + +micro-memoize@^4.1.2: + version "4.1.2" + resolved "https://registry.yarnpkg.com/micro-memoize/-/micro-memoize-4.1.2.tgz#ce719c1ba1e41592f1cd91c64c5f41dcbf135f36" + integrity sha512-+HzcV2H+rbSJzApgkj0NdTakkC+bnyeiUxgT6/m7mjcz1CmM22KYFKp+EVj1sWe4UYcnriJr5uqHQD/gMHLD+g== + micromatch@^3.1.10, micromatch@^3.1.4: version "3.1.10" resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23" @@ -13180,7 +15323,7 @@ miller-rabin@^4.0.0: bn.js "^4.0.0" brorand "^1.0.1" -mime-db@1.52.0: +mime-db@1.52.0, mime-db@^1.28.0: version "1.52.0" resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70" integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg== @@ -13197,11 +15340,26 @@ mime@1.6.0: resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1" integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg== +mime@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/mime/-/mime-3.0.0.tgz#b374550dca3a0c18443b0c950a6a58f1931cf7a7" + integrity sha512-jSCU7/VB1loIWBZe14aEYHU/+1UMEHoaO7qxCOVJOw9GgH72VAWppxNcjU+x9a2k3GSIBXNKxXQFqRvvZ7vr3A== + +mimic-fn@^1.0.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022" + integrity sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ== + mimic-fn@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b" integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg== +mimic-fn@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-4.0.0.tgz#60a90550d5cb0b239cca65d893b1a53b29871ecc" + integrity sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw== + mimic-response@^1.0.0, mimic-response@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b" @@ -13212,6 +15370,11 @@ mimic-response@^3.1.0: resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-3.1.0.tgz#2d1d59af9c1b129815accc2c46a022a5ce1fa3c9" integrity sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ== +mimic-response@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-4.0.0.tgz#35468b19e7c75d10f5165ea25e75a5ceea7cf70f" + integrity sha512-e5ISH9xMYU0DzrT+jl8q2ze9D6eWBto+I8CNpe+VI+K2J/F/k3PdkdTdz4wvGVH4NTpo+NRYTVIuMQEMMcsLqg== + min-document@^2.19.0: version "2.19.0" resolved "https://registry.yarnpkg.com/min-document/-/min-document-2.19.0.tgz#7bd282e3f5842ed295bb748cdd9f1ffa2c824685" @@ -13234,10 +15397,10 @@ minimalistic-crypto-utils@^1.0.1: resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a" integrity sha512-JIYlbt6g8i5jKfJ3xz7rF0LXmv2TkDxBLUkiBeZ7bAx4GnnNMr8xFpGnOxn6GhTEHx3SjRrZEoU+j04prX1ktg== -minimatch@3.0.4: - version "3.0.4" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" - integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA== +"minimatch@2 || 3", minimatch@^3.0.2, minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2: + 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" @@ -13255,24 +15418,10 @@ minimatch@5.0.1: dependencies: brace-expansion "^2.0.1" -minimatch@^3.0.2, minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2: - 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.0.1, minimatch@^5.1.1: - version "5.1.6" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.6.tgz#1cfcb8cf5522ea69952cd2af95ae09477f122a96" - integrity sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g== - dependencies: - brace-expansion "^2.0.1" - -minimatch@^6.1.6: - version "6.2.0" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-6.2.0.tgz#2b70fd13294178c69c04dfc05aebdb97a4e79e42" - integrity sha512-sauLxniAmvnhhRjFwPNnJKaPFYyddAgbYdeUpHULtCT/GhzdCx/MDNy+Y40lBxTQUrMzDE8e0S43Z5uqfO0REg== +minimatch@^5.0.1, minimatch@^5.1.0, minimatch@^5.1.1: + version "5.1.6" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.6.tgz#1cfcb8cf5522ea69952cd2af95ae09477f122a96" + integrity sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g== dependencies: brace-expansion "^2.0.1" @@ -13283,6 +15432,13 @@ minimatch@^8.0.2: dependencies: brace-expansion "^2.0.1" +minimatch@^9.0.0, minimatch@^9.0.1, minimatch@^9.0.3: + version "9.0.3" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.3.tgz#a6e00c3de44c3a542bfaae70abfc22420a6da825" + integrity sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg== + dependencies: + brace-expansion "^2.0.1" + minimist-options@4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/minimist-options/-/minimist-options-4.1.0.tgz#c0655713c53a8a2ebd77ffa247d342c40f010619" @@ -13292,7 +15448,7 @@ minimist-options@4.1.0: is-plain-obj "^1.1.0" kind-of "^6.0.3" -minimist@^1.2.0, minimist@^1.2.6, minimist@~1.2.7: +minimist@^1.2.0, minimist@^1.2.3, minimist@^1.2.5, minimist@^1.2.6, minimist@~1.2.8: version "1.2.8" resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c" integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA== @@ -13312,7 +15468,7 @@ minipass@^3.0.0: dependencies: yallist "^4.0.0" -minipass@^4.0.0, minipass@^4.2.4: +minipass@^4.2.4: version "4.2.8" resolved "https://registry.yarnpkg.com/minipass/-/minipass-4.2.8.tgz#f0010f64393ecfc1d1ccb5f582bcaf45f48e1a3a" integrity sha512-fNzuVyifolSLFL4NzpF+wEF4qrgqaaKX0haXPQEdQ7NKAN+WecoKMHV09YcuL/DHxrUsYQOK3MiuDf7Ip2OXfQ== @@ -13322,6 +15478,11 @@ minipass@^5.0.0: resolved "https://registry.yarnpkg.com/minipass/-/minipass-5.0.0.tgz#3e9788ffb90b694a5d0ec94479a45b5d8738133d" integrity sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ== +"minipass@^5.0.0 || ^6.0.2 || ^7.0.0": + version "7.0.4" + resolved "https://registry.yarnpkg.com/minipass/-/minipass-7.0.4.tgz#dbce03740f50a4786ba994c1fb908844d27b038c" + integrity sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ== + minizlib@^1.3.3: version "1.3.3" resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.3.3.tgz#2290de96818a34c29551c8a8d301216bd65a861d" @@ -13337,22 +15498,6 @@ minizlib@^2.1.1: minipass "^3.0.0" yallist "^4.0.0" -mississippi@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-3.0.0.tgz#ea0a3291f97e0b5e8776b363d5f0a12d94c67022" - integrity sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA== - dependencies: - concat-stream "^1.5.0" - duplexify "^3.4.2" - end-of-stream "^1.1.0" - flush-write-stream "^1.0.0" - from2 "^2.1.0" - parallel-transform "^1.1.0" - pump "^3.0.0" - pumpify "^1.3.3" - stream-each "^1.1.0" - through2 "^2.0.0" - mixin-deep@^1.2.0: version "1.3.2" resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.2.tgz#1120b43dc359a785dce65b55b82e257ccf479566" @@ -13361,6 +15506,11 @@ mixin-deep@^1.2.0: for-in "^1.0.2" is-extendable "^1.0.1" +mkdirp-classic@^0.5.2, mkdirp-classic@^0.5.3: + version "0.5.3" + resolved "https://registry.yarnpkg.com/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz#fa10c9115cc6d8865be221ba47ee9bed78601113" + integrity sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A== + mkdirp-promise@^5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/mkdirp-promise/-/mkdirp-promise-5.0.1.tgz#e9b8f68e552c68a9c1713b84883f7a1dd039b8a1" @@ -13369,31 +15519,31 @@ mkdirp-promise@^5.0.1: mkdirp "*" mkdirp@*: - version "3.0.0" - resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-3.0.0.tgz#758101231418bda24435c0888a91d9bd91f1372d" - integrity sha512-7+JDnNsyCvZXoUJdkMR0oUE2AmAdsNXGTmRbiOjYIwQ6q+bL6NwrozGQdPcmYaNcrhH37F50HHBUzoaBV6FITQ== + version "3.0.1" + resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-3.0.1.tgz#e44e4c5607fb279c168241713cc6e0fea9adcb50" + integrity sha512-+NsyUUAZDmo6YVHzL/stxSu3t9YS1iljliy3BSDrXJ/dkn1KYdmtZODGGjLcc9XLgVVpH4KshHB8XmZgMhaBXg== -mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@^0.5.5, mkdirp@~0.5.1: +mkdirp@0.5.x, mkdirp@^0.5.1, mkdirp@^0.5.5, mkdirp@~0.5.1: version "0.5.6" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.6.tgz#7def03d2432dcae4ba1d611445c48396062255f6" integrity sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw== dependencies: minimist "^1.2.6" -mkdirp@^1.0.3: +mkdirp@^1.0.3, mkdirp@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e" integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw== -mlly@^1.0.0, mlly@^1.1.0, mlly@^1.1.1: - version "1.2.0" - resolved "https://registry.yarnpkg.com/mlly/-/mlly-1.2.0.tgz#f0f6c2fc8d2d12ea6907cd869066689b5031b613" - integrity sha512-+c7A3CV0KGdKcylsI6khWyts/CYrGTrRVo4R/I7u/cUsy0Conxa6LUhiEzVKIw14lc2L5aiO4+SeVe4TeGRKww== +mlly@^1.0.0, mlly@^1.1.0, mlly@^1.2.0, mlly@^1.4.2: + version "1.5.0" + resolved "https://registry.yarnpkg.com/mlly/-/mlly-1.5.0.tgz#8428a4617d54cc083d3009030ac79739a0e5447a" + integrity sha512-NPVQvAY1xr1QoVeG0cy8yUYC7FQcOx6evl/RjT1wL5FvzPnzOysoqB/jmx/DhssT2dYa8nxECLAaFI/+gVLhDQ== dependencies: - acorn "^8.8.2" - pathe "^1.1.0" - pkg-types "^1.0.2" - ufo "^1.1.1" + acorn "^8.11.3" + pathe "^1.1.2" + pkg-types "^1.0.3" + ufo "^1.3.2" mnemonist@^0.38.0: version "0.38.5" @@ -13402,7 +15552,7 @@ mnemonist@^0.38.0: dependencies: obliterator "^2.0.0" -mocha@^10.0.0: +mocha@10.2.0, mocha@^10.0.0, mocha@^10.2.0: version "10.2.0" resolved "https://registry.yarnpkg.com/mocha/-/mocha-10.2.0.tgz#1fd4a7c32ba5ac372e03a17eef435bd00e5c68b8" integrity sha512-IDY7fl/BecMwFHzoqF2sg/SHHANeBoMMXFlS9r0OXKDssYE1M5O43wUY/9BVPeIvfH2zmEbBfseqN9gBQZzXkg== @@ -13429,52 +15579,44 @@ mocha@^10.0.0: yargs-parser "20.2.4" yargs-unparser "2.0.0" -mocha@^8.2.1: - version "8.4.0" - resolved "https://registry.yarnpkg.com/mocha/-/mocha-8.4.0.tgz#677be88bf15980a3cae03a73e10a0fc3997f0cff" - integrity sha512-hJaO0mwDXmZS4ghXsvPVriOhsxQ7ofcpQdm8dE+jISUOKopitvnXFQmpRR7jd2K6VBG6E26gU3IAbXXGIbu4sQ== - dependencies: - "@ungap/promise-all-settled" "1.1.2" - ansi-colors "4.1.1" - browser-stdout "1.3.1" - chokidar "3.5.1" - debug "4.3.1" - diff "5.0.0" - escape-string-regexp "4.0.0" - find-up "5.0.0" - glob "7.1.6" - growl "1.10.5" - he "1.2.0" - js-yaml "4.0.0" - log-symbols "4.0.0" - minimatch "3.0.4" - ms "2.1.3" - nanoid "3.1.20" - serialize-javascript "5.0.1" - strip-json-comments "3.1.1" - supports-color "8.1.1" - which "2.0.2" - wide-align "1.1.3" - workerpool "6.1.0" - yargs "16.2.0" - yargs-parser "20.2.4" - yargs-unparser "2.0.0" - mock-fs@^4.1.0: version "4.14.0" resolved "https://registry.yarnpkg.com/mock-fs/-/mock-fs-4.14.0.tgz#ce5124d2c601421255985e6e94da80a7357b1b18" integrity sha512-qYvlv/exQ4+svI3UOvPUpLDF0OMX5euvUH0Ny4N5QyRyhNdgAgUrVH3iUINSzEPLvx0kbo/Bp28GJKIqvE7URw== -module-alias@^2.2.2: - version "2.2.2" - resolved "https://registry.yarnpkg.com/module-alias/-/module-alias-2.2.2.tgz#151cdcecc24e25739ff0aa6e51e1c5716974c0e0" - integrity sha512-A/78XjoX2EmNvppVWEhM2oGk3x4lLxnkEA4jTbaK97QKSDjkIoOsKQlfylt/d3kKKi596Qy3NP5XrXJ6fZIC9Q== +mock-property@~1.0.0: + version "1.0.3" + resolved "https://registry.yarnpkg.com/mock-property/-/mock-property-1.0.3.tgz#3e37c50a56609d548cabd56559fde3dd8767b10c" + integrity sha512-2emPTb1reeLLYwHxyVx993iYyCHEiRRO+y8NFXFPL5kl5q14sgTK76cXyEKkeKCHeRw35SfdkUJ10Q1KfHuiIQ== + dependencies: + define-data-property "^1.1.1" + functions-have-names "^1.2.3" + gopd "^1.0.1" + has-property-descriptors "^1.0.0" + hasown "^2.0.0" + isarray "^2.0.5" + +module-definition@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/module-definition/-/module-definition-5.0.1.tgz#62d1194e5d5ea6176b7dc7730f818f466aefa32f" + integrity sha512-kvw3B4G19IXk+BOXnYq/D/VeO9qfHaapMeuS7w7sNUqmGaA6hywdFHMi+VWeR9wUScXM7XjoryTffCZ5B0/8IA== + dependencies: + ast-module-types "^5.0.0" + node-source-walk "^6.0.1" module-error@^1.0.1, module-error@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/module-error/-/module-error-1.0.2.tgz#8d1a48897ca883f47a45816d4fb3e3c6ba404d86" integrity sha512-0yuvsqSCv8LbaOKhnsQ/T5JhyFlCYLPXK3U2sgV10zoKQwzs/MyfuQUOZQ1V/6OCOJsK/TRgNVrPuPDqtdMFtA== +moize@^6.1.0, moize@^6.1.3: + version "6.1.6" + resolved "https://registry.yarnpkg.com/moize/-/moize-6.1.6.tgz#ac2e723e74b951875fe2c0c3433405c2b098c3e6" + integrity sha512-vSKdIUO61iCmTqhdoIDrqyrtp87nWZUmBPniNjO0fX49wEYmyDO4lvlnFXiGcaH1JLE/s/9HbiK4LSHsbiUY6Q== + dependencies: + fast-equals "^3.0.1" + micro-memoize "^4.1.2" + motion@10.16.2: version "10.16.2" resolved "https://registry.yarnpkg.com/motion/-/motion-10.16.2.tgz#7dc173c6ad62210a7e9916caeeaf22c51e598d21" @@ -13487,17 +15629,17 @@ motion@10.16.2: "@motionone/utils" "^10.15.1" "@motionone/vue" "^10.16.2" -move-concurrently@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/move-concurrently/-/move-concurrently-1.0.1.tgz#be2c005fda32e0b29af1f05d7c4b33214c701f92" - integrity sha512-hdrFxZOycD/g6A6SoI2bB5NA/5NEqD0569+S47WZhPvm46sD50ZHdYaFmnua5lndde9rCHGjmfK7Z8BuCt/PcQ== +move-file@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/move-file/-/move-file-3.1.0.tgz#ea9675d54852708242462bfe60d56b3c3854cdf7" + integrity sha512-4aE3U7CCBWgrQlQDMq8da4woBWDGHioJFiOZ8Ie6Yq2uwYQ9V2kGhTz4x3u6Wc+OU17nw0yc3rJ/lQ4jIiPe3A== dependencies: - aproba "^1.1.1" - copy-concurrently "^1.0.0" - fs-write-stream-atomic "^1.0.8" - mkdirp "^0.5.1" - rimraf "^2.5.4" - run-queue "^1.0.3" + path-exists "^5.0.0" + +mri@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/mri/-/mri-1.2.0.tgz#6721480fec2a11a4889861115a48b6cbe7cc8f0b" + integrity sha512-tzzskb3bG8LvYGFF/mDTpq3jpI6Q9wc3LEmBaghu+DdCssd1FakN7Bc0hVNmEyGq1bq3RgfkCb3cmQLpNPOroA== ms@2.0.0: version "2.0.0" @@ -13514,10 +15656,10 @@ ms@2.1.3, ms@^2.1.1: resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== -muggle-string@^0.2.2: - version "0.2.2" - resolved "https://registry.yarnpkg.com/muggle-string/-/muggle-string-0.2.2.tgz#786aa53fea1652c61c6a59e1f839292b262bc72a" - integrity sha512-YVE1mIJ4VpUMqZObFndk9CJu6DBJR/GB13p3tXuNbwD4XExaI5EOuRl6BHeIDxIqXZVxSfAC+y6U1Z/IxCfKUg== +muggle-string@^0.3.1: + version "0.3.1" + resolved "https://registry.yarnpkg.com/muggle-string/-/muggle-string-0.3.1.tgz#e524312eb1728c63dd0b2ac49e3282e6ed85963a" + integrity sha512-ckmWDJjphvd/FvZawgygcUeQCxzvohjFO5RxTjj4eq8kw359gFF3E1brjfI+viLMxss5JrHTDRHZvu2/tuy0Qg== multiaddr-to-uri@^8.0.0: version "8.0.0" @@ -13538,6 +15680,18 @@ multiaddr@^10.0.0: uint8arrays "^3.0.0" varint "^6.0.0" +multiaddr@^7.2.1, multiaddr@^7.3.0: + version "7.5.0" + resolved "https://registry.yarnpkg.com/multiaddr/-/multiaddr-7.5.0.tgz#976c88e256e512263445ab03b3b68c003d5f485e" + integrity sha512-GvhHsIGDULh06jyb6ev+VfREH9evJCFIRnh3jUt9iEZ6XDbyoisZRFEI9bMvK/AiR6y66y6P+eoBw9mBYMhMvw== + dependencies: + buffer "^5.5.0" + cids "~0.8.0" + class-is "^1.1.0" + is-ip "^3.1.0" + multibase "^0.7.0" + varint "^5.0.0" + multibase@^0.7.0: version "0.7.0" resolved "https://registry.yarnpkg.com/multibase/-/multibase-0.7.0.tgz#1adfc1c50abe05eefeb5091ac0c2728d6b84581b" @@ -13577,22 +15731,12 @@ multicodec@^1.0.0, multicodec@^1.0.1: buffer "^5.6.0" varint "^5.0.0" -multiformats@^10.0.1: - version "10.0.3" - resolved "https://registry.yarnpkg.com/multiformats/-/multiformats-10.0.3.tgz#d4147d01f9a31271c6fb5d24adf9b01f9e656bba" - integrity sha512-K2yGSmstS/oEmYiEIieHb53jJCaqp4ERPDQAYrm5sV3UUrVDZeshJQCK6GHAKyIGufU1vAcbS0PdAAZmC7Tzcw== - -multiformats@^11.0.0: - version "11.0.2" - resolved "https://registry.yarnpkg.com/multiformats/-/multiformats-11.0.2.tgz#b14735efc42cd8581e73895e66bebb9752151b60" - integrity sha512-b5mYMkOkARIuVZCpvijFj9a6m5wMVLC7cf/jIPd5D/ARDOfLC5+IFkbgDXQgcU2goIsTD/O9NY4DI/Mt4OGvlg== - multiformats@^9.4.13, multiformats@^9.4.2, multiformats@^9.4.5, multiformats@^9.5.4: version "9.9.0" resolved "https://registry.yarnpkg.com/multiformats/-/multiformats-9.9.0.tgz#c68354e7d21037a8f1f8833c8ccd68618e8f1d37" integrity sha512-HoMUjhH9T8DDBNT+6xzkrd9ga/XiBI4xLr58LJACwK6G3HTOPeMz4nB4KJs33L2BelrIJa7P0VuNaVF3hMYfjg== -multihashes@^0.4.15, multihashes@~0.4.15: +multihashes@^0.4.15, multihashes@~0.4.13, multihashes@~0.4.15: version "0.4.21" resolved "https://registry.yarnpkg.com/multihashes/-/multihashes-0.4.21.tgz#dc02d525579f334a7909ade8a122dabb58ccfcb5" integrity sha512-uVSvmeCWf36pU2nB4/1kzYZjsXD9vofZKpgudqkceYY5g2aZZXJ5r9lxuzoRLl1OAp28XljXsEJ/X/85ZsKmKw== @@ -13622,6 +15766,15 @@ multihashing-async@^0.8.0, multihashing-async@~0.8.0, multihashing-async@~0.8.1: multihashes "^1.0.1" murmurhash3js-revisited "^3.0.0" +multiparty@4.2.3: + version "4.2.3" + resolved "https://registry.yarnpkg.com/multiparty/-/multiparty-4.2.3.tgz#6b14981badb5ad3f0929622868751810368d4633" + integrity sha512-Ak6EUJZuhGS8hJ3c2fY6UW5MbkGUPMBEGd13djUzoY/BHqV/gTuFWtC6IuVA7A2+v3yjBS6c4or50xhzTQZImQ== + dependencies: + http-errors "~1.8.1" + safe-buffer "5.2.1" + uid-safe "2.1.5" + murmurhash3js-revisited@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/murmurhash3js-revisited/-/murmurhash3js-revisited-3.0.0.tgz#6bd36e25de8f73394222adc6e41fa3fac08a5869" @@ -13632,7 +15785,12 @@ mustache@^4.2.0: resolved "https://registry.yarnpkg.com/mustache/-/mustache-4.2.0.tgz#e5892324d60a12ec9c2a73359edca52972bf6f64" integrity sha512-71ippSywq5Yb7/tVYyGbkBggbU8H3u5Rz56fH60jGFgr8uHwxs+aSKeqmluIVzM0m0kB7xQjKS6qPfd0b2ZoqQ== -mute-stream@0.0.8: +mute-stream@0.0.7: + version "0.0.7" + resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab" + integrity sha512-r65nCZhrbXXb6dXOACihYApHw2Q6pV0M3V0PSxd74N0+D8nzAdEAITq2oAjA1jVnKI+tGvEBUpqiMh0+rW6zDQ== + +mute-stream@0.0.8, mute-stream@~0.0.4: version "0.0.8" resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d" integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA== @@ -13646,36 +15804,21 @@ mz@^2.7.0: object-assign "^4.0.1" thenify-all "^1.0.0" -n-readlines@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/n-readlines/-/n-readlines-1.0.1.tgz#bbb7364d38bc31a170a199f986fcacfa76b95f6e" - integrity sha512-z4SyAIVgMy7CkgsoNw7YVz40v0g4+WWvvqy8+ZdHrCtgevcEO758WQyrYcw3XPxcLxF+//RszTz/rO48nzD0wQ== - -nan@^2.12.1, nan@^2.2.1: - version "2.17.0" - resolved "https://registry.yarnpkg.com/nan/-/nan-2.17.0.tgz#c0150a2368a182f033e9aa5195ec76ea41a199cb" - integrity sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ== +nan@^2.16.0: + version "2.18.0" + resolved "https://registry.yarnpkg.com/nan/-/nan-2.18.0.tgz#26a6faae7ffbeb293a39660e88a76b82e30b7554" + integrity sha512-W7tfG7vMOGtD30sHoZSSc/JVYiyDPEyQVso/Zz+/uQd0B0L46gtC+pHha5FFMRpil6fm/AoEcRWyOVi4+E/f8w== nano-json-stream-parser@^0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/nano-json-stream-parser/-/nano-json-stream-parser-0.1.2.tgz#0cc8f6d0e2b622b479c40d499c46d64b755c6f5f" integrity sha512-9MqxMH/BSJC7dnLsEMPyfN5Dvoo49IsPFYMcHw3Bcfc2kN0lpHRBSzlMSVx4HGyJ7s9B31CyBTVehWJoQ8Ctew== -nanoassert@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/nanoassert/-/nanoassert-1.1.0.tgz#4f3152e09540fde28c76f44b19bbcd1d5a42478d" - integrity sha512-C40jQ3NzfkP53NsO8kEOFd79p4b9kDXQMwgiY1z8ZwrDZgUyom0AHwGegF4Dm99L+YoYhuaB0ceerUcXmqr1rQ== - nanoassert@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/nanoassert/-/nanoassert-2.0.0.tgz#a05f86de6c7a51618038a620f88878ed1e490c09" integrity sha512-7vO7n28+aYO4J+8w96AzhmU8G+Y/xpPDJz/se19ICsqj/momRbb9mh9ZUtkoJ5X3nTnPdhEJyc0qnM6yAsHBaA== -nanoid@3.1.20: - version "3.1.20" - resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.20.tgz#badc263c6b1dcf14b71efaa85f6ab4c1d6cfc788" - integrity sha512-a1cQNyczgKbLX9jwbS/+d7W8fX/RfgYR7lVWwWOGIPNgK2m0MWvrGF6/m4kk6U3QcFMnZf3RIhL0v2Jgh/0Uxw== - nanoid@3.3.3: version "3.3.3" resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.3.tgz#fd8e8b7aa761fe807dba2d1b98fb7241bb724a25" @@ -13686,10 +15829,10 @@ nanoid@^2.1.11: resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-2.1.11.tgz#ec24b8a758d591561531b4176a01e3ab4f0f0280" integrity sha512-s/snB+WGm6uwi0WjsZdaVcuf3KJXlfGl2LcxgwkEwJF0D/BWzVWAZW/XY4bFaiR7s0Jk3FPvlnepg1H1b1UwlA== -nanoid@^3.0.2, nanoid@^3.1.20, nanoid@^3.1.23, nanoid@^3.3.6: - version "3.3.6" - resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.6.tgz#443380c856d6e9f9824267d960b4236ad583ea4c" - integrity sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA== +nanoid@^3.0.2, nanoid@^3.1.20, nanoid@^3.1.23, nanoid@^3.3.7: + version "3.3.7" + resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.7.tgz#d0c301a691bc8d54efa0a2226ccf3fe2fd656bd8" + integrity sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g== nanomatch@^1.2.9: version "1.2.13" @@ -13708,6 +15851,11 @@ nanomatch@^1.2.9: snapdragon "^0.8.1" to-regex "^3.0.1" +napi-build-utils@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/napi-build-utils/-/napi-build-utils-1.0.2.tgz#b1fddc0b2c46e380a0b7a76f984dd47c41a13806" + integrity sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg== + napi-macros@^2.2.2: version "2.2.2" resolved "https://registry.yarnpkg.com/napi-macros/-/napi-macros-2.2.2.tgz#817fef20c3e0e40a963fbf7b37d1600bd0201044" @@ -13718,6 +15866,11 @@ napi-macros@~2.0.0: resolved "https://registry.yarnpkg.com/napi-macros/-/napi-macros-2.0.0.tgz#2b6bae421e7b96eb687aa6c77a7858640670001b" integrity sha512-A0xLykHtARfueITVDernsAWdtIMbOJgKgcluwENp3AlsKN/PloyO10HtmoqnFAQAcxPkgZN7wdfPfEd0zNGxbg== +napi-wasm@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/napi-wasm/-/napi-wasm-1.1.0.tgz#bbe617823765ae9c1bc12ff5942370eae7b2ba4e" + integrity sha512-lHwIAJbmLSjF9VDRm9GoVOy9AGp3aIvkjv+Kvz9h16QR3uSVYH78PNQUnT2U4X53mhlnV2M7wrhibQ3GHicDmg== + native-abort-controller@^1.0.3, native-abort-controller@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/native-abort-controller/-/native-abort-controller-1.0.4.tgz#39920155cc0c18209ff93af5bc90be856143f251" @@ -13728,11 +15881,6 @@ native-fetch@^3.0.0: resolved "https://registry.yarnpkg.com/native-fetch/-/native-fetch-3.0.0.tgz#06ccdd70e79e171c365c75117959cf4fe14a09bb" integrity sha512-G3Z7vx0IFb/FQ4JxvtqGABsOTIqRWvgQz6e+erkB+JJD6LrszQtMozEHI4EkmgZQvnGHrpLVzUWk7t4sJCIkVw== -native-fetch@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/native-fetch/-/native-fetch-4.0.2.tgz#75c8a44c5f3bb021713e5e24f2846750883e49af" - integrity sha512-4QcVlKFtv2EYVS5MBgsGX5+NWKtbDbIECdUXDBGDMAZXq3Jkv9zf+y8iS7Ub8fEdga3GpYeazp9gauNqXHJOCg== - natural-compare-lite@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz#17b09581988979fddafe0201e931ba933c96cbb4" @@ -13753,32 +15901,172 @@ negotiator@0.6.3: resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd" integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg== -neo-async@^2.5.0, neo-async@^2.6.1: +neo-async@^2.6.2: version "2.6.2" resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f" integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw== -netlify-lambda@^2.0.16: - version "2.0.16" - resolved "https://registry.yarnpkg.com/netlify-lambda/-/netlify-lambda-2.0.16.tgz#5403d9447252a9f55aaec58eb39d174d84154ebb" - integrity sha512-Wykqt2wBYswjN4nOlZ1nWC15A8Rkoe+OHUWyASBr1byYQB2BcqzCCFwaImt/iwyCW1hgWXezHUlb9XvoVgsADA== - dependencies: - "@babel/core" "^7.10.4" - "@babel/plugin-proposal-class-properties" "^7.10.4" - "@babel/plugin-proposal-object-rest-spread" "^7.10.4" - "@babel/plugin-transform-object-assign" "^7.10.4" - "@babel/preset-env" "^7.10.4" - babel-loader "^8.1.0" - body-parser "^1.19.0" - commander "^9.0.0" - express "^4.17.1" - express-logging "^1.1.1" - find-up "^5.0.0" - globby "^11.0.1" - jwt-decode "^3.0.0" +nested-error-stacks@^2.0.0, nested-error-stacks@^2.1.0, nested-error-stacks@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/nested-error-stacks/-/nested-error-stacks-2.1.1.tgz#26c8a3cee6cc05fbcf1e333cd2fc3e003326c0b5" + integrity sha512-9iN1ka/9zmX1ZvLV9ewJYEk9h7RyRRtqdK0woXcqohu8EWIerfPUjYJPg0ULy0UqP7cslmdGc8xKDJcojlKiaw== + +netlify-cli@^17.15.7: + version "17.15.7" + resolved "https://registry.yarnpkg.com/netlify-cli/-/netlify-cli-17.15.7.tgz#d8d42fc9e4684cce44e5bb0faee6c05c01bb53d5" + integrity sha512-OxqsMSZdUt7iJDLi4WMWbDqnuzRcYim6FnmfrilzqAQ2kPRDuL9gb7/sNiSc0sKBpqhbKOoTaaECVfivTD+5xg== + dependencies: + "@bugsnag/js" "7.20.2" + "@fastify/static" "6.10.2" + "@netlify/blobs" "6.4.2" + "@netlify/build" "29.33.4" + "@netlify/build-info" "7.12.0" + "@netlify/config" "20.10.3" + "@netlify/edge-bundler" "11.2.2" + "@netlify/local-functions-proxy" "1.1.1" + "@netlify/zip-it-and-ship-it" "9.29.0" + "@octokit/rest" "19.0.13" + ansi-escapes "6.2.0" + ansi-styles "6.2.1" + ansi-to-html "0.7.2" + ascii-table "0.0.9" + backoff "2.5.0" + better-opn "3.0.2" + boxen "7.1.1" + chalk "5.2.0" + chokidar "3.5.3" + ci-info "3.8.0" + clean-deep "3.4.0" + commander "10.0.1" + comment-json "4.2.3" + concordance "5.0.4" + configstore "6.0.0" + content-type "1.0.5" + cookie "0.5.0" + copy-template-dir "1.4.0" + cron-parser "4.8.1" + debug "4.3.4" + decache "4.6.2" + dot-prop "7.2.0" + dotenv "16.0.3" + env-paths "3.0.0" + envinfo "7.8.1" + etag "1.8.1" + execa "5.1.1" + express "4.18.2" + express-logging "1.1.1" + extract-zip "2.0.1" + fastest-levenshtein "1.0.16" + fastify "4.17.0" + find-up "6.3.0" + flush-write-stream "2.0.0" + folder-walker "3.2.0" + from2-array "0.0.4" + fuzzy "0.1.3" + get-port "5.1.1" + gh-release-fetch "4.0.3" + git-repo-info "2.1.1" + gitconfiglocal "2.1.0" + hasbin "1.2.3" + hasha "5.2.2" + http-proxy "1.18.1" + http-proxy-middleware "2.0.6" + https-proxy-agent "5.0.1" + inquirer "6.5.2" + inquirer-autocomplete-prompt "1.4.0" + ipx "2.0.1" + is-docker "3.0.0" + is-stream "3.0.0" + is-wsl "2.2.0" + isexe "2.0.0" + js-yaml "4.1.0" + jsonwebtoken "9.0.1" + jwt-decode "3.1.2" + lambda-local "2.1.2" + listr2 "7.0.2" + locate-path "7.2.0" + lodash "4.17.21" + log-symbols "5.1.0" + log-update "5.0.1" + multiparty "4.2.3" + netlify "13.1.14" + netlify-headers-parser "7.1.3" + netlify-redirect-parser "14.2.1" + netlify-redirector "0.5.0" + node-fetch "2.6.12" + node-version-alias "3.4.1" + ora "6.3.1" + p-filter "3.0.0" + p-map "5.5.0" + p-wait-for "5.0.2" + parallel-transform "1.2.0" + parse-github-url "1.0.2" + parse-gitignore "2.0.0" + path-key "4.0.0" + prettyjson "1.2.5" + pump "3.0.0" + raw-body "2.5.2" + read-pkg-up "9.1.0" + semver "7.5.4" + source-map-support "0.5.21" + strip-ansi-control-characters "2.0.0" + tabtab "3.0.2" + tempy "3.0.0" + terminal-link "3.0.0" + through2-filter "3.0.0" + through2-map "3.0.0" + to-readable-stream "3.0.0" + toml "3.0.0" + tomlify-j0.4 "3.0.0" + ulid "2.3.0" + unixify "1.0.0" + update-notifier "6.0.2" + uuid "9.0.0" + wait-port "1.0.4" + write-file-atomic "5.0.1" + ws "8.14.2" + zod "3.22.4" + +netlify-headers-parser@7.1.3, netlify-headers-parser@^7.1.3: + version "7.1.3" + resolved "https://registry.yarnpkg.com/netlify-headers-parser/-/netlify-headers-parser-7.1.3.tgz#64b3015c05a9b5dbd9853a02df397e5b33fb67fd" + integrity sha512-0iR1iWbknBLv6T7zzmMR2AtfO7G/0lMajRyAX3SXhc3U3MqpXsElXinWZteMWM7KeGb7PePQgEalEkk2T6kXSw== + dependencies: + escape-string-regexp "^5.0.0" + fast-safe-stringify "^2.0.7" + is-plain-obj "^4.0.0" + map-obj "^5.0.0" + path-exists "^5.0.0" + toml "^3.0.0" + +netlify-redirect-parser@14.2.1, netlify-redirect-parser@^14.2.1: + version "14.2.1" + resolved "https://registry.yarnpkg.com/netlify-redirect-parser/-/netlify-redirect-parser-14.2.1.tgz#5061be09481088da249fffbd11d384d880c2f296" + integrity sha512-poQgLGh+YATMHatzf/1TaWcbKQIBhszebhJV7btc6Ysw4xmnUedaE8nCscfdDH2PygT6Y+IHZkyMU4gvTFffVA== + dependencies: + fast-safe-stringify "^2.1.1" + filter-obj "^5.0.0" + is-plain-obj "^4.0.0" + path-exists "^5.0.0" toml "^3.0.0" - webpack "^4.43.0" - webpack-merge "^4.2.2" + +netlify-redirector@0.5.0: + version "0.5.0" + resolved "https://registry.yarnpkg.com/netlify-redirector/-/netlify-redirector-0.5.0.tgz#9611dd8497dab4e13d9f6a6f1595b9528b9e7abf" + integrity sha512-4zdzIP+6muqPCuE8avnrgDJ6KW/2+UpHTRcTbMXCIRxiRmyrX+IZ4WSJGZdHPWF3WmQpXpy603XxecZ9iygN7w== + +netlify@13.1.14, netlify@^13.1.14: + version "13.1.14" + resolved "https://registry.yarnpkg.com/netlify/-/netlify-13.1.14.tgz#fbba73e5d979b94c2b050037c9dbf16f10523801" + integrity sha512-7vSq6so7lPjr3HEpjbtLyde0F3IXOzD0ocJs3s2wnJR+nX+8pWOAVGe+KN6S98odsClJBJxCkWG2rLjTBzW9pw== + dependencies: + "@netlify/open-api" "^2.28.0" + lodash-es "^4.17.21" + micro-api-client "^3.3.0" + node-fetch "^3.0.0" + omit.js "^2.0.2" + p-wait-for "^4.0.0" + qs "^6.9.6" next-tick@^1.1.0: version "1.1.0" @@ -13798,30 +16086,73 @@ no-case@^3.0.4: lower-case "^2.0.2" tslib "^2.0.3" +node-abi@^3.3.0: + version "3.54.0" + resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.54.0.tgz#f6386f7548817acac6434c6cba02999c9aebcc69" + integrity sha512-p7eGEiQil0YUV3ItH4/tBb781L5impVmmx2E9FRKF7d18XXzp4PGT2tdYMFY6wQqgxD0IwNZOiSJ0/K0fSi/OA== + dependencies: + semver "^7.3.5" + node-addon-api@^2.0.0: version "2.0.2" resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-2.0.2.tgz#432cfa82962ce494b132e9d72a15b29f71ff5d32" integrity sha512-Ntyt4AIXyaLIuMHF6IOoTakB3K+RWxwtsHNRxllEoA6vPwP9o4866g6YWDLUdnucilZhmkxiHwHr11gAENw+QA== -node-addon-api@^3.0.0, node-addon-api@^3.2.1: +node-addon-api@^3.0.0: version "3.2.1" resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-3.2.1.tgz#81325e0a2117789c0128dab65e7e38f07ceba161" integrity sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A== -node-fetch@2.6.7: - version "2.6.7" - resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.7.tgz#24de9fba827e3b4ae44dc8b20256a379160052ad" - integrity sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ== +node-addon-api@^6.1.0: + version "6.1.0" + resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-6.1.0.tgz#ac8470034e58e67d0c6f1204a18ae6995d9c0d76" + integrity sha512-+eawOlIgy680F0kBzPUNFhMZGtJ1YmqM6l4+Crf4IkImjYrO/mqPwRMh352g23uIaQKFItcQ64I7KMaJxHgAVA== + +node-addon-api@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-7.0.0.tgz#8136add2f510997b3b94814f4af1cce0b0e3962e" + integrity sha512-vgbBJTS4m5/KkE16t5Ly0WW9hz46swAstv0hYYwMtbG7AznRhNyfLRe8HZAiWIpcHzoO7HxhLuBQj9rJ/Ho0ZA== + +node-domexception@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/node-domexception/-/node-domexception-1.0.0.tgz#6888db46a1f71c0b76b3f7555016b63fe64766e5" + integrity sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ== + +node-emoji@^1.10.0: + version "1.11.0" + resolved "https://registry.yarnpkg.com/node-emoji/-/node-emoji-1.11.0.tgz#69a0150e6946e2f115e9d7ea4df7971e2628301c" + integrity sha512-wo2DpQkQp7Sjm2A0cq+sN7EHKO6Sl0ctXeBdFZrL9T9+UywORbufTcTZxom8YqpLQt/FqNMUkOpkZrJVYSKD3A== + dependencies: + lodash "^4.17.21" + +node-fetch-native@^1.4.0, node-fetch-native@^1.4.1, node-fetch-native@^1.6.1: + version "1.6.1" + resolved "https://registry.yarnpkg.com/node-fetch-native/-/node-fetch-native-1.6.1.tgz#f95c74917d3cebc794cdae0cd2a9c7594aad0cb4" + integrity sha512-bW9T/uJDPAJB2YNYEpWzE54U5O3MQidXsOyTfnbKYtTtFexRvGzb1waphBN4ZwP6EcIvYYEOwW0b72BpAqydTw== + +node-fetch@2.6.12: + version "2.6.12" + resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.12.tgz#02eb8e22074018e3d5a83016649d04df0e348fba" + integrity sha512-C/fGU2E8ToujUivIO0H+tpQ6HWo4eEmchoPIoXtxCrVghxdKq+QOHqEZW7tuP3KlV3bC8FRMO5nMCC7Zm1VP6g== dependencies: whatwg-url "^5.0.0" -node-fetch@^2.6.0, node-fetch@^2.6.1, node-fetch@^2.6.7, node-fetch@^2.6.8: - version "2.6.9" - resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.9.tgz#7c7f744b5cc6eb5fd404e0c7a9fec630a55657e6" - integrity sha512-DJm/CJkZkRjKKj4Zi4BsKVZh3ValV5IR5s7LVZnW+6YMh0W1BfNA8XSs6DLMGYlId5F3KnA70uu2qepcR08Qqg== +node-fetch@^2.6.0, node-fetch@^2.6.1, node-fetch@^2.6.12, node-fetch@^2.6.7, node-fetch@^2.6.8: + version "2.7.0" + resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.7.0.tgz#d0f0fa6e3e2dc1d27efcd8ad99d550bda94d187d" + integrity sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A== dependencies: whatwg-url "^5.0.0" +node-fetch@^3.0.0, node-fetch@^3.1.1, node-fetch@^3.3.1, node-fetch@^3.3.2: + version "3.3.2" + resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-3.3.2.tgz#d1e889bacdf733b4ff3b2b243eb7a12866a0b78b" + integrity sha512-dRB78srN/l6gqWulah9SrxeYnxeddIG30+GOqK/9OlLVyLg3HPnr6SqOWTWOXKRwC2eGYCkZ59NNuSgvSrpgOA== + dependencies: + data-uri-to-buffer "^4.0.0" + fetch-blob "^3.1.4" + formdata-polyfill "^4.0.10" + node-fetch@~1.7.1: version "1.7.3" resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-1.7.3.tgz#980f6f72d85211a5347c6b2bc18c5b84c3eb47ef" @@ -13836,9 +16167,9 @@ node-forge@^1.3.1: integrity sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA== node-gyp-build@^4.2.0, node-gyp-build@^4.2.2, node-gyp-build@^4.3.0: - version "4.6.0" - resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.6.0.tgz#0c52e4cbf54bbd28b709820ef7b6a3c2d6209055" - integrity sha512-NTZVKn9IylLwUzaKjkas1e4u2DLNcV4rdYagA4PWdPwW87Bi7z+BznyKSRwS/761tV/lzCGXplWsiaMjLqP2zQ== + version "4.8.0" + resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.8.0.tgz#3fee9c1731df4581a3f9ead74664369ff00d26dd" + integrity sha512-u6fs2AEUljNho3EYTJNBfImO5QTo/J/1Etd+NVdCj7qWKUSN/bSLkZwhDv7I+w/MSC6qJ4cknepkAYykDdK8og== node-gyp-build@~4.1.0: version "4.1.1" @@ -13850,39 +16181,17 @@ node-int64@^0.4.0: resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b" integrity sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw== -node-libs-browser@^2.2.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.2.1.tgz#b64f513d18338625f90346d27b0d235e631f6425" - integrity sha512-h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q== - dependencies: - assert "^1.1.1" - browserify-zlib "^0.2.0" - buffer "^4.3.0" - console-browserify "^1.1.0" - constants-browserify "^1.0.0" - crypto-browserify "^3.11.0" - domain-browser "^1.1.1" - events "^3.0.0" - https-browserify "^1.0.0" - os-browserify "^0.3.0" - path-browserify "0.0.1" - process "^0.11.10" - punycode "^1.2.4" - querystring-es3 "^0.2.0" - readable-stream "^2.3.3" - stream-browserify "^2.0.1" - stream-http "^2.7.2" - string_decoder "^1.0.0" - timers-browserify "^2.0.4" - tty-browserify "0.0.0" - url "^0.11.0" - util "^0.11.0" - vm-browserify "^1.0.1" +node-releases@^2.0.14: + version "2.0.14" + resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.14.tgz#2ffb053bceb8b2be8495ece1ab6ce600c4461b0b" + integrity sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw== -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== +node-source-walk@^6.0.0, node-source-walk@^6.0.1, node-source-walk@^6.0.2: + version "6.0.2" + resolved "https://registry.yarnpkg.com/node-source-walk/-/node-source-walk-6.0.2.tgz#ba81bc4bc0f6f05559b084bea10be84c3f87f211" + integrity sha512-jn9vOIK/nfqoFCcpK89/VCVaLg1IHE6UVfDOzvqmANaJ/rWCTEdH8RZ1V278nv2jr36BJdyQXIAavBLXpzdlag== + dependencies: + "@babel/parser" "^7.21.8" node-stdlib-browser@^1.2.0: version "1.2.0" @@ -13917,12 +16226,57 @@ node-stdlib-browser@^1.2.0: util "^0.12.4" vm-browserify "^1.0.1" +node-stream-zip@^1.15.0: + version "1.15.0" + resolved "https://registry.yarnpkg.com/node-stream-zip/-/node-stream-zip-1.15.0.tgz#158adb88ed8004c6c49a396b50a6a5de3bca33ea" + integrity sha512-LN4fydt9TqhZhThkZIVQnF9cwjU3qmUH9h78Mx/K7d3VvfRqqwthLwJEUOEL0QPZ0XQmNN7be5Ggit5+4dq3Bw== + +node-version-alias@3.4.1: + version "3.4.1" + resolved "https://registry.yarnpkg.com/node-version-alias/-/node-version-alias-3.4.1.tgz#3b38457372bd54ecf2fe10607b8124067d4c60a8" + integrity sha512-Kf3L9spAL6lEHMPyqpwHSTNG3LPkOXBfSUnBMG/YE2TdoC8Qoqf0+qg01nr6K9MFQEcXtWUyTQzLJByRixSBsA== + dependencies: + all-node-versions "^11.3.0" + filter-obj "^5.1.0" + is-plain-obj "^4.1.0" + normalize-node-version "^12.4.0" + path-exists "^5.0.0" + semver "^7.3.8" + nofilter@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/nofilter/-/nofilter-3.1.0.tgz#c757ba68801d41ff930ba2ec55bab52ca184aa66" integrity sha512-l2NNj07e9afPnhAhvgVrCD/oy2Ai1yfLpuo3EpiO1jFTsB4sFz6oIfAfSZyQzVpkZQ9xS8ZS5g1jCBgq4Hwo0g== -normalize-package-data@^2.3.2, normalize-package-data@^2.5.0: +noop2@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/noop2/-/noop2-2.0.0.tgz#4b636015e9882b54783c02b412f699d8c5cd0a5b" + integrity sha512-2bu7Pfpf6uNqashWV8P7yYeutQ3XkLY9MBSYI5sOAFZxuWcW/uJfLbKj5m6SvMDT9U1Y0C+7UFG+7VSiIdXjtA== + +nopt@3.x: + version "3.0.6" + resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9" + integrity sha512-4GUt3kSEYmk4ITxzB/b9vaIDfUVWN/Ml1Fwl11IlnIG2iaJ9O6WXZ9SrYM9NLI8OCBieN2Y8SWC2oJV0RQ7qYg== + dependencies: + abbrev "1" + +nopt@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/nopt/-/nopt-5.0.0.tgz#530942bb58a512fccafe53fe210f13a25355dc88" + integrity sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ== + dependencies: + abbrev "1" + +normalize-node-version@^12.4.0: + version "12.4.0" + resolved "https://registry.yarnpkg.com/normalize-node-version/-/normalize-node-version-12.4.0.tgz#94d4be3f7e6769d85c5de8b4b8d4ed3bc232f538" + integrity sha512-0oLZN5xcyKVrSHMk8/9RuNblEe7HEsXAt5Te2xmMiZD9VX7bqWYe0HMyfqSYFD3xv0949lZuXaEwjTqle1uWWQ== + dependencies: + all-node-versions "^11.3.0" + filter-obj "^5.1.0" + semver "^7.3.7" + +normalize-package-data@^2.5.0: version "2.5.0" resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8" integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA== @@ -13932,7 +16286,7 @@ normalize-package-data@^2.3.2, normalize-package-data@^2.5.0: semver "2 || 3 || 4 || 5" validate-npm-package-license "^3.0.1" -normalize-package-data@^3.0.0: +normalize-package-data@^3.0.0, normalize-package-data@^3.0.2: version "3.0.3" resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-3.0.3.tgz#dbcc3e2da59509a0983422884cd172eefdfa525e" integrity sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA== @@ -13969,14 +16323,36 @@ normalize-url@^6.0.1: resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-6.1.0.tgz#40d0885b535deffe3f3147bec877d05fe4c5668a" integrity sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A== -npm-run-path@^4.0.0, npm-run-path@^4.0.1: +normalize-url@^8.0.0: + version "8.0.0" + resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-8.0.0.tgz#593dbd284f743e8dcf6a5ddf8fadff149c82701a" + integrity sha512-uVFpKhj5MheNBJRTiMZ9pE/7hD1QTeEvugSJW/OmLzAp78PB5O6adfMNTvmfKhXBkvCzC+rqifWcVYpGFwTjnw== + +npm-run-path@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea" integrity sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw== dependencies: path-key "^3.0.0" -nth-check@^2.0.1: +npm-run-path@^5.1.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-5.2.0.tgz#224cdd22c755560253dd71b83a1ef2f758b2e955" + integrity sha512-W4/tgAXFqFA0iL7fk0+uQ3g7wkL8xJmx3XdK0VGb4cHW//eZTtKGvFBBoRKVTpY7n6ze4NL9ly7rgXcHufqXKg== + dependencies: + path-key "^4.0.0" + +npmlog@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-5.0.1.tgz#f06678e80e29419ad67ab964e0fa69959c1eb8b0" + integrity sha512-AqZtDUWOMKs1G/8lwylVjrdYgqA4d9nu8hc+0gzRxlDb1I10+FHBGMXs6aiQHFdCUUlqH99MUMuLfzWDNDtfxw== + dependencies: + are-we-there-yet "^2.0.0" + console-control-strings "^1.1.0" + gauge "^3.0.0" + set-blocking "^2.0.0" + +nth-check@^2.0.1, nth-check@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-2.1.1.tgz#c9eab428effce36cd6b92c924bdb000ef1f1ed1d" integrity sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w== @@ -13988,11 +16364,6 @@ nullthrows@^1.1.1: resolved "https://registry.yarnpkg.com/nullthrows/-/nullthrows-1.1.1.tgz#7818258843856ae971eae4208ad7d7eb19a431b1" integrity sha512-2vPPEi+Z7WqML2jZYddDIfy5Dqb0r2fze2zTxNNknZaFpVHU3mFB3R+DWeJWGVx0ecvttSGlJTI+WG+8Z4cDWw== -number-is-nan@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d" - integrity sha512-4jbtZXNAsfZbAHiiqjLPBiCl16dES1zI4Hpzzxw61Tk+loF+sBDBKx1ICKKKwIqQ7M0mFn1TmkN7euSncWgHiQ== - number-to-bn@1.7.0: version "1.7.0" resolved "https://registry.yarnpkg.com/number-to-bn/-/number-to-bn-1.7.0.tgz#bb3623592f7e5f9e0030b1977bd41a0c53fe1ea0" @@ -14002,9 +16373,9 @@ number-to-bn@1.7.0: strip-hex-prefix "1.0.0" nwsapi@^2.2.2: - version "2.2.4" - resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.4.tgz#fd59d5e904e8e1f03c25a7d5a15cfa16c714a1e5" - integrity sha512-NHj4rzRo0tQdijE9ZqAx6kYDcoRwYwSYzCA8MY3JzfxlrvEU0jhnhJT9BhqhJs7I/dKcrDm6TyulaRqZPIhN5g== + version "2.2.7" + resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.7.tgz#738e0707d3128cb750dddcfe90e4610482df0f30" + integrity sha512-ub5E4+FBPKwAZx0UwIQOjYWGHTEq5sPqHQNRN8Z9e4A7u3Tj1weLJsL59yH9vmvqEtBHaOmT6cYQKIZOxp35FQ== oauth-sign@~0.9.0: version "0.9.0" @@ -14030,12 +16401,17 @@ object-hash@^3.0.0: resolved "https://registry.yarnpkg.com/object-hash/-/object-hash-3.0.0.tgz#73f97f753e7baffc0e2cc9d6e079079744ac82e9" integrity sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw== -object-inspect@^1.12.3, object-inspect@^1.9.0, object-inspect@~1.12.3: +object-inspect@^1.13.1, object-inspect@^1.9.0: + version "1.13.1" + resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.13.1.tgz#b96c6109324ccfef6b12216a956ca4dc2ff94bc2" + integrity sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ== + +object-inspect@~1.12.3: version "1.12.3" resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.3.tgz#ba62dffd67ee256c8c086dfae69e016cd1f198b9" integrity sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g== -object-is@^1.0.1: +object-is@^1.1.5: version "1.1.5" resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.1.5.tgz#b9deeaa5fc7f1846a0faecdceec138e5778f53ac" integrity sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw== @@ -14066,24 +16442,25 @@ object-visit@^1.0.0: isobject "^3.0.0" object.assign@^4.1.4: - version "4.1.4" - resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.4.tgz#9673c7c7c351ab8c4d0b516f4343ebf4dfb7799f" - integrity sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ== + version "4.1.5" + resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.5.tgz#3a833f9ab7fdb80fc9e8d2300c803d216d8fdbb0" + integrity sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ== dependencies: - call-bind "^1.0.2" - define-properties "^1.1.4" + call-bind "^1.0.5" + define-properties "^1.2.1" has-symbols "^1.0.3" object-keys "^1.1.1" -object.getownpropertydescriptors@^2.1.1: - version "2.1.5" - resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.5.tgz#db5a9002489b64eef903df81d6623c07e5b4b4d3" - integrity sha512-yDNzckpM6ntyQiGTik1fKV1DcVDRS+w8bvpWNCBanvH5LfRX9O8WTHqQzG4RZwRAM4I0oU7TV11Lj5v0g20ibw== +object.getownpropertydescriptors@^2.1.6: + version "2.1.7" + resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.7.tgz#7a466a356cd7da4ba8b9e94ff6d35c3eeab5d56a" + integrity sha512-PrJz0C2xJ58FNn11XV2lr4Jt5Gzl94qpy9Lu0JlfEj14z88sqbSBJCBEzdlNUCzY2gburhbrwOZ5BHCmuNUy0g== dependencies: - array.prototype.reduce "^1.0.5" + array.prototype.reduce "^1.0.6" call-bind "^1.0.2" - define-properties "^1.1.4" - es-abstract "^1.20.4" + define-properties "^1.2.0" + es-abstract "^1.22.1" + safe-array-concat "^1.0.0" object.pick@^1.3.0: version "1.3.0" @@ -14104,18 +16481,30 @@ oboe@2.1.4: dependencies: http-https "^1.0.0" -oboe@2.1.5: - version "2.1.5" - resolved "https://registry.yarnpkg.com/oboe/-/oboe-2.1.5.tgz#5554284c543a2266d7a38f17e073821fbde393cd" - integrity sha512-zRFWiF+FoicxEs3jNI/WYUrVEgA7DeET/InK0XQuudGHRg8iIob3cNPrJTKaz4004uaA9Pbe+Dwa8iluhjLZWA== +ofetch@^1.3.3: + version "1.3.3" + resolved "https://registry.yarnpkg.com/ofetch/-/ofetch-1.3.3.tgz#588cb806a28e5c66c2c47dd8994f9059a036d8c0" + integrity sha512-s1ZCMmQWXy4b5K/TW9i/DtiN8Ku+xCiHcjQ6/J/nDdssirrQNOoB165Zu8EqLMA2lln1JUth9a0aW9Ap2ctrUg== dependencies: - http-https "^1.0.0" + destr "^2.0.1" + node-fetch-native "^1.4.0" + ufo "^1.3.0" + +omit.js@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/omit.js/-/omit.js-2.0.2.tgz#dd9b8436fab947a5f3ff214cb2538631e313ec2f" + integrity sha512-hJmu9D+bNB40YpL9jYebQl4lsTW6yEHRTroJzNLqQJYHm7c+NQnJGfZmIWh8S3q3KoaxV1aLhV6B3+0N0/kyJg== on-exit-leak-free@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/on-exit-leak-free/-/on-exit-leak-free-0.2.0.tgz#b39c9e3bf7690d890f4861558b0d7b90a442d209" integrity sha512-dqaz3u44QbRXQooZLTUKU41ZrzYrcvLISVgbrzbyCMxpmSLJvZ3ZamIJIZ29P6OhZIkNIQKosdeM6t1LYbA9hg== +on-exit-leak-free@^2.1.0: + version "2.1.2" + resolved "https://registry.yarnpkg.com/on-exit-leak-free/-/on-exit-leak-free-2.1.2.tgz#fed195c9ebddb7d9e4c3842f93f281ac8dadd3b8" + integrity sha512-0eJJY6hXLGf1udHwfNftBqH+g73EU4B504nZeKpz1sYRKafAghwxEJunB2O7rDZkL4PGfsMVnTXZ2EjibbqcsA== + on-finished@2.4.1: version "2.4.1" resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.4.1.tgz#58c8c44116e54845ad57f14ab10b03533184ac3f" @@ -14128,13 +16517,27 @@ on-headers@^1.0.0: resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.2.tgz#772b0ae6aaa525c399e489adfad90c403eb3c28f" integrity sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA== -once@^1.3.0, once@^1.3.1, once@^1.4.0: +once@1.x, once@^1.3.0, once@^1.3.1, once@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" integrity sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w== dependencies: wrappy "1" +one-time@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/one-time/-/one-time-1.0.0.tgz#e06bc174aed214ed58edede573b433bbf827cb45" + integrity sha512-5DXOiRKwuSEcQ/l0kGCF6Q3jcADFv5tSmRaJck/OqkVFcOzutB134KRSfF0xDrL39MNnqxbHBbUUcjZIhTgb2g== + dependencies: + fn.name "1.x.x" + +onetime@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/onetime/-/onetime-2.0.1.tgz#067428230fd67443b2794b22bba528b6867962d4" + integrity sha512-oyyPpiMaKARvvcgip+JV+7zci5L8D1W9RZIz2l1o08AM3pfspitVWnPt3mzHcBPp12oYMTy0pqrFs/C+m3EwsQ== + dependencies: + mimic-fn "^1.0.0" + onetime@^5.1.0, onetime@^5.1.2: version "5.1.2" resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e" @@ -14142,28 +16545,27 @@ onetime@^5.1.0, onetime@^5.1.2: dependencies: mimic-fn "^2.1.0" -open@^7.4.2: - version "7.4.2" - resolved "https://registry.yarnpkg.com/open/-/open-7.4.2.tgz#b8147e26dcf3e426316c730089fd71edd29c2321" - integrity sha512-MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q== +onetime@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/onetime/-/onetime-6.0.0.tgz#7c24c18ed1fd2e9bca4bd26806a33613c77d34b4" + integrity sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ== dependencies: - is-docker "^2.0.0" - is-wsl "^2.1.1" + mimic-fn "^4.0.0" + +open@^8.0.4: + version "8.4.2" + resolved "https://registry.yarnpkg.com/open/-/open-8.4.2.tgz#5b5ffe2a8f793dcd2aad73e550cb87b59cb084f9" + integrity sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ== + dependencies: + define-lazy-prop "^2.0.0" + is-docker "^2.1.1" + is-wsl "^2.2.0" opencollective-postinstall@^2.0.0: version "2.0.3" resolved "https://registry.yarnpkg.com/opencollective-postinstall/-/opencollective-postinstall-2.0.3.tgz#7a0fff978f6dbfa4d006238fbac98ed4198c3259" integrity sha512-8AV/sCtuzUeTo8gQK5qDZzARrulB3egtLzFgteqB2tcT4Mw7B8Kt7JcDHmltjz6FOAHsvTevk70gZEbhM4ZS9Q== -optimisedmt@^0.0.7: - version "0.0.7" - resolved "https://registry.yarnpkg.com/optimisedmt/-/optimisedmt-0.0.7.tgz#ef1dac1e5d84c27b19bcdbec16eb4a213fa86f75" - integrity sha512-yVlKMmP/egqiAtg12KFZxqKx35STm+RB5kSSvo9q0B0sIx/7HbWj7fJcFLUFtWzbYp2IvdOhx31s4IC7RmU5pQ== - dependencies: - assert "^2.0.0" - circomlibjs "0.0.8" - ffjavascript "^0.2.39" - optionator@^0.8.1: version "0.8.3" resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495" @@ -14176,30 +16578,44 @@ optionator@^0.8.1: type-check "~0.3.2" word-wrap "~1.2.3" -optionator@^0.9.1: - version "0.9.1" - resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.1.tgz#4f236a6373dae0566a6d43e1326674f50c291499" - integrity sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw== +optionator@^0.9.3: + version "0.9.3" + resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.3.tgz#007397d44ed1872fdc6ed31360190f81814e2c64" + integrity sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg== dependencies: + "@aashutoshrathi/word-wrap" "^1.2.3" deep-is "^0.1.3" fast-levenshtein "^2.0.6" levn "^0.4.1" prelude-ls "^1.2.1" type-check "^0.4.0" - word-wrap "^1.2.3" -ora@^4.0.0: - version "4.1.1" - resolved "https://registry.yarnpkg.com/ora/-/ora-4.1.1.tgz#566cc0348a15c36f5f0e979612842e02ba9dddbc" - integrity sha512-sjYP8QyVWBpBZWD6Vr1M/KwknSw6kJOz41tvGMlwWeClHBtYKTbHMki1PsLZnxKpXMPbTKv9b3pjQu3REib96A== +ora@4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/ora/-/ora-4.0.2.tgz#0e1e68fd45b135d28648b27cf08081fa6e8a297d" + integrity sha512-YUOZbamht5mfLxPmk4M35CD/5DuOkAacxlEUbStVXpBAt4fyhBf+vZHI/HRkI++QUp3sNoeA2Gw4C+hi4eGSig== dependencies: - chalk "^3.0.0" + chalk "^2.4.2" cli-cursor "^3.1.0" cli-spinners "^2.2.0" is-interactive "^1.0.0" log-symbols "^3.0.0" - mute-stream "0.0.8" - strip-ansi "^6.0.0" + strip-ansi "^5.2.0" + wcwidth "^1.0.1" + +ora@6.3.1: + version "6.3.1" + resolved "https://registry.yarnpkg.com/ora/-/ora-6.3.1.tgz#a4e9e5c2cf5ee73c259e8b410273e706a2ad3ed6" + integrity sha512-ERAyNnZOfqM+Ao3RAvIXkYh5joP220yf59gVe2X/cI6SiCxIdi4c9HZKZD8R6q/RDXEje1THBju6iExiSsgJaQ== + dependencies: + chalk "^5.0.0" + cli-cursor "^4.0.0" + cli-spinners "^2.6.1" + is-interactive "^2.0.0" + is-unicode-supported "^1.1.0" + log-symbols "^5.1.0" + stdin-discarder "^0.1.0" + strip-ansi "^7.0.1" wcwidth "^1.0.1" ora@^5.4.1: @@ -14217,6 +16633,11 @@ ora@^5.4.1: strip-ansi "^6.0.0" wcwidth "^1.0.1" +ordinal@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/ordinal/-/ordinal-1.0.3.tgz#1a3c7726a61728112f50944ad7c35c06ae3a0d4d" + integrity sha512-cMddMgb2QElm8G7vdaa02jhUNbTSrhsgAGUz1OokD83uJTwSUn+nKoNoKVVaRa08yF6sgfO7Maou1+bgLd9rdQ== + os-browserify@^0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27" @@ -14227,12 +16648,13 @@ os-homedir@^1.0.0: resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3" integrity sha512-B5JU3cabzk8c67mRRd3ECmROafjYMXbuzlwtqdM8IbS8ktlTix8aFGb2bAGKrSRIlnfKwovGUUr72JUPyOb6kQ== -os-locale@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-1.4.0.tgz#20f9f17ae29ed345e8bde583b13d2009803c14d9" - integrity sha512-PRT7ZORmwu2MEFt4/fv3Q+mEfN4zetKxufQrkShY2oGvUms9r8otu5HfdyIFHkYXjO7laNsoVGmM2MANfuTA8g== +os-name@^5.0.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/os-name/-/os-name-5.1.0.tgz#4f5ab5edfa6938b590112714f1570fe79f1d957a" + integrity sha512-YEIoAnM6zFmzw3PQ201gCVCIWbXNyKObGlVvpAVvraAeOHnlYVKFssbA/riRX5R40WA6kKrZ7Dr7dWzO3nKSeQ== dependencies: - lcid "^1.0.0" + macos-release "^3.1.0" + windows-release "^5.0.1" os-tmpdir@^1.0.1, os-tmpdir@~1.0.2: version "1.0.2" @@ -14259,6 +16681,27 @@ p-defer@^3.0.0: resolved "https://registry.yarnpkg.com/p-defer/-/p-defer-3.0.0.tgz#d1dceb4ee9b2b604b1d94ffec83760175d4e6f83" integrity sha512-ugZxsxmtTln604yeYd29EGrNhazN2lywetzpKhfmQjW/VJmhpDmWbiX+h0zL8V91R0UXkhb3KtPmyq9PZw3aYw== +p-event@^4.1.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/p-event/-/p-event-4.2.0.tgz#af4b049c8acd91ae81083ebd1e6f5cae2044c1b5" + integrity sha512-KXatOjCRXXkSePPb1Nbi0p0m+gQAwdlbhi4wQKJPI1HsMQS9g+Sqp2o+QHziPr7eYJyOZet836KoHEVM1mwOrQ== + dependencies: + p-timeout "^3.1.0" + +p-event@^5.0.0, p-event@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/p-event/-/p-event-5.0.1.tgz#614624ec02ae7f4f13d09a721c90586184af5b0c" + integrity sha512-dd589iCQ7m1L0bmC5NLlVYfy3TbBEsMUfWx9PyAgPeIcFZ/E2yaTZ4Rz4MiBmmJShviiftHVXOqfnfzJ6kyMrQ== + dependencies: + p-timeout "^5.0.2" + +p-every@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/p-every/-/p-every-2.0.0.tgz#ad940b82b1bd1da01c307b11e1dd25fe7286181a" + integrity sha512-MCz9DqD5opPC48Zsd+BHm56O/HfhYIQQtupfDzhXoVgQdg/Ux4F8/JcdRuQ+arq7zD5fB6zP3axbH3d9Nr8dlw== + dependencies: + p-map "^2.0.0" + p-fifo@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/p-fifo/-/p-fifo-1.0.0.tgz#e29d5cf17c239ba87f51dde98c1d26a9cfe20a63" @@ -14267,17 +16710,19 @@ p-fifo@^1.0.0: fast-fifo "^1.0.0" p-defer "^3.0.0" +p-filter@3.0.0, p-filter@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/p-filter/-/p-filter-3.0.0.tgz#ce50e03b24b23930e11679ab8694bd09a2d7ed35" + integrity sha512-QtoWLjXAW++uTX67HZQz1dbTpqBfiidsB6VtQUC9iR85S120+s0T5sO6s+B5MLzFcZkrEd/DGMmCjR+f2Qpxwg== + dependencies: + p-map "^5.1.0" + p-finally@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae" integrity sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow== -p-finally@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-2.0.1.tgz#bd6fcaa9c559a096b680806f4d657b3f0f240561" - integrity sha512-vpm09aKwq6H9phqRQzecoDpD8TmVyGw70qmWlyq5onxY7tqyTTFVvxMykxQSQKILBSFlbXpypIw2T1Ml7+DDtw== - -p-limit@3.1.0, p-limit@^3.0.2: +p-limit@3.1.0, p-limit@^3.0.2, p-limit@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b" integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ== @@ -14298,6 +16743,13 @@ p-limit@^2.0.0, p-limit@^2.2.0: dependencies: p-try "^2.0.0" +p-limit@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-4.0.0.tgz#914af6544ed32bfa54670b061cafcbd04984b644" + integrity sha512-5b0R4txpzjPWVw/cXXUResoD4hb6U/x9BH08L7nw+GN1sezDzPdxeRvpc9c433fZhBan/wusjbCsqwqm4EIBIQ== + dependencies: + yocto-queue "^1.0.0" + p-locate@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43" @@ -14326,6 +16778,25 @@ p-locate@^5.0.0: dependencies: p-limit "^3.0.2" +p-locate@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-6.0.0.tgz#3da9a49d4934b901089dca3302fa65dc5a05c04f" + integrity sha512-wPrq66Llhl7/4AGC6I+cqxT07LhXvWL08LNXz1fENOw0Ap4sRZZ/gZpTTJ5jpurzzzfS2W/Ge9BY3LgLjCShcw== + dependencies: + p-limit "^4.0.0" + +p-map@5.5.0, p-map@^5.0.0, p-map@^5.1.0, p-map@^5.3.0: + version "5.5.0" + resolved "https://registry.yarnpkg.com/p-map/-/p-map-5.5.0.tgz#054ca8ca778dfa4cf3f8db6638ccb5b937266715" + integrity sha512-VFqfGDHlx87K66yZrNdI4YGtD70IRyd+zSvgks6mzHPRNkoKy+9EKP4SFC77/vTTQYmRmti7dvqC+m5jBrBAcg== + dependencies: + aggregate-error "^4.0.0" + +p-map@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/p-map/-/p-map-2.1.0.tgz#310928feef9c9ecc65b68b17693018a665cea175" + integrity sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw== + p-map@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/p-map/-/p-map-4.0.0.tgz#bb2f95a5eda2ec168ec9274e06a747c3e2904d2b" @@ -14333,6 +16804,11 @@ p-map@^4.0.0: dependencies: aggregate-error "^3.0.0" +p-map@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/p-map/-/p-map-6.0.0.tgz#4d9c40d3171632f86c47601b709f4b4acd70fed4" + integrity sha512-T8BatKGY+k5rU+Q/GTYgrEf2r4xRMevAN5mtXc2aPc4rS1j3s+vWTaO2Wag94neXuCAUAs8cxBL9EeB5EA6diw== + p-queue@^6.0.0: version "6.6.2" resolved "https://registry.yarnpkg.com/p-queue/-/p-queue-6.6.2.tgz#2068a9dcf8e67dd0ec3e7a2bcb76810faa85e426" @@ -14341,13 +16817,36 @@ p-queue@^6.0.0: eventemitter3 "^4.0.4" p-timeout "^3.2.0" -p-timeout@^3.2.0: +p-reduce@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/p-reduce/-/p-reduce-3.0.0.tgz#f11773794792974bd1f7a14c72934248abff4160" + integrity sha512-xsrIUgI0Kn6iyDYm9StOpOeK29XM1aboGji26+QEortiFST1hGZaUQOLhtEbqHErPpGW/aSz6allwK2qcptp0Q== + +p-retry@^5.1.1: + version "5.1.2" + resolved "https://registry.yarnpkg.com/p-retry/-/p-retry-5.1.2.tgz#c16eaee4f2016f9161d12da40d3b8b0f2e3c1b76" + integrity sha512-couX95waDu98NfNZV+i/iLt+fdVxmI7CbrrdC2uDWfPdUAApyxT4wmDlyOtR5KtTDmkDO0zDScDjDou9YHhd9g== + dependencies: + "@types/retry" "0.12.1" + retry "^0.13.1" + +p-timeout@^3.1.0, p-timeout@^3.2.0: version "3.2.0" resolved "https://registry.yarnpkg.com/p-timeout/-/p-timeout-3.2.0.tgz#c7e17abc971d2a7962ef83626b35d635acf23dfe" integrity sha512-rhIwUycgwwKcP9yTOOFK/AKsAopjjCakVqLHePO3CC6Mir1Z99xT+R63jZxAT5lFZLa2inS5h+ZS2GvR99/FBg== dependencies: p-finally "^1.0.0" +p-timeout@^5.0.0, p-timeout@^5.0.2: + version "5.1.0" + resolved "https://registry.yarnpkg.com/p-timeout/-/p-timeout-5.1.0.tgz#b3c691cf4415138ce2d9cfe071dba11f0fee085b" + integrity sha512-auFDyzzzGZZZdHz3BtET9VEz0SE/uMEAx7uWfGPucfzEwwe/xH0iVeZibQmANYE/hp9T2+UUZT5m+BKyrDp3Ew== + +p-timeout@^6.0.0: + version "6.1.2" + resolved "https://registry.yarnpkg.com/p-timeout/-/p-timeout-6.1.2.tgz#22b8d8a78abf5e103030211c5fc6dee1166a6aa5" + integrity sha512-UbD77BuZ9Bc9aABo74gfXhNvzC9Tx7SxtHSh1fxvx3jTLLYvmVhiQZZrJzqqU0jKbN32kb5VOKiLEQI/3bIjgQ== + p-try@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3" @@ -14358,12 +16857,36 @@ p-try@^2.0.0: resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6" integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ== +p-wait-for@5.0.2: + version "5.0.2" + resolved "https://registry.yarnpkg.com/p-wait-for/-/p-wait-for-5.0.2.tgz#1546a15e64accf1897377cb1507fa4c756fffe96" + integrity sha512-lwx6u1CotQYPVju77R+D0vFomni/AqRfqLmqQ8hekklqZ6gAY9rONh7lBQ0uxWMkC2AuX9b2DVAl8To0NyP1JA== + dependencies: + p-timeout "^6.0.0" + +p-wait-for@^4.0.0, p-wait-for@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/p-wait-for/-/p-wait-for-4.1.0.tgz#290f126f49bbd7c84e0cedccb342cd631aaa0f16" + integrity sha512-i8nE5q++9h8oaQHWltS1Tnnv4IoMDOlqN7C0KFG2OdbK0iFJIt6CROZ8wfBM+K4Pxqfnq4C4lkkpXqTEpB5DZw== + dependencies: + p-timeout "^5.0.0" + +package-json@^8.1.0: + version "8.1.1" + resolved "https://registry.yarnpkg.com/package-json/-/package-json-8.1.1.tgz#3e9948e43df40d1e8e78a85485f1070bf8f03dc8" + integrity sha512-cbH9IAIJHNj9uXi196JVsRlt7cHKak6u/e6AkL/bkRelZ7rlL3X1YKxsZwa36xipOEKAsdtmaG6aAJoM1fx2zA== + dependencies: + got "^12.1.0" + registry-auth-token "^5.0.1" + registry-url "^6.0.0" + semver "^7.3.7" + pako@~1.0.5: version "1.0.11" resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.11.tgz#6c9599d340d54dfd3946380252a35705a6b992bf" integrity sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw== -parallel-transform@^1.1.0: +parallel-transform@1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/parallel-transform/-/parallel-transform-1.2.0.tgz#9049ca37d6cb2182c3b1d2c720be94d14a5814fc" integrity sha512-P2vSmIu38uIlvdcU7fDkyrxj33gTUy/ABO5ZUbGowxNCopBq/OoD42bP4UmMrJoPyk4Uqf0mu3mtWBhHCZD8yg== @@ -14387,7 +16910,7 @@ parent-module@^1.0.0: dependencies: callsites "^3.0.0" -parse-asn1@^5.0.0, parse-asn1@^5.1.5: +parse-asn1@^5.0.0, parse-asn1@^5.1.6: version "5.1.6" resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.6.tgz#385080a3ec13cb62a62d39409cb3e88844cdaed4" integrity sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw== @@ -14404,9 +16927,9 @@ parse-cache-control@^1.0.1: integrity sha512-60zvsJReQPX5/QP0Kzfd/VrpjScIQ7SHBW6bFCYfEP+fp0Eppr1SHhIO5nd1PjZtvclzSzES9D/p5nFJurwfWg== parse-duration@^1.0.0: - version "1.0.3" - resolved "https://registry.yarnpkg.com/parse-duration/-/parse-duration-1.0.3.tgz#b6681f5edcc2689643b34c09ea63f86f58a35814" - integrity sha512-o6NAh12na5VvR6nFejkU0gpQ8jmOY9Y9sTU2ke3L3G/d/3z8jqmbBbeyBGHU73P4JLXfc7tJARygIK3WGIkloA== + version "1.1.0" + resolved "https://registry.yarnpkg.com/parse-duration/-/parse-duration-1.1.0.tgz#5192084c5d8f2a3fd676d04a451dbd2e05a1819c" + integrity sha512-z6t9dvSJYaPoQq7quMzdEagSFtpGu+utzHqqxmpVWNNZRIXnvqyCvn9XsTdh7c/w0Bqmdz3RB3YnRaKtpRtEXQ== parse-filepath@^1.0.2: version "1.0.2" @@ -14417,19 +16940,22 @@ parse-filepath@^1.0.2: map-cache "^0.2.0" path-root "^0.1.1" +parse-github-url@1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/parse-github-url/-/parse-github-url-1.0.2.tgz#242d3b65cbcdda14bb50439e3242acf6971db395" + integrity sha512-kgBf6avCbO3Cn6+RnzRGLkUsv4ZVqv/VfAYkRsyBcgkshNvVBkRn1FEZcW0Jb+npXQWm2vHPnnOqFteZxRRGNw== + +parse-gitignore@2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/parse-gitignore/-/parse-gitignore-2.0.0.tgz#81156b265115c507129f3faea067b8476da3b642" + integrity sha512-RmVuCHWsfu0QPNW+mraxh/xjQVw/lhUCUru8Zni3Ctq3AoMhpDTq0OVdKS6iesd6Kqb7viCV3isAL43dciOSog== + parse-headers@^2.0.0: version "2.0.5" resolved "https://registry.yarnpkg.com/parse-headers/-/parse-headers-2.0.5.tgz#069793f9356a54008571eb7f9761153e6c770da9" integrity sha512-ft3iAoLOB/MlwbNXgzy43SWGP6sQki2jQvAyBg/zDFAgr9bfNWZIUj42Kw2eJIl8kEi4PbgE6U1Zau/HwI75HA== -parse-json@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9" - integrity sha512-QR/GGaKCkhwk1ePQNYDRKYZ3mwU9ypsKhB0XyFnLQdomyEqk3e8wpW3V5Jp88zbxK4n5ST1nqo+g9juTpownhQ== - dependencies: - error-ex "^1.2.0" - -parse-json@^5.0.0: +parse-json@^5.0.0, parse-json@^5.2.0: version "5.2.0" resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz#c76fc66dee54231c962b22bcc8a72cf2f99753cd" integrity sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg== @@ -14439,6 +16965,11 @@ parse-json@^5.0.0: json-parse-even-better-errors "^2.3.0" lines-and-columns "^1.1.6" +parse-ms@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/parse-ms/-/parse-ms-3.0.0.tgz#3ea24a934913345fcc3656deda72df921da3a70e" + integrity sha512-Tpb8Z7r7XbbtBTrM9UhpkzzaMrqA2VXMT3YChzYltwV3P3pM6t8wl7TvpMnSTosz1aQAdVib7kdoys7vYOPerw== + parse5@^7.1.1: version "7.1.2" resolved "https://registry.yarnpkg.com/parse5/-/parse5-7.1.2.tgz#0736bebbfd77793823240a23b7fc5e010b7f8e32" @@ -14465,12 +16996,12 @@ pascalcase@^0.1.1: integrity sha512-XHXfu/yOQRy9vYOtUDVMN60OEJjW013GoObG1o+xwQTpB9eYJX/BjXMsdW13ZDPruFhYYn0AG22w0xgQMwl3Nw== password-prompt@^1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/password-prompt/-/password-prompt-1.1.2.tgz#85b2f93896c5bd9e9f2d6ff0627fa5af3dc00923" - integrity sha512-bpuBhROdrhuN3E7G/koAju0WjVw9/uQOG5Co5mokNj0MiOSBVZS1JTwM4zl55hu0WFmIEFvO9cU9sJQiBIYeIA== + version "1.1.3" + resolved "https://registry.yarnpkg.com/password-prompt/-/password-prompt-1.1.3.tgz#05e539f4e7ca4d6c865d479313f10eb9db63ee5f" + integrity sha512-HkrjG2aJlvF0t2BMH0e2LB/EHf3Lcq3fNMzy4GYHcQblAvOl+QQji1Lx7WRBMqpVK8p+KR7bCg7oqAMXtdgqyw== dependencies: - ansi-escapes "^3.1.0" - cross-spawn "^6.0.5" + ansi-escapes "^4.3.2" + cross-spawn "^7.0.3" patch-package@6.2.2: version "6.2.2" @@ -14490,32 +17021,7 @@ patch-package@6.2.2: slash "^2.0.0" tmp "^0.0.33" -patch-package@^6.2.2: - version "6.5.1" - resolved "https://registry.yarnpkg.com/patch-package/-/patch-package-6.5.1.tgz#3e5d00c16997e6160291fee06a521c42ac99b621" - integrity sha512-I/4Zsalfhc6bphmJTlrLoOcAF87jcxko4q0qsv4bGcurbr8IskEOtdnt9iCmsQVGL1B+iUhSQqweyTLJfCF9rA== - dependencies: - "@yarnpkg/lockfile" "^1.1.0" - chalk "^4.1.2" - cross-spawn "^6.0.5" - find-yarn-workspace-root "^2.0.0" - fs-extra "^9.0.0" - is-ci "^2.0.0" - klaw-sync "^6.0.0" - minimist "^1.2.6" - open "^7.4.2" - rimraf "^2.6.3" - semver "^5.6.0" - slash "^2.0.0" - tmp "^0.0.33" - yaml "^1.10.2" - -path-browserify@0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.1.tgz#e6c4ddd7ed3aa27c68a20cc4e50e1a4ee83bbc4a" - integrity sha512-BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ== - -path-browserify@^1.0.0, path-browserify@^1.0.1: +path-browserify@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-1.0.1.tgz#d98454a9c3753d5790860f16f68867b9e46be1fd" integrity sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g== @@ -14528,18 +17034,6 @@ path-case@^3.0.4: dot-case "^3.0.4" tslib "^2.0.3" -path-dirname@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0" - integrity sha512-ALzNPpyNq9AqXMBjeymIjFDAkAFH06mHJH/cSBHAgU0s4vfpBn6b2nf8tiRLvagKD8RbTpq2FKTBg7cl9l3c7Q== - -path-exists@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-2.1.0.tgz#0feb6c64f0fc518d9a754dd5efb62c7022761f4b" - integrity sha512-yTltuKuhtNeFJKa1PiRzfLAU5182q1y4Eb4XCJ3PBqyzEDkAZRzBrKKBct682ls9reBVHf9udYLN5Nd+K1B9BQ== - dependencies: - pinkie-promise "^2.0.0" - path-exists@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515" @@ -14550,11 +17044,21 @@ path-exists@^4.0.0: resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3" integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w== +path-exists@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-5.0.0.tgz#a6aad9489200b21fab31e49cf09277e5116fb9e7" + integrity sha512-RjhtfwJOxzcFmNOi6ltcbcu4Iu+FL3zEj83dk4kAS+fVpTxXLO1b38RvJgT/0QwvV/L3aY9TAnyv0EOqW4GoMQ== + path-is-absolute@^1.0.0, path-is-absolute@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" integrity sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg== +path-key@4.0.0, path-key@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/path-key/-/path-key-4.0.0.tgz#295588dc3aee64154f877adb9d780b81c554bf18" + integrity sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ== + path-key@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40" @@ -14582,33 +17086,29 @@ path-root@^0.1.1: dependencies: path-root-regex "^0.1.0" -path-scurry@^1.6.1: - version "1.7.0" - resolved "https://registry.yarnpkg.com/path-scurry/-/path-scurry-1.7.0.tgz#99c741a2cfbce782294a39994d63748b5a24f6db" - integrity sha512-UkZUeDjczjYRE495+9thsgcVgsaCPkaw80slmfVFgllxY+IO8ubTsOpFVjDPROBqJdHfVPUFRHPBV/WciOVfWg== +path-scurry@^1.10.1, path-scurry@^1.6.1: + version "1.10.1" + resolved "https://registry.yarnpkg.com/path-scurry/-/path-scurry-1.10.1.tgz#9ba6bf5aa8500fe9fd67df4f0d9483b2b0bfc698" + integrity sha512-MkhCqzzBEpPvxxQ71Md0b1Kk51W01lrYvlMzSUaIzNsODdd7mqhiimSZlr+VegAz5Z6Vzt9Xg2ttE//XBhH3EQ== dependencies: - lru-cache "^9.0.0" - minipass "^5.0.0" + lru-cache "^9.1.1 || ^10.0.0" + minipass "^5.0.0 || ^6.0.2 || ^7.0.0" path-to-regexp@0.1.7: version "0.1.7" resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c" integrity sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ== -path-type@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/path-type/-/path-type-1.1.0.tgz#59c44f7ee491da704da415da5a4070ba4f8fe441" - integrity sha512-S4eENJz1pkiQn9Znv33Q+deTOKmbl+jj1Fl+qiP/vYezj+S8x+J3Uo0ISrx/QoEvIlOaDWJhPaRd1flJ9HXZqg== - dependencies: - graceful-fs "^4.1.2" - pify "^2.0.0" - pinkie-promise "^2.0.0" - path-type@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b" integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw== +path-type@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/path-type/-/path-type-5.0.0.tgz#14b01ed7aea7ddf9c7c3f46181d4d04f9c785bb8" + integrity sha512-5HviZNaZcfqP95rwpv+1HDgUamezbqdSYTyzjTvwtJSnIH+3vnbmWsItli8OFEndS984VT55M3jduxZbX351gg== + path@^0.12.7: version "0.12.7" resolved "https://registry.yarnpkg.com/path/-/path-0.12.7.tgz#d4dc2a506c4ce2197eb481ebfcd5b36c0140b10f" @@ -14622,10 +17122,10 @@ pathe@^0.2.0: resolved "https://registry.yarnpkg.com/pathe/-/pathe-0.2.0.tgz#30fd7bbe0a0d91f0e60bae621f5d19e9e225c339" integrity sha512-sTitTPYnn23esFR3RlqYBWn4c45WGeLcsKzQiUpXJAyfcWkolvlYpV8FLo7JishK946oQwMFUCHXQ9AjGPKExw== -pathe@^1.0.0, pathe@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/pathe/-/pathe-1.1.0.tgz#e2e13f6c62b31a3289af4ba19886c230f295ec03" - integrity sha512-ODbEPR0KKHqECXW1GoxdDb+AZvULmXjVPy4rt+pGo2+TnjJTIPJQSVS6N63n8T2Ip+syHhbn52OewKicV0373w== +pathe@^1.0.0, pathe@^1.1.0, pathe@^1.1.1, pathe@^1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/pathe/-/pathe-1.1.2.tgz#6c4cb47a945692e48a1ddd6e4094d170516437ec" + integrity sha512-whLdWMYL2TwI08hn8/ZqAbrVemu0LNaNNJZX73O6qaIdCTfXutsLhMkjdENX0qhsQ9uIimo4/aQOmXkoon2nDQ== pathval@^1.1.1: version "1.1.1" @@ -14643,6 +17143,16 @@ pbkdf2@^3.0.17, pbkdf2@^3.0.3, pbkdf2@^3.0.9: safe-buffer "^5.0.1" sha.js "^2.4.8" +peek-readable@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/peek-readable/-/peek-readable-5.0.0.tgz#7ead2aff25dc40458c60347ea76cfdfd63efdfec" + integrity sha512-YtCKvLUOvwtMGmrniQPdO7MwPjgkFBtFIrmfSbYmYuq3tKDV/mcfAhBth1+C3ru7uXIZasc/pHnb+YDYNkkj4A== + +pend@~1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50" + integrity sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg== + performance-now@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" @@ -14658,7 +17168,7 @@ picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.2, picomatch@^2.3.1: resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42" integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA== -pify@^2.0.0, pify@^2.3.0: +pify@^2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c" integrity sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog== @@ -14669,24 +17179,12 @@ pify@^4.0.1: integrity sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g== pinia@^2.0.26: - version "2.0.34" - resolved "https://registry.yarnpkg.com/pinia/-/pinia-2.0.34.tgz#6c0c84f06b631c30c030633fa64e525c609105a9" - integrity sha512-cgOoGUiyqX0SSgX8XelK9+Ri4XA2/YyNtgjogwfzIx1g7iZTaZPxm7/bZYMCLU2qHRiHhxG7SuQO0eBacFNc2Q== + version "2.1.7" + resolved "https://registry.yarnpkg.com/pinia/-/pinia-2.1.7.tgz#4cf5420d9324ca00b7b4984d3fbf693222115bbc" + integrity sha512-+C2AHFtcFqjPih0zpYuvof37SFxMQ7OEG2zV9jRI12i9BOy3YQVAHwdKtyyc8pDcDyIc33WCIsZaCFWU7WWxGQ== dependencies: "@vue/devtools-api" "^6.5.0" - vue-demi "*" - -pinkie-promise@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa" - integrity sha512-0Gni6D4UcLTbv9c57DfxDGdr41XfgUjqWZu492f0cIGr16zDU06BWP/RAEvOuo7CQ0CNjHaLlM59YJJFm3NWlw== - dependencies: - pinkie "^2.0.0" - -pinkie@^2.0.0: - version "2.0.4" - resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870" - integrity sha512-MnUuEycAemtSaeFSjXKW/aroV7akBbY+Sv+RkyqFjgAe73F+MR0TBWKBRDkmfWq/HiFmdavfZ1G7h4SPZXaCSg== + vue-demi ">=0.14.5" pino-abstract-transport@v0.5.0: version "0.5.0" @@ -14696,11 +17194,24 @@ pino-abstract-transport@v0.5.0: duplexify "^4.1.2" split2 "^4.0.0" +pino-abstract-transport@v1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/pino-abstract-transport/-/pino-abstract-transport-1.1.0.tgz#083d98f966262164504afb989bccd05f665937a8" + integrity sha512-lsleG3/2a/JIWUtf9Q5gUNErBqwIu1tUKTT3dUzaf5DySw9ra1wcqKjJjLX1VTY64Wk1eEOYsVGSaGfCK85ekA== + dependencies: + readable-stream "^4.0.0" + split2 "^4.0.0" + pino-std-serializers@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/pino-std-serializers/-/pino-std-serializers-4.0.0.tgz#1791ccd2539c091ae49ce9993205e2cd5dbba1e2" integrity sha512-cK0pekc1Kjy5w9V2/n+8MkZwusa6EyyxfeQCB799CQRhRt/CqYKiWs5adeu8Shve2ZNffvfC/7J64A2PJo1W/Q== +pino-std-serializers@^6.0.0: + version "6.2.2" + resolved "https://registry.yarnpkg.com/pino-std-serializers/-/pino-std-serializers-6.2.2.tgz#d9a9b5f2b9a402486a5fc4db0a737570a860aab3" + integrity sha512-cHjPPsE+vhj/tnhCy/wiMh3M3z3h/j15zHQX+S9GkTBgqJuTuJzYJ4gUyACLhDaJ7kk9ba9iRDmbH2tJU03OiA== + pino@7.11.0: version "7.11.0" resolved "https://registry.yarnpkg.com/pino/-/pino-7.11.0.tgz#0f0ea5c4683dc91388081d44bff10c83125066f6" @@ -14718,24 +17229,27 @@ pino@7.11.0: sonic-boom "^2.2.1" thread-stream "^0.15.1" -pirates@^4.0.1: - version "4.0.5" - resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.5.tgz#feec352ea5c3268fb23a37c702ab1699f35a5f3b" - integrity sha512-8V9+HQPupnaXMA23c5hvl69zXvTwTzyAYasnkb0Tts4XvO4CliqONMOnvlq26rkhLC3nWDFBJf73LU1e1VZLaQ== - -pkg-dir@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-3.0.0.tgz#2749020f239ed990881b1f71210d51eb6523bea3" - integrity sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw== +pino@^8.5.0: + version "8.17.2" + resolved "https://registry.yarnpkg.com/pino/-/pino-8.17.2.tgz#0ed20175623a69d31664a1e8a5f85476272224be" + integrity sha512-LA6qKgeDMLr2ux2y/YiUt47EfgQ+S9LznBWOJdN3q1dx2sv0ziDLUBeVpyVv17TEcGCBuWf0zNtg3M5m1NhhWQ== dependencies: - find-up "^3.0.0" + atomic-sleep "^1.0.0" + fast-redact "^3.1.1" + on-exit-leak-free "^2.1.0" + pino-abstract-transport v1.1.0 + pino-std-serializers "^6.0.0" + process-warning "^3.0.0" + quick-format-unescaped "^4.0.3" + real-require "^0.2.0" + safe-stable-stringify "^2.3.1" + sonic-boom "^3.7.0" + thread-stream "^2.0.0" -pkg-dir@^4.1.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" +pirates@^4.0.1: + version "4.0.6" + resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.6.tgz#3018ae32ecfcff6c29ba2267cbf21166ac1f36b9" + integrity sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg== pkg-dir@^5.0.0: version "5.0.0" @@ -14744,13 +17258,20 @@ pkg-dir@^5.0.0: dependencies: find-up "^5.0.0" -pkg-types@^1.0.1, pkg-types@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/pkg-types/-/pkg-types-1.0.2.tgz#c233efc5210a781e160e0cafd60c0d0510a4b12e" - integrity sha512-hM58GKXOcj8WTqUXnsQyJYXdeAPbythQgEF3nTcEo+nkD49chjQ9IKm/QJy9xf6JakXptz86h7ecP2024rrLaQ== +pkg-dir@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-7.0.0.tgz#8f0c08d6df4476756c5ff29b3282d0bab7517d11" + integrity sha512-Ie9z/WINcxxLp27BKOCHGde4ITq9UklYKDzVo1nhk5sqGEXU3FpkwP5GM2voTGJkGd9B3Otl+Q4uwSOeSUtOBA== + dependencies: + find-up "^6.3.0" + +pkg-types@^1.0.1, pkg-types@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/pkg-types/-/pkg-types-1.0.3.tgz#988b42ab19254c01614d13f4f65a2cfc7880f868" + integrity sha512-nN7pYi0AQqJnoLPC9eHFQ8AcyaixBUOwvqc5TDnIKCMEE6I0y8P7OKA7fPexsXGCGxQDl/cmrLAp26LhcwxZ4A== dependencies: jsonc-parser "^3.2.0" - mlly "^1.1.1" + mlly "^1.2.0" pathe "^1.1.0" please-upgrade-node@^3.2.0: @@ -14780,41 +17301,41 @@ posix-character-classes@^0.1.0: resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab" integrity sha512-xTgYBc3fuo7Yt7JbiuFxSYGToMoz8fLoE6TC9Wx1P/u+LfeThMOAqmuyECnlBaaJb+u1m9hHiXUEtwW4OzfUJg== -postcss-import@^14.1.0: - version "14.1.0" - resolved "https://registry.yarnpkg.com/postcss-import/-/postcss-import-14.1.0.tgz#a7333ffe32f0b8795303ee9e40215dac922781f0" - integrity sha512-flwI+Vgm4SElObFVPpTIT7SU7R3qk2L7PyduMcokiaVKuWv9d/U+Gm/QAd8NDLuykTWTkcrjOeD2Pp1rMeBTGw== +postcss-import@^15.1.0: + version "15.1.0" + resolved "https://registry.yarnpkg.com/postcss-import/-/postcss-import-15.1.0.tgz#41c64ed8cc0e23735a9698b3249ffdbf704adc70" + integrity sha512-hpr+J05B2FVYUAXHeK1YyI267J/dDDhMU6B6civm8hSY1jYJnBXxzKDKDswzJmtLHryrjhnDjqqp/49t8FALew== dependencies: postcss-value-parser "^4.0.0" read-cache "^1.0.0" resolve "^1.1.7" -postcss-js@^4.0.0: +postcss-js@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/postcss-js/-/postcss-js-4.0.1.tgz#61598186f3703bab052f1c4f7d805f3991bee9d2" integrity sha512-dDLF8pEO191hJMtlHFPRa8xsizHaM82MLfNkUHdUtVEV3tgTp5oj+8qbEqYM57SLfc74KSbw//4SeJma2LRVIw== dependencies: camelcase-css "^2.0.1" -postcss-load-config@^3.1.4: - version "3.1.4" - resolved "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-3.1.4.tgz#1ab2571faf84bb078877e1d07905eabe9ebda855" - integrity sha512-6DiM4E7v4coTE4uzA8U//WhtPwyhiim3eyjEMFCnUpzbrkK9wJHgKDT2mR+HbtSrd/NubVaYTOpSpjUl8NQeRg== +postcss-load-config@^4.0.1: + version "4.0.2" + resolved "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-4.0.2.tgz#7159dcf626118d33e299f485d6afe4aff7c4a3e3" + integrity sha512-bSVhyJGL00wMVoPUzAVAnbEoWyqRxkjv64tUl427SKnPrENtq6hJwUojroMz2VB+Q1edmi4IfrAPpami5VVgMQ== dependencies: - lilconfig "^2.0.5" - yaml "^1.10.2" + lilconfig "^3.0.0" + yaml "^2.3.4" -postcss-nested@6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/postcss-nested/-/postcss-nested-6.0.0.tgz#1572f1984736578f360cffc7eb7dca69e30d1735" - integrity sha512-0DkamqrPcmkBDsLn+vQDIrtkSbNkv5AD/M322ySo9kqFkCIYklym2xEmWkwo+Y3/qZo34tzEPNUw4y7yMCdv5w== +postcss-nested@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/postcss-nested/-/postcss-nested-6.0.1.tgz#f83dc9846ca16d2f4fa864f16e9d9f7d0961662c" + integrity sha512-mEp4xPMi5bSWiMbsgoPfcP74lsWLHkQbZc3sY+jWYd65CUwXrUaTp0fmNpa01ZcETKlIgUdFN/MpS2xZtqL9dQ== dependencies: - postcss-selector-parser "^6.0.10" + postcss-selector-parser "^6.0.11" -postcss-selector-parser@^6.0.10, postcss-selector-parser@^6.0.11, postcss-selector-parser@^6.0.9: - version "6.0.11" - resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.11.tgz#2e41dc39b7ad74046e1615185185cd0b17d0c8dc" - integrity sha512-zbARubNdogI9j7WY4nQJBiNqQf3sLS3wCP4WfOidu+p28LofJqDH1tcXypGrcmMHhDk2t9wGhCsYe/+szLTy1g== +postcss-selector-parser@^6.0.11, postcss-selector-parser@^6.0.13: + version "6.0.15" + resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.15.tgz#11cc2b21eebc0b99ea374ffb9887174855a01535" + integrity sha512-rEYkQOMUCEMhsKbK66tbEU9QVIxbhN18YiniAwA7XQYTVBqrBy+P2p5JcdqsHgKM2zWylp8d7J6eszocfds5Sw== dependencies: cssesc "^3.0.0" util-deprecate "^1.0.2" @@ -14824,19 +17345,59 @@ postcss-value-parser@^4.0.0, postcss-value-parser@^4.2.0: resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz#723c09920836ba6d3e5af019f92bc0971c02e514" integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ== -postcss@^8.0.9, postcss@^8.1.10, postcss@^8.4.18, postcss@^8.4.19, postcss@^8.4.21: - version "8.4.22" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.22.tgz#c29e6776b60ab3af602d4b513d5bd2ff9aa85dc1" - integrity sha512-XseknLAfRHzVWjCEtdviapiBtfLdgyzExD50Rg2ePaucEesyh8Wv4VPdW0nbyDa1ydbrAxV19jvMT4+LFmcNUA== +postcss-values-parser@^6.0.2: + version "6.0.2" + resolved "https://registry.yarnpkg.com/postcss-values-parser/-/postcss-values-parser-6.0.2.tgz#636edc5b86c953896f1bb0d7a7a6615df00fb76f" + integrity sha512-YLJpK0N1brcNJrs9WatuJFtHaV9q5aAOj+S4DI5S7jgHlRfm0PIbDCAFRYMQD5SHq7Fy6xsDhyutgS0QOAs0qw== + dependencies: + color-name "^1.1.4" + is-url-superb "^4.0.0" + quote-unquote "^1.0.0" + +postcss@^8.4.19, postcss@^8.4.23, postcss@^8.4.27, postcss@^8.4.33: + version "8.4.33" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.33.tgz#1378e859c9f69bf6f638b990a0212f43e2aaa742" + integrity sha512-Kkpbhhdjw2qQs2O2DGX+8m5OVqEcbB9HRBvuYM9pgrjEFUg30A9LmXNlTAUj4S9kgtGyrMbTzVjH7E+s5Re2yg== dependencies: - nanoid "^3.3.6" + nanoid "^3.3.7" picocolors "^1.0.0" source-map-js "^1.0.2" -postinstall-postinstall@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/postinstall-postinstall/-/postinstall-postinstall-2.1.0.tgz#4f7f77441ef539d1512c40bd04c71b06a4704ca3" - integrity sha512-7hQX6ZlZXIoRiWNrbMQaLzUUfH+sSx39u8EJ9HYuDc1kLo9IXKWjM5RSquZN1ad5GnH8CGFM78fsAAQi3OKEEQ== +prebuild-install@^7.1.1: + version "7.1.1" + resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-7.1.1.tgz#de97d5b34a70a0c81334fd24641f2a1702352e45" + integrity sha512-jAXscXWMcCK8GgCoHOfIr0ODh5ai8mj63L2nWrjuAgXE6tDyYGnx4/8o/rCgU+B4JSyZBKbeZqzhtwtC3ovxjw== + dependencies: + detect-libc "^2.0.0" + expand-template "^2.0.3" + github-from-package "0.0.0" + minimist "^1.2.3" + mkdirp-classic "^0.5.3" + napi-build-utils "^1.0.1" + node-abi "^3.3.0" + pump "^3.0.0" + rc "^1.2.7" + simple-get "^4.0.0" + tar-fs "^2.0.0" + tunnel-agent "^0.6.0" + +precinct@^11.0.0: + version "11.0.5" + resolved "https://registry.yarnpkg.com/precinct/-/precinct-11.0.5.tgz#3e15b3486670806f18addb54b8533e23596399ff" + integrity sha512-oHSWLC8cL/0znFhvln26D14KfCQFFn4KOLSw6hmLhd+LQ2SKt9Ljm89but76Pc7flM9Ty1TnXyrA2u16MfRV3w== + dependencies: + "@dependents/detective-less" "^4.1.0" + commander "^10.0.1" + detective-amd "^5.0.2" + detective-cjs "^5.0.1" + detective-es6 "^4.0.1" + detective-postcss "^6.1.3" + detective-sass "^5.0.3" + detective-scss "^4.0.3" + detective-stylus "^4.0.0" + detective-typescript "^11.1.0" + module-definition "^5.0.1" + node-source-walk "^6.0.2" precond@0.2: version "0.2.3" @@ -14865,15 +17426,39 @@ prettier-linter-helpers@^1.0.0: dependencies: fast-diff "^1.1.2" -prettier@1.19.1, prettier@^1.14.2: - version "1.19.1" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.19.1.tgz#f7d7f5ff8a9cd872a7be4ca142095956a60797cb" - integrity sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew== +prettier@3.0.3: + version "3.0.3" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.0.3.tgz#432a51f7ba422d1469096c0fdc28e235db8f9643" + integrity sha512-L/4pUDMxcNa8R/EthV08Zt42WBO4h1rarVtK0K+QJG0X187OLo7l699jWw0GKuwzkPQ//jMFA/8Xm6Fh3J/DAg== + +prettier@^2.1.2, prettier@^2.3.1: + version "2.8.8" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.8.tgz#e8c5d7e98a4305ffe3de2e1fc4aca1a71c28b1da" + integrity sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q== -prettier@^2.1.2, prettier@^2.8.0, prettier@^2.8.3, prettier@^2.8.6: - version "2.8.7" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.7.tgz#bb79fc8729308549d28fe3a98fce73d2c0656450" - integrity sha512-yPngTo3aXUUmyuTjeTUT75txrf+aMh9FiD7q9ZE/i6r0bPb22g4FsE6Y338PQX1bmfy08i9QQCB7/rcUAVntfw== +pretty-format@^27.5.1: + version "27.5.1" + resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-27.5.1.tgz#2181879fdea51a7a5851fb39d920faa63f01d88e" + integrity sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ== + dependencies: + ansi-regex "^5.0.1" + ansi-styles "^5.0.0" + react-is "^17.0.1" + +pretty-ms@^8.0.0: + version "8.0.0" + resolved "https://registry.yarnpkg.com/pretty-ms/-/pretty-ms-8.0.0.tgz#a35563b2a02df01e595538f86d7de54ca23194a3" + integrity sha512-ASJqOugUF1bbzI35STMBUpZqdfYKlJugy6JBziGi2EE+AL5JPJGSzvpeVXojxrr0ViUYoToUjb5kjSEGf7Y83Q== + dependencies: + parse-ms "^3.0.0" + +prettyjson@1.2.5: + version "1.2.5" + resolved "https://registry.yarnpkg.com/prettyjson/-/prettyjson-1.2.5.tgz#ef3cfffcc70505c032abc59785884b4027031835" + integrity sha512-rksPWtoZb2ZpT5OVgtmy0KHVM+Dca3iVwWY9ifwhcexfjebtgjg3wmrUt9PvJ59XIYBcknQeYHD8IAnVlh9lAw== + dependencies: + colors "1.4.0" + minimist "^1.2.0" private@^0.1.6, private@^0.1.8: version "0.1.8" @@ -14890,16 +17475,21 @@ process-warning@^1.0.0: resolved "https://registry.yarnpkg.com/process-warning/-/process-warning-1.0.0.tgz#980a0b25dc38cd6034181be4b7726d89066b4616" integrity sha512-du4wfLyj4yCZq1VupnVSZmRsPJsNuxoDQFdCFHLaYiEbFBD7QE0a+I4D7hOxrVnh78QE/YipFAj9lXHiXocV+Q== +process-warning@^2.0.0: + version "2.3.2" + resolved "https://registry.yarnpkg.com/process-warning/-/process-warning-2.3.2.tgz#70d8a3251aab0eafe3a595d8ae2c5d2277f096a5" + integrity sha512-n9wh8tvBe5sFmsqlg+XQhaQLumwpqoAUruLwjCopgTmUBjJ/fjtBsJzKleCaIGBOMXYEhp1YfKl4d7rJ5ZKJGA== + +process-warning@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/process-warning/-/process-warning-3.0.0.tgz#96e5b88884187a1dce6f5c3166d611132058710b" + integrity sha512-mqn0kFRl0EoqhnL0GQ0veqFHyIN1yig9RHh/InzORTUiZHFRAur+aMtRkELNwGs9aNwKS6tg/An4NYBPGwvtzQ== + process@^0.11.1, process@^0.11.10: version "0.11.10" resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182" integrity sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A== -promise-inflight@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3" - integrity sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g== - promise-to-callback@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/promise-to-callback/-/promise-to-callback-1.0.0.tgz#5d2a749010bfb67d963598fcd3960746a68feef7" @@ -14922,12 +17512,16 @@ promise@^8.0.0: dependencies: asap "~2.0.6" -prompt-sync@4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/prompt-sync/-/prompt-sync-4.2.0.tgz#0198f73c5b70e3b03e4b9033a50540a7c9a1d7f4" - integrity sha512-BuEzzc5zptP5LsgV5MZETjDaKSWfchl5U9Luiu8SKp7iZWD5tZalOxvNcZRwv+d2phNFr8xlbxmFNcRKfJOzJw== +prompt@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/prompt/-/prompt-1.3.0.tgz#b1f6d47cb1b6beed4f0660b470f5d3ec157ad7ce" + integrity sha512-ZkaRWtaLBZl7KKAKndKYUL8WqNT+cQHKRZnT4RYYms48jQkFw3rrBL+/N5K/KtdEveHkxs982MX2BkDKub2ZMg== dependencies: - strip-ansi "^5.0.0" + "@colors/colors" "1.5.0" + async "3.2.3" + read "1.0.x" + revalidator "0.1.x" + winston "2.x" proper-lockfile@^4.0.0, proper-lockfile@^4.1.1: version "4.1.2" @@ -14938,10 +17532,15 @@ proper-lockfile@^4.0.0, proper-lockfile@^4.1.1: retry "^0.12.0" signal-exit "^3.0.2" +proto-list@~1.2.1: + version "1.2.4" + resolved "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849" + integrity sha512-vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA== + protobufjs@^6.10.2: - version "6.11.3" - resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-6.11.3.tgz#637a527205a35caa4f3e2a9a4a13ddffe0e7af74" - integrity sha512-xL96WDdCZYdU7Slin569tFX712BxsxslWwAfAhCYjQKGTq7dAU91Lomy6nLLhh/dyGhk/YH4TwTSRxTzhuHyZg== + version "6.11.4" + resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-6.11.4.tgz#29a412c38bf70d89e537b6d02d904a6f448173aa" + integrity sha512-5kQWPaJHi1WoCpjTGszzQ32PG2F4+wRY6BmAT4Vfw56Q2FZ4YZzK20xUYQH4YkfehY1e6QSICrJquM6xXZNcrw== dependencies: "@protobufjs/aspromise" "^1.1.2" "@protobufjs/base64" "^1.1.2" @@ -14972,7 +17571,7 @@ protons@^1.0.2, protons@^1.1.0: signed-varint "^2.0.1" varint "^5.0.0" -proxy-addr@~2.0.7: +proxy-addr@^2.0.7, proxy-addr@~2.0.7: version "2.0.7" resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.7.tgz#f19fe69ceab311eeb94b42e70e8c2070f9ba1025" integrity sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg== @@ -14985,11 +17584,21 @@ proxy-compare@2.5.1: resolved "https://registry.yarnpkg.com/proxy-compare/-/proxy-compare-2.5.1.tgz#17818e33d1653fbac8c2ec31406bce8a2966f600" integrity sha512-oyfc0Tx87Cpwva5ZXezSp5V9vht1c7dZBhvuV/y3ctkgMVUmiAGDVeeB0dKhGSyT0v1ZTEQYpe/RXlBVBNuCLA== +proxy-from-env@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2" + integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg== + prr@~1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476" integrity sha512-yPw4Sng1gWghHQWj0B3ZggWUm4qVbPwPFcRG8KyxiU7J2OHFSoEHKS+EZ3fv5l1t9CyCiop6l/ZYeWbrgoQejw== +ps-list@^8.0.0: + version "8.1.1" + resolved "https://registry.yarnpkg.com/ps-list/-/ps-list-8.1.1.tgz#9ff1952b26a9a07fcc05270407e60544237ae581" + integrity sha512-OPS9kEJYVmiO48u/B9qneqhkMvgCxT+Tm28VCEJpheTpl8cJ0ffZRRNgS5mrQRTrX5yRTpaJ+hRDeefXYmmorQ== + pseudomap@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3" @@ -15060,23 +17669,7 @@ pull-window@^2.1.4: dependencies: looper "^2.0.0" -pump@^1.0.0: - version "1.0.3" - resolved "https://registry.yarnpkg.com/pump/-/pump-1.0.3.tgz#5dfe8311c33bbf6fc18261f9f34702c47c08a954" - integrity sha512-8k0JupWme55+9tCVE+FS5ULT3K6AbgqrGa58lTT49RpyfwwcGedHqaC5LlQNdEAumn/wFsu6aPwkuPMioy8kqw== - dependencies: - end-of-stream "^1.1.0" - once "^1.3.1" - -pump@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/pump/-/pump-2.0.1.tgz#12399add6e4cf7526d973cbc8b5ce2e2908b3909" - integrity sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA== - dependencies: - end-of-stream "^1.1.0" - once "^1.3.1" - -pump@^3.0.0: +pump@3.0.0, pump@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64" integrity sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww== @@ -15084,48 +17677,49 @@ pump@^3.0.0: end-of-stream "^1.1.0" once "^1.3.1" -pumpify@^1.3.3: - version "1.5.1" - resolved "https://registry.yarnpkg.com/pumpify/-/pumpify-1.5.1.tgz#36513be246ab27570b1a374a5ce278bfd74370ce" - integrity sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ== +pump@^1.0.0: + version "1.0.3" + resolved "https://registry.yarnpkg.com/pump/-/pump-1.0.3.tgz#5dfe8311c33bbf6fc18261f9f34702c47c08a954" + integrity sha512-8k0JupWme55+9tCVE+FS5ULT3K6AbgqrGa58lTT49RpyfwwcGedHqaC5LlQNdEAumn/wFsu6aPwkuPMioy8kqw== dependencies: - duplexify "^3.6.0" - inherits "^2.0.3" - pump "^2.0.0" - -punycode@1.3.2: - version "1.3.2" - resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d" - integrity sha512-RofWgt/7fL5wP1Y7fxE7/EmTLzQVnB0ycyibJ0OOHIlJqTNzglYFxVwETOcIoJqJmpDXJ9xImDv+Fq34F/d4Dw== + end-of-stream "^1.1.0" + once "^1.3.1" punycode@2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.0.tgz#5f863edc89b96db09074bad7947bf09056ca4e7d" integrity sha512-Yxz2kRwT90aPiWEMHVYnEf4+rhwF1tBmmZ4KepCP+Wkium9JxtWnUm1nqGwpiAHr/tnTSeHqr3wb++jgSkXjhA== -punycode@^1.2.4, punycode@^1.3.2, punycode@^1.4.1: +punycode@^1.3.2, punycode@^1.4.1: version "1.4.1" resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e" integrity sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ== punycode@^2.1.0, punycode@^2.1.1: - version "2.3.0" - resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.0.tgz#f67fa67c94da8f4d0cfff981aee4118064199b8f" - integrity sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA== + version "2.3.1" + resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.1.tgz#027422e2faec0b25e1549c3e1bd8309b9133b6e5" + integrity sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg== -pvtsutils@^1.3.2: - version "1.3.2" - resolved "https://registry.yarnpkg.com/pvtsutils/-/pvtsutils-1.3.2.tgz#9f8570d132cdd3c27ab7d51a2799239bf8d8d5de" - integrity sha512-+Ipe2iNUyrZz+8K/2IOo+kKikdtfhRKzNpQbruF2URmqPtoqAs8g3xS7TJvFF2GcPXjh7DkqMnpVveRFq4PgEQ== +pupa@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/pupa/-/pupa-3.1.0.tgz#f15610274376bbcc70c9a3aa8b505ea23f41c579" + integrity sha512-FLpr4flz5xZTSJxSeaheeMKN/EDzMdK7b8PTOC6a5PYFKTucWbdqjgqaEyH0shFiSJrVB1+Qqi4Tk19ccU6Aug== dependencies: - tslib "^2.4.0" + escape-goat "^4.0.0" + +pvtsutils@^1.3.2, pvtsutils@^1.3.5: + version "1.3.5" + resolved "https://registry.yarnpkg.com/pvtsutils/-/pvtsutils-1.3.5.tgz#b8705b437b7b134cd7fd858f025a23456f1ce910" + integrity sha512-ARvb14YB9Nm2Xi6nBq1ZX6dAM0FsJnuk+31aUp4TrcZEdKUlSqOqsxJHUPJDNE3qiIp+iUPEIeR6Je/tgV7zsA== + dependencies: + tslib "^2.6.1" pvutils@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/pvutils/-/pvutils-1.1.3.tgz#f35fc1d27e7cd3dfbd39c0826d173e806a03f5a3" integrity sha512-pMpnA0qRdFp32b1sJl1wOJNxZLQ2cbQx+k6tjNtZ8CpvVhNqEPRgivZ2WOUev2YMajecdH7ctUPDvEe87nariQ== -qrcode@1.5.3: +qrcode@1.5.3, qrcode@^1.5.1: version "1.5.3" resolved "https://registry.yarnpkg.com/qrcode/-/qrcode-1.5.3.tgz#03afa80912c0dccf12bc93f615a535aad1066170" integrity sha512-puyri6ApkEHYiVl4CFzo1tDkAZ+ATcnbJrJ6RiBM1Fhctdn/ix9MTE3hRph33omisEbC/2fcfemsseiKgBPKZg== @@ -15135,16 +17729,6 @@ qrcode@1.5.3: pngjs "^5.0.0" yargs "^15.3.1" -qrcode@^1.5.1: - version "1.5.1" - resolved "https://registry.yarnpkg.com/qrcode/-/qrcode-1.5.1.tgz#0103f97317409f7bc91772ef30793a54cd59f0cb" - integrity sha512-nS8NJ1Z3md8uTjKtP+SGGhfqmTCs5flU/xR623oI0JX+Wepz9R8UrRVCTBTJm3qGw3rH6jJ6MUHjkDx15cxSSg== - dependencies: - dijkstrajs "^1.0.1" - encode-utf8 "^1.0.3" - pngjs "^5.0.0" - yargs "^15.3.1" - qs@6.11.0: version "6.11.0" resolved "https://registry.yarnpkg.com/qs/-/qs-6.11.0.tgz#fd0d963446f7a65e1367e01abd85429453f0c37a" @@ -15152,10 +17736,10 @@ qs@6.11.0: dependencies: side-channel "^1.0.4" -qs@^6.4.0, qs@^6.7.0: - version "6.11.1" - resolved "https://registry.yarnpkg.com/qs/-/qs-6.11.1.tgz#6c29dff97f0c0060765911ba65cbc9764186109f" - integrity sha512-0wsrzgTz/kAVIeuxSjnpGC56rzYtr6JT/2BwEvMaPhFIoYa1aGO8LbzuU1R0uUYQkLpWBTOj0l/CLAJB64J6nQ== +qs@^6.11.2, qs@^6.4.0, qs@^6.9.6: + version "6.11.2" + resolved "https://registry.yarnpkg.com/qs/-/qs-6.11.2.tgz#64bea51f12c1f5da1bc01496f48ffcff7c69d7d9" + integrity sha512-tDNIz22aBzCDxLtVH++VnTfzxlfeK5CbqohpSqpJgj1Wg/cQbStNAz3NuqCs5vV+pjBsK4x4pN9HlVh7rcYRiA== dependencies: side-channel "^1.0.4" @@ -15183,16 +17767,11 @@ query-string@^5.0.1: object-assign "^4.1.0" strict-uri-encode "^1.0.0" -querystring-es3@^0.2.0, querystring-es3@^0.2.1: +querystring-es3@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73" integrity sha512-773xhDQnZBMFobEiztv8LIl70ch5MSF/jUQVlhwFyBILqq96anmoctVIYz+ZRp0qbCKATTn6ev02M3r7Ga5vqA== -querystring@0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620" - integrity sha512-X/xY82scca2tau62i9mDyU9K+I+djTMUsvwf7xnUX5GLvVzgJybOJf4Y6o9Zx3oJK/LSXg5tTZBjwzqVPaPO2g== - querystringify@^2.1.1: version "2.2.0" resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.2.0.tgz#3345941b4153cb9d082d8eee4cda2016a9aef7f6" @@ -15203,6 +17782,11 @@ queue-microtask@^1.2.2, queue-microtask@^1.2.3: resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243" integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A== +queue-tick@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/queue-tick/-/queue-tick-1.0.1.tgz#f6f07ac82c1fd60f82e098b417a80e52f1f4c142" + integrity sha512-kJt5qhMxoszgU/62PLP1CJytzd2NKetjSRnyuj31fDd3Rlcz3fzlFdFLD1SItunPwyqEOkca6GbV612BWfaBag== + quick-format-unescaped@^4.0.3: version "4.0.4" resolved "https://registry.yarnpkg.com/quick-format-unescaped/-/quick-format-unescaped-4.0.4.tgz#93ef6dd8d3453cbc7970dd614fad4c5954d6b5a7" @@ -15218,24 +17802,30 @@ quick-lru@^5.1.1: resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-5.1.1.tgz#366493e6b3e42a3a6885e2e99d18f80fb7a8c932" integrity sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA== -r1csfile@0.0.16: - version "0.0.16" - resolved "https://registry.yarnpkg.com/r1csfile/-/r1csfile-0.0.16.tgz#53c66a79b50eebc2d15a1048e39d548ce9da7ccd" - integrity sha512-A2jRVWzGgmXeG2lVAc0H4suJmzt50it5UvBnycJgBCpMXM3tH/M6RguP7nvs6suY/yYnkN6jX6iTScSiDUF3FA== +quote-unquote@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/quote-unquote/-/quote-unquote-1.0.0.tgz#67a9a77148effeaf81a4d428404a710baaac8a0b" + integrity sha512-twwRO/ilhlG/FIgYeKGFqyHhoEhqgnKVkcmqMKi2r524gz3ZbDTcyFt38E9xjJI2vT+KbRNHVbnJ/e0I25Azwg== + +r1csfile@0.0.41, r1csfile@^0.0.41: + version "0.0.41" + resolved "https://registry.yarnpkg.com/r1csfile/-/r1csfile-0.0.41.tgz#e3d2709d36923156dd1fc2db9858987b30c92948" + integrity sha512-Q1WDF3u1vYeAwjHo4YuddkA8Aq0TulbKjmGm99+Atn13Lf5fTsMZBnBV9T741w8iSyPFG6Uh6sapQby77sREqA== dependencies: "@iden3/bigarray" "0.0.2" - fastfile "0.0.18" - ffjavascript "0.2.22" + "@iden3/binfileutils" "0.0.11" + fastfile "0.0.20" + ffjavascript "0.2.56" -r1csfile@0.0.32: - version "0.0.32" - resolved "https://registry.yarnpkg.com/r1csfile/-/r1csfile-0.0.32.tgz#64a6c63ff76b737b3ee22bcedb2bb9a033cbeb1a" - integrity sha512-DkRXeOg0iRmfhgIuWICvdkOiLHpyb7+AcUd/WHpqBJEUp27pe7wKXBR4Jr3TPYCT4sTV9a/F3bovyAC4wystnQ== +r1csfile@0.0.47: + version "0.0.47" + resolved "https://registry.yarnpkg.com/r1csfile/-/r1csfile-0.0.47.tgz#ed95a0dc8e910e9c070253906f7a31bd8c5333c8" + integrity sha512-oI4mAwuh1WwuFg95eJDNDDL8hCaZkwnPuNZrQdLBWvDoRU7EG+L/MOHL7SwPW2Y+ZuYcTLpj3rBkgllBQZN/JA== dependencies: "@iden3/bigarray" "0.0.2" - "@iden3/binfileutils" "0.0.8" - fastfile "0.0.19" - ffjavascript "0.2.35" + "@iden3/binfileutils" "0.0.11" + fastfile "0.0.20" + ffjavascript "0.2.60" rabin-wasm@~0.0.8: version "0.0.8" @@ -15249,22 +17839,15 @@ rabin-wasm@~0.0.8: node-fetch "^2.6.0" readable-stream "^2.0.4" -ramda@^0.24.1: - version "0.24.1" - resolved "https://registry.yarnpkg.com/ramda/-/ramda-0.24.1.tgz#c3b7755197f35b8dc3502228262c4c91ddb6b857" - integrity sha512-HEm619G8PaZMfkqCa23qiOe7r3R0brPu7ZgOsgKUsnvLhd0qhc/vTjkUovomgPWa5ECBa08fJZixth9LaoBo5w== - -ramda@^0.25.0: - version "0.25.0" - resolved "https://registry.yarnpkg.com/ramda/-/ramda-0.25.0.tgz#8fdf68231cffa90bc2f9460390a0cb74a29b29a9" - integrity sha512-GXpfrYVPwx3K7RQ6aYT8KPS8XViSXUVJT1ONhoKPE9VAleW42YE+U+8VEyGWt41EnEQW7gwecYJriTI0pKoecQ== +radix3@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/radix3/-/radix3-1.1.0.tgz#9745df67a49c522e94a33d0a93cf743f104b6e0d" + integrity sha512-pNsHDxbGORSvuSScqNJ+3Km6QAVqk8CfsCBIEoDgpqLrkD2f3QM4I7d1ozJJ172OmIcoUcerZaNWqtLkRXTV3A== -ramdasauce@^2.1.0: - version "2.1.3" - resolved "https://registry.yarnpkg.com/ramdasauce/-/ramdasauce-2.1.3.tgz#acb45ecc7e4fc4d6f39e19989b4a16dff383e9c2" - integrity sha512-Ml3CPim4SKwmg5g9UI77lnRSeKr/kQw7YhQ6rfdMcBYy6DMlwmkEwQqjygJ3OhxPR+NfFfpjKl3Tf8GXckaqqg== - dependencies: - ramda "^0.24.1" +random-bytes@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/random-bytes/-/random-bytes-1.0.0.tgz#4f68a1dc0ae58bd3fb95848c30324db75d64360b" + integrity sha512-iv7LhNVO047HzYR3InF6pUcUsPQiHTM1Qal51DcGSuZFBil1aBBWG5eHPNek7bvILMaYJ/8RU1e8w1AMdHmLQQ== randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5, randombytes@^2.0.6, randombytes@^2.1.0: version "2.1.0" @@ -15306,6 +17889,21 @@ raw-body@2.5.2, raw-body@^2.4.1: iconv-lite "0.4.24" unpipe "1.0.0" +rc@1.2.8, rc@^1.2.7: + version "1.2.8" + resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed" + integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw== + dependencies: + deep-extend "^0.6.0" + ini "~1.3.0" + minimist "^1.2.0" + strip-json-comments "~2.0.1" + +react-is@^17.0.1: + version "17.0.2" + resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.2.tgz#e691d4a8e9c789365655539ab372762b0efb54f0" + integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w== + react-native-fetch-api@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/react-native-fetch-api/-/react-native-fetch-api-3.0.0.tgz#81e1bb6562c292521bc4eca52fe1097f4c1ebab5" @@ -15320,13 +17918,14 @@ read-cache@^1.0.0: dependencies: pify "^2.3.0" -read-pkg-up@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02" - integrity sha512-WD9MTlNtI55IwYUS27iHh9tK3YoIVhxis8yKhLpTqWtml739uXc9NWTpxoHkfZf3+DkCCsXox94/VWZniuZm6A== +read-pkg-up@9.1.0, read-pkg-up@^9.0.0: + version "9.1.0" + resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-9.1.0.tgz#38ca48e0bc6c6b260464b14aad9bcd4e5b1fbdc3" + integrity sha512-vaMRR1AC1nrd5CQM0PhlRsO5oc2AAigqr7cCrZ/MW/Rsaflz4RlgzkpL4qoU/z1F6wrbd85iFv1OQj/y5RdGvg== dependencies: - find-up "^1.0.0" - read-pkg "^1.0.0" + find-up "^6.3.0" + read-pkg "^7.1.0" + type-fest "^2.5.0" read-pkg-up@^7.0.1: version "7.0.1" @@ -15337,15 +17936,6 @@ read-pkg-up@^7.0.1: read-pkg "^5.2.0" type-fest "^0.8.1" -read-pkg@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-1.1.0.tgz#f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28" - integrity sha512-7BGwRHqt4s/uVbuyoeejRn4YmFnYZiFl4AuaeXHlgZf3sONF0SOGlxs2Pw8g6hCKupo08RafIO5YXFNOKTfwsQ== - dependencies: - load-json-file "^1.0.0" - normalize-package-data "^2.3.2" - path-type "^1.0.0" - read-pkg@^5.2.0: version "5.2.0" resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-5.2.0.tgz#7bf295438ca5a33e56cd30e053b34ee7250c93cc" @@ -15356,18 +17946,22 @@ read-pkg@^5.2.0: parse-json "^5.0.0" type-fest "^0.6.0" -"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.5, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.2.8, readable-stream@^2.2.9, readable-stream@^2.3.0, readable-stream@^2.3.3, readable-stream@^2.3.5, readable-stream@^2.3.6, readable-stream@~2.3.6: - version "2.3.8" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.8.tgz#91125e8042bba1b9887f49345f6277027ce8be9b" - integrity sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA== +read-pkg@^7.1.0: + version "7.1.0" + resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-7.1.0.tgz#438b4caed1ad656ba359b3e00fd094f3c427a43e" + integrity sha512-5iOehe+WF75IccPc30bWTbpdDQLOCc3Uu8bi3Dte3Eueij81yx1Mrufk8qBx/YAbR4uL1FdUr+7BKXDwEtisXg== dependencies: - core-util-is "~1.0.0" - inherits "~2.0.3" - isarray "~1.0.0" - process-nextick-args "~2.0.0" - safe-buffer "~5.1.1" - string_decoder "~1.1.1" - util-deprecate "~1.0.1" + "@types/normalize-package-data" "^2.4.1" + normalize-package-data "^3.0.2" + parse-json "^5.2.0" + type-fest "^2.0.0" + +read@1.0.x: + version "1.0.7" + resolved "https://registry.yarnpkg.com/read/-/read-1.0.7.tgz#b3da19bd052431a97671d44a42634adf710b40c4" + integrity sha512-rSOKNYUmaxy0om1BNjMN4ezNT6VKK+2xF4GBhc81mkH7L60i6dp8qPYrkndNLT3QPphoII3maL9PVC9XmhHwVQ== + dependencies: + mute-stream "~0.0.4" readable-stream@^1.0.33: version "1.1.14" @@ -15379,7 +17973,20 @@ readable-stream@^1.0.33: isarray "0.0.1" string_decoder "~0.10.x" -readable-stream@^3.0.6, readable-stream@^3.1.1, readable-stream@^3.4.0, readable-stream@^3.5.0, readable-stream@^3.6.0: +readable-stream@^2.0.0, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.5, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.2.8, readable-stream@^2.2.9, readable-stream@^2.3.0, readable-stream@^2.3.5, readable-stream@^2.3.6, readable-stream@~2.3.6: + version "2.3.8" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.8.tgz#91125e8042bba1b9887f49345f6277027ce8be9b" + integrity sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA== + dependencies: + core-util-is "~1.0.0" + inherits "~2.0.3" + isarray "~1.0.0" + process-nextick-args "~2.0.0" + safe-buffer "~5.1.1" + string_decoder "~1.1.1" + util-deprecate "~1.0.1" + +readable-stream@^3.0.6, readable-stream@^3.1.1, readable-stream@^3.4.0, readable-stream@^3.5.0, readable-stream@^3.6.0, readable-stream@^3.6.2: version "3.6.2" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.2.tgz#56a9b36ea965c00c5a93ef31eb111a0f11056967" integrity sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA== @@ -15388,6 +17995,17 @@ readable-stream@^3.0.6, readable-stream@^3.1.1, readable-stream@^3.4.0, readable string_decoder "^1.1.1" util-deprecate "^1.0.1" +readable-stream@^4.0.0: + version "4.5.2" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-4.5.2.tgz#9e7fc4c45099baeed934bff6eb97ba6cf2729e09" + integrity sha512-yjavECdqeZ3GLXNgRXgeQEdz9fvDDkNKyHnbHRFtOr7/LcfgBcmct7t/ET+HaCTqfh06OzoAxrkN/IfjJBVe+g== + dependencies: + abort-controller "^3.0.0" + buffer "^6.0.3" + events "^3.3.0" + process "^0.11.10" + string_decoder "^1.3.0" + readable-stream@~1.0.15, readable-stream@~1.0.26-4: version "1.0.34" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c" @@ -15398,7 +18016,21 @@ readable-stream@~1.0.15, readable-stream@~1.0.26-4: isarray "0.0.1" string_decoder "~0.10.x" -readdirp@^2.2.1: +readable-web-to-node-stream@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/readable-web-to-node-stream/-/readable-web-to-node-stream-3.0.2.tgz#5d52bb5df7b54861fd48d015e93a2cb87b3ee0bb" + integrity sha512-ePeK6cc1EcKLEhJFt/AebMCLL+GgSKhuygrZ/GLaKZYEecIgIECf4UaUuaByiGtzckwR4ain9VzUh95T1exYGw== + dependencies: + readable-stream "^3.6.0" + +readdir-glob@^1.1.2: + version "1.1.3" + resolved "https://registry.yarnpkg.com/readdir-glob/-/readdir-glob-1.1.3.tgz#c3d831f51f5e7bfa62fa2ffbe4b508c640f09584" + integrity sha512-v05I2k7xN8zXvPD9N+z/uhXPaj0sUFCe2rcWZIpBsqxfP7xXFQ0tipAd/wjj1YxWyWtUS5IDJpOG82JKt2EAVA== + dependencies: + minimatch "^5.1.0" + +readdirp@^2.0.0: version "2.2.1" resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.2.1.tgz#0e87622a3325aa33e892285caf8b4e846529a525" integrity sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ== @@ -15407,14 +18039,7 @@ readdirp@^2.2.1: micromatch "^3.1.10" readable-stream "^2.0.2" -readdirp@~3.5.0: - version "3.5.0" - resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.5.0.tgz#9ba74c019b15d365278d2e91bb8c48d7b4d42c9e" - integrity sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ== - dependencies: - picomatch "^2.2.1" - -readdirp@~3.6.0: +readdirp@^3.4.0, readdirp@~3.6.0: version "3.6.0" resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7" integrity sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA== @@ -15426,6 +18051,11 @@ real-require@^0.1.0: resolved "https://registry.yarnpkg.com/real-require/-/real-require-0.1.0.tgz#736ac214caa20632847b7ca8c1056a0767df9381" integrity sha512-r/H9MzAWtrv8aSVjPCMFpDMl5q66GqtmmRkRjpHTsp4zBAa+snZyiQNlMONiUmEJcsnaw0wCauJ2GWODr/aFkg== +real-require@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/real-require/-/real-require-0.2.0.tgz#209632dea1810be2ae063a6ac084fee7e33fba78" + integrity sha512-57frrGM/OCTLqLOAh0mhVA9VBMHd+9U7Zb2THMGdBUoZVOtGbJzjxsYGDJ3A9AYYCP4hn6y1TVbaOfzWtm5GFg== + receptacle@^1.3.2: version "1.3.2" resolved "https://registry.yarnpkg.com/receptacle/-/receptacle-1.3.2.tgz#a7994c7efafc7a01d0e2041839dab6c4951360d2" @@ -15440,6 +18070,13 @@ rechoir@^0.6.2: dependencies: resolve "^1.1.6" +recursive-readdir@^2.2.2: + version "2.2.3" + resolved "https://registry.yarnpkg.com/recursive-readdir/-/recursive-readdir-2.2.3.tgz#e726f328c0d69153bcabd5c322d3195252379372" + integrity sha512-8HrF5ZsXk5FAH9dgsx3BlUer73nIhuj+9OrQwEbLTPOBzGkL1lsFCR01am+v+0m2Cmbs1nP12hLDl5FA7EszKA== + dependencies: + minimatch "^3.0.5" + redent@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/redent/-/redent-3.0.0.tgz#e557b7998316bb53c9f1f56fa626352c6963059f" @@ -15455,14 +18092,24 @@ redeyed@~2.1.0: dependencies: esprima "~4.0.0" -regenerate-unicode-properties@^10.1.0: - version "10.1.0" - resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.0.tgz#7c3192cab6dd24e21cb4461e5ddd7dd24fa8374c" - integrity sha512-d1VudCLoIGitcU/hEg2QqvyGZQmdC0Lf8BqdOMXGFSvJP4bNV1+XqbPQeHHLD51Jh4QJJ225dlIFvY4Ly6MXmQ== +redis-errors@^1.0.0, redis-errors@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/redis-errors/-/redis-errors-1.2.0.tgz#eb62d2adb15e4eaf4610c04afe1529384250abad" + integrity sha512-1qny3OExCf0UvUV/5wpYKf2YwPcOqXzkwKKSmKHiE6ZMQs5heeE/c8eXK+PNllPvmjgAbfnsbpkGZWy8cBpn9w== + +redis-parser@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/redis-parser/-/redis-parser-3.0.0.tgz#b66d828cdcafe6b4b8a428a7def4c6bcac31c8b4" + integrity sha512-DJnGAeenTdpMEH6uAJRK/uiyEIH9WVsUmoLwzudwGJUwZPp80PDBWPHXSAGNPwNvIXAbe7MSUB1zQFugFml66A== dependencies: - regenerate "^1.4.2" + redis-errors "^1.0.0" + +reduce-flatten@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/reduce-flatten/-/reduce-flatten-2.0.0.tgz#734fd84e65f375d7ca4465c69798c25c9d10ae27" + integrity sha512-EJ4UNY/U1t2P/2k6oqotuX2Cc3T6nxJwsM0N0asT7dhrtH1ltUxDn4NalSYmPE2rCkVpcf/X6R0wDwcFpzhd4w== -regenerate@^1.2.1, regenerate@^1.4.2: +regenerate@^1.2.1: version "1.4.2" resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.2.tgz#b9346d8827e8f5a32f7ba29637d398b69014848a" integrity sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A== @@ -15472,10 +18119,10 @@ regenerator-runtime@^0.11.0: resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9" integrity sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg== -regenerator-runtime@^0.13.11: - version "0.13.11" - resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz#f6dca3e7ceec20590d07ada785636a90cdca17f9" - integrity sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg== +regenerator-runtime@^0.14.0: + version "0.14.1" + resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz#356ade10263f685dda125100cd862c1db895327f" + integrity sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw== regenerator-transform@^0.10.0: version "0.10.1" @@ -15486,13 +18133,6 @@ regenerator-transform@^0.10.0: babel-types "^6.19.0" private "^0.1.6" -regenerator-transform@^0.15.1: - version "0.15.1" - resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.15.1.tgz#f6c4e99fc1b4591f780db2586328e4d9a9d8dc56" - integrity sha512-knzmNAcuyxV+gQCufkYcvOqX/qIIfHLv0u5x79kRxuGojfYVky1f15TzZEu2Avte8QGepvUNTnLskf8E6X6Vyg== - dependencies: - "@babel/runtime" "^7.8.4" - regex-not@^1.0.0, regex-not@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c" @@ -15501,14 +18141,19 @@ regex-not@^1.0.0, regex-not@^1.0.2: extend-shallow "^3.0.2" safe-regex "^1.1.0" -regexp.prototype.flags@^1.2.0, regexp.prototype.flags@^1.4.3: - version "1.4.3" - resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz#87cab30f80f66660181a3bb7bf5981a872b367ac" - integrity sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA== +regexp-tree@^0.1.24: + version "0.1.27" + resolved "https://registry.yarnpkg.com/regexp-tree/-/regexp-tree-0.1.27.tgz#2198f0ef54518ffa743fe74d983b56ffd631b6cd" + integrity sha512-iETxpjK6YoRWJG5o6hXLwvjYAoW+FEZn9os0PD/b6AP6xQwsa/Y7lCVgIixBbUPMfhu+i2LtdeAqVTgGlQarfA== + +regexp.prototype.flags@^1.5.1: + version "1.5.1" + resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.5.1.tgz#90ce989138db209f81492edd734183ce99f9677e" + integrity sha512-sy6TXMN+hnP/wMy+ISxg3krXx7BAtWVO4UouuCN/ziM9UEne0euamVNafDfvC83bRNr95y0V5iijeDQFUNpvrg== dependencies: call-bind "^1.0.2" - define-properties "^1.1.3" - functions-have-names "^1.2.2" + define-properties "^1.2.0" + set-function-name "^2.0.0" regexpu-core@^2.0.0: version "2.0.0" @@ -15519,17 +18164,19 @@ regexpu-core@^2.0.0: regjsgen "^0.2.0" regjsparser "^0.1.4" -regexpu-core@^5.3.1: - version "5.3.2" - resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-5.3.2.tgz#11a2b06884f3527aec3e93dbbf4a3b958a95546b" - integrity sha512-RAM5FlZz+Lhmo7db9L298p2vHP5ZywrVXmVXpmAD9GuL5MPH6t9ROw1iA/wfHkQ76Qe7AaPF0nGuim96/IrQMQ== +registry-auth-token@^5.0.1: + version "5.0.2" + resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-5.0.2.tgz#8b026cc507c8552ebbe06724136267e63302f756" + integrity sha512-o/3ikDxtXaA59BmZuZrJZDJv8NMDGSj+6j6XaeBmHw8eY1i1qd9+6H+LjVvQXx3HN6aRCGa1cUdJ9RaJZUugnQ== dependencies: - "@babel/regjsgen" "^0.8.0" - regenerate "^1.4.2" - regenerate-unicode-properties "^10.1.0" - regjsparser "^0.9.1" - unicode-match-property-ecmascript "^2.0.0" - unicode-match-property-value-ecmascript "^2.1.0" + "@pnpm/npm-conf" "^2.1.0" + +registry-url@^6.0.0: + version "6.0.1" + resolved "https://registry.yarnpkg.com/registry-url/-/registry-url-6.0.1.tgz#056d9343680f2f64400032b1e199faa692286c58" + integrity sha512-+crtS5QjFRqFCoQmvGduwYWEBng99ZvmFvF+cUJkGYF1L1BfU8C6Zp9T7f5vPAwyLkUExpvK+ANVZmGU49qi4Q== + dependencies: + rc "1.2.8" regjsgen@^0.2.0: version "0.2.0" @@ -15539,14 +18186,7 @@ regjsgen@^0.2.0: regjsparser@^0.1.4: version "0.1.5" resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.1.5.tgz#7ee8f84dc6fa792d3fd0ae228d24bd949ead205c" - integrity sha512-jlQ9gYLfk2p3V5Ag5fYhA7fv7OHzd1KUH0PRP46xc3TgwjwgROIW572AfYg/X9kaNq/LJnu6oJcFRXlIrGoTRw== - dependencies: - jsesc "~0.5.0" - -regjsparser@^0.9.1: - version "0.9.1" - resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.9.1.tgz#272d05aa10c7c1f67095b1ff0addae8442fc5709" - integrity sha512-dQUtn90WanSNl+7mQKcXAgZxvUe7Z0SqXlgzv0za4LwiUhyzBC58yQO3liFoUgu8GiJVInAhJjkj1N0EtQ5nkQ== + integrity sha512-jlQ9gYLfk2p3V5Ag5fYhA7fv7OHzd1KUH0PRP46xc3TgwjwgROIW572AfYg/X9kaNq/LJnu6oJcFRXlIrGoTRw== dependencies: jsesc "~0.5.0" @@ -15591,7 +18231,21 @@ repeating@^2.0.0: dependencies: is-finite "^1.0.0" -request@2.88.2, request@^2.79.0, request@^2.85.0: +req-cwd@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/req-cwd/-/req-cwd-2.0.0.tgz#d4082b4d44598036640fb73ddea01ed53db49ebc" + integrity sha512-ueoIoLo1OfB6b05COxAA9UpeoscNpYyM+BqYlA7H6LVF4hKGPXQQSSaD2YmvDVJMkk4UDpAHIeU1zG53IqjvlQ== + dependencies: + req-from "^2.0.0" + +req-from@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/req-from/-/req-from-2.0.0.tgz#d74188e47f93796f4aa71df6ee35ae689f3e0e70" + integrity sha512-LzTfEVDVQHBRfjOUMgNBA+V6DWsSnoeKzf42J7l0xa/B4jyPOuuF5MlNSmomLNGemWTnV2TIdjSSLnEn95fOQA== + dependencies: + resolve-from "^3.0.0" + +request@^2.79.0, request@^2.85.0: version "2.88.2" resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3" integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw== @@ -15622,26 +18276,21 @@ require-directory@^2.1.1: resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42" integrity sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q== -require-from-string@^1.1.0: - version "1.2.1" - resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-1.2.1.tgz#529c9ccef27380adfec9a2f965b649bbee636418" - integrity sha512-H7AkJWMobeskkttHyhTVtS0fxpFLjxhbfMa6Bk3wimP7sdPRGL3EyCg3sAQenFfAe+xQ+oAc85Nmtvq0ROM83Q== - require-from-string@^2.0.0, require-from-string@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909" integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw== -require-main-filename@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1" - integrity sha512-IqSUtOVP4ksd1C/ej5zeEh/BIP2ajqpn8c5x+q99gvcIG/Qf0cud5raVnE/Dwd0ua9TXYDoDc0RE5hBSdz22Ug== - require-main-filename@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b" integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg== +require-package-name@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/require-package-name/-/require-package-name-2.0.1.tgz#c11e97276b65b8e2923f75dabf5fb2ef0c3841b9" + integrity sha512-uuoJ1hU/k6M0779t3VMVIYpb2VMJk05cehCaABFhXaibcbvfgR8wKiozLjVFSzJPmQMRqIcO0HMyTFqfV09V6Q== + requires-port@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff" @@ -15652,11 +18301,16 @@ resolve-alpn@^1.0.0, resolve-alpn@^1.2.0: resolved "https://registry.yarnpkg.com/resolve-alpn/-/resolve-alpn-1.2.1.tgz#b7adbdac3546aaaec20b45e7d8265927072726f9" integrity sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g== -resolve-from@5.0.0: +resolve-from@5.0.0, 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-from@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz#b22c7af7d9d6881bc8b6e653335eebcb0a188748" + integrity sha512-GnlH6vxLymXJNMBo7XP1fJIzBFbdYt49CuTwmB/6N53t+kMPRMFKz783LlQ4tv28XoQfMWinAJX6WCGf2IlaIw== + resolve-from@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6" @@ -15667,6 +18321,11 @@ resolve-url@^0.2.1: resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a" integrity sha512-ZuF55hVUQaaczgOIwqWzkEcEidmlD/xl44x1UZnhOXcYuFN2S6+rcxpG+C1N3So0wvNI3DmJICUFfu2SxhBmvg== +resolve@1.1.x: + version "1.1.7" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b" + integrity sha512-9znBF0vBcaSN3W2j7wKvdERPwqTxSpCq+if5C0WoTCyV9n24rua28jeuQ2pL/HOf+yUe/Mef+H/5p60K0Id3bg== + resolve@1.17.0: version "1.17.0" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.17.0.tgz#b25941b54968231cc2d1bb76a79cb7f2c0bf8444" @@ -15674,12 +18333,21 @@ resolve@1.17.0: dependencies: path-parse "^1.0.6" -resolve@^1.1.6, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.14.2, resolve@^1.17.0, resolve@^1.22.1, resolve@^1.8.1, resolve@~1.22.1: - version "1.22.2" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.2.tgz#0ed0943d4e301867955766c9f3e1ae6d01c6845f" - integrity sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g== +resolve@^1.1.6, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.17.0, resolve@^1.22.1, resolve@^1.22.2, resolve@^1.8.1, resolve@~1.22.6: + version "1.22.8" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.8.tgz#b6c87a9f2aa06dfab52e3d70ac8cde321fa5a48d" + integrity sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw== + dependencies: + is-core-module "^2.13.0" + path-parse "^1.0.7" + supports-preserve-symlinks-flag "^1.0.0" + +resolve@^2.0.0-next.1: + version "2.0.0-next.5" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-2.0.0-next.5.tgz#6b0ec3107e671e52b68cd068ef327173b90dc03c" + integrity sha512-U7WjGVG9sH8tvjW5SmGbQuui75FiyjAX72HX15DwBBwF9dNiQZRQAg9nnPhYy+TUnE0+VcrttuvNI8oSxZcocA== dependencies: - is-core-module "^2.11.0" + is-core-module "^2.13.0" path-parse "^1.0.7" supports-preserve-symlinks-flag "^1.0.0" @@ -15697,6 +18365,21 @@ responselike@^2.0.0: dependencies: lowercase-keys "^2.0.0" +responselike@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/responselike/-/responselike-3.0.0.tgz#20decb6c298aff0dbee1c355ca95461d42823626" + integrity sha512-40yHxbNcl2+rzXvZuVkrYohathsSJlMTXKryG5y8uciHv1+xDLHQpgjG64JUO9nrEq2jGLH6IZ8BcZyw3wrweg== + dependencies: + lowercase-keys "^3.0.0" + +restore-cursor@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf" + integrity sha512-6IzJLuGi4+R14vwagDHX+JrXmPVtPpn4mffDJ1UdR7/Edm87fl6yi8mMBIVvFtJaNTUvjughmW4hwLhRG7gC1Q== + dependencies: + onetime "^2.0.0" + signal-exit "^3.0.2" + restore-cursor@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-3.1.0.tgz#39f67c54b3a7a58cea5236d95cf0034239631f7e" @@ -15705,18 +18388,24 @@ restore-cursor@^3.1.0: onetime "^5.1.0" signal-exit "^3.0.2" -resumer@~0.0.0: - version "0.0.0" - resolved "https://registry.yarnpkg.com/resumer/-/resumer-0.0.0.tgz#f1e8f461e4064ba39e82af3cdc2a8c893d076759" - integrity sha512-Fn9X8rX8yYF4m81rZCK/5VmrmsSbqS/i3rDLl6ZZHAXgC2nTAx3dhwG8q8odP/RmdLa2YrybDJaAMg+X1ajY3w== +restore-cursor@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-4.0.0.tgz#519560a4318975096def6e609d44100edaa4ccb9" + integrity sha512-I9fPXU9geO9bHOt9pHHOhOkYerIMsmVaWB0rA2AI9ERh/+x/i7MV5HKBNrg+ljO5eoPVgCcnFuRjJ9uH6I/3eg== dependencies: - through "~2.3.4" + onetime "^5.1.0" + signal-exit "^3.0.2" ret@~0.1.10: version "0.1.15" resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc" integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg== +ret@~0.2.0: + version "0.2.2" + resolved "https://registry.yarnpkg.com/ret/-/ret-0.2.2.tgz#b6861782a1f4762dce43402a71eb7a283f44573c" + integrity sha512-M0b3YWQs7R3Z917WRQy1HHA7Ba7D8hvZg6UE5mLykJxQVE2ju0IXbGlaHPPlkY+WN7wFP+wUMXmBFA0aV6vYGQ== + retimer@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/retimer/-/retimer-3.0.0.tgz#98b751b1feaf1af13eb0228f8ea68b8f9da530df" @@ -15727,17 +18416,27 @@ retry@^0.12.0: resolved "https://registry.yarnpkg.com/retry/-/retry-0.12.0.tgz#1b42a6266a21f07421d1b0b54b7dc167b01c013b" integrity sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow== +retry@^0.13.1: + version "0.13.1" + resolved "https://registry.yarnpkg.com/retry/-/retry-0.13.1.tgz#185b1587acf67919d63b357349e03537b2484658" + integrity sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg== + reusify@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76" integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw== -rfdc@^1.3.0: +revalidator@0.1.x: + version "0.1.8" + resolved "https://registry.yarnpkg.com/revalidator/-/revalidator-0.1.8.tgz#fece61bfa0c1b52a206bd6b18198184bdd523a3b" + integrity sha512-xcBILK2pA9oh4SiinPEZfhP8HfrB/ha+a2fTMyl7Om2WjlDVrOQy99N2MXXlUHqGJz4qEu2duXxHJjDWuK/0xg== + +rfdc@^1.2.0, rfdc@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/rfdc/-/rfdc-1.3.0.tgz#d0b7c441ab2720d05dc4cf26e01c89631d9da08b" integrity sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA== -rimraf@^2.2.8, rimraf@^2.5.4, rimraf@^2.6.3: +rimraf@^2.2.8, rimraf@^2.6.3: version "2.7.1" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec" integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w== @@ -15766,21 +18465,14 @@ rlp@^2.0.0, rlp@^2.2.1, rlp@^2.2.2, rlp@^2.2.3, rlp@^2.2.4, rlp@^2.2.5: dependencies: bn.js "^5.2.0" -rollup@^2.79.1: - version "2.79.1" - resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.79.1.tgz#bedee8faef7c9f93a2647ac0108748f497f081c7" - integrity sha512-uKxbd0IhMZOhjAiD5oAFp7BqvkA4Dv47qpOCtaNvng4HBwdbWtdOh8f5nZNuk2rp51PMGk3bzfWu5oayNEuYnw== - optionalDependencies: - fsevents "~2.3.2" - -rollup@^3.18.0: - version "3.20.6" - resolved "https://registry.yarnpkg.com/rollup/-/rollup-3.20.6.tgz#53c0fd73e397269d2ce5f0ec12851457dd53cacd" - integrity sha512-2yEB3nQXp/tBQDN0hJScJQheXdvU2wFhh6ld7K/aiZ1vYcak6N/BKjY1QrU6BvO2JWYS8bEs14FRaxXosxy2zw== +rollup@^3.27.1: + version "3.29.4" + resolved "https://registry.yarnpkg.com/rollup/-/rollup-3.29.4.tgz#4d70c0f9834146df8705bfb69a9a19c9e1109981" + integrity sha512-oWzmBZwvYrU0iJHtDmhsm662rC15FRXmcjCk1xD771dFDx5jJ02ufAQQTn0etB2emNk4J9EZg/yWKpsn9BWGRw== optionalDependencies: fsevents "~2.3.2" -run-async@^2.4.0: +run-async@^2.2.0, run-async@^2.4.0: version "2.4.1" resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.4.1.tgz#8440eccf99ea3e70bd409d49aab88e10c189a455" integrity sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ== @@ -15792,32 +18484,54 @@ run-parallel-limit@^1.1.0: dependencies: queue-microtask "^1.2.2" -run-parallel@^1.1.9: +run-parallel@^1.1.4, run-parallel@^1.1.9: version "1.2.0" resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee" integrity sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA== dependencies: queue-microtask "^1.2.2" -run-queue@^1.0.0, run-queue@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/run-queue/-/run-queue-1.0.3.tgz#e848396f057d223f24386924618e25694161ec47" - integrity sha512-ntymy489o0/QQplUDnpYAYUsO50K9SBrIVaKCWDOJzYJts0f9WH9RFJkyagebkw5+y1oi00R7ynNW/d12GBumg== +rust-verkle-wasm@^0.0.1: + version "0.0.1" + resolved "https://registry.yarnpkg.com/rust-verkle-wasm/-/rust-verkle-wasm-0.0.1.tgz#fd8396a7060d8ee8ea10da50ab6e862948095a74" + integrity sha512-BN6fiTsxcd2dCECz/cHtGTt9cdLJR925nh7iAuRcj8ymKw7OOaPmCneQZ7JePOJ/ia27TjEL91VdOi88Yf+mcA== + +rustbn-wasm@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/rustbn-wasm/-/rustbn-wasm-0.2.0.tgz#0407521fb55ae69eeb4968d01885d63efd1c4ff9" + integrity sha512-FThvYFNTqrEKGqXuseeg0zR7yROh/6U1617mCHF68OVqrN1tNKRN7Tdwy4WayPVsCmmK+eMxtIZX1qL6JxTkMg== dependencies: - aproba "^1.1.1" + "@scure/base" "^1.1.1" rustbn.js@~0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/rustbn.js/-/rustbn.js-0.2.0.tgz#8082cb886e707155fd1cb6f23bd591ab8d55d0ca" integrity sha512-4VlvkRUuCJvr2J6Y0ImW7NvTCriMi7ErOAqWk1y69vAdoNIzCF3yPmgeNzx+RQTLEDFq5sHfscn1MwHxP9hNfA== +rxjs@^6.4.0, rxjs@^6.6.2: + version "6.6.7" + resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.7.tgz#90ac018acabf491bf65044235d5863c4dab804c9" + integrity sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ== + dependencies: + tslib "^1.9.0" + rxjs@^7.5.1, rxjs@^7.5.5: - version "7.8.0" - resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.8.0.tgz#90a938862a82888ff4c7359811a595e14e1e09a4" - integrity sha512-F2+gxDshqmIub1KdvZkaEfGDwLNpPvk9Fs6LD/MyQxNgMds/WH9OdDDXOmxUZpME+iSK3rQCctkL0DYyytUqMg== + version "7.8.1" + resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.8.1.tgz#6f6f3d99ea8044291efd92e7c7fcf562c4057543" + integrity sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg== dependencies: tslib "^2.1.0" +safe-array-concat@^1.0.0, safe-array-concat@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/safe-array-concat/-/safe-array-concat-1.0.1.tgz#91686a63ce3adbea14d61b14c99572a8ff84754c" + integrity sha512-6XbUAseYE2KtOuGueyeobCySj9L4+66Tn6KQMOPQJrAJEowYKW/YR/MGJZl7FdydUdaFu4LYyDZjxf4/Nmo23Q== + dependencies: + call-bind "^1.0.2" + get-intrinsic "^1.2.1" + has-symbols "^1.0.3" + isarray "^2.0.5" + safe-buffer@5.2.1, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.0, safe-buffer@^5.2.1, safe-buffer@~5.2.0: version "5.2.1" resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" @@ -15835,20 +18549,27 @@ safe-event-emitter@^1.0.1: dependencies: events "^3.0.0" -safe-json-utils@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/safe-json-utils/-/safe-json-utils-1.1.1.tgz#0e883874467d95ab914c3f511096b89bfb3e63b1" - integrity sha512-SAJWGKDs50tAbiDXLf89PDwt9XYkWyANFWVzn4dTXl5QyI8t2o/bW5/OJl3lvc2WVU4MEpTo9Yz5NVFNsp+OJQ== +safe-json-stringify@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/safe-json-stringify/-/safe-json-stringify-1.2.0.tgz#356e44bc98f1f93ce45df14bcd7c01cda86e0afd" + integrity sha512-gH8eh2nZudPQO6TytOvbxnuhYBOvDBBLW52tz5q6X58lJcd/tkmqFR+5Z9adS8aJtURSXWThWy/xJtJwixErvg== safe-regex-test@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/safe-regex-test/-/safe-regex-test-1.0.0.tgz#793b874d524eb3640d1873aad03596db2d4f2295" - integrity sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA== + version "1.0.2" + resolved "https://registry.yarnpkg.com/safe-regex-test/-/safe-regex-test-1.0.2.tgz#3ba32bdb3ea35f940ee87e5087c60ee786c3f6c5" + integrity sha512-83S9w6eFq12BBIJYvjMux6/dkirb8+4zJRA9cxNBVb7Wq5fJBW+Xze48WqR8pxua7bDuAaaAxtVVd4Idjp1dBQ== dependencies: - call-bind "^1.0.2" - get-intrinsic "^1.1.3" + call-bind "^1.0.5" + get-intrinsic "^1.2.2" is-regex "^1.1.4" +safe-regex2@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/safe-regex2/-/safe-regex2-2.0.0.tgz#b287524c397c7a2994470367e0185e1916b1f5b9" + integrity sha512-PaUSFsUaNNuKwkBijoAPHAK6/eM6VirvyPWlZ7BAQy4D+hCvh4B6lIG+nPdhbFfIbP+gTGBcrdsOaUs0F+ZBOQ== + dependencies: + ret "~0.2.0" + safe-regex@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e" @@ -15856,7 +18577,7 @@ safe-regex@^1.1.0: dependencies: ret "~0.1.10" -safe-stable-stringify@^2.1.0: +safe-stable-stringify@^2.1.0, safe-stable-stringify@^2.3.1: version "2.4.3" resolved "https://registry.yarnpkg.com/safe-stable-stringify/-/safe-stable-stringify-2.4.3.tgz#138c84b6f6edb3db5f8ef3ef7115b8f55ccbf886" integrity sha512-e2bDA2WJT0wxseVd4lsDP4+3ONX6HpMXQa1ZhFQ7SU+GjvORCmShbCMltrtIDfkYhVHrOcPtj+KhmDBdPdZD1g== @@ -15867,9 +18588,9 @@ safe-stable-stringify@^2.1.0: integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== sass@^1.56.1: - version "1.62.0" - resolved "https://registry.yarnpkg.com/sass/-/sass-1.62.0.tgz#3686b2195b93295d20765135e562366b33ece37d" - integrity sha512-Q4USplo4pLYgCi+XlipZCWUQz5pkg/ruSSgJ0WRDSb/+3z9tXUOkQ7QPYn4XrhZKYAK4HlpaQecRwKLJX6+DBg== + version "1.69.7" + resolved "https://registry.yarnpkg.com/sass/-/sass-1.69.7.tgz#6e7e1c8f51e8162faec3e9619babc7da780af3b7" + integrity sha512-rzj2soDeZ8wtE2egyLXgOOHQvaC2iosZrkF6v3EUG+tBwEvhqUCzm0VP3k9gHF9LXbSrRhT5SksoI56Iw8NPnQ== dependencies: chokidar ">=3.0.0 <4.0.0" immutable "^4.0.0" @@ -15882,28 +18603,25 @@ saxes@^6.0.0: dependencies: xmlchars "^2.2.0" -schema-utils@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-1.0.0.tgz#0b79a93204d7b600d4b2850d1f66c2a34951c770" - integrity sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g== - dependencies: - ajv "^6.1.0" - ajv-errors "^1.0.0" - ajv-keywords "^3.1.0" - -schema-utils@^2.6.5: - version "2.7.1" - resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.1.tgz#1ca4f32d1b24c590c203b8e7a50bf0ea4cd394d7" - integrity sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg== - dependencies: - "@types/json-schema" "^7.0.5" - ajv "^6.12.4" - ajv-keywords "^3.5.2" - -scrypt-js@2.0.4: - version "2.0.4" - resolved "https://registry.yarnpkg.com/scrypt-js/-/scrypt-js-2.0.4.tgz#32f8c5149f0797672e551c07e230f834b6af5f16" - integrity sha512-4KsaGcPnuhtCZQCxFxN3GVYIhKFPTdLd8PLC552XwbMndtD0cjRFAhDuuydXQ0h08ZfPgzqe6EKHozpuH74iDw== +sc-istanbul@^0.4.5: + version "0.4.6" + resolved "https://registry.yarnpkg.com/sc-istanbul/-/sc-istanbul-0.4.6.tgz#cf6784355ff2076f92d70d59047d71c13703e839" + integrity sha512-qJFF/8tW/zJsbyfh/iT/ZM5QNHE3CXxtLJbZsL+CzdJLBsPD7SedJZoUA4d8iAcN2IoMp/Dx80shOOd2x96X/g== + dependencies: + abbrev "1.0.x" + async "1.x" + escodegen "1.8.x" + esprima "2.7.x" + glob "^5.0.15" + handlebars "^4.0.1" + js-yaml "3.x" + mkdirp "0.5.x" + nopt "3.x" + once "1.x" + resolve "1.1.x" + supports-color "^3.1.0" + which "^1.1.1" + wordwrap "^1.0.0" scrypt-js@3.0.1, scrypt-js@^3.0.0, scrypt-js@^3.0.1: version "3.0.1" @@ -15923,9 +18641,9 @@ scuid@^1.1.0: integrity sha512-MuCAyrGZcTLfQoH2XoBlQ8C6bzwN88XT/0slOGz0pn8+gIP85BOAfYa44ZXQUTOwRwPU0QvgU+V+OSajl/59Xg== scule@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/scule/-/scule-1.0.0.tgz#895e6f4ba887e78d8b9b4111e23ae84fef82376d" - integrity sha512-4AsO/FrViE/iDNEPaAQlb77tf0csuq27EsVpy6ett584EcRTp6pTDLoGWVxCD77y5iU5FauOvhsI4o1APwPoSQ== + version "1.2.0" + resolved "https://registry.yarnpkg.com/scule/-/scule-1.2.0.tgz#b46d444d6a8c92e73eb80d2d8d00b94ab065cc3e" + integrity sha512-CRCmi5zHQnSoeCik9565PONMg0kfkvYmcSqrbOJY4txFfy1wvVULV4FDaiXhUblUgahdqz3F2NwHZ8i4eBTwUw== secp256k1@^4.0.1: version "4.0.3" @@ -15936,11 +18654,23 @@ secp256k1@^4.0.1: node-addon-api "^2.0.0" node-gyp-build "^4.2.0" +secure-json-parse@^2.5.0: + version "2.7.0" + resolved "https://registry.yarnpkg.com/secure-json-parse/-/secure-json-parse-2.7.0.tgz#5a5f9cd6ae47df23dba3151edd06855d47e09862" + integrity sha512-6aU+Rwsezw7VR8/nyvKTx8QpWH9FrcYiXXlqC4z5d5XQBDRqtbfsRjnwGyqbi3gddNtWHuEk9OANUotL26qKUw== + seedrandom@3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/seedrandom/-/seedrandom-3.0.1.tgz#eb3dde015bcf55df05a233514e5df44ef9dce083" integrity sha512-1/02Y/rUeU1CJBAGLebiC5Lbo5FnB22gQbIFFYTLkwvp1xdABZJH1sn4ZT1MzXmPpzv+Rf/Lu2NcsLJiK4rcDg== +seek-bzip@^1.0.6: + version "1.0.6" + resolved "https://registry.yarnpkg.com/seek-bzip/-/seek-bzip-1.0.6.tgz#35c4171f55a680916b52a07859ecf3b5857f21c4" + integrity sha512-e1QtP3YL5tWww8uKaOCQ18UxIT2laNBXHjV/S2WYCiK4udiv8lkG89KRIoCjUagnAmCBurjF4zEVX2ByBbnCjQ== + dependencies: + commander "^2.8.1" + semaphore@>=1.0.1, semaphore@^1.0.3, semaphore@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/semaphore/-/semaphore-1.1.0.tgz#aaad8b86b20fe8e9b32b16dc2ee682a8cd26a8aa" @@ -15951,30 +18681,44 @@ semver-compare@^1.0.0: resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc" integrity sha512-YM3/ITh2MJ5MtzaM429anh+x2jiLVjqILF4m4oyQB18W7Ggea7BfqdH/wGMK7dDiMghv/6WG7znWMwUDzJiXow== +semver-diff@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/semver-diff/-/semver-diff-4.0.0.tgz#3afcf5ed6d62259f5c72d0d5d50dffbdc9680df5" + integrity sha512-0Ju4+6A8iOnpL/Thra7dZsSlOHYAHIeMxfhWQRI1/VLcT3WDBZKKtQt/QkBOsiIN9ZpuvHE6cGZ0x4glCMmfiA== + dependencies: + semver "^7.3.5" + "semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.5.0, semver@^5.6.0: - version "5.7.1" - resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" - integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== + version "5.7.2" + resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.2.tgz#48d55db737c3287cd4835e17fa13feace1c41ef8" + integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g== -semver@7.3.8: - version "7.3.8" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.8.tgz#07a78feafb3f7b32347d725e33de7e2a2df67798" - integrity sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A== +semver@7.3.5: + version "7.3.5" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7" + integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ== dependencies: lru-cache "^6.0.0" -semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0: - version "6.3.0" - resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" - integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== +semver@7.4.0: + version "7.4.0" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.4.0.tgz#8481c92feffc531ab1e012a8ffc15bdd3a0f4318" + integrity sha512-RgOxM8Mw+7Zus0+zcLEUn8+JfoLpj/huFTItQy2hsM4khuC1HYRDp0cU482Ewn/Fcy6bCjufD8vAj7voC66KQw== + dependencies: + lru-cache "^6.0.0" -semver@^7.0.0, semver@^7.3.4, semver@^7.3.5, semver@^7.3.6, semver@^7.3.7: - 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== +semver@7.5.4, semver@^7.0.0, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.6, semver@^7.3.7, semver@^7.3.8, semver@^7.5.3, semver@^7.5.4: + version "7.5.4" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e" + integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA== dependencies: lru-cache "^6.0.0" +semver@^6.0.0, semver@^6.3.0, semver@^6.3.1: + version "6.3.1" + resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4" + integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA== + semver@~5.4.1: version "5.4.1" resolved "https://registry.yarnpkg.com/semver/-/semver-5.4.1.tgz#e059c09d8571f0540823733433505d3a2f00b18e" @@ -16008,13 +18752,6 @@ sentence-case@^3.0.4: tslib "^2.0.3" upper-case-first "^2.0.2" -serialize-javascript@5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-5.0.1.tgz#7886ec848049a462467a97d3d918ebb2aaf934f4" - integrity sha512-SaaNal9imEO737H2c05Og0/8LUXG7EnsZyMa8MzkmuHoELfT6txuj0cMqRj6zfPKnmQ1yasR4PCJc8x+M4JSPA== - dependencies: - randombytes "^2.1.0" - serialize-javascript@6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.0.tgz#efae5d88f45d7924141da8b5c3a7a7e663fefeb8" @@ -16022,13 +18759,6 @@ serialize-javascript@6.0.0: dependencies: randombytes "^2.1.0" -serialize-javascript@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-4.0.0.tgz#b525e1238489a5ecfc42afacc3fe99e666f4b1aa" - integrity sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw== - dependencies: - randombytes "^2.1.0" - serve-static@1.15.0: version "1.15.0" resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.15.0.tgz#faaef08cffe0a1a62f60cad0c4e513cff0ac9540" @@ -16055,6 +18785,31 @@ set-blocking@^2.0.0: resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" integrity sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw== +set-cookie-parser@^2.4.1: + version "2.6.0" + resolved "https://registry.yarnpkg.com/set-cookie-parser/-/set-cookie-parser-2.6.0.tgz#131921e50f62ff1a66a461d7d62d7b21d5d15a51" + integrity sha512-RVnVQxTXuerk653XfuliOxBP81Sf0+qfQE73LIYKcyMYHG94AuH0kgrQpRDuTZnSmjpysHmzxJXKNfa6PjFhyQ== + +set-function-length@^1.1.1: + version "1.2.0" + resolved "https://registry.yarnpkg.com/set-function-length/-/set-function-length-1.2.0.tgz#2f81dc6c16c7059bda5ab7c82c11f03a515ed8e1" + integrity sha512-4DBHDoyHlM1IRPGYcoxexgh67y4ueR53FKV1yyxwFMY7aCqcN/38M1+SwZ/qJQ8iLv7+ck385ot4CcisOAPT9w== + dependencies: + define-data-property "^1.1.1" + function-bind "^1.1.2" + get-intrinsic "^1.2.2" + gopd "^1.0.1" + has-property-descriptors "^1.0.1" + +set-function-name@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/set-function-name/-/set-function-name-2.0.1.tgz#12ce38b7954310b9f61faa12701620a0c882793a" + integrity sha512-tMNCiqYVkXIZgc2Hnoy2IvC/f8ezc5koaRFkCjrpWzGpCd3qbZXPzVy9MAZzK1ch/X0jvSkojys3oqJN0qCmdA== + dependencies: + define-data-property "^1.0.1" + functions-have-names "^1.2.3" + has-property-descriptors "^1.0.0" + set-immediate-shim@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz#4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61" @@ -16070,11 +18825,6 @@ set-value@^2.0.0, set-value@^2.0.1: is-plain-object "^2.0.3" split-string "^3.0.1" -setimmediate@1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.4.tgz#20e81de622d4a02588ce0c8da8973cbcf1d3138f" - integrity sha512-/TjEmXQVEzdod/FFskf3o7oOAsGhHf2j1dZqRFbDzq4F3mvvxflIIi4Hd3bLQE9y/CpwqfSQam5JakI/mi3Pog== - setimmediate@^1.0.4, setimmediate@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285" @@ -16093,6 +18843,28 @@ sha.js@^2.4.0, sha.js@^2.4.8: inherits "^2.0.1" safe-buffer "^5.0.1" +sha1@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/sha1/-/sha1-1.1.1.tgz#addaa7a93168f393f19eb2b15091618e2700f848" + integrity sha512-dZBS6OrMjtgVkopB1Gmo4RQCDKiZsqcpAQpkV/aaj+FCrCg8r4I4qMkDPQjBgLIxlmu9k4nUbWq6ohXahOneYA== + dependencies: + charenc ">= 0.0.1" + crypt ">= 0.0.1" + +sharp@^0.32.6: + version "0.32.6" + resolved "https://registry.yarnpkg.com/sharp/-/sharp-0.32.6.tgz#6ad30c0b7cd910df65d5f355f774aa4fce45732a" + integrity sha512-KyLTWwgcR9Oe4d9HwCwNM2l7+J0dUQwn/yf7S0EnTtb0eVS4RxO0eUSvxPtzT4F3SY+C4K6fqdv/DO27sJ/v/w== + dependencies: + color "^4.2.3" + detect-libc "^2.0.2" + node-addon-api "^6.1.0" + prebuild-install "^7.1.1" + semver "^7.5.4" + simple-get "^4.0.1" + tar-fs "^3.0.4" + tunnel-agent "^0.6.0" + shebang-command@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea" @@ -16140,11 +18912,16 @@ side-channel@^1.0.4: get-intrinsic "^1.0.2" object-inspect "^1.9.0" -signal-exit@^3.0.2, signal-exit@^3.0.3: +signal-exit@^3.0.0, signal-exit@^3.0.2, signal-exit@^3.0.3, signal-exit@^3.0.7: version "3.0.7" resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9" integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ== +signal-exit@^4.0.1, signal-exit@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-4.1.0.tgz#952188c1cbd546070e2dd20d0f41c0ae0530cb04" + integrity sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw== + signed-varint@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/signed-varint/-/signed-varint-2.0.1.tgz#50a9989da7c98c2c61dad119bc97470ef8528129" @@ -16171,6 +18948,22 @@ simple-get@^2.7.0: once "^1.3.1" simple-concat "^1.0.0" +simple-get@^4.0.0, simple-get@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/simple-get/-/simple-get-4.0.1.tgz#4a39db549287c979d352112fa03fd99fd6bc3543" + integrity sha512-brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA== + dependencies: + decompress-response "^6.0.0" + once "^1.3.1" + simple-concat "^1.0.0" + +simple-swizzle@^0.2.2: + version "0.2.2" + resolved "https://registry.yarnpkg.com/simple-swizzle/-/simple-swizzle-0.2.2.tgz#a4da6b635ffcccca33f70d17cb92592de95e557a" + integrity sha512-JA//kQgZtbuY83m+xT+tXJkmJncGMTFT+C+g2h2R9uxkYIrE2yy9sgmcLhCnw57/WSD+Eh3J97FPEDFnbXnDUg== + dependencies: + is-arrayish "^0.3.1" + slash@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55" @@ -16186,6 +18979,11 @@ slash@^3.0.0: resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634" integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q== +slash@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/slash/-/slash-4.0.0.tgz#2422372176c4c6c5addb5e2ada885af984b396a7" + integrity sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew== + slice-ansi@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-3.0.0.tgz#31ddc10930a1b7e0b67b08c96c2f49b77a789787" @@ -16204,6 +19002,14 @@ slice-ansi@^4.0.0: astral-regex "^2.0.0" is-fullwidth-code-point "^3.0.0" +slice-ansi@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-5.0.0.tgz#b73063c57aa96f9cd881654b15294d95d285c42a" + integrity sha512-FC+lgizVPfie0kkhqUScwRu1O/lF6NOgJmlCgK+/LYxDCTk8sGelYaHDhFcDN+Sn3Cv+3VSa4Byeo+IMCzpMgQ== + dependencies: + ansi-styles "^6.0.0" + is-fullwidth-code-point "^4.0.0" + snake-case@^3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/snake-case/-/snake-case-3.0.4.tgz#4f2bbd568e9935abdfd593f34c691dadb49c452c" @@ -16242,18 +19048,37 @@ snapdragon@^0.8.1: source-map-resolve "^0.5.0" use "^3.1.0" -snarkjs@0.3.59: - version "0.3.59" - resolved "https://registry.yarnpkg.com/snarkjs/-/snarkjs-0.3.59.tgz#818821658117bb65aff5f1c8b6fe03d74dd91354" - integrity sha512-fj8EOtziIz6FvNmcT97L4QM+QNzoCf8zTo4ghpYY4wFf0ZkgX9tSR2SZy1BjtaQnlC+LiF55wOG+jucP9Aw5BA== +snarkjs@0.5.0: + version "0.5.0" + resolved "https://registry.yarnpkg.com/snarkjs/-/snarkjs-0.5.0.tgz#cf26bf1d3835eb16b4b330a438bad9824837d6b0" + integrity sha512-KWz8mZ2Y+6wvn6GGkQo6/ZlKwETdAGohd40Lzpwp5TUZCn6N6O4Az1SuX1rw/qREGL6Im+ycb19suCFE8/xaKA== + dependencies: + "@iden3/binfileutils" "0.0.11" + bfj "^7.0.2" + blake2b-wasm "^2.4.0" + circom_runtime "0.1.21" + ejs "^3.1.6" + fastfile "0.0.20" + ffjavascript "0.2.56" + js-sha3 "^0.8.0" + logplease "^1.2.15" + r1csfile "0.0.41" + +snarkjs@^0.7.0, snarkjs@^0.7.3: + version "0.7.3" + resolved "https://registry.yarnpkg.com/snarkjs/-/snarkjs-0.7.3.tgz#7f703d05b810235255f2d0a70d8a9b8b3ea916e5" + integrity sha512-cDLpWqdqEJSCQNc+cXYX1XTKdUZBtYEisuOsgmXf/HUsN5WmGN+FO7HfCS+cMQT1Nzbm1a9gAEpKH6KRtDtS1Q== dependencies: - "@iden3/binfileutils" "0.0.8" - blake2b-wasm "https://github.com/jbaylina/blake2b-wasm.git" - circom_runtime "0.1.13" - fastfile "0.0.19" - ffjavascript "0.2.35" + "@iden3/binfileutils" "0.0.11" + bfj "^7.0.2" + blake2b-wasm "^2.4.0" + circom_runtime "0.1.24" + ejs "^3.1.6" + fastfile "0.0.20" + ffjavascript "0.2.63" + js-sha3 "^0.8.0" logplease "^1.2.15" - r1csfile "0.0.32" + r1csfile "0.0.47" solc@0.7.3: version "0.7.3" @@ -16270,55 +19095,46 @@ solc@0.7.3: semver "^5.5.0" tmp "0.0.33" -solc@^0.4.20: - version "0.4.26" - resolved "https://registry.yarnpkg.com/solc/-/solc-0.4.26.tgz#5390a62a99f40806b86258c737c1cf653cc35cb5" - integrity sha512-o+c6FpkiHd+HPjmjEVpQgH7fqZ14tJpXhho+/bQXlXbliLIS/xjXb42Vxh+qQY1WCSTMQ0+a5vR9vi0MfhU6mA== +solidity-ast@^0.4.38: + version "0.4.55" + resolved "https://registry.yarnpkg.com/solidity-ast/-/solidity-ast-0.4.55.tgz#00b685e6eefb2e8dfb67df1fe0afbe3b3bfb4b28" + integrity sha512-qeEU/r/K+V5lrAw8iswf2/yfWAnSGs3WKPHI+zAFKFjX0dIBVXEU/swQ8eJQYHf6PJWUZFO2uWV4V1wEOkeQbA== dependencies: - fs-extra "^0.30.0" - memorystream "^0.3.1" - require-from-string "^1.1.0" - semver "^5.3.0" - yargs "^4.7.1" + array.prototype.findlast "^1.2.2" -solc@^0.6.3: - version "0.6.12" - resolved "https://registry.yarnpkg.com/solc/-/solc-0.6.12.tgz#48ac854e0c729361b22a7483645077f58cba080e" - integrity sha512-Lm0Ql2G9Qc7yPP2Ba+WNmzw2jwsrd3u4PobHYlSOxaut3TtUbj9+5ZrT6f4DUpNPEoBaFUOEg9Op9C0mk7ge9g== +solidity-coverage@^0.8.1: + version "0.8.5" + resolved "https://registry.yarnpkg.com/solidity-coverage/-/solidity-coverage-0.8.5.tgz#64071c3a0c06a0cecf9a7776c35f49edc961e875" + integrity sha512-6C6N6OV2O8FQA0FWA95FdzVH+L16HU94iFgg5wAFZ29UpLFkgNI/DRR2HotG1bC0F4gAc/OMs2BJI44Q/DYlKQ== dependencies: - command-exists "^1.2.8" - commander "3.0.2" - fs-extra "^0.30.0" - js-sha3 "0.8.0" - memorystream "^0.3.1" - require-from-string "^2.0.0" - semver "^5.5.0" - tmp "0.0.33" + "@ethersproject/abi" "^5.0.9" + "@solidity-parser/parser" "^0.16.0" + chalk "^2.4.2" + death "^1.1.0" + detect-port "^1.3.0" + difflib "^0.2.4" + fs-extra "^8.1.0" + ghost-testrpc "^0.0.2" + global-modules "^2.0.0" + globby "^10.0.1" + jsonschema "^1.2.4" + lodash "^4.17.15" + mocha "10.2.0" + node-emoji "^1.10.0" + pify "^4.0.1" + recursive-readdir "^2.2.2" + sc-istanbul "^0.4.5" + semver "^7.3.4" + shelljs "^0.8.3" + web3-utils "^1.3.6" -solhint@^3.3.2: - version "3.4.1" - resolved "https://registry.yarnpkg.com/solhint/-/solhint-3.4.1.tgz#8ea15b21c13d1be0b53fd46d605a24d0b36a0c46" - integrity sha512-pzZn2RlZhws1XwvLPVSsxfHrwsteFf5eySOhpAytzXwKQYbTCJV6z8EevYDiSVKMpWrvbKpEtJ055CuEmzp4Xg== +solidity-docgen@^0.6.0-beta.36: + version "0.6.0-beta.36" + resolved "https://registry.yarnpkg.com/solidity-docgen/-/solidity-docgen-0.6.0-beta.36.tgz#9c76eda58580fb52e2db318c22fe3154e0c09dd1" + integrity sha512-f/I5G2iJgU1h0XrrjRD0hHMr7C10u276vYvm//rw1TzFcYQ4xTOyAoi9oNAHRU0JU4mY9eTuxdVc2zahdMuhaQ== dependencies: - "@solidity-parser/parser" "^0.16.0" - ajv "^6.12.6" - antlr4 "^4.11.0" - ast-parents "^0.0.1" - chalk "^4.1.2" - commander "^10.0.0" - cosmiconfig "^8.0.0" - fast-diff "^1.2.0" - glob "^8.0.3" - ignore "^5.2.4" - js-yaml "^4.1.0" - lodash "^4.17.21" - pluralize "^8.0.0" - semver "^6.3.0" - strip-ansi "^6.0.1" - table "^6.8.1" - text-table "^0.2.0" - optionalDependencies: - prettier "^2.8.3" + handlebars "^4.7.7" + solidity-ast "^0.4.38" solidity-rlp@2.0.8: version "2.0.8" @@ -16332,6 +19148,27 @@ sonic-boom@^2.2.1: dependencies: atomic-sleep "^1.0.0" +sonic-boom@^3.7.0: + version "3.8.0" + resolved "https://registry.yarnpkg.com/sonic-boom/-/sonic-boom-3.8.0.tgz#e442c5c23165df897d77c3c14ef3ca40dec66a66" + integrity sha512-ybz6OYOUjoQQCQ/i4LU8kaToD8ACtYP+Cj5qd2AO36bwbdewxWJ3ArmJ2cr6AvxlL2o0PqnCcPGUgkILbfkaCA== + dependencies: + atomic-sleep "^1.0.0" + +sort-keys-length@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/sort-keys-length/-/sort-keys-length-1.0.1.tgz#9cb6f4f4e9e48155a6aa0671edd336ff1479a188" + integrity sha512-GRbEOUqCxemTAk/b32F2xa8wDTs+Z1QHOkbhJDQTvv/6G3ZkbJ+frYWsTcc7cBB3Fu4wy4XlLCuNtJuMn7Gsvw== + dependencies: + sort-keys "^1.0.0" + +sort-keys@^1.0.0: + version "1.1.2" + resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-1.1.2.tgz#441b6d4d346798f1b4e49e8920adfba0e543f9ad" + integrity sha512-vzn8aSqKgytVik0iwdBEi+zevbTYZogewTUM6dtpmGwEcdzbub/TX4bCzRhebDCRC3QzXgJsLRKB2V/Oof7HXg== + dependencies: + is-plain-obj "^1.0.0" + sort-keys@^4.0.0: version "4.2.0" resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-4.2.0.tgz#6b7638cee42c506fff8c1cecde7376d21315be18" @@ -16339,12 +19176,7 @@ sort-keys@^4.0.0: dependencies: is-plain-obj "^2.0.0" -source-list-map@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34" - integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw== - -"source-map-js@>=0.6.2 <2.0.0", source-map-js@^1.0.2: +"source-map-js@>=0.6.2 <2.0.0", source-map-js@^1.0.1, source-map-js@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c" integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw== @@ -16368,14 +19200,7 @@ source-map-support@0.5.12: buffer-from "^1.0.0" source-map "^0.6.0" -source-map-support@^0.4.15: - version "0.4.18" - resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.18.tgz#0286a6de8be42641338594e97ccea75f0a2c585f" - integrity sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA== - dependencies: - source-map "^0.5.6" - -source-map-support@^0.5.11, source-map-support@^0.5.13, source-map-support@^0.5.17, source-map-support@^0.5.19, source-map-support@^0.5.20, source-map-support@^0.5.21, source-map-support@~0.5.12: +source-map-support@0.5.21, source-map-support@^0.5.11, source-map-support@^0.5.13, source-map-support@^0.5.20, source-map-support@^0.5.21: version "0.5.21" resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f" integrity sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w== @@ -16383,6 +19208,13 @@ source-map-support@^0.5.11, source-map-support@^0.5.13, source-map-support@^0.5. buffer-from "^1.0.0" source-map "^0.6.0" +source-map-support@^0.4.15: + version "0.4.18" + resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.18.tgz#0286a6de8be42641338594e97ccea75f0a2c585f" + integrity sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA== + dependencies: + source-map "^0.5.6" + source-map-url@^0.4.0: version "0.4.1" resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.1.tgz#0af66605a745a5a2f91cf1bbf8a7afbc283dec56" @@ -16398,6 +19230,13 @@ source-map@^0.5.6, source-map@^0.5.7: resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" integrity sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ== +source-map@~0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.2.0.tgz#dab73fbcfc2ba819b4de03bd6f6eaa48164b3f9d" + integrity sha512-CBdZ2oa/BHhS4xj5DlhjWNHcan57/5YuvfdLf17iVmIpd9KRm+DFLmC6nBNj+6Ua7Kt3TmOjDpQT1aTYOQtoUA== + dependencies: + amdefine ">=0.0.4" + sourcemap-codec@^1.4.8: version "1.4.8" resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz#ea804bd94857402e6992d05a38ef1ae35a9ab4c4" @@ -16430,9 +19269,9 @@ spdx-expression-parse@^3.0.0: spdx-license-ids "^3.0.0" spdx-license-ids@^3.0.0: - version "3.0.13" - resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.13.tgz#7189a474c46f8d47c7b0da4b987bb45e908bd2d5" - integrity sha512-XkD+zwiqXHikFZm4AX/7JSCXA98U5Db4AFd5XUg/+9UNtnH75+Z9KxtpYiJZx36mUDVOwH83pl7yvCer6ewM3w== + version "3.0.16" + resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.16.tgz#a14f64e0954f6e25cc6587bd4f392522db0d998f" + integrity sha512-eWN+LnM3GR6gPu35WxNgbGl8rmY1AEmoMDvL/QD6zYmPWgywxWqJWNdLGT+ke8dKNWrcYgYjPpG5gbTfghP8rw== split-ca@^1.0.0: version "1.0.1" @@ -16451,6 +19290,13 @@ split-string@^3.0.1, split-string@^3.0.2: dependencies: extend-shallow "^3.0.0" +split2@^1.0.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/split2/-/split2-1.1.1.tgz#162d9b18865f02ab2f2ad9585522db9b54c481f9" + integrity sha512-cfurE2q8LamExY+lJ9Ex3ZfBwqAPduzOKVscPDXNCLLMvyaeD3DTz1yk7fVIs6Chco+12XeD0BB6HEoYzPYbXA== + dependencies: + through2 "~2.0.0" + split2@^4.0.0: version "4.2.0" resolved "https://registry.yarnpkg.com/split2/-/split2-4.2.0.tgz#c9c5920904d148bab0b9f67145f245a86aadbfa4" @@ -16469,9 +19315,9 @@ sprintf-js@~1.0.2: integrity sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g== sshpk@^1.7.0: - version "1.17.0" - resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.17.0.tgz#578082d92d4fe612b13007496e543fa0fbcbe4c5" - integrity sha512-/9HIEs1ZXGhSPE8X6Ccm7Nam1z8KcoCqPdI7ecm1N33EzAetWahvQWVqLZtaZQ+IDKX4IyA2o0gBzqIMkAagHQ== + version "1.18.0" + resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.18.0.tgz#1663e55cddf4d688b86a46b77f0d5fe363aba028" + integrity sha512-2p2KJZTSqQ/I3+HX42EpYOa2l3f8Erv8MWKsy2I9uf4wA7yFIkXRffYdsx86y6z4vHtV8u7g+pPlr8/4ouAxsQ== dependencies: asn1 "~0.2.3" assert-plus "^1.0.0" @@ -16483,18 +19329,28 @@ sshpk@^1.7.0: safer-buffer "^2.0.2" tweetnacl "~0.14.0" -ssri@^6.0.1: - version "6.0.2" - resolved "https://registry.yarnpkg.com/ssri/-/ssri-6.0.2.tgz#157939134f20464e7301ddba3e90ffa8f7728ac5" - integrity sha512-cepbSq/neFK7xB6A50KHN0xHDotYzq58wWCa5LeWqnPrHG8GzfEjO/4O8kpmcGW+oaxkvhEJCWgbgNk4/ZV93Q== - dependencies: - figgy-pudding "^3.5.1" - stable@^0.1.8: version "0.1.8" resolved "https://registry.yarnpkg.com/stable/-/stable-0.1.8.tgz#836eb3c8382fe2936feaf544631017ce7d47a3cf" integrity sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w== +stack-generator@^2.0.3: + version "2.0.10" + resolved "https://registry.yarnpkg.com/stack-generator/-/stack-generator-2.0.10.tgz#8ae171e985ed62287d4f1ed55a1633b3fb53bb4d" + integrity sha512-mwnua/hkqM6pF4k8SnmZ2zfETsRUpWXREfA/goT8SLCV4iOFa4bzOX2nDipWAZFPTjLvQB82f5yaodMVhK0yJQ== + dependencies: + stackframe "^1.3.4" + +stack-trace@0.0.x: + version "0.0.10" + resolved "https://registry.yarnpkg.com/stack-trace/-/stack-trace-0.0.10.tgz#547c70b347e8d32b4e108ea1a2a159e5fdde19c0" + integrity sha512-KGzahc7puUKkzyMt+IqAep+TVNbKP+k2Lmwhub39m1AsTSkaDutx56aDCo+HLDzf/D26BIHTJWNiTG1KAJiQCg== + +stackframe@^1.3.4: + version "1.3.4" + resolved "https://registry.yarnpkg.com/stackframe/-/stackframe-1.3.4.tgz#b881a004c8c149a5e8efef37d51b16e412943310" + integrity sha512-oeVtt7eWQS+Na6F//S4kJ2K2VbRlS9D43mAlMyVpVWovy9o+jfgH8O9agzANzaiLjclA0oYzUXEM4PurhSUChw== + stacktrace-parser@^0.1.10: version "0.1.10" resolved "https://registry.yarnpkg.com/stacktrace-parser/-/stacktrace-parser-0.1.10.tgz#29fb0cae4e0d0b85155879402857a1639eb6051a" @@ -16502,6 +19358,18 @@ stacktrace-parser@^0.1.10: dependencies: type-fest "^0.7.1" +standard-as-callback@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/standard-as-callback/-/standard-as-callback-2.1.0.tgz#8953fc05359868a77b5b9739a665c5977bb7df45" + integrity sha512-qoRRSyROncaz1z0mvYqIE4lCd9p2R90i6GxW3uZv5ucSu8tU7B5HXUP1gG8pVZsYNVaXjk8ClXHPttLyxAL48A== + +static-eval@2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/static-eval/-/static-eval-2.0.2.tgz#2d1759306b1befa688938454c546b7871f806a42" + integrity sha512-N/D219Hcr2bPjLxPiV+TQE++Tsmrady7TqAJugLy7Xk1EumfDWS/f5dtBbkRCGE7wKKXuYockQoj8Rm2/pVKyg== + dependencies: + escodegen "^1.8.1" + static-extend@^0.1.1: version "0.1.2" resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6" @@ -16515,13 +19383,22 @@ statuses@2.0.1: resolved "https://registry.yarnpkg.com/statuses/-/statuses-2.0.1.tgz#55cb000ccf1d48728bd23c685a063998cf1a1b63" integrity sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ== -stream-browserify@^2.0.1: - version "2.0.2" - resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.2.tgz#87521d38a44aa7ee91ce1cd2a47df0cb49dd660b" - integrity sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg== +"statuses@>= 1.5.0 < 2": + version "1.5.0" + resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c" + integrity sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA== + +std-env@^3.7.0: + version "3.7.0" + resolved "https://registry.yarnpkg.com/std-env/-/std-env-3.7.0.tgz#c9f7386ced6ecf13360b6c6c55b8aaa4ef7481d2" + integrity sha512-JPbdCEQLj1w5GilpiHAx3qJvFndqybBysA3qUOnznweH4QbNYUsW/ea8QzSrnh0vNsezMMw5bcVool8lM0gwzg== + +stdin-discarder@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/stdin-discarder/-/stdin-discarder-0.1.0.tgz#22b3e400393a8e28ebf53f9958f3880622efde21" + integrity sha512-xhV7w8S+bUwlPTb4bAOUQhv8/cSS5offJuX8GQGq32ONF0ZtDWKfkdomM3HMRA+LhX6um/FZ0COqlwsjD53LeQ== dependencies: - inherits "~2.0.1" - readable-stream "^2.0.2" + bl "^5.0.0" stream-browserify@^3.0.0: version "3.0.0" @@ -16531,25 +19408,6 @@ stream-browserify@^3.0.0: inherits "~2.0.4" readable-stream "^3.5.0" -stream-each@^1.1.0: - version "1.2.3" - resolved "https://registry.yarnpkg.com/stream-each/-/stream-each-1.2.3.tgz#ebe27a0c389b04fbcc233642952e10731afa9bae" - integrity sha512-vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw== - dependencies: - end-of-stream "^1.1.0" - stream-shift "^1.0.0" - -stream-http@^2.7.2: - version "2.8.3" - resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.8.3.tgz#b2d242469288a5a27ec4fe8933acf623de6514fc" - integrity sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw== - dependencies: - builtin-status-codes "^3.0.0" - inherits "^2.0.1" - readable-stream "^2.3.6" - to-arraybuffer "^1.0.0" - xtend "^4.0.0" - stream-http@^3.2.0: version "3.2.0" resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-3.2.0.tgz#1872dfcf24cb15752677e40e5c3f9cc1926028b5" @@ -16561,9 +19419,9 @@ stream-http@^3.2.0: xtend "^4.0.2" stream-shift@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.1.tgz#d7088281559ab2778424279b0877da3c392d5a3d" - integrity sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ== + version "1.0.2" + resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.2.tgz#548bff71c92322e1ade886979f7f67c0723eb9e4" + integrity sha512-rV4Bovi9xx0BFzOb/X0B2GqoIjvqPCttZdu0Wgtx2Dxkj7ETyWl9gmqJ4EutWRLvtZWm8dxE+InQZX1IryZn/w== stream-to-it@^0.2.0, stream-to-it@^0.2.2: version "0.2.4" @@ -16590,6 +19448,14 @@ streamsearch@^1.1.0: resolved "https://registry.yarnpkg.com/streamsearch/-/streamsearch-1.1.0.tgz#404dd1e2247ca94af554e841a8ef0eaa238da764" integrity sha512-Mcc5wHehp9aXz1ax6bZUyY5afg9u2rv5cqQI3mRrYkGC8rW2hM02jWuwjtL++LS5qinSyhj2QfLyNsuc+VsExg== +streamx@^2.15.0: + version "2.15.6" + resolved "https://registry.yarnpkg.com/streamx/-/streamx-2.15.6.tgz#28bf36997ebc7bf6c08f9eba958735231b833887" + integrity sha512-q+vQL4AAz+FdfT137VF69Cc/APqUbxy+MDOImRrMvchJpigHj9GksgDU2LYbO9rx7RX6osWgxJB2WxhYv4SZAw== + dependencies: + fast-fifo "^1.1.0" + queue-tick "^1.0.1" + strict-uri-encode@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713" @@ -16610,16 +19476,21 @@ string-env-interpolation@1.0.1, string-env-interpolation@^1.0.1: resolved "https://registry.yarnpkg.com/string-env-interpolation/-/string-env-interpolation-1.0.1.tgz#ad4397ae4ac53fe6c91d1402ad6f6a52862c7152" integrity sha512-78lwMoCcn0nNu8LszbP1UA7g55OeE4v7rCeWnM5B453rnNr4aq+5it3FEYtZrSEiMvHZOZ9Jlqb0OD0M2VInqg== -string-width@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3" - integrity sha512-0XsVpQLnVCXHJfyEs8tC0zpTVIr5PKKsQtkT29IwupnPTjtPmQ3xT/4yCREF9hYkV/3M3kzcUTSAZT6a6h81tw== +string-format@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/string-format/-/string-format-2.0.0.tgz#f2df2e7097440d3b65de31b6d40d54c96eaffb9b" + integrity sha512-bbEs3scLeYNXLecRRuk6uJxdXUSj6le/8rNPHChIJTn2V79aXVTR1EH2OH5zLKKoz0V02fOUKZZcw01pLUShZA== + +"string-width-cjs@npm:string-width@^4.2.0", "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2, string-width@^4.2.3: + version "4.2.3" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" + integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== dependencies: - code-point-at "^1.0.0" - is-fullwidth-code-point "^1.0.0" - strip-ansi "^3.0.0" + emoji-regex "^8.0.0" + is-fullwidth-code-point "^3.0.0" + strip-ansi "^6.0.1" -"string-width@^1.0.2 || 2", string-width@^2.1.1: +string-width@^2.1.0, string-width@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e" integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw== @@ -16636,43 +19507,43 @@ string-width@^3.0.0, string-width@^3.1.0: is-fullwidth-code-point "^2.0.0" strip-ansi "^5.1.0" -string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: - version "4.2.3" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" - integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== - dependencies: - emoji-regex "^8.0.0" - is-fullwidth-code-point "^3.0.0" - strip-ansi "^6.0.1" +string-width@^5.0.0, string-width@^5.0.1, string-width@^5.1.2: + version "5.1.2" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-5.1.2.tgz#14f8daec6d81e7221d2a357e668cab73bdbca794" + integrity sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA== + dependencies: + eastasianwidth "^0.2.0" + emoji-regex "^9.2.2" + strip-ansi "^7.0.1" -string.prototype.trim@^1.2.7, string.prototype.trim@~1.2.7: - version "1.2.7" - resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.2.7.tgz#a68352740859f6893f14ce3ef1bb3037f7a90533" - integrity sha512-p6TmeT1T3411M8Cgg9wBTMRtY2q9+PNy9EV1i2lIXUN/btt763oIfxwN3RR8VU6wHX8j/1CFy0L+YuThm6bgOg== +string.prototype.trim@^1.2.8, string.prototype.trim@~1.2.8: + version "1.2.8" + resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.2.8.tgz#f9ac6f8af4bd55ddfa8895e6aea92a96395393bd" + integrity sha512-lfjY4HcixfQXOfaqCvcBuOIapyaroTXhbkfJN3gcB1OtyupngWK4sEET9Knd0cXd28kTUqu/kHoV4HKSJdnjiQ== dependencies: call-bind "^1.0.2" - define-properties "^1.1.4" - es-abstract "^1.20.4" + define-properties "^1.2.0" + es-abstract "^1.22.1" -string.prototype.trimend@^1.0.6: - version "1.0.6" - resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz#c4a27fa026d979d79c04f17397f250a462944533" - integrity sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ== +string.prototype.trimend@^1.0.7: + version "1.0.7" + resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.7.tgz#1bb3afc5008661d73e2dc015cd4853732d6c471e" + integrity sha512-Ni79DqeB72ZFq1uH/L6zJ+DKZTkOtPIHovb3YZHQViE+HDouuU4mBrLOLDn5Dde3RF8qw5qVETEjhu9locMLvA== dependencies: call-bind "^1.0.2" - define-properties "^1.1.4" - es-abstract "^1.20.4" + define-properties "^1.2.0" + es-abstract "^1.22.1" -string.prototype.trimstart@^1.0.6: - version "1.0.6" - resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz#e90ab66aa8e4007d92ef591bbf3cd422c56bdcf4" - integrity sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA== +string.prototype.trimstart@^1.0.7: + version "1.0.7" + resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.7.tgz#d4cdb44b83a4737ffbac2d406e405d43d0184298" + integrity sha512-NGhtDFu3jCEm7B4Fy0DpLewdJQOZcQ0rGbwQ/+stjnrp2i+rlKeCvos9hOIeCmqwratM47OBxY7uFZzjxHXmrg== dependencies: call-bind "^1.0.2" - define-properties "^1.1.4" - es-abstract "^1.20.4" + define-properties "^1.2.0" + es-abstract "^1.22.1" -string_decoder@^1.0.0, string_decoder@^1.1.1: +string_decoder@^1.0.0, string_decoder@^1.1.1, string_decoder@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e" integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA== @@ -16700,7 +19571,19 @@ stringify-object@3.3.0: is-obj "^1.0.1" is-regexp "^1.0.0" -strip-ansi@^3.0.0, strip-ansi@^3.0.1: +"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" + integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== + dependencies: + ansi-regex "^5.0.1" + +strip-ansi-control-characters@2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/strip-ansi-control-characters/-/strip-ansi-control-characters-2.0.0.tgz#8875b5ba3a859a0a44f94e1cf7d3eda8980997b9" + integrity sha512-Q0/k5orrVGeaOlIOUn1gybGU0IcAbgHQT1faLo5hik4DqClKVSaka5xOhNNoRgtfztHVxCYxi7j71mrWom0bIw== + +strip-ansi@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf" integrity sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg== @@ -16721,25 +19604,31 @@ strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0: dependencies: ansi-regex "^4.1.0" -strip-ansi@^6.0.0, strip-ansi@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" - integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== +strip-ansi@^7.0.0, strip-ansi@^7.0.1: + version "7.1.0" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.0.tgz#d5b6568ca689d8561370b0707685d22434faff45" + integrity sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ== dependencies: - ansi-regex "^5.0.1" + ansi-regex "^6.0.1" -strip-bom@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e" - integrity sha512-kwrX1y7czp1E69n2ajbG65mIo9dqvJ+8aBQXOGVxqwvNbsXdFM6Lq37dLAY3mknUwru8CfcCbfOLL/gMo+fi3g== +strip-dirs@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/strip-dirs/-/strip-dirs-3.0.0.tgz#7c9a5d7822ce079a9db40387a4b20d5654746f42" + integrity sha512-I0sdgcFTfKQlUPZyAqPJmSG3HLO9rWDFnxonnIbskYNM3DwFOeTNB5KzVq3dA1GdRAc/25b5Y7UO2TQfKWw4aQ== dependencies: - is-utf8 "^0.2.0" + inspect-with-kind "^1.0.5" + is-plain-obj "^1.1.0" 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" integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA== +strip-final-newline@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-3.0.0.tgz#52894c313fbff318835280aed60ff71ebf12b8fd" + integrity sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw== + strip-hex-prefix@1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/strip-hex-prefix/-/strip-hex-prefix-1.0.0.tgz#0c5f155fef1151373377de9dbb588da05500e36f" @@ -16754,26 +19643,44 @@ strip-indent@^3.0.0: dependencies: min-indent "^1.0.0" -strip-json-comments@3.1.1, strip-json-comments@^3.1.0, strip-json-comments@^3.1.1: +strip-json-comments@3.1.1, strip-json-comments@^3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006" integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig== +strip-json-comments@~2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" + integrity sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ== + strip-literal@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/strip-literal/-/strip-literal-1.0.1.tgz#0115a332710c849b4e46497891fb8d585e404bd2" - integrity sha512-QZTsipNpa2Ppr6v1AmJHESqJ3Uz247MUS0OjrnnZjFAvEoWqxuyFuXn2xLgMtRnijJShAa1HL0gtJyUs7u7n3Q== + version "1.3.0" + resolved "https://registry.yarnpkg.com/strip-literal/-/strip-literal-1.3.0.tgz#db3942c2ec1699e6836ad230090b84bb458e3a07" + integrity sha512-PugKzOsyXpArk0yWmUwqOZecSO0GH0bPoctLcqNDH9J04pVW3lflYE0ujElBGTloevcxF5MofAOZ7C5l2b+wLg== + dependencies: + acorn "^8.10.0" + +strip-outer@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/strip-outer/-/strip-outer-2.0.0.tgz#c45c724ed9b1ff6be5f660503791404f4714084b" + integrity sha512-A21Xsm1XzUkK0qK1ZrytDUvqsQWict2Cykhvi0fBQntGG5JSprESasEyV1EZ/4CiR5WB5KjzLTrP/bO37B0wPg== + +strtok3@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/strtok3/-/strtok3-7.0.0.tgz#868c428b4ade64a8fd8fee7364256001c1a4cbe5" + integrity sha512-pQ+V+nYQdC5H3Q7qBZAz/MO6lwGhoC2gOAjuouGf/VO0m7vQRh8QNMl2Uf6SwAtzZ9bOw3UIeBukEGNJl5dtXQ== dependencies: - acorn "^8.8.2" + "@tokenizer/token" "^0.3.0" + peek-readable "^5.0.0" -sucrase@^3.29.0: - version "3.32.0" - resolved "https://registry.yarnpkg.com/sucrase/-/sucrase-3.32.0.tgz#c4a95e0f1e18b6847127258a75cf360bc568d4a7" - integrity sha512-ydQOU34rpSyj2TGyz4D2p8rbktIOZ8QY9s+DGLvFU1i5pWJE8vkpruCjGCMHsdXwnD7JDcS+noSwM/a7zyNFDQ== +sucrase@^3.32.0: + version "3.35.0" + resolved "https://registry.yarnpkg.com/sucrase/-/sucrase-3.35.0.tgz#57f17a3d7e19b36d8995f06679d121be914ae263" + integrity sha512-8EbVDiu9iN/nESwxeSxDKe0dunta1GOlHufmSSXxMD2z2/tMZpDMpvXQGsc+ajGo8y2uYUmixaSRUc/QPoQ0GA== dependencies: "@jridgewell/gen-mapping" "^0.3.2" commander "^4.0.0" - glob "7.1.6" + glob "^10.3.10" lines-and-columns "^1.1.6" mz "^2.7.0" pirates "^4.0.1" @@ -16791,6 +19698,13 @@ supports-color@^2.0.0: resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7" integrity sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g== +supports-color@^3.1.0: + version "3.2.3" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.2.3.tgz#65ac0504b3954171d8a64946b2ae3cbb8a5f54f6" + integrity sha512-Jds2VIYDrlp5ui7t8abHN2bjAu4LV/q4N2KivFPpGH0lrka0BMq/33AmECUXlKPcHigkNaqfXRENFju+rlcy+A== + dependencies: + has-flag "^1.0.0" + supports-color@^5.3.0: version "5.5.0" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f" @@ -16805,6 +19719,11 @@ supports-color@^7.0.0, supports-color@^7.1.0: dependencies: has-flag "^4.0.0" +supports-color@^9.0.0: + version "9.4.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-9.4.0.tgz#17bfcf686288f531db3dea3215510621ccb55954" + integrity sha512-VL+lNrEoIXww1coLPOmiEmK/0sGigko5COxI09KzHc2VJXJsQ37UaQ+8quuxjDeA7+KnLGTWRyOXSLLR2Wb4jw== + supports-hyperlinks@^2.2.0: version "2.3.0" resolved "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-2.3.0.tgz#3943544347c1ff90b15effb03fc14ae45ec10624" @@ -16818,6 +19737,19 @@ supports-preserve-symlinks-flag@^1.0.0: resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09" integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w== +svgo@^3.0.2: + version "3.2.0" + resolved "https://registry.yarnpkg.com/svgo/-/svgo-3.2.0.tgz#7a5dff2938d8c6096e00295c2390e8e652fa805d" + integrity sha512-4PP6CMW/V7l/GmKRKzsLR8xxjdHTV4IMvhTnpuHwwBazSIlw5W/5SmPjN8Dwyt7lKbSJrRDgp4t9ph0HgChFBQ== + dependencies: + "@trysound/sax" "0.2.0" + commander "^7.2.0" + css-select "^5.1.0" + css-tree "^2.3.1" + css-what "^6.1.0" + csso "^5.0.5" + picocolors "^1.0.0" + swap-case@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/swap-case/-/swap-case-2.0.2.tgz#671aedb3c9c137e2985ef51c51f9e98445bf70d9" @@ -16847,7 +19779,7 @@ symbol-tree@^3.2.4: resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2" integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw== -sync-request@6.1.0: +sync-request@6.1.0, sync-request@^6.0.0: version "6.1.0" resolved "https://registry.yarnpkg.com/sync-request/-/sync-request-6.1.0.tgz#e96217565b5e50bbffe179868ba75532fb597e68" integrity sha512-8fjNkrNlNCrVc/av+Jn+xxqfCjYaBoHqCsDz6mt030UMxJGr+GSfCV1dQt2gRtlL63+VPidwDVLr7V2OcTSdRw== @@ -16863,12 +19795,27 @@ sync-rpc@^1.2.1: dependencies: get-port "^3.1.0" -tabbable@^6.1.1: - version "6.1.1" - resolved "https://registry.yarnpkg.com/tabbable/-/tabbable-6.1.1.tgz#40cfead5ed11be49043f04436ef924c8890186a0" - integrity sha512-4kl5w+nCB44EVRdO0g/UGoOp3vlwgycUVtkk/7DPyeLZUCuNFFKCFG6/t/DgHLrUPHjrZg6s5tNm+56Q2B0xyg== +system-architecture@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/system-architecture/-/system-architecture-0.1.0.tgz#71012b3ac141427d97c67c56bc7921af6bff122d" + integrity sha512-ulAk51I9UVUyJgxlv9M6lFot2WP3e7t8Kz9+IS6D4rVba1tR9kON+Ey69f+1R4Q8cd45Lod6a4IcJIxnzGc/zA== + +tabbable@^6.2.0: + version "6.2.0" + resolved "https://registry.yarnpkg.com/tabbable/-/tabbable-6.2.0.tgz#732fb62bc0175cfcec257330be187dcfba1f3b97" + integrity sha512-Cat63mxsVJlzYvN51JmVXIgNoUokrIaT2zLclCXjRd8boZ0004U4KCs/sToJ75C6sdlByWxpYnb5Boif1VSFew== + +table-layout@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/table-layout/-/table-layout-1.0.2.tgz#c4038a1853b0136d63365a734b6931cf4fad4a04" + integrity sha512-qd/R7n5rQTRFi+Zf2sk5XVVd9UQl6ZkduPFC3S7WEGJAmetDTjY3qPN50eSKzwuzEyQKy5TN2TiZdkIjos2L6A== + dependencies: + array-back "^4.0.1" + deep-extend "~0.6.0" + typical "^5.2.0" + wordwrapjs "^4.0.0" -table@^6.8.0, table@^6.8.1: +table@^6.8.0: version "6.8.1" resolved "https://registry.yarnpkg.com/table/-/table-6.8.1.tgz#ea2b71359fe03b017a5fbc296204471158080bdf" integrity sha512-Y4X9zqrCftUhMeH2EptSSERdVKt/nEdijTOacGD/97EKjhQ/Qs8RTlEGABSJNNN8lac9kheH+af7yAkEWlgneA== @@ -16879,46 +19826,53 @@ table@^6.8.0, table@^6.8.1: string-width "^4.2.3" strip-ansi "^6.0.1" +tabtab@3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/tabtab/-/tabtab-3.0.2.tgz#a2cea0f1035f88d145d7da77eaabbd3fe03e1ec9" + integrity sha512-jANKmUe0sIQc/zTALTBy186PoM/k6aPrh3A7p6AaAfF6WPSbTx1JYeGIGH162btpH+mmVEXln+UxwViZHO2Jhg== + dependencies: + debug "^4.0.1" + es6-promisify "^6.0.0" + inquirer "^6.0.0" + minimist "^1.2.0" + mkdirp "^0.5.1" + untildify "^3.0.3" + tailwindcss@^3.2.4: - version "3.3.1" - resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-3.3.1.tgz#b6662fab6a9b704779e48d083a9fef5a81d2b81e" - integrity sha512-Vkiouc41d4CEq0ujXl6oiGFQ7bA3WEhUZdTgXAhtKxSy49OmKs8rEfQmupsfF0IGW8fv2iQkp1EVUuapCFrZ9g== + version "3.4.1" + resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-3.4.1.tgz#f512ca5d1dd4c9503c7d3d28a968f1ad8f5c839d" + integrity sha512-qAYmXRfk3ENzuPBakNK0SRrUDipP8NQnEY6772uDhflcQz5EhRdD7JNZxyrFHVQNCwULPBn6FNPp9brpO7ctcA== dependencies: + "@alloc/quick-lru" "^5.2.0" arg "^5.0.2" chokidar "^3.5.3" - color-name "^1.1.4" didyoumean "^1.2.2" dlv "^1.1.3" - fast-glob "^3.2.12" + fast-glob "^3.3.0" glob-parent "^6.0.2" is-glob "^4.0.3" - jiti "^1.17.2" - lilconfig "^2.0.6" + jiti "^1.19.1" + lilconfig "^2.1.0" micromatch "^4.0.5" normalize-path "^3.0.0" object-hash "^3.0.0" picocolors "^1.0.0" - postcss "^8.0.9" - postcss-import "^14.1.0" - postcss-js "^4.0.0" - postcss-load-config "^3.1.4" - postcss-nested "6.0.0" + postcss "^8.4.23" + postcss-import "^15.1.0" + postcss-js "^4.0.1" + postcss-load-config "^4.0.1" + postcss-nested "^6.0.1" postcss-selector-parser "^6.0.11" - postcss-value-parser "^4.2.0" - quick-lru "^5.1.1" - resolve "^1.22.1" - sucrase "^3.29.0" - -tapable@^1.0.0, tapable@^1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2" - integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA== + resolve "^1.22.2" + sucrase "^3.32.0" tape@^4.6.3: - version "4.16.2" - resolved "https://registry.yarnpkg.com/tape/-/tape-4.16.2.tgz#7565e6af20426565557266e9dda7215869b297b6" - integrity sha512-TUChV+q0GxBBCEbfCYkGLkv8hDJYjMdSWdE0/Lr331sB389dsvFUHNV9ph5iQqKzt8Ss9drzcda/YeexclBFqg== + version "4.17.0" + resolved "https://registry.yarnpkg.com/tape/-/tape-4.17.0.tgz#de89f3671ddc5dad178d04c28dc6b0183f42268e" + integrity sha512-KCuXjYxCZ3ru40dmND+oCLsXyuA8hoseu2SS404Px5ouyS0A99v8X/mdiLqsR5MTAyamMBN7PRwt2Dv3+xGIxw== dependencies: + "@ljharb/resumer" "~0.0.1" + "@ljharb/through" "~2.3.9" call-bind "~1.0.2" deep-equal "~1.1.1" defined "~1.0.1" @@ -16928,12 +19882,30 @@ tape@^4.6.3: has "~1.0.3" inherits "~2.0.4" is-regex "~1.1.4" - minimist "~1.2.7" + minimist "~1.2.8" + mock-property "~1.0.0" object-inspect "~1.12.3" - resolve "~1.22.1" - resumer "~0.0.0" - string.prototype.trim "~1.2.7" - through "~2.3.8" + resolve "~1.22.6" + string.prototype.trim "~1.2.8" + +tar-fs@^2.0.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.1.1.tgz#489a15ab85f1f0befabb370b7de4f9eb5cbe8784" + integrity sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng== + dependencies: + chownr "^1.1.1" + mkdirp-classic "^0.5.2" + pump "^3.0.0" + tar-stream "^2.1.4" + +tar-fs@^3.0.4: + version "3.0.4" + resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-3.0.4.tgz#a21dc60a2d5d9f55e0089ccd78124f1d3771dbbf" + integrity sha512-5AFQU8b9qLfZCX9zp2duONhPmZv0hGYiBPJsyUdqMjzq/mqVpy/rEUSeHk1+YitmxugaptgBh5oDGU3VsAJq4w== + dependencies: + mkdirp-classic "^0.5.2" + pump "^3.0.0" + tar-stream "^3.1.5" tar-fs@~1.16.3: version "1.16.3" @@ -16958,6 +19930,35 @@ tar-stream@^1.1.2: to-buffer "^1.1.1" xtend "^4.0.0" +tar-stream@^2.1.4: + version "2.2.0" + resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.2.0.tgz#acad84c284136b060dc3faa64474aa9aebd77287" + integrity sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ== + dependencies: + bl "^4.0.3" + end-of-stream "^1.4.1" + fs-constants "^1.0.0" + inherits "^2.0.3" + readable-stream "^3.1.1" + +tar-stream@^3.0.0, tar-stream@^3.1.4: + version "3.1.6" + resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-3.1.6.tgz#6520607b55a06f4a2e2e04db360ba7d338cc5bab" + integrity sha512-B/UyjYwPpMBv+PaFSWAmtYjwdrlEaZQEhMIBFNC5oEG8lpiW8XjcSdmEaClj28ArfKScKHs2nshz3k2le6crsg== + dependencies: + b4a "^1.6.4" + fast-fifo "^1.2.0" + streamx "^2.15.0" + +tar-stream@^3.1.5: + version "3.1.7" + resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-3.1.7.tgz#24b3fb5eabada19fe7338ed6d26e5f7c482e792b" + integrity sha512-qJj60CXt7IU1Ffyc3NJMjh6EkuCFej46zUqJ4J7pqYlThyd9bO0XBTmcOIhSzZJVWfsLks0+nle/j538YAW9RQ== + dependencies: + b4a "^1.6.4" + fast-fifo "^1.2.0" + streamx "^2.15.0" + tar@^4.0.2: version "4.4.19" resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.19.tgz#2e4d7263df26f2b914dee10c825ab132123742f3" @@ -16971,41 +19972,40 @@ tar@^4.0.2: safe-buffer "^5.2.1" yallist "^3.1.1" -tar@^6.1.0: - version "6.1.13" - resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.13.tgz#46e22529000f612180601a6fe0680e7da508847b" - integrity sha512-jdIBIN6LTIe2jqzay/2vtYLlBHa3JF42ot3h1dW8Q0PaAG4v8rm0cvpVePtau5C6OKXGGcgO9q2AMNSWxiLqKw== +tar@^6.1.0, tar@^6.1.11: + version "6.2.0" + resolved "https://registry.yarnpkg.com/tar/-/tar-6.2.0.tgz#b14ce49a79cb1cd23bc9b016302dea5474493f73" + integrity sha512-/Wo7DcT0u5HUV486xg675HtjNd3BXZ6xDbzsCUZPt5iw8bTQ63bP0Raut3mvro9u+CUyq7YQd8Cx55fsZXxqLQ== dependencies: chownr "^2.0.0" fs-minipass "^2.0.0" - minipass "^4.0.0" + minipass "^5.0.0" minizlib "^2.1.1" mkdirp "^1.0.3" yallist "^4.0.0" -terser-webpack-plugin@^1.4.3: - version "1.4.5" - resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.5.tgz#a217aefaea330e734ffacb6120ec1fa312d6040b" - integrity sha512-04Rfe496lN8EYruwi6oPQkG0vo8C+HT49X687FZnpPF0qMAIHONI6HEXYPKDOE8e5HjXTyKfqRd/agHtH0kOtw== +temp-dir@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/temp-dir/-/temp-dir-2.0.0.tgz#bde92b05bdfeb1516e804c9c00ad45177f31321e" + integrity sha512-aoBAniQmmwtcKp/7BzsH8Cxzv8OL736p7v1ihGb5e9DJ9kTwGWHrQrVB5+lfVDzfGrdRzXch+ig7LHaY1JTOrg== + +tempy@3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/tempy/-/tempy-3.0.0.tgz#a6c0a15f5534a820e92c3e1369f1c1e87ebd6b68" + integrity sha512-B2I9X7+o2wOaW4r/CWMkpOO9mdiTRCxXNgob6iGvPmfPWgH/KyUD6Uy5crtWBxIBe3YrNZKR2lSzv1JJKWD4vA== dependencies: - cacache "^12.0.2" - find-cache-dir "^2.1.0" - is-wsl "^1.1.0" - schema-utils "^1.0.0" - serialize-javascript "^4.0.0" - source-map "^0.6.1" - terser "^4.1.2" - webpack-sources "^1.4.0" - worker-farm "^1.7.0" + is-stream "^3.0.0" + temp-dir "^2.0.0" + type-fest "^2.12.2" + unique-string "^3.0.0" -terser@^4.1.2: - version "4.8.1" - resolved "https://registry.yarnpkg.com/terser/-/terser-4.8.1.tgz#a00e5634562de2239fd404c649051bf6fc21144f" - integrity sha512-4GnLC0x667eJG0ewJTa6z/yXrbLGv80D9Ru6HIpCQmO+Q4PfEtBFi0ObSckqwL6VyQv/7ENJieXHo2ANmdQwgw== +terminal-link@3.0.0, terminal-link@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/terminal-link/-/terminal-link-3.0.0.tgz#91c82a66b52fc1684123297ce384429faf72ac5c" + integrity sha512-flFL3m4wuixmf6IfhFJd1YPiLiMuxEc8uHRM1buzIeZPm22Au2pDqBJQgdo7n1WfPU1ONFGv7YDwpFBmHGF6lg== dependencies: - commander "^2.20.0" - source-map "~0.6.1" - source-map-support "~0.5.12" + ansi-escapes "^5.0.0" + supports-hyperlinks "^2.2.0" test-value@^2.1.0: version "2.1.0" @@ -17015,10 +20015,10 @@ test-value@^2.1.0: array-back "^1.0.3" typical "^2.6.0" -testrpc@0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/testrpc/-/testrpc-0.0.1.tgz#83e2195b1f5873aec7be1af8cbe6dcf39edb7aed" - integrity sha512-afH1hO+SQ/VPlmaLUFj2636QMeDvPCeQMc/9RBMW0IfjNe9gFD9Ra3ShqYkB7py0do1ZcCna/9acHyzTJ+GcNA== +text-hex@1.0.x: + version "1.0.0" + resolved "https://registry.yarnpkg.com/text-hex/-/text-hex-1.0.0.tgz#69dc9c1b17446ee79a92bf5b884bb4b9127506f5" + integrity sha512-uuVGNWzgJ4yhRaNSiubPY7OjISw4sw4E5Uv0wbjp+OzcbmVU/rsT8ujgcXJhn9ypzsgr5vlzpPqP+MBBKcGvbg== text-table@^0.2.0: version "0.2.0" @@ -17063,7 +20063,30 @@ thread-stream@^0.15.1: dependencies: real-require "^0.1.0" -through2@^2.0.0, through2@^2.0.3: +thread-stream@^2.0.0: + version "2.4.1" + resolved "https://registry.yarnpkg.com/thread-stream/-/thread-stream-2.4.1.tgz#6d588b14f0546e59d3f306614f044bc01ce43351" + integrity sha512-d/Ex2iWd1whipbT681JmTINKw0ZwOUBZm7+Gjs64DHuX34mmw8vJL2bFAaNacaW72zYiTJxSHi5abUuOi5nsfg== + dependencies: + real-require "^0.2.0" + +through2-filter@3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/through2-filter/-/through2-filter-3.0.0.tgz#700e786df2367c2c88cd8aa5be4cf9c1e7831254" + integrity sha512-jaRjI2WxN3W1V8/FMZ9HKIBXixtiqs3SQSX4/YGIiP3gL6djW48VoZq9tDqeCWs3MT8YY5wb/zli8VW8snY1CA== + dependencies: + through2 "~2.0.0" + xtend "~4.0.0" + +through2-map@3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/through2-map/-/through2-map-3.0.0.tgz#a6c3026ce63b4898a997d540506b66ffd970f271" + integrity sha512-Ms68QPbSJKjRYY7fmqZHB0VGt+vD0/tjmDHUWgxltjifCof6hZWWeQAEi27Wjbs7jyNlIIyerQw/TVj7gHkd/Q== + dependencies: + through2 "~2.0.0" + xtend "^4.0.0" + +through2@^2.0.0, through2@^2.0.3, through2@~2.0.0: version "2.0.5" resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd" integrity sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ== @@ -17071,11 +20094,16 @@ through2@^2.0.0, through2@^2.0.3: readable-stream "~2.3.6" xtend "~4.0.1" -"through@>=2.2.7 <3", through@^2.3.6, through@^2.3.8, through@~2.3.4, through@~2.3.8: +"through@>=2.2.7 <3", through@^2.3.6, through@^2.3.8: version "2.3.8" resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" integrity sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg== +time-zone@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/time-zone/-/time-zone-1.0.0.tgz#99c5bf55958966af6d06d83bdf3800dc82faec5d" + integrity sha512-TIsDdtKo6+XrPtiTm1ssmMngN1sAhyKnTO2kunQWqNPWIVvCm15Wmw4SWInwTVgJ5u/Tr04+8Ei9TNcw4x4ONA== + timed-out@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/timed-out/-/timed-out-4.0.1.tgz#f32eacac5a175bea25d7fab565ab3ed8741ef56f" @@ -17097,10 +20125,15 @@ timers-browserify@^2.0.4: dependencies: setimmediate "^1.0.4" +tiny-lru@^11.0.1: + version "11.2.5" + resolved "https://registry.yarnpkg.com/tiny-lru/-/tiny-lru-11.2.5.tgz#b138b99022aa26c567fa51a8dbf9e3e2959b2b30" + integrity sha512-JpqM0K33lG6iQGKiigcwuURAKZlq6rHXfrgeL4/I8/REoyJTGU+tEMszvT/oTRVHG2OiylhGDjqPp1jWMlr3bw== + tinybench@^2.3.1: - version "2.4.0" - resolved "https://registry.yarnpkg.com/tinybench/-/tinybench-2.4.0.tgz#83f60d9e5545353610fe7993bd783120bc20c7a7" - integrity sha512-iyziEiyFxX4kyxSp+MtY1oCH/lvjH3PxFN8PGCDeqcZWAJ/i+9y+nL85w99PxVzrIvew/GSkSbDYtiGVa85Afg== + version "2.5.1" + resolved "https://registry.yarnpkg.com/tinybench/-/tinybench-2.5.1.tgz#3408f6552125e53a5a48adee31261686fd71587e" + integrity sha512-65NKvSuAVDP/n4CqH+a9w2kTlLReS9vhsAP06MWx+/89nMinJyB2icyl58RIcqCmIggpojIGeuJGhjU1aGMBSg== tinypool@^0.3.0: version "0.3.1" @@ -17119,20 +20152,13 @@ title-case@^3.0.3: dependencies: tslib "^2.0.3" -tmp-promise@3.0.3: +tmp-promise@3.0.3, tmp-promise@^3.0.2, tmp-promise@^3.0.3: version "3.0.3" resolved "https://registry.yarnpkg.com/tmp-promise/-/tmp-promise-3.0.3.tgz#60a1a1cc98c988674fcbfd23b6e3367bdeac4ce7" integrity sha512-RwM7MoPojPxsOBYnyd2hy0bxtIlVrihNs9pj5SUvY8Zz1sQcQG2tG1hSr8PDxfgEB8RNKDhqbIlroIarSNDNsQ== dependencies: tmp "^0.2.0" -tmp-promise@^2.0.2: - version "2.1.1" - resolved "https://registry.yarnpkg.com/tmp-promise/-/tmp-promise-2.1.1.tgz#eb97c038995af74efbfe8156f5e07fdd0c935539" - integrity sha512-Z048AOz/w9b6lCbJUpevIJpRpUztENl8zdv1bmAKVHimfqRFl92ROkmT9rp7TVBnrEw2gtMTol/2Cp2S2kJa4Q== - dependencies: - tmp "0.1.0" - tmp@0.0.33, tmp@^0.0.33: version "0.0.33" resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9" @@ -17154,11 +20180,6 @@ tmp@^0.2.0: dependencies: rimraf "^3.0.0" -to-arraybuffer@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43" - integrity sha512-okFlQcoGTi4LQBG/PgSYblw9VOyptsz2KJZqc6qtgGdes8VktzUQkj4BI2blit072iS8VODNcMA+tvnS9dnuMA== - to-buffer@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/to-buffer/-/to-buffer-1.1.1.tgz#493bd48f62d7c43fcded313a03dcadb2e1213a80" @@ -17181,6 +20202,11 @@ to-object-path@^0.3.0: dependencies: kind-of "^3.0.2" +to-readable-stream@3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/to-readable-stream/-/to-readable-stream-3.0.0.tgz#7c4aa6e3e2413c86c6276a57780dadfba226762f" + integrity sha512-vD2LytT6DxPynBa1xbMtswY9gGqj27wNbh2uvI5OhBe+mrGLurRWRQZyQn3812sqlQRtUJwaKVshG+PoGwbPDQ== + 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" @@ -17216,15 +20242,28 @@ toidentifier@1.0.1: resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.1.tgz#3be34321a88a820ed1bd80dfaa33e479fbb8dd35" integrity sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA== -toml@^3.0.0: +token-types@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/token-types/-/token-types-5.0.1.tgz#aa9d9e6b23c420a675e55413b180635b86a093b4" + integrity sha512-Y2fmSnZjQdDb9W4w4r1tswlMHylzWIeOKpx0aZH9BgGtACHhrk3OkT52AzwcuqTRBZtvvnTjDBh8eynMulu8Vg== + dependencies: + "@tokenizer/token" "^0.3.0" + ieee754 "^1.2.1" + +toml@3.0.0, toml@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/toml/-/toml-3.0.0.tgz#342160f1af1904ec9d204d03a5d61222d762c5ee" integrity sha512-y/mWCZinnvxjTKYhJ+pYxwD0mRLVvOtdS2Awbgxln6iEnt4rk0yBxeSBHkGJcPucRiG0e55mwWp+g/05rsrd6w== +tomlify-j0.4@3.0.0, tomlify-j0.4@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/tomlify-j0.4/-/tomlify-j0.4-3.0.0.tgz#99414d45268c3a3b8bf38be82145b7bba34b7473" + integrity sha512-2Ulkc8T7mXJ2l0W476YC/A209PR38Nw8PuaCNtk9uI3t1zzFdGQeWYGQvmj2PZkVvRC/Yoi4xQKMRnWc/N29tQ== + tough-cookie@^4.1.2: - version "4.1.2" - resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.1.2.tgz#e53e84b85f24e0b65dd526f46628db6c85f6b874" - integrity sha512-G9fqXWoYFZgTc2z8Q5zaHy/vJMjm+WV0AkAeHxVCQiEB1b+dGvWzFW6QV07cY5jQ5gRkeid2qIkzkxUnmoQZUQ== + version "4.1.3" + resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.1.3.tgz#97b9adb0728b42280aa3d814b6b999b2ff0318bf" + integrity sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw== dependencies: psl "^1.1.33" punycode "^2.1.1" @@ -17256,11 +20295,38 @@ trim-newlines@^3.0.0: resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-3.0.1.tgz#260a5d962d8b752425b32f3a7db0dcacd176c144" integrity sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw== +trim-repeated@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/trim-repeated/-/trim-repeated-2.0.0.tgz#5d60556d6d40d9461b7c7e06c3ac20b6b1d50090" + integrity sha512-QUHBFTJGdOwmp0tbOG505xAgOp/YliZP/6UgafFXYZ26WT1bvQmSMJUvkeVSASuJJHbqsFbynTvkd5W8RBTipg== + dependencies: + escape-string-regexp "^5.0.0" + trim-right@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003" integrity sha512-WZGXGstmCWgeevgTL54hrCuw1dyMQIzWy7ZfqRJfSmJZBwklI15egmQytFP6bPidmw3M8d5yEowl1niq4vmqZw== +triple-beam@^1.3.0: + version "1.4.1" + resolved "https://registry.yarnpkg.com/triple-beam/-/triple-beam-1.4.1.tgz#6fde70271dc6e5d73ca0c3b24e2d92afb7441984" + integrity sha512-aZbgViZrg1QNcG+LULa7nhZpJTZSLm/mXnHXnbAbjmN5aSa0y7V+wvv6+4WaBtpISJzThKy+PIPxc1Nq1EJ9mg== + +tryer@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/tryer/-/tryer-1.0.1.tgz#f2c85406800b9b0f74c9f7465b81eaad241252f8" + integrity sha512-c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA== + +ts-command-line-args@^2.2.0: + version "2.5.1" + resolved "https://registry.yarnpkg.com/ts-command-line-args/-/ts-command-line-args-2.5.1.tgz#e64456b580d1d4f6d948824c274cf6fa5f45f7f0" + integrity sha512-H69ZwTw3rFHb5WYpQya40YAX2/w7Ut75uUECbgBIsLmM+BNuYnxsltfyyLMxy6sEeKxgijLTnQtLd0nKd6+IYw== + dependencies: + chalk "^4.1.0" + command-line-args "^5.1.1" + command-line-usage "^6.1.0" + string-format "^2.0.0" + ts-essentials@^1.0.0: version "1.0.4" resolved "https://registry.yarnpkg.com/ts-essentials/-/ts-essentials-1.0.4.tgz#ce3b5dade5f5d97cf69889c11bf7d2da8555b15a" @@ -17271,20 +20337,10 @@ ts-essentials@^6.0.3: resolved "https://registry.yarnpkg.com/ts-essentials/-/ts-essentials-6.0.7.tgz#5f4880911b7581a873783740ce8b94da163d18a6" integrity sha512-2E4HIIj4tQJlIHuATRHayv0EfMGK3ris/GRk1E3CFnsZzeNV+hUmelbaTZHLtXaZppM5oLhHRtO04gINC4Jusw== -ts-generator@^0.0.8: - version "0.0.8" - resolved "https://registry.yarnpkg.com/ts-generator/-/ts-generator-0.0.8.tgz#7bd48ca064db026d9520bcb682b69efc20971d6a" - integrity sha512-Gi+aZCELpVL7Mqb+GuMgM+n8JZ/arZZib1iD/R9Ok8JDjOCOCrqS9b1lr72ku7J45WeDCFZxyJoRsiQvhokCnw== - dependencies: - "@types/mkdirp" "^0.5.2" - "@types/prettier" "^1.13.2" - "@types/resolve" "^0.0.8" - chalk "^2.4.1" - glob "^7.1.2" - mkdirp "^0.5.1" - prettier "^1.14.2" - resolve "^1.8.1" - ts-essentials "^1.0.0" +ts-essentials@^7.0.1: + version "7.0.3" + resolved "https://registry.yarnpkg.com/ts-essentials/-/ts-essentials-7.0.3.tgz#686fd155a02133eedcc5362dc8b5056cde3e5a38" + integrity sha512-8+gr5+lqO3G84KdiTSMRLtuyJ+nTBVRKuCrK4lidMPdVeEp0uqC875uE5NMcaA7YYMN7XsNiFQuMvasF8HT/xQ== ts-generator@^0.1.1: version "0.1.1" @@ -17311,10 +20367,10 @@ ts-log@^2.2.3: resolved "https://registry.yarnpkg.com/ts-log/-/ts-log-2.2.5.tgz#aef3252f1143d11047e2cb6f7cfaac7408d96623" integrity sha512-PGcnJoTBnVGy6yYNFxWVNkdcAuAMstvutN9MgDJIV6L0oG8fB+ZNNy1T+wJzah8RPGor1mZuPQkVfXNDpy9eHA== -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== +ts-node@^10.9.1, ts-node@^10.9.2: + version "10.9.2" + resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-10.9.2.tgz#70f021c9e185bccdca820e26dc413805c101c71f" + integrity sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ== dependencies: "@cspotcode/source-map-support" "^0.8.0" "@tsconfig/node10" "^1.0.7" @@ -17330,32 +20386,31 @@ ts-node@^10.9.1: v8-compile-cache-lib "^3.0.1" yn "3.1.1" -ts-node@^8.8.1: - version "8.10.2" - resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-8.10.2.tgz#eee03764633b1234ddd37f8db9ec10b75ec7fb8d" - integrity sha512-ISJJGgkIpDdBhWVu3jufsWpK3Rzo7bdiIXJjQc0ynKxVOVcg2oIrf2H2cejminGrptVc6q6/uynAHNCuWGbpVA== - dependencies: - arg "^4.1.0" - diff "^4.0.1" - make-error "^1.1.1" - source-map-support "^0.5.17" - yn "3.1.1" - -tslib@1.14.1, tslib@^1.8.1, tslib@^1.9.3: +tslib@1.14.1, tslib@^1.8.1, tslib@^1.9.0, tslib@^1.9.3: version "1.14.1" resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== -tslib@^2.0.0, tslib@^2.0.3, tslib@^2.1.0, tslib@^2.3.1, tslib@^2.4.0, tslib@^2.5.0, tslib@~2.5.0: - version "2.5.0" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.5.0.tgz#42bfed86f5787aeb41d031866c8f402429e0fddf" - integrity sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg== +tslib@2.4.0: + version "2.4.0" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.0.tgz#7cecaa7f073ce680a05847aa77be941098f36dc3" + integrity sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ== + +tslib@^2.0.0, tslib@^2.0.3, tslib@^2.1.0, tslib@^2.3.1, tslib@^2.4.0, tslib@^2.5.0, tslib@^2.6.1, tslib@^2.6.2: + version "2.6.2" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.2.tgz#703ac29425e7b37cd6fd456e92404d46d1f3e4ae" + integrity sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q== tslib@~2.4.0: version "2.4.1" resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.1.tgz#0d0bfbaac2880b91e22df0768e55be9753a5b17e" integrity sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA== +tslib@~2.5.0: + version "2.5.3" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.5.3.tgz#24944ba2d990940e6e982c4bea147aba80209913" + integrity sha512-mSxlJJwl3BMEQCUNnxXBU9jP4JBktcEGhURcPR6VQVlnP0FdDEsIaz0C35dXNGLyRfrATNofF0F5p2KPxQgB+w== + tsort@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/tsort/-/tsort-0.0.1.tgz#e2280f5e817f8bf4275657fd0f9aebd44f5a2786" @@ -17368,11 +20423,6 @@ tsutils@^3.21.0: dependencies: tslib "^1.8.1" -tty-browserify@0.0.0: - version "0.0.0" - resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6" - integrity sha512-JVa5ijo+j/sOoHGjw0sxw734b1LhBkQ3bvUGNdxnVXDCX81Yx7TFgnZygxrIIWn23hbfTaMYLwRmAxFyDuFmIw== - tty-browserify@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.1.tgz#3f05251ee17904dfd0677546670db9651682b811" @@ -17414,7 +20464,7 @@ type-check@~0.3.2: dependencies: prelude-ls "~1.1.2" -type-detect@^4.0.0, type-detect@^4.0.5: +type-detect@^4.0.0, type-detect@^4.0.8: 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== @@ -17444,11 +20494,26 @@ type-fest@^0.7.1: resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.7.1.tgz#8dda65feaf03ed78f0a3f9678f1869147f7c5c48" integrity sha512-Ne2YiiGN8bmrmJJEuTWTLJR32nh/JdL1+PSicowtNb0WFpn59GK8/lfD61bVtzguz7b3PBt74nxpv/Pw5po5Rg== -type-fest@^0.8.1: +type-fest@^0.8.0, type-fest@^0.8.1: version "0.8.1" resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d" integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA== +type-fest@^1.0.1, type-fest@^1.0.2: + version "1.4.0" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-1.4.0.tgz#e9fb813fe3bf1744ec359d55d1affefa76f14be1" + integrity sha512-yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA== + +type-fest@^2.0.0, type-fest@^2.11.2, type-fest@^2.12.2, type-fest@^2.13.0, type-fest@^2.5.0: + version "2.19.0" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-2.19.0.tgz#88068015bb33036a598b952e55e9311a60fd3a9b" + integrity sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA== + +type-fest@^3.0.0: + version "3.13.1" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-3.13.1.tgz#bb744c1f0678bea7543a2d1ec24e83e68e8c8706" + integrity sha512-tLq3bSNx+xSpwvAJnzrK0Ep5CLNWjvFTOp71URMaAEWBfRb9nnJiBoUe0tF8bI4ZFO3omgBR6NvnbzVUT3Ly4g== + type-is@~1.6.18: version "1.6.18" resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131" @@ -17480,6 +20545,52 @@ typechain@^3.0.0: ts-essentials "^6.0.3" ts-generator "^0.1.1" +typechain@^8.3.2: + version "8.3.2" + resolved "https://registry.yarnpkg.com/typechain/-/typechain-8.3.2.tgz#1090dd8d9c57b6ef2aed3640a516bdbf01b00d73" + integrity sha512-x/sQYr5w9K7yv3es7jo4KTX05CLxOf7TRWwoHlrjRh8H82G64g+k7VuWPJlgMo6qrjfCulOdfBjiaDtmhFYD/Q== + 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" + +typed-array-buffer@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/typed-array-buffer/-/typed-array-buffer-1.0.0.tgz#18de3e7ed7974b0a729d3feecb94338d1472cd60" + integrity sha512-Y8KTSIglk9OZEr8zywiIHG/kmQ7KWyjseXs1CbSo8vC42w7hg2HgYTxSWwP0+is7bWDc1H+Fo026CpHFwm8tkw== + dependencies: + call-bind "^1.0.2" + get-intrinsic "^1.2.1" + is-typed-array "^1.1.10" + +typed-array-byte-length@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/typed-array-byte-length/-/typed-array-byte-length-1.0.0.tgz#d787a24a995711611fb2b87a4052799517b230d0" + integrity sha512-Or/+kvLxNpeQ9DtSydonMxCx+9ZXOswtwJn17SNLvhptaXYDJvkFFP5zbfU/uLmvnBJlI4yrnXRxpdWH/M5tNA== + dependencies: + call-bind "^1.0.2" + for-each "^0.3.3" + has-proto "^1.0.1" + is-typed-array "^1.1.10" + +typed-array-byte-offset@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/typed-array-byte-offset/-/typed-array-byte-offset-1.0.0.tgz#cbbe89b51fdef9cd6aaf07ad4707340abbc4ea0b" + integrity sha512-RD97prjEt9EL8YgAgpOkf3O4IF9lhJFr9g0htQkm0rchFp/Vx7LW5Q8fSXXub7BXAODyUQohRMyOc3faCPd0hg== + dependencies: + available-typed-arrays "^1.0.5" + call-bind "^1.0.2" + for-each "^0.3.3" + has-proto "^1.0.1" + is-typed-array "^1.1.10" + typed-array-length@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/typed-array-length/-/typed-array-length-1.0.4.tgz#89d83785e5c4098bec72e08b319651f0eac9c1bb" @@ -17506,6 +20617,11 @@ typescript@^4.9.3: resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.5.tgz#095979f9bcc0d09da324d58d03ce8f8374cbe65a" integrity sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g== +typescript@^5.0.0, typescript@^5.0.4: + version "5.3.3" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.3.3.tgz#b3ce6ba258e72e6305ba66f5c9b452aaee3ffe37" + integrity sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw== + typewise-core@^1.2, typewise-core@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/typewise-core/-/typewise-core-1.2.0.tgz#97eb91805c7f55d2f941748fa50d315d991ef195" @@ -17528,25 +20644,47 @@ typical@^2.6.0, typical@^2.6.1: resolved "https://registry.yarnpkg.com/typical/-/typical-2.6.1.tgz#5c080e5d661cbbe38259d2e70a3c7253e873881d" integrity sha512-ofhi8kjIje6npGozTip9Fr8iecmYfEbS06i0JnIg+rh51KakryWF4+jX8lLKZVhy6N+ID45WYSFCxPOdTWCzNg== +typical@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/typical/-/typical-4.0.0.tgz#cbeaff3b9d7ae1e2bbfaf5a4e6f11eccfde94fc4" + integrity sha512-VAH4IvQ7BDFYglMd7BPRDfLgxZZX4O4TFcRDA6EN5X7erNJJq+McIEp8np9aVtxrCJ6qx4GTYVfOWNjcqwZgRw== + +typical@^5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/typical/-/typical-5.2.0.tgz#4daaac4f2b5315460804f0acf6cb69c52bb93066" + integrity sha512-dvdQgNDNJo+8B2uBQoqdb11eUCE1JQXhvjC/CZtgvZseVd5TYMXnq0+vuUemXbd/Se29cTaUuPX3YIc2xgbvIg== + typical@^6.0.0: version "6.0.1" resolved "https://registry.yarnpkg.com/typical/-/typical-6.0.1.tgz#89bd1a6aa5e5e96fa907fb6b7579223bff558a06" integrity sha512-+g3NEp7fJLe9DPa1TArHm9QAA7YciZmWnfAqEaFrBihQ7epOv9i99rjtgb6Iz0wh3WuQDjsCTDfgRoGnmHN81A== -ua-parser-js@^0.7.30: - version "0.7.35" - resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.35.tgz#8bda4827be4f0b1dda91699a29499575a1f1d307" - integrity sha512-veRf7dawaj9xaWEu9HoTVn5Pggtc/qj+kqTOFvNiN1l0YdxwC1kvel57UCjThjGa3BHBihE8/UJAHI+uQHmd/g== +ua-parser-js@^1.0.35: + version "1.0.37" + resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-1.0.37.tgz#b5dc7b163a5c1f0c510b08446aed4da92c46373f" + integrity sha512-bhTyI94tZofjo+Dn8SN6Zv8nBDvyXTymAdM3LDI/0IboIUwTu1rEhW7v2TfiVsoYWgkQ4kOVqnI8APUFbIQIFQ== uc.micro@^1.0.1, uc.micro@^1.0.5: version "1.0.6" resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.6.tgz#9c411a802a409a91fc6cf74081baba34b24499ac" integrity sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA== -ufo@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/ufo/-/ufo-1.1.1.tgz#e70265e7152f3aba425bd013d150b2cdf4056d7c" - integrity sha512-MvlCc4GHrmZdAllBc0iUDowff36Q9Ndw/UzqmEKyrfSzokTd9ZCy1i+IIk5hrYKkjoYVQyNbrw7/F8XJ2rEwTg== +ufo@^1.3.0, ufo@^1.3.1, ufo@^1.3.2: + version "1.3.2" + resolved "https://registry.yarnpkg.com/ufo/-/ufo-1.3.2.tgz#c7d719d0628a1c80c006d2240e0d169f6e3c0496" + integrity sha512-o+ORpgGwaYQXgqGDwd+hkS4PuZ3QnmqMMxRuajK/a38L6fTpcE5GPIfrf+L/KemFzfUpeUQc1rRS1iDBozvnFA== + +uglify-js@^3.1.4: + version "3.17.4" + resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.17.4.tgz#61678cf5fa3f5b7eb789bb345df29afb8257c22c" + integrity sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g== + +uid-safe@2.1.5: + version "2.1.5" + resolved "https://registry.yarnpkg.com/uid-safe/-/uid-safe-2.1.5.tgz#2b3d5c7240e8fc2e58f8aa269e5ee49c0857bd3a" + integrity sha512-KPHm4VL5dDXKz01UuEd88Df+KzynaohSL9fBh096KWAxSKZQDI2uBrVqtvRM4rwrIrRRKsdLNML/lnaaVSRioA== + dependencies: + random-bytes "~1.0.0" uint8arrays@^3.0.0, uint8arrays@^3.1.0: version "3.1.1" @@ -17555,12 +20693,10 @@ uint8arrays@^3.0.0, uint8arrays@^3.1.0: dependencies: multiformats "^9.4.2" -uint8arrays@^4.0.2: - version "4.0.3" - resolved "https://registry.yarnpkg.com/uint8arrays/-/uint8arrays-4.0.3.tgz#43109c03c4c10d312e7f2e9f4d53e5cd2398c7fd" - integrity sha512-b+aKlI2oTnxnfeSQWV1sMacqSNxqhtXySaH6bflvONGxF8V/fT3ZlYH7z2qgGfydsvpVo4JUgM/Ylyfl2YouCg== - dependencies: - multiformats "^11.0.0" +ulid@2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/ulid/-/ulid-2.3.0.tgz#93063522771a9774121a84d126ecd3eb9804071f" + integrity sha512-keqHubrlpvT6G2wH0OEfSW4mquYRcbe/J8NMmveoQOjUqmo+hXtO+ORCpWhdbZ7k72UtY61BL7haGxW6enBnjw== ultron@~1.1.0: version "1.1.1" @@ -17577,45 +20713,61 @@ unbox-primitive@^1.0.2: has-symbols "^1.0.3" which-boxed-primitive "^1.0.2" +unbzip2-stream@^1.4.3: + version "1.4.3" + resolved "https://registry.yarnpkg.com/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz#b0da04c4371311df771cdc215e87f2130991ace7" + integrity sha512-mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg== + dependencies: + buffer "^5.2.1" + through "^2.3.8" + unc-path-regex@^0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/unc-path-regex/-/unc-path-regex-0.1.2.tgz#e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa" integrity sha512-eXL4nmJT7oCpkZsHZUOJo8hcX3GbsiDOa0Qu9F646fi8dT3XuSVopVqAcEiVzSKKH7UoDti23wNX3qGFxcW5Qg== +uncrypto@^0.1.3: + version "0.1.3" + resolved "https://registry.yarnpkg.com/uncrypto/-/uncrypto-0.1.3.tgz#e1288d609226f2d02d8d69ee861fa20d8348ef2b" + integrity sha512-Ql87qFHB3s/De2ClA9e0gsnS6zXG27SkTiSJwjCc9MebbfapQfuPzumMIUMi38ezPZVNFcHI9sUIepeQfw8J8Q== + +underscore@1.12.1: + version "1.12.1" + resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.12.1.tgz#7bb8cc9b3d397e201cf8553336d262544ead829e" + integrity sha512-hEQt0+ZLDVUMhebKxL4x1BTtDY7bavVofhZ9KZ4aI26X9SRaE+Y3m83XUL1UP2jn8ynjndwCCpEHdUG+9pP1Tw== + underscore@1.9.1: version "1.9.1" resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.9.1.tgz#06dce34a0e68a7babc29b365b8e74b8925203961" integrity sha512-5/4etnCkd9c8gwgowi5/om/mYO5ajCaOgdzj/oW+0eQV9WxKBDZw5+ycmKmeaTXjInS/W0BzpGLo2xR2aBwZdg== -undici@^5.12.0, undici@^5.14.0: - version "5.21.2" - resolved "https://registry.yarnpkg.com/undici/-/undici-5.21.2.tgz#329f628aaea3f1539a28b9325dccc72097d29acd" - integrity sha512-f6pTQ9RF4DQtwoWSaC42P/NKlUjvezVvd9r155ohqkwFNRyBKM3f3pcty3ouusefNRyM25XhIQEbeQ46sZDJfQ== - dependencies: - busboy "^1.6.0" - -unicode-canonical-property-names-ecmascript@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz#301acdc525631670d39f6146e0e77ff6bbdebddc" - integrity sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ== +undici-types@~5.26.4: + version "5.26.5" + resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617" + integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA== -unicode-match-property-ecmascript@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz#54fd16e0ecb167cf04cf1f756bdcc92eba7976c3" - integrity sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q== +undici@^5.14.0: + version "5.28.2" + resolved "https://registry.yarnpkg.com/undici/-/undici-5.28.2.tgz#fea200eac65fc7ecaff80a023d1a0543423b4c91" + integrity sha512-wh1pHJHnUeQV5Xa8/kyQhO7WFa8M34l026L5P/+2TYiakvGy5Rdc8jWZVyG7ieht/0WgJLEd3kcU5gKx+6GC8w== dependencies: - unicode-canonical-property-names-ecmascript "^2.0.0" - unicode-property-aliases-ecmascript "^2.0.0" + "@fastify/busboy" "^2.0.0" -unicode-match-property-value-ecmascript@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.1.0.tgz#cb5fffdcd16a05124f5a4b0bf7c3770208acbbe0" - integrity sha512-qxkjQt6qjg/mYscYMC0XKRn3Rh0wFPlfxB0xkt9CfyTvpX1Ra0+rAmdX2QyAobptSEvuy4RtpPRui6XkV+8wjA== +unenv@^1.8.0: + version "1.9.0" + resolved "https://registry.yarnpkg.com/unenv/-/unenv-1.9.0.tgz#469502ae85be1bd3a6aa60f810972b1a904ca312" + integrity sha512-QKnFNznRxmbOF1hDgzpqrlIf6NC5sbZ2OJ+5Wl3OX8uM+LUJXbj4TXvLJCtwbPTmbMHCLIz6JLKNinNsMShK9g== + dependencies: + consola "^3.2.3" + defu "^6.1.3" + mime "^3.0.0" + node-fetch-native "^1.6.1" + pathe "^1.1.1" -unicode-property-aliases-ecmascript@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.1.0.tgz#43d41e3be698bd493ef911077c9b131f827e8ccd" - integrity sha512-6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w== +unfetch@^4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/unfetch/-/unfetch-4.2.0.tgz#7e21b0ef7d363d8d9af0fb929a5555f6ef97a3be" + integrity sha512-F9p7yYCn6cIW9El1zi0HI6vqpeIvBsr3dSuRO6Xuppb1u5rXpCPmMvLSyECLhybr9isec8Ohl0hPekMVrEinDA== unimport@^1.0.1: version "1.3.0" @@ -17644,19 +20796,17 @@ union-value@^1.0.0: is-extendable "^0.1.1" set-value "^2.0.1" -unique-filename@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-1.1.1.tgz#1d69769369ada0583103a1e6ae87681b56573230" - integrity sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ== +unique-string@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/unique-string/-/unique-string-3.0.0.tgz#84a1c377aff5fd7a8bc6b55d8244b2bd90d75b9a" + integrity sha512-VGXBUVwxKMBUznyffQweQABPRRW1vHZAbadFZud4pLFAqRGvv/96vafgjWFqzourzr8YonlQiPgH0YCJfawoGQ== dependencies: - unique-slug "^2.0.0" + crypto-random-string "^4.0.0" -unique-slug@^2.0.0: - version "2.0.2" - resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-2.0.2.tgz#baabce91083fc64e945b0f3ad613e264f7cd4e6c" - integrity sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w== - dependencies: - imurmurhash "^0.1.4" +universal-user-agent@^6.0.0: + version "6.0.1" + resolved "https://registry.yarnpkg.com/universal-user-agent/-/universal-user-agent-6.0.1.tgz#15f20f55da3c930c57bddbf1734c6654d5fd35aa" + integrity sha512-yCzhz6FN2wU1NiiQRogkTQszlQSlpWaw8SvVegAc+bDxbzHgh1vX8uIe8OYyMH6DwH+sdTJsgMl36+mSMdRJIQ== universalify@^0.1.0: version "0.1.2" @@ -17669,11 +20819,19 @@ universalify@^0.2.0: integrity sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg== universalify@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717" - integrity sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ== + version "2.0.1" + resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.1.tgz#168efc2180964e6386d061e094df61afe239b18d" + integrity sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw== + +unix-dgram@2.x: + version "2.0.6" + resolved "https://registry.yarnpkg.com/unix-dgram/-/unix-dgram-2.0.6.tgz#6d567b0eb6d7a9504e561532b598a46e34c5968b" + integrity sha512-AURroAsb73BZ6CdAyMrTk/hYKNj3DuYYEuOaB8bYMOHGKupRNScw90Q5C71tWJc3uE7dIeXRyuwN0xLLq3vDTg== + dependencies: + bindings "^1.5.0" + nan "^2.16.0" -unixify@^1.0.0: +unixify@1.0.0, unixify@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/unixify/-/unixify-1.0.0.tgz#3a641c8c2ffbce4da683a5c70f03a462940c2090" integrity sha512-6bc58dPYhCMHHuwxldQxO3RRNZ4eCogZ/st++0+fcC1nr0jiGUtAdBJ2qzmLQWSxbtz42pWt4QQMiZ9HvZf5cg== @@ -17719,14 +20877,14 @@ unplugin-vue-components@^0.22.11: unplugin "^1.0.1" unplugin@^1.0.0, unplugin@^1.0.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/unplugin/-/unplugin-1.3.1.tgz#7af993ba8695d17d61b0845718380caf6af5109f" - integrity sha512-h4uUTIvFBQRxUKS2Wjys6ivoeofGhxzTe2sRWlooyjHXVttcVfV/JiavNd3d4+jty0SVV0dxGw9AkY9MwiaCEw== + version "1.6.0" + resolved "https://registry.yarnpkg.com/unplugin/-/unplugin-1.6.0.tgz#0bd7c344182c73e685c864f4f7161531f024b942" + integrity sha512-BfJEpWBu3aE/AyHx8VaNE/WgouoQxgH9baAiH82JjX8cqVyi3uJQstqwD5J+SZxIK326SZIhsSZlALXVBCknTQ== dependencies: - acorn "^8.8.2" + acorn "^8.11.2" chokidar "^3.5.3" webpack-sources "^3.2.3" - webpack-virtual-modules "^0.5.0" + webpack-virtual-modules "^0.6.1" unset-value@^1.0.0: version "1.0.0" @@ -17736,19 +20894,65 @@ unset-value@^1.0.0: has-value "^0.3.1" isobject "^3.0.0" -upath@^1.1.1: - version "1.2.0" - resolved "https://registry.yarnpkg.com/upath/-/upath-1.2.0.tgz#8f66dbcd55a883acdae4408af8b035a5044c1894" - integrity sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg== +unstorage@^1.9.0: + version "1.10.1" + resolved "https://registry.yarnpkg.com/unstorage/-/unstorage-1.10.1.tgz#bf8cc00a406e40a6293e893da9807057d95875b0" + integrity sha512-rWQvLRfZNBpF+x8D3/gda5nUCQL2PgXy2jNG4U7/Rc9BGEv9+CAJd0YyGCROUBKs9v49Hg8huw3aih5Bf5TAVw== + dependencies: + anymatch "^3.1.3" + chokidar "^3.5.3" + destr "^2.0.2" + h3 "^1.8.2" + ioredis "^5.3.2" + listhen "^1.5.5" + lru-cache "^10.0.2" + mri "^1.2.0" + node-fetch-native "^1.4.1" + ofetch "^1.3.3" + ufo "^1.3.1" + +untildify@^3.0.3: + version "3.0.3" + resolved "https://registry.yarnpkg.com/untildify/-/untildify-3.0.3.tgz#1e7b42b140bcfd922b22e70ca1265bfe3634c7c9" + integrity sha512-iSk/J8efr8uPT/Z4eSUywnqyrQU7DSdMfdqK4iWEaUVVmcP5JcnpRqmVMwcwcnmI1ATFNgC5V90u09tBynNFKA== -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== +untun@^0.1.3: + version "0.1.3" + resolved "https://registry.yarnpkg.com/untun/-/untun-0.1.3.tgz#5d10dee37a3a5737ff03d158be877dae0a0e58a6" + integrity sha512-4luGP9LMYszMRZwsvyUd9MrxgEGZdZuZgpVQHEEX0lCYFESasVRvZd0EYpCkOIbJKHMuv0LskpXc/8Un+MJzEQ== + dependencies: + citty "^0.1.5" + consola "^3.2.3" + pathe "^1.1.1" + +update-browserslist-db@^1.0.13: + version "1.0.13" + resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz#3c5e4f5c083661bd38ef64b6328c26ed6c8248c4" + integrity sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg== dependencies: escalade "^3.1.1" picocolors "^1.0.0" +update-notifier@6.0.2: + version "6.0.2" + resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-6.0.2.tgz#a6990253dfe6d5a02bd04fbb6a61543f55026b60" + integrity sha512-EDxhTEVPZZRLWYcJ4ZXjGFN0oP7qYvbXWzEgRm/Yql4dHX5wDbvh89YHP6PK1lzZJYrMtXUuZZz8XGK+U6U1og== + dependencies: + boxen "^7.0.0" + chalk "^5.0.1" + configstore "^6.0.0" + has-yarn "^3.0.0" + import-lazy "^4.0.0" + is-ci "^3.0.1" + is-installed-globally "^0.4.0" + is-npm "^6.0.0" + is-yarn-global "^0.4.0" + latest-version "^7.0.0" + pupa "^3.1.0" + semver "^7.3.7" + semver-diff "^4.0.0" + xdg-basedir "^5.1.0" + upper-case-first@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/upper-case-first/-/upper-case-first-2.0.2.tgz#992c3273f882abd19d1e02894cc147117f844324" @@ -17763,6 +20967,11 @@ upper-case@^2.0.2: dependencies: tslib "^2.0.3" +uqr@^0.1.2: + version "0.1.2" + resolved "https://registry.yarnpkg.com/uqr/-/uqr-0.1.2.tgz#5c6cd5dcff9581f9bb35b982cb89e2c483a41d7d" + integrity sha512-MJu7ypHq6QasgF5YRTjqscSzQp/W11zoUk6kvmlH+fmWEs63Y0Eib13hYFwAzagRJcVY8WVnlV+eBDUGMJ5IbA== + uri-js@^4.2.2: version "4.4.1" resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e" @@ -17796,19 +21005,17 @@ url-set-query@^1.0.0: integrity sha512-3AChu4NiXquPfeckE5R5cGdiHCMWJx1dwCWOmWIL4KHAziJNOFIYJlpGFeKDvwLPHovZRCxK3cYlwzqI9Vp+Gg== url@^0.11.0: - version "0.11.0" - resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1" - integrity sha512-kbailJa29QrtXnxgq+DdCEGlbTeYM2eJUxsz6vjZavrCYPMIFHMKQmSKYAIuUK2i7hgPm28a8piX5NTUtM/LKQ== + version "0.11.3" + resolved "https://registry.yarnpkg.com/url/-/url-0.11.3.tgz#6f495f4b935de40ce4a0a52faee8954244f3d3ad" + integrity sha512-6hxOLGfZASQK/cijlZnZJTq8OXAkt/3YGfQX45vvMYXpZoo8NdWZcY73K108Jf759lS1Bv/8wXnHDTSz17dSRw== dependencies: - punycode "1.3.2" - querystring "0.2.0" + punycode "^1.4.1" + qs "^6.11.2" -urlpattern-polyfill@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/urlpattern-polyfill/-/urlpattern-polyfill-7.0.0.tgz#dc9e5098efc492b4f09bc9fc6acfba545dfb149d" - integrity sha512-fErMjbZwveQIk+EY4vxM5GKDuInBOigxmjM6WT2R/cV2ETVyFtDHeU+VmbnfuJ5sp0qNbyUBelTO/60/d+/SSQ== - dependencies: - braces "^3.0.2" +urlpattern-polyfill@8.0.2, urlpattern-polyfill@^8.0.0: + version "8.0.2" + resolved "https://registry.yarnpkg.com/urlpattern-polyfill/-/urlpattern-polyfill-8.0.2.tgz#99f096e35eff8bf4b5a2aa7d58a1523d6ebc7ce5" + integrity sha512-Qp95D4TPJl1kC9SKigDcqgyM2VDVO4RiJc2d4qe5GrYm+zbIQCWWKAFaJNQ4BhdFeDGwBmAxqJBwWSJDb9T3BQ== use-sync-external-store@1.2.0: version "1.2.0" @@ -17838,22 +21045,17 @@ util-deprecate@^1.0.1, util-deprecate@^1.0.2, util-deprecate@~1.0.1: integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw== util.promisify@^1.0.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/util.promisify/-/util.promisify-1.1.1.tgz#77832f57ced2c9478174149cae9b96e9918cd54b" - integrity sha512-/s3UsZUrIfa6xDhr7zZhnE9SLQ5RIXyYfiVnMMyMDzOc8WhWN4Nbh36H842OyurKbCDAesZOJaVyvmSl6fhGQw== + version "1.1.2" + resolved "https://registry.yarnpkg.com/util.promisify/-/util.promisify-1.1.2.tgz#02b3dbadbb80071eee4c43aed58747afdfc516db" + integrity sha512-PBdZ03m1kBnQ5cjjO0ZvJMJS+QsbyIcFwi4hY4U76OQsCO9JrOYjbCFgIF76ccFg9xnJo7ZHPkqyj1GqmdS7MA== dependencies: - call-bind "^1.0.0" - define-properties "^1.1.3" + call-bind "^1.0.2" + define-properties "^1.2.0" for-each "^0.3.3" - has-symbols "^1.0.1" - object.getownpropertydescriptors "^2.1.1" - -util@0.10.3: - version "0.10.3" - resolved "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9" - integrity sha512-5KiHfsmkqacuKjkRkdV7SsfDJ2EGiPsK92s2MhNSY0craxjTdKTtqKsJaCWp4LW33ZZ0OPUv1WO/TFvNQRiQxQ== - dependencies: - inherits "2.0.1" + has-proto "^1.0.1" + has-symbols "^1.0.3" + object.getownpropertydescriptors "^2.1.6" + safe-array-concat "^1.0.0" util@^0.10.3: version "0.10.4" @@ -17862,14 +21064,7 @@ util@^0.10.3: dependencies: inherits "2.0.3" -util@^0.11.0: - version "0.11.1" - resolved "https://registry.yarnpkg.com/util/-/util-0.11.1.tgz#3236733720ec64bb27f6e26f421aaa2e1b588d61" - integrity sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ== - dependencies: - inherits "2.0.3" - -util@^0.12.0, util@^0.12.4, util@^0.12.5: +util@^0.12.4, util@^0.12.5: version "0.12.5" resolved "https://registry.yarnpkg.com/util/-/util-0.12.5.tgz#5f17a6059b73db61a875668781a1c2b136bd6fbc" integrity sha512-kZf/K6hEIrWHI6XqOFUiiMa+79wE/D8Q+NCNAWclkyg3b4d2k7s0QGepNjiABc+aR3N1PAyHL7p6UcLY6LmrnA== @@ -17885,16 +21080,16 @@ utils-merge@1.0.1: resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713" integrity sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA== -uuid@2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/uuid/-/uuid-2.0.1.tgz#c2a30dedb3e535d72ccf82e343941a50ba8533ac" - integrity sha512-nWg9+Oa3qD2CQzHIP4qKUqwNfzKn8P0LtFhotaCTFchsV7ZfDhAybeip/HZVeMIpZi9JgY1E3nUlwaCmZT1sEg== - uuid@3.3.2: version "3.3.2" resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131" integrity sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA== +uuid@9.0.0: + version "9.0.0" + resolved "https://registry.yarnpkg.com/uuid/-/uuid-9.0.0.tgz#592f550650024a38ceb0c562f2f6aa435761efb5" + integrity sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg== + uuid@^3.2.2, uuid@^3.3.2: version "3.4.0" resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee" @@ -17906,9 +21101,9 @@ uuid@^8.3.2: integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg== uuid@^9.0.0: - version "9.0.0" - resolved "https://registry.yarnpkg.com/uuid/-/uuid-9.0.0.tgz#592f550650024a38ceb0c562f2f6aa435761efb5" - integrity sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg== + version "9.0.1" + resolved "https://registry.yarnpkg.com/uuid/-/uuid-9.0.1.tgz#e188d4c8853cc722220392c424cd637f32293f30" + integrity sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA== v8-compile-cache-lib@^3.0.1: version "3.0.1" @@ -17923,15 +21118,22 @@ validate-npm-package-license@^3.0.1: spdx-correct "^3.0.0" spdx-expression-parse "^3.0.0" -valtio@1.10.7: - version "1.10.7" - resolved "https://registry.yarnpkg.com/valtio/-/valtio-1.10.7.tgz#0843b8bc8382060b3e6a0d31be645c3ef9a7f7dc" - integrity sha512-XUwXJ9twXqwfVhXlcbYlCcRUUSOmp8RcJODVAxPrUZc2jh3com13B49MOL/cbgcTOX+5yf7wdMqbFGR7ba2sPg== +validate-npm-package-name@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/validate-npm-package-name/-/validate-npm-package-name-4.0.0.tgz#fe8f1c50ac20afdb86f177da85b3600f0ac0d747" + integrity sha512-mzR0L8ZDktZjpX4OB46KT+56MAhl4EIazWP/+G/HPGuvfdaqg4YsCdtOm6U9+LOFyYDoh4dpnpxZRB9MQQns5Q== + dependencies: + builtins "^5.0.0" + +valtio@1.11.2: + version "1.11.2" + resolved "https://registry.yarnpkg.com/valtio/-/valtio-1.11.2.tgz#b8049c02dfe65620635d23ebae9121a741bb6530" + integrity sha512-1XfIxnUXzyswPAPXo1P3Pdx2mq/pIqZICkWN60Hby0d9Iqb+MEIpqgYVlbflvHdrp2YR/q3jyKWRPJJ100yxaw== dependencies: proxy-compare "2.5.1" use-sync-external-store "1.2.0" -value-or-promise@1.0.12, value-or-promise@^1.0.11, value-or-promise@^1.0.12: +value-or-promise@^1.0.11, value-or-promise@^1.0.12: version "1.0.12" resolved "https://registry.yarnpkg.com/value-or-promise/-/value-or-promise-1.0.12.tgz#0e5abfeec70148c78460a849f6b003ea7986f15c" integrity sha512-Z6Uz+TYwEqE7ZN50gwn+1LCVo9ZVrpxRPOhOLnncYkY1ZzOYtrX8Fwf/rFktZ8R5mJms6EZf5TqNOMeZmnPq9Q== @@ -17972,27 +21174,35 @@ vite-node@0.26.3: source-map-support "^0.5.21" vite "^3.0.0 || ^4.0.0" -vite@3.2.4: - version "3.2.4" - resolved "https://registry.yarnpkg.com/vite/-/vite-3.2.4.tgz#d8c7892dd4268064e04fffbe7d866207dd24166e" - integrity sha512-Z2X6SRAffOUYTa+sLy3NQ7nlHFU100xwanq1WDwqaiFiCe+25zdxP1TfCS5ojPV2oDDcXudHIoPnI1Z/66B7Yw== +vite-plugin-node-polyfills@0.15.0: + version "0.15.0" + resolved "https://registry.yarnpkg.com/vite-plugin-node-polyfills/-/vite-plugin-node-polyfills-0.15.0.tgz#ea425595f4258e04fddd06b4e422fc8d391e6a17" + integrity sha512-IF9aTSPV9zebrcC6ezJA3Ym4r4U1C3jKUAnG16Sq7+UPtisNEOcNOAu3p5wcgFFOuuUwAUjQlIeJHMcnSXXemQ== dependencies: - esbuild "^0.15.9" - postcss "^8.4.18" - resolve "^1.22.1" - rollup "^2.79.1" + "@rollup/plugin-inject" "^5.0.3" + buffer-polyfill "npm:buffer@^6.0.3" + node-stdlib-browser "^1.2.0" + process "^0.11.10" + +vite@4.5.0: + version "4.5.0" + resolved "https://registry.yarnpkg.com/vite/-/vite-4.5.0.tgz#ec406295b4167ac3bc23e26f9c8ff559287cff26" + integrity sha512-ulr8rNLA6rkyFAlVWw2q5YJ91v098AFQ2R0PRFwPzREXOUJQPtFUG0t+/ZikhaOCDqFoDhN6/v8Sq0o4araFAw== + dependencies: + esbuild "^0.18.10" + postcss "^8.4.27" + rollup "^3.27.1" optionalDependencies: fsevents "~2.3.2" "vite@^3.0.0 || ^4.0.0": - version "4.2.2" - resolved "https://registry.yarnpkg.com/vite/-/vite-4.2.2.tgz#014c30e5163844f6e96d7fe18fbb702236516dc6" - integrity sha512-PcNtT5HeDxb3QaSqFYkEum8f5sCVe0R3WK20qxgIvNBZPXU/Obxs/+ubBMeE7nLWeCo2LDzv+8hRYSlcaSehig== + version "4.5.1" + resolved "https://registry.yarnpkg.com/vite/-/vite-4.5.1.tgz#3370986e1ed5dbabbf35a6c2e1fb1e18555b968a" + integrity sha512-AXXFaAJ8yebyqzoNB9fu2pHoo/nWX+xZlaRwoeYUxEqBO+Zj4msE5G+BhGBll9lYEKv9Hfks52PAF2X7qDYXQA== dependencies: - esbuild "^0.17.5" - postcss "^8.4.21" - resolve "^1.22.1" - rollup "^3.18.0" + esbuild "^0.18.10" + postcss "^8.4.27" + rollup "^3.27.1" optionalDependencies: fsevents "~2.3.2" @@ -18022,20 +21232,20 @@ vm-browserify@^1.0.1: resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.2.tgz#78641c488b8e6ca91a75f511e7a3b32a86e5dda0" integrity sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ== -vue-demi@*: - version "0.14.0" - resolved "https://registry.yarnpkg.com/vue-demi/-/vue-demi-0.14.0.tgz#dcfd9a9cf9bb62ada1582ec9042372cf67ca6190" - integrity sha512-gt58r2ogsNQeVoQ3EhoUAvUsH9xviydl0dWJj7dabBC/2L4uBId7ujtCwDRD0JhkGsV1i0CtfLAeyYKBht9oWg== +vue-demi@*, vue-demi@>=0.14.5, vue-demi@>=0.14.6: + version "0.14.6" + resolved "https://registry.yarnpkg.com/vue-demi/-/vue-demi-0.14.6.tgz#dc706582851dc1cdc17a0054f4fec2eb6df74c92" + integrity sha512-8QA7wrYSHKaYgUxDA5ZC24w+eHm3sYCbp0EzcDwKqN3p6HqtTCGR/GVsPyZW92unff4UlcSh++lmqDWN3ZIq4w== vue-demi@^0.13.11: version "0.13.11" resolved "https://registry.yarnpkg.com/vue-demi/-/vue-demi-0.13.11.tgz#7d90369bdae8974d87b1973564ad390182410d99" integrity sha512-IR8HoEEGM65YY3ZJYAjMlKygDQn25D5ajNFNoKh9RSDMQtlzCxtfQjdQgv9jjK+m3377SsJXY8ysq8kLCZL25A== -vue-eslint-parser@^9.0.0, vue-eslint-parser@^9.0.1: - version "9.1.1" - resolved "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-9.1.1.tgz#3f4859be7e9bb7edaa1dc7edb05abffee72bf3dd" - integrity sha512-C2aI/r85Q6tYcz4dpgvrs4wH/MqVrRAVIdpYedrxnATDHHkb+TroeRcDpKWGZCx/OcECMWfz7tVwQ8e+Opy6rA== +vue-eslint-parser@^9.1.1, vue-eslint-parser@^9.4.0: + version "9.4.0" + resolved "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-9.4.0.tgz#dfd22302e2992fe45748a76553cef7afa5bdde27" + integrity sha512-7KsNBb6gHFA75BtneJsoK/dbZ281whUIwFYdQxA68QrCrGMXYzUMbPDHGcOQ0OocIVKrWSKWXZ4mL7tonCXoUw== dependencies: debug "^4.3.4" eslint-scope "^7.1.1" @@ -18046,14 +21256,13 @@ vue-eslint-parser@^9.0.0, vue-eslint-parser@^9.0.1: semver "^7.3.6" vue-final-modal@^4.3.0: - version "4.3.1" - resolved "https://registry.yarnpkg.com/vue-final-modal/-/vue-final-modal-4.3.1.tgz#8d3bb4481ba324f49e2277b58a236eb53bdb01fb" - integrity sha512-lKWV0iUrMLM2wLBtWJ1PFdx9kUn6b+aGEH2mTOHXBmDknilBAymdXaNc7LbSz/tWY6plAR0S3XfyHuI2nTdL4g== + version "4.5.3" + resolved "https://registry.yarnpkg.com/vue-final-modal/-/vue-final-modal-4.5.3.tgz#56e94e28e0e5d351b9f0bebf3146f75d4c77531e" + integrity sha512-BX+If7NuOTbFlTrNu7/tPRJMTOQKdI3/8JT9VAQ9xjKSQ/kmBw0RUQKC9VwitBBSTeosk5uuVSlJRSbvTcL1rg== dependencies: - "@vueuse/core" "^9.13.0" - "@vueuse/integrations" "^9.13.0" - focus-trap "^7.4.0" - vue "^3.2.47" + "@vueuse/core" "^10.5.0" + "@vueuse/integrations" "^10.5.0" + focus-trap "^7.5.4" vue-i18n-extract@^2.0.7: version "2.0.7" @@ -18067,14 +21276,13 @@ vue-i18n-extract@^2.0.7: js-yaml "^4.1.0" vue-i18n@9: - version "9.2.2" - resolved "https://registry.yarnpkg.com/vue-i18n/-/vue-i18n-9.2.2.tgz#aeb49d9424923c77e0d6441e3f21dafcecd0e666" - integrity sha512-yswpwtj89rTBhegUAv9Mu37LNznyu3NpyLQmozF3i1hYOhwpG8RjcjIFIIfnu+2MDZJGSZPXaKWvnQA71Yv9TQ== + version "9.9.0" + resolved "https://registry.yarnpkg.com/vue-i18n/-/vue-i18n-9.9.0.tgz#20d348fa7e37fc88e4c84f69781b2f1215c7769f" + integrity sha512-xQ5SxszUAqK5n84N+uUyHH/PiQl9xZ24FOxyAaNonmOQgXeN+rD9z/6DStOpOxNFQn4Cgcquot05gZc+CdOujA== dependencies: - "@intlify/core-base" "9.2.2" - "@intlify/shared" "9.2.2" - "@intlify/vue-devtools" "9.2.2" - "@vue/devtools-api" "^6.2.1" + "@intlify/core-base" "9.9.0" + "@intlify/shared" "9.9.0" + "@vue/devtools-api" "^6.5.0" vue-meta@3.0.0-alpha.8: version "3.0.0-alpha.8" @@ -18087,38 +21295,39 @@ vue-resize@^2.0.0-alpha.1: integrity sha512-7+iqOueLU7uc9NrMfrzbG8hwMqchfVfSzpVlCMeJQe4pyibqyoifDNbKTZvwxZKDvGkB+PdFeKvnGZMoEb8esg== vue-router@4: - version "4.1.6" - resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-4.1.6.tgz#b70303737e12b4814578d21d68d21618469375a1" - integrity sha512-DYWYwsG6xNPmLq/FmZn8Ip+qrhFEzA14EI12MsMgVxvHFDYvlr4NXpVF5hrRH1wVcDP8fGi5F4rxuJSl8/r+EQ== + version "4.2.5" + resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-4.2.5.tgz#b9e3e08f1bd9ea363fdd173032620bc50cf0e98a" + integrity sha512-DIUpKcyg4+PTQKfFPX88UWhlagBEBEfJ5A8XDXRJLUnZOvcpMF8o/dnL90vpVkGaPbjvXazV/rC1qBKrZlFugw== dependencies: - "@vue/devtools-api" "^6.4.5" + "@vue/devtools-api" "^6.5.0" vue-template-compiler@^2.7.14: - version "2.7.14" - resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.7.14.tgz#4545b7dfb88090744c1577ae5ac3f964e61634b1" - integrity sha512-zyA5Y3ArvVG0NacJDkkzJuPQDF8RFeRlzV2vLeSnhSpieO6LK2OVbdLPi5MPPs09Ii+gMO8nY4S3iKQxBxDmWQ== + version "2.7.16" + resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.7.16.tgz#c81b2d47753264c77ac03b9966a46637482bb03b" + integrity sha512-AYbUWAJHLGGQM7+cNTELw+KsOG9nl2CnSv467WobS5Cv9uk3wFcnr1Etsz2sEIHEZvw1U+o9mRlEO6QbZvUPGQ== dependencies: de-indent "^1.0.2" he "^1.2.0" vue-tsc@^1.0.13: - version "1.2.0" - resolved "https://registry.yarnpkg.com/vue-tsc/-/vue-tsc-1.2.0.tgz#2b64b960cc96208492541394423ace589a461be6" - integrity sha512-rIlzqdrhyPYyLG9zxsVRa+JEseeS9s8F2BbVVVWRRsTZvJO2BbhLEb2HW3MY+DFma0378tnIqs+vfTzbcQtRFw== + version "1.8.27" + resolved "https://registry.yarnpkg.com/vue-tsc/-/vue-tsc-1.8.27.tgz#feb2bb1eef9be28017bb9e95e2bbd1ebdd48481c" + integrity sha512-WesKCAZCRAbmmhuGl3+VrdWItEvfoFIPXOvUJkjULi+x+6G/Dy69yO3TBRJDr9eUlmsNAwVmxsNZxvHKzbkKdg== dependencies: - "@volar/vue-language-core" "1.2.0" - "@volar/vue-typescript" "1.2.0" + "@volar/typescript" "~1.11.1" + "@vue/language-core" "1.8.27" + semver "^7.5.4" -vue@^3.2.45, vue@^3.2.47: - version "3.2.47" - resolved "https://registry.yarnpkg.com/vue/-/vue-3.2.47.tgz#3eb736cbc606fc87038dbba6a154707c8a34cff0" - integrity sha512-60188y/9Dc9WVrAZeUVSDxRQOZ+z+y5nO2ts9jWXSTkMvayiWxCWOWtBQoYjLeccfXkiiPZWAHcV+WTPhkqJHQ== +vue@^3.2.45: + version "3.4.14" + resolved "https://registry.yarnpkg.com/vue/-/vue-3.4.14.tgz#d7d3a3fe6b2e901e5b2ce583e11102c958ab87f2" + integrity sha512-Rop5Al/ZcBbBz+KjPZaZDgHDX0kUP4duEzDbm+1o91uxYUNmJrZSBuegsNIJvUGy+epLevNRNhLjm08VKTgGyw== dependencies: - "@vue/compiler-dom" "3.2.47" - "@vue/compiler-sfc" "3.2.47" - "@vue/runtime-dom" "3.2.47" - "@vue/server-renderer" "3.2.47" - "@vue/shared" "3.2.47" + "@vue/compiler-dom" "3.4.14" + "@vue/compiler-sfc" "3.4.14" + "@vue/runtime-dom" "3.4.14" + "@vue/server-renderer" "3.4.14" + "@vue/shared" "3.4.14" w3c-xmlserializer@^4.0.0: version "4.0.0" @@ -18127,42 +21336,20 @@ w3c-xmlserializer@^4.0.0: dependencies: xml-name-validator "^4.0.0" -wasmbuilder@0.0.10: - version "0.0.10" - resolved "https://registry.yarnpkg.com/wasmbuilder/-/wasmbuilder-0.0.10.tgz#b8298b2095ef9979d32f3881d1feef1705ec868a" - integrity sha512-zQSvZ7d74d9OvN+mCN6ucNne4QS5/cBBYTHldX0Oe+u9gStY21orapvuX1ajisA7RVIpuFhYg+ZgdySsPfeh0A== +wait-port@1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/wait-port/-/wait-port-1.0.4.tgz#6f9474645ddbf7701ac100ab6762438edf6e5689" + integrity sha512-w8Ftna3h6XSFWWc2JC5gZEgp64nz8bnaTp5cvzbJSZ53j+omktWTDdwXxEF0jM8YveviLgFWvNGrSvRHnkyHyw== dependencies: - big-integer "^1.6.48" + chalk "^4.1.2" + commander "^9.3.0" + debug "^4.3.4" wasmbuilder@0.0.16: version "0.0.16" resolved "https://registry.yarnpkg.com/wasmbuilder/-/wasmbuilder-0.0.16.tgz#f34c1f2c047d2f6e1065cbfec5603988f16d8549" integrity sha512-Qx3lEFqaVvp1cEYW7Bfi+ebRJrOiwz2Ieu7ZG2l7YyeSJIok/reEQCQCuicj/Y32ITIJuGIM9xZQppGx5LrQdA== -wasmcurves@0.0.12: - version "0.0.12" - resolved "https://registry.yarnpkg.com/wasmcurves/-/wasmcurves-0.0.12.tgz#1496e2219ac07f9a420f527803ae13b1d7a89246" - integrity sha512-1Jl9mkatyHSNj80ILjf85SZUNuZQBCkTjJlhzqHnZQXUmIimCIWkugaVaYNjozLs1Gun4h/keZe1MBeBN0sRpg== - dependencies: - big-integer "^1.6.42" - blakejs "^1.1.0" - -wasmcurves@0.0.14: - version "0.0.14" - resolved "https://registry.yarnpkg.com/wasmcurves/-/wasmcurves-0.0.14.tgz#cbe0f19650d9554937154afdbed66b305bd2a348" - integrity sha512-G1iMkxlRaQSdqQ1JrwHcU+awLmwyH6kFKfT8g9obd8MWe+u5oSdFXrODB0zmSI5aGGvJPG+4cAmqCGYv9R+7qg== - dependencies: - big-integer "^1.6.42" - blakejs "^1.1.0" - -wasmcurves@0.0.5: - version "0.0.5" - resolved "https://registry.yarnpkg.com/wasmcurves/-/wasmcurves-0.0.5.tgz#d0b58e803c0b1c09c966b7dc0fad6dd405d18547" - integrity sha512-BmI4GXLjLawGg2YkvHa8zRsnWec+d1uwoxE+Iov8cqOpDL7GA5XO2pk2yuDbXHMzwIug2exnKot3baRZ86R0pA== - dependencies: - big-integer "^1.6.42" - blakejs "^1.1.0" - wasmcurves@0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/wasmcurves/-/wasmcurves-0.2.0.tgz#ccfc5a7d3778b6e0768b82a9336c80054f9bc0cf" @@ -18170,23 +21357,12 @@ wasmcurves@0.2.0: dependencies: wasmbuilder "0.0.16" -watchpack-chokidar2@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/watchpack-chokidar2/-/watchpack-chokidar2-2.0.1.tgz#38500072ee6ece66f3769936950ea1771be1c957" - integrity sha512-nCFfBIPKr5Sh61s4LPpy1Wtfi0HE8isJ3d2Yb5/Ppw2P2B/3eVSEBjKfN0fmHJSK14+31KwMKmcrzs2GM4P0Ww== - dependencies: - chokidar "^2.1.8" - -watchpack@^1.7.4: - version "1.7.5" - resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.7.5.tgz#1267e6c55e0b9b5be44c2023aed5437a2c26c453" - integrity sha512-9P3MWk6SrKjHsGkLT2KHXdQ/9SNkyoJbabxnKOoJepsvJjJG8uYTR3yTPxPQvNDI3w4Nz1xnE0TLHK4RIVe/MQ== +wasmcurves@0.2.2: + version "0.2.2" + resolved "https://registry.yarnpkg.com/wasmcurves/-/wasmcurves-0.2.2.tgz#ca444f6a6f6e2a5cbe6629d98ff478a62b4ccb2b" + integrity sha512-JRY908NkmKjFl4ytnTu5ED6AwPD+8VJ9oc94kdq7h5bIwbj0L4TDJ69mG+2aLs2SoCmGfqIesMWTEJjtYsoQXQ== dependencies: - graceful-fs "^4.1.2" - neo-async "^2.5.0" - optionalDependencies: - chokidar "^3.4.1" - watchpack-chokidar2 "^2.0.1" + wasmbuilder "0.0.16" wcwidth@^1.0.1: version "1.0.1" @@ -18195,16 +21371,21 @@ wcwidth@^1.0.1: dependencies: defaults "^1.0.3" -web-streams-polyfill@^3.2.1: - version "3.2.1" - resolved "https://registry.yarnpkg.com/web-streams-polyfill/-/web-streams-polyfill-3.2.1.tgz#71c2718c52b45fd49dbeee88634b3a60ceab42a6" - integrity sha512-e0MO3wdXWKrLbL0DgGnUV7WHVuw9OUvL4hjgnPkIeEvESk74gAITi5G606JtZPp39cd8HA9VQzCIvA49LpPN5Q== +web-streams-polyfill@^3.0.3, web-streams-polyfill@^3.2.1: + version "3.3.2" + resolved "https://registry.yarnpkg.com/web-streams-polyfill/-/web-streams-polyfill-3.3.2.tgz#32e26522e05128203a7de59519be3c648004343b" + integrity sha512-3pRGuxRF5gpuZc0W+EpwQRmCD7gRqcDOMt688KmdlDAgAyaB1XlN0zq2njfDNm44XVdIouE7pZ6GzbdyH47uIQ== -web-worker@^1.0.0, web-worker@^1.2.0: +web-worker@1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/web-worker/-/web-worker-1.2.0.tgz#5d85a04a7fbc1e7db58f66595d7a3ac7c9c180da" integrity sha512-PgF341avzqyx60neE9DD+XS26MMNMoUQRz9NOZwW32nPQrF6p77f1htcnjBSEV8BGMKZ16choqUG4hyI0Hx7mA== +web-worker@^1.2.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/web-worker/-/web-worker-1.3.0.tgz#e5f2df5c7fe356755a5fb8f8410d4312627e6776" + integrity sha512-BSR9wyRsy/KOValMgd5kMyr3JzpdeoR9KVId8u5GVlTTAtNChlsE4yTxeY7zMdNSyOmoKBv8NH2qeRY9Tg+IaA== + web3-bzz@1.2.11: version "1.2.11" resolved "https://registry.yarnpkg.com/web3-bzz/-/web3-bzz-1.2.11.tgz#41bc19a77444bd5365744596d778b811880f707f" @@ -18215,15 +21396,6 @@ web3-bzz@1.2.11: swarm-js "^0.1.40" underscore "1.9.1" -web3-bzz@1.9.0: - version "1.9.0" - resolved "https://registry.yarnpkg.com/web3-bzz/-/web3-bzz-1.9.0.tgz#3334049f386e73e2b3dcfa96432e65391538d8ac" - integrity sha512-9Zli9dikX8GdHwBb5/WPzpSVuy3EWMKY3P4EokCQra31fD7DLizqAAaTUsFwnK7xYkw5ogpHgelw9uKHHzNajg== - dependencies: - "@types/node" "^12.12.6" - got "12.1.0" - swarm-js "^0.1.40" - web3-core-helpers@1.2.11: version "1.2.11" resolved "https://registry.yarnpkg.com/web3-core-helpers/-/web3-core-helpers-1.2.11.tgz#84c681ed0b942c0203f3b324a245a127e8c67a99" @@ -18233,14 +21405,6 @@ web3-core-helpers@1.2.11: web3-eth-iban "1.2.11" web3-utils "1.2.11" -web3-core-helpers@1.9.0: - version "1.9.0" - resolved "https://registry.yarnpkg.com/web3-core-helpers/-/web3-core-helpers-1.9.0.tgz#a1ca4ac7b9cec822886643312d2e98b0e4d8f1bc" - integrity sha512-NeJzylAp9Yj9xAt2uTT+kyug3X0DLnfBdnAcGZuY6HhoNPDIfQRA9CkJjLngVRlGTLZGjNp9x9eR+RyZQgUlXg== - dependencies: - web3-eth-iban "1.9.0" - web3-utils "1.9.0" - web3-core-method@1.2.11: version "1.2.11" resolved "https://registry.yarnpkg.com/web3-core-method/-/web3-core-method-1.2.11.tgz#f880137d1507a0124912bf052534f168b8d8fbb6" @@ -18253,17 +21417,6 @@ web3-core-method@1.2.11: web3-core-subscriptions "1.2.11" web3-utils "1.2.11" -web3-core-method@1.9.0: - version "1.9.0" - resolved "https://registry.yarnpkg.com/web3-core-method/-/web3-core-method-1.9.0.tgz#81da8aa21503b470537c9f075f30adfad194a2d8" - integrity sha512-sswbNsY2xRBBhGeaLt9c/eDc+0yDDhi6keUBAkgIRa9ueSx/VKzUY9HMqiV6bXDcGT2fJyejq74FfEB4lc/+/w== - dependencies: - "@ethersproject/transactions" "^5.6.2" - web3-core-helpers "1.9.0" - web3-core-promievent "1.9.0" - web3-core-subscriptions "1.9.0" - web3-utils "1.9.0" - web3-core-promievent@1.2.11: version "1.2.11" resolved "https://registry.yarnpkg.com/web3-core-promievent/-/web3-core-promievent-1.2.11.tgz#51fe97ca0ddec2f99bf8c3306a7a8e4b094ea3cf" @@ -18271,13 +21424,6 @@ web3-core-promievent@1.2.11: dependencies: eventemitter3 "4.0.4" -web3-core-promievent@1.9.0: - version "1.9.0" - resolved "https://registry.yarnpkg.com/web3-core-promievent/-/web3-core-promievent-1.9.0.tgz#2598a4d91b4edd3607366529f52bc96dee9f6d83" - integrity sha512-PHG1Mn23IGwMZhnPDN8dETKypqsFbHfiyRqP+XsVMPmTHkVfzDQTCBU/c2r6hUktBDoGKut5xZQpGfhFk71KbQ== - dependencies: - eventemitter3 "4.0.4" - web3-core-requestmanager@1.2.11: version "1.2.11" resolved "https://registry.yarnpkg.com/web3-core-requestmanager/-/web3-core-requestmanager-1.2.11.tgz#fe6eb603fbaee18530293a91f8cf26d8ae28c45a" @@ -18289,17 +21435,6 @@ web3-core-requestmanager@1.2.11: web3-providers-ipc "1.2.11" web3-providers-ws "1.2.11" -web3-core-requestmanager@1.9.0: - version "1.9.0" - resolved "https://registry.yarnpkg.com/web3-core-requestmanager/-/web3-core-requestmanager-1.9.0.tgz#9d7d0e7f890cf7a24e9c568b9772c64d57fc4fcd" - integrity sha512-hcJ5PCtTIJpj+8qWxoseqlCovDo94JJjTX7dZOLXgwp8ah7E3WRYozhGyZocerx+KebKyg1mCQIhkDpMwjfo9Q== - dependencies: - util "^0.12.5" - web3-core-helpers "1.9.0" - web3-providers-http "1.9.0" - web3-providers-ipc "1.9.0" - web3-providers-ws "1.9.0" - web3-core-subscriptions@1.2.11: version "1.2.11" resolved "https://registry.yarnpkg.com/web3-core-subscriptions/-/web3-core-subscriptions-1.2.11.tgz#beca908fbfcb050c16f45f3f0f4c205e8505accd" @@ -18309,14 +21444,6 @@ web3-core-subscriptions@1.2.11: underscore "1.9.1" web3-core-helpers "1.2.11" -web3-core-subscriptions@1.9.0: - version "1.9.0" - resolved "https://registry.yarnpkg.com/web3-core-subscriptions/-/web3-core-subscriptions-1.9.0.tgz#dc67b478875dab1875844df3307a986dd7d468dd" - integrity sha512-MaIo29yz7hTV8X8bioclPDbHFOVuHmnbMv+D3PDH12ceJFJAXGyW8GL5KU1DYyWIj4TD1HM4WknyVA/YWBiiLA== - dependencies: - eventemitter3 "4.0.4" - web3-core-helpers "1.9.0" - web3-core@1.2.11: version "1.2.11" resolved "https://registry.yarnpkg.com/web3-core/-/web3-core-1.2.11.tgz#1043cacc1becb80638453cc5b2a14be9050288a7" @@ -18330,19 +21457,6 @@ web3-core@1.2.11: web3-core-requestmanager "1.2.11" web3-utils "1.2.11" -web3-core@1.9.0: - version "1.9.0" - resolved "https://registry.yarnpkg.com/web3-core/-/web3-core-1.9.0.tgz#9cfafb2f8c01931429108af75205610406a5a1ab" - integrity sha512-DZ+TPmq/ZLlx4LSVzFgrHCP/QFpKDbGWO4HoquZSdu24cjk5SZ+FEU1SZB2OaK3/bgBh+25mRbmv8y56ysUu1w== - dependencies: - "@types/bn.js" "^5.1.1" - "@types/node" "^12.12.6" - bignumber.js "^9.0.0" - web3-core-helpers "1.9.0" - web3-core-method "1.9.0" - web3-core-requestmanager "1.9.0" - web3-utils "1.9.0" - web3-eth-abi@1.2.11: version "1.2.11" resolved "https://registry.yarnpkg.com/web3-eth-abi/-/web3-eth-abi-1.2.11.tgz#a887494e5d447c2926d557a3834edd66e17af9b0" @@ -18360,14 +21474,6 @@ web3-eth-abi@1.7.0: "@ethersproject/abi" "5.0.7" web3-utils "1.7.0" -web3-eth-abi@1.9.0: - version "1.9.0" - resolved "https://registry.yarnpkg.com/web3-eth-abi/-/web3-eth-abi-1.9.0.tgz#18662ef68bd3d25eedd9a1a1484089c39529c652" - integrity sha512-0BLQ3FKMrzJkA930jOX3fMaybAyubk06HChclLpiR0NWmgWXm1tmBrJdkyRy2ZTZpmfuZc9xTFRfl0yZID1voA== - dependencies: - "@ethersproject/abi" "^5.6.3" - web3-utils "1.9.0" - web3-eth-accounts@1.2.11: version "1.2.11" resolved "https://registry.yarnpkg.com/web3-eth-accounts/-/web3-eth-accounts-1.2.11.tgz#a9e3044da442d31903a7ce035a86d8fa33f90520" @@ -18385,22 +21491,6 @@ web3-eth-accounts@1.2.11: web3-core-method "1.2.11" web3-utils "1.2.11" -web3-eth-accounts@1.9.0: - version "1.9.0" - resolved "https://registry.yarnpkg.com/web3-eth-accounts/-/web3-eth-accounts-1.9.0.tgz#fab7d563c63bdff2aa5ad89a94faf128961d9504" - integrity sha512-VeIZVevmnSll0AC1k5F/y398ZE89d1SRuYk8IewLUhL/tVAsFEsjl2SGgm0+aDcHmgPrkW+qsCJ+C7rWg/N4ZA== - dependencies: - "@ethereumjs/common" "2.5.0" - "@ethereumjs/tx" "3.3.2" - eth-lib "0.2.8" - ethereumjs-util "^7.1.5" - scrypt-js "^3.0.1" - uuid "^9.0.0" - web3-core "1.9.0" - web3-core-helpers "1.9.0" - web3-core-method "1.9.0" - web3-utils "1.9.0" - web3-eth-contract@1.2.11: version "1.2.11" resolved "https://registry.yarnpkg.com/web3-eth-contract/-/web3-eth-contract-1.2.11.tgz#917065902bc27ce89da9a1da26e62ef663663b90" @@ -18416,20 +21506,6 @@ web3-eth-contract@1.2.11: web3-eth-abi "1.2.11" web3-utils "1.2.11" -web3-eth-contract@1.9.0: - version "1.9.0" - resolved "https://registry.yarnpkg.com/web3-eth-contract/-/web3-eth-contract-1.9.0.tgz#00b7ac8314d562d10d7dd0c7d0f52555c3862995" - integrity sha512-+j26hpSaEtAdUed0TN5rnc+YZOcjPxMjFX4ZBKatvFkImdbVv/tzTvcHlltubSpgb2ZLyZ89lSL6phKYwd2zNQ== - dependencies: - "@types/bn.js" "^5.1.1" - web3-core "1.9.0" - web3-core-helpers "1.9.0" - web3-core-method "1.9.0" - web3-core-promievent "1.9.0" - web3-core-subscriptions "1.9.0" - web3-eth-abi "1.9.0" - web3-utils "1.9.0" - web3-eth-ens@1.2.11: version "1.2.11" resolved "https://registry.yarnpkg.com/web3-eth-ens/-/web3-eth-ens-1.2.11.tgz#26d4d7f16d6cbcfff918e39832b939edc3162532" @@ -18445,20 +21521,6 @@ web3-eth-ens@1.2.11: web3-eth-contract "1.2.11" web3-utils "1.2.11" -web3-eth-ens@1.9.0: - version "1.9.0" - resolved "https://registry.yarnpkg.com/web3-eth-ens/-/web3-eth-ens-1.9.0.tgz#2014b16e1116be5ab34404a8db29ad1d8632ced0" - integrity sha512-LOJZeN+AGe9arhuExnrPPFYQr4WSxXEkpvYIlst/joOEUNLDwfndHnJIK6PI5mXaYSROBtTx6erv+HupzGo7vA== - dependencies: - content-hash "^2.5.2" - eth-ens-namehash "2.0.8" - web3-core "1.9.0" - web3-core-helpers "1.9.0" - web3-core-promievent "1.9.0" - web3-eth-abi "1.9.0" - web3-eth-contract "1.9.0" - web3-utils "1.9.0" - web3-eth-iban@1.2.11: version "1.2.11" resolved "https://registry.yarnpkg.com/web3-eth-iban/-/web3-eth-iban-1.2.11.tgz#f5f73298305bc7392e2f188bf38a7362b42144ef" @@ -18467,14 +21529,6 @@ web3-eth-iban@1.2.11: bn.js "^4.11.9" web3-utils "1.2.11" -web3-eth-iban@1.9.0: - version "1.9.0" - resolved "https://registry.yarnpkg.com/web3-eth-iban/-/web3-eth-iban-1.9.0.tgz#a8f838e42c20d49ff58aaa9f67ece47a968e40b1" - integrity sha512-jPAm77PuEs1kE/UrrBFJdPD2PN42pwfXA0gFuuw35bZezhskYML9W4QCxcqnUtceyEA4FUn7K2qTMuCk+23fog== - dependencies: - bn.js "^5.2.1" - web3-utils "1.9.0" - web3-eth-personal@1.2.11: version "1.2.11" resolved "https://registry.yarnpkg.com/web3-eth-personal/-/web3-eth-personal-1.2.11.tgz#a38b3942a1d87a62070ce0622a941553c3d5aa70" @@ -18487,18 +21541,6 @@ web3-eth-personal@1.2.11: web3-net "1.2.11" web3-utils "1.2.11" -web3-eth-personal@1.9.0: - version "1.9.0" - resolved "https://registry.yarnpkg.com/web3-eth-personal/-/web3-eth-personal-1.9.0.tgz#f5092bcb2688979dd7778d5a56ae6922c341ce52" - integrity sha512-r9Ldo/luBqJlv1vCUEQnUS+C3a3ZdbYxVHyfDkj6RWMyCqqo8JE41HWE+pfa0RmB1xnGL2g8TbYcHcqItck/qg== - dependencies: - "@types/node" "^12.12.6" - web3-core "1.9.0" - web3-core-helpers "1.9.0" - web3-core-method "1.9.0" - web3-net "1.9.0" - web3-utils "1.9.0" - web3-eth@1.2.11: version "1.2.11" resolved "https://registry.yarnpkg.com/web3-eth/-/web3-eth-1.2.11.tgz#4c81fcb6285b8caf544058fba3ae802968fdc793" @@ -18518,24 +21560,6 @@ web3-eth@1.2.11: web3-net "1.2.11" web3-utils "1.2.11" -web3-eth@1.9.0: - version "1.9.0" - resolved "https://registry.yarnpkg.com/web3-eth/-/web3-eth-1.9.0.tgz#1fe82ba429a44b1aa0a3b95de3e79e6c5a9eb00c" - integrity sha512-c5gSWk9bLNr6VPATHmZ1n7LTIefIZQnJMzfnvkoBcIFGKJbGmsuRhv6lEXsKdAO/FlqYnSbaw3fOq1fVFiIOFQ== - dependencies: - web3-core "1.9.0" - web3-core-helpers "1.9.0" - web3-core-method "1.9.0" - web3-core-subscriptions "1.9.0" - web3-eth-abi "1.9.0" - web3-eth-accounts "1.9.0" - web3-eth-contract "1.9.0" - web3-eth-ens "1.9.0" - web3-eth-iban "1.9.0" - web3-eth-personal "1.9.0" - web3-net "1.9.0" - web3-utils "1.9.0" - web3-net@1.2.11: version "1.2.11" resolved "https://registry.yarnpkg.com/web3-net/-/web3-net-1.2.11.tgz#eda68ef25e5cdb64c96c39085cdb74669aabbe1b" @@ -18545,15 +21569,6 @@ web3-net@1.2.11: web3-core-method "1.2.11" web3-utils "1.2.11" -web3-net@1.9.0: - version "1.9.0" - resolved "https://registry.yarnpkg.com/web3-net/-/web3-net-1.9.0.tgz#ee8799bf766039aa5b157d6db0be5ffdecd39d64" - integrity sha512-L+fDZFgrLM5Y15aonl2q6L+RvfaImAngmC0Jv45hV2FJ5IfRT0/2ob9etxZmvEBWvOpbqSvghfOhJIT3XZ37Pg== - dependencies: - web3-core "1.9.0" - web3-core-method "1.9.0" - web3-utils "1.9.0" - web3-provider-engine@14.2.1: version "14.2.1" resolved "https://registry.yarnpkg.com/web3-provider-engine/-/web3-provider-engine-14.2.1.tgz#ef351578797bf170e08d529cb5b02f8751329b95" @@ -18588,16 +21603,6 @@ web3-providers-http@1.2.11: web3-core-helpers "1.2.11" xhr2-cookies "1.1.0" -web3-providers-http@1.9.0: - version "1.9.0" - resolved "https://registry.yarnpkg.com/web3-providers-http/-/web3-providers-http-1.9.0.tgz#93cd3eb42fff974c9f7634ede1a9795d6435c3fe" - integrity sha512-5+dMNDAE0rRFz6SJpfnBqlVi2J5bB/Ivr2SanMt2YUrkxW5t8betZbzVwRkTbwtUvkqgj3xeUQzqpOttiv+IqQ== - dependencies: - abortcontroller-polyfill "^1.7.3" - cross-fetch "^3.1.4" - es6-promise "^4.2.8" - web3-core-helpers "1.9.0" - web3-providers-ipc@1.2.11: version "1.2.11" resolved "https://registry.yarnpkg.com/web3-providers-ipc/-/web3-providers-ipc-1.2.11.tgz#d16d6c9be1be6e0b4f4536c4acc16b0f4f27ef21" @@ -18607,14 +21612,6 @@ web3-providers-ipc@1.2.11: underscore "1.9.1" web3-core-helpers "1.2.11" -web3-providers-ipc@1.9.0: - version "1.9.0" - resolved "https://registry.yarnpkg.com/web3-providers-ipc/-/web3-providers-ipc-1.9.0.tgz#db486cb0dde9062ac6055478861e3d37535924d2" - integrity sha512-cPXU93Du40HCylvjaa5x62DbnGqH+86HpK/+kMcFIzF6sDUBhKpag2tSbYhGbj7GMpfkmDTUiiMLdWnFV6+uBA== - dependencies: - oboe "2.1.5" - web3-core-helpers "1.9.0" - web3-providers-ws@1.2.11: version "1.2.11" resolved "https://registry.yarnpkg.com/web3-providers-ws/-/web3-providers-ws-1.2.11.tgz#a1dfd6d9778d840561d9ec13dd453046451a96bb" @@ -18625,15 +21622,6 @@ web3-providers-ws@1.2.11: web3-core-helpers "1.2.11" websocket "^1.0.31" -web3-providers-ws@1.9.0: - version "1.9.0" - resolved "https://registry.yarnpkg.com/web3-providers-ws/-/web3-providers-ws-1.9.0.tgz#568330766e8abbb6eb43e1153a72fb24398fcb7e" - integrity sha512-JRVsnQZ7j2k1a2yzBNHe39xqk1ijOv01dfIBFw52VeEkSRzvrOcsPIM/ttSyBuJqt70ntMxXY0ekCrqfleKH/w== - dependencies: - eventemitter3 "4.0.4" - web3-core-helpers "1.9.0" - websocket "^1.0.32" - web3-shh@1.2.11: version "1.2.11" resolved "https://registry.yarnpkg.com/web3-shh/-/web3-shh-1.2.11.tgz#f5d086f9621c9a47e98d438010385b5f059fd88f" @@ -18644,16 +21632,6 @@ web3-shh@1.2.11: web3-core-subscriptions "1.2.11" web3-net "1.2.11" -web3-shh@1.9.0: - version "1.9.0" - resolved "https://registry.yarnpkg.com/web3-shh/-/web3-shh-1.9.0.tgz#75a37cd9f78d485ee5f018e2e66853e1e1c6ce4f" - integrity sha512-bIBZlralgz4ICCrwkefB2nPPJWfx28NuHIpjB7d9ADKynElubQuqudYhKtSEkKXACuME/BJm0pIFJcJs/gDnMg== - dependencies: - web3-core "1.9.0" - web3-core-method "1.9.0" - web3-core-subscriptions "1.9.0" - web3-net "1.9.0" - web3-utils@1.2.11: version "1.2.11" resolved "https://registry.yarnpkg.com/web3-utils/-/web3-utils-1.2.11.tgz#af1942aead3fb166ae851a985bed8ef2c2d95a82" @@ -18681,14 +21659,15 @@ web3-utils@1.7.0: randombytes "^2.1.0" utf8 "3.0.0" -web3-utils@1.9.0, web3-utils@^1.0.0-beta.31, web3-utils@^1.3.0, web3-utils@^1.6.0: - version "1.9.0" - resolved "https://registry.yarnpkg.com/web3-utils/-/web3-utils-1.9.0.tgz#7c5775a47586cefb4ad488831be8f6627be9283d" - integrity sha512-p++69rCNNfu2jM9n5+VD/g26l+qkEOQ1m6cfRQCbH8ZRrtquTmrirJMgTmyOoax5a5XRYOuws14aypCOs51pdQ== +web3-utils@^1.3.6: + version "1.10.3" + resolved "https://registry.yarnpkg.com/web3-utils/-/web3-utils-1.10.3.tgz#f1db99c82549c7d9f8348f04ffe4e0188b449714" + integrity sha512-OqcUrEE16fDBbGoQtZXWdavsPzbGIDc5v3VrRTZ0XrIpefC/viZ1ZU9bGEemazyS0catk/3rkOOxpzTfY+XsyQ== dependencies: + "@ethereumjs/util" "^8.1.0" bn.js "^5.2.1" ethereum-bloom-filters "^1.0.6" - ethereumjs-util "^7.1.0" + ethereum-cryptography "^2.1.2" ethjs-unit "0.1.6" number-to-bn "1.7.0" randombytes "^2.1.0" @@ -18707,19 +21686,6 @@ web3@1.2.11: web3-shh "1.2.11" web3-utils "1.2.11" -web3@^1.6.0: - version "1.9.0" - resolved "https://registry.yarnpkg.com/web3/-/web3-1.9.0.tgz#4fde5d134f8ee11355ed5bfa1bb41f8bc58e23f3" - integrity sha512-E9IvVy/d2ozfQQsCiV+zh/LmlZGv9fQxI0UedDVjm87yOKf4AYbBNEn1iWtHveiGzAk2CEMZMUzAZzaQNSSYog== - dependencies: - web3-bzz "1.9.0" - web3-core "1.9.0" - web3-eth "1.9.0" - web3-eth-personal "1.9.0" - web3-net "1.9.0" - web3-shh "1.9.0" - web3-utils "1.9.0" - webcrypto-core@^1.7.7: version "1.7.7" resolved "https://registry.yarnpkg.com/webcrypto-core/-/webcrypto-core-1.7.7.tgz#06f24b3498463e570fed64d7cab149e5437b162c" @@ -18741,59 +21707,15 @@ webidl-conversions@^7.0.0: resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-7.0.0.tgz#256b4e1882be7debbf01d05f0aa2039778ea080a" integrity sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g== -webpack-merge@^4.2.2: - version "4.2.2" - resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-4.2.2.tgz#a27c52ea783d1398afd2087f547d7b9d2f43634d" - integrity sha512-TUE1UGoTX2Cd42j3krGYqObZbOD+xF7u28WB7tfUordytSjbWTIjK/8V0amkBfTYN4/pB/GIDlJZZ657BGG19g== - dependencies: - lodash "^4.17.15" - -webpack-sources@^1.4.0, webpack-sources@^1.4.1: - version "1.4.3" - resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.4.3.tgz#eedd8ec0b928fbf1cbfe994e22d2d890f330a933" - integrity sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ== - dependencies: - source-list-map "^2.0.0" - source-map "~0.6.1" - webpack-sources@^3.2.3: version "3.2.3" resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.3.tgz#2d4daab8451fd4b240cc27055ff6a0c2ccea0cde" integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w== -webpack-virtual-modules@^0.5.0: - version "0.5.0" - resolved "https://registry.yarnpkg.com/webpack-virtual-modules/-/webpack-virtual-modules-0.5.0.tgz#362f14738a56dae107937ab98ea7062e8bdd3b6c" - integrity sha512-kyDivFZ7ZM0BVOUteVbDFhlRt7Ah/CSPwJdi8hBpkK7QLumUqdLtVfm/PX/hkcnrvr0i77fO5+TjZ94Pe+C9iw== - -webpack@^4.43.0: - version "4.46.0" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.46.0.tgz#bf9b4404ea20a073605e0a011d188d77cb6ad542" - integrity sha512-6jJuJjg8znb/xRItk7bkT0+Q7AHCYjjFnvKIWQPkNIOyRqoCGvkOs0ipeQzrqz4l5FtN5ZI/ukEHroeX/o1/5Q== - dependencies: - "@webassemblyjs/ast" "1.9.0" - "@webassemblyjs/helper-module-context" "1.9.0" - "@webassemblyjs/wasm-edit" "1.9.0" - "@webassemblyjs/wasm-parser" "1.9.0" - acorn "^6.4.1" - ajv "^6.10.2" - ajv-keywords "^3.4.1" - chrome-trace-event "^1.0.2" - enhanced-resolve "^4.5.0" - eslint-scope "^4.0.3" - json-parse-better-errors "^1.0.2" - loader-runner "^2.4.0" - loader-utils "^1.2.3" - memory-fs "^0.4.1" - micromatch "^3.1.10" - mkdirp "^0.5.3" - neo-async "^2.6.1" - node-libs-browser "^2.2.1" - schema-utils "^1.0.0" - tapable "^1.1.3" - terser-webpack-plugin "^1.4.3" - watchpack "^1.7.4" - webpack-sources "^1.4.1" +webpack-virtual-modules@^0.6.1: + version "0.6.1" + resolved "https://registry.yarnpkg.com/webpack-virtual-modules/-/webpack-virtual-modules-0.6.1.tgz#ac6fdb9c5adb8caecd82ec241c9631b7a3681b6f" + integrity sha512-poXpCylU7ExuvZK8z+On3kX+S8o/2dQ/SVYueKA0D4WEMXROXgY8Ez50/bQEUmvoSMMrWcrJqCHuhAbsiwg7Dg== websocket@1.0.32: version "1.0.32" @@ -18807,7 +21729,7 @@ websocket@1.0.32: utf-8-validate "^5.0.2" yaeti "^0.0.6" -websocket@^1.0.31, websocket@^1.0.32: +websocket@^1.0.31: version "1.0.34" resolved "https://registry.yarnpkg.com/websocket/-/websocket-1.0.34.tgz#2bdc2602c08bf2c82253b730655c0ef7dcab3111" integrity sha512-PRDso2sGwF6kM75QykIesBijKSVceR6jL2G8NGYyq2XrItNC2P5/qL5XeR056GhA+Ly7JMFvJb9I312mJfmqnQ== @@ -18819,6 +21741,11 @@ websocket@^1.0.31, websocket@^1.0.32: utf-8-validate "^5.0.2" yaeti "^0.0.6" +well-known-symbols@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/well-known-symbols/-/well-known-symbols-2.0.0.tgz#e9c7c07dbd132b7b84212c8174391ec1f9871ba5" + integrity sha512-ZMjC3ho+KXo0BfJb7JgtQ5IBuvnShdlACNkKkdsqBmYw3bPAaJfPeYUo6tLUaT5tG/Gkh7xkpBhKRQ9e7pyg9Q== + whatwg-encoding@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-2.0.0.tgz#e7635f597fd87020858626805a2729fa7698ac53" @@ -18863,48 +21790,42 @@ which-boxed-primitive@^1.0.2: is-string "^1.0.5" is-symbol "^1.0.3" -which-module@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/which-module/-/which-module-1.0.0.tgz#bba63ca861948994ff307736089e3b96026c2a4f" - integrity sha512-F6+WgncZi/mJDrammbTuHe1q0R5hOXv/mBaiNA2TCNT/LTHusX0V+CJnj9XT8ki5ln2UZyyddDgHfCzyrOH7MQ== - which-module@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a" - integrity sha512-B+enWhmw6cjfVC7kS8Pj9pCrKSc5txArRyaYGe088shv/FGWH+0Rjx/xPgtsWfsUtS27FkP697E4DDhgrgoc0Q== + version "2.0.1" + resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.1.tgz#776b1fe35d90aebe99e8ac15eb24093389a4a409" + integrity sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ== -which-typed-array@^1.1.2, which-typed-array@^1.1.9: - version "1.1.9" - resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.9.tgz#307cf898025848cf995e795e8423c7f337efbde6" - integrity sha512-w9c4xkx6mPidwp7180ckYWfMmvxpjlZuIudNtDf4N/tTAUB8VJbX25qZoAsrtGuYNnGw3pa0AXgbGKRB8/EceA== +which-typed-array@^1.1.11, which-typed-array@^1.1.13, which-typed-array@^1.1.2: + version "1.1.13" + resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.13.tgz#870cd5be06ddb616f504e7b039c4c24898184d36" + integrity sha512-P5Nra0qjSncduVPEAr7xhoF5guty49ArDTwzJ/yNuPIbZppyRxFQsRCWrocxIY+CnMVG+qfbU2FmDKyvSGClow== dependencies: available-typed-arrays "^1.0.5" - call-bind "^1.0.2" + call-bind "^1.0.4" for-each "^0.3.3" gopd "^1.0.1" has-tostringtag "^1.0.0" - is-typed-array "^1.1.10" -which@2.0.2, which@^2.0.0, which@^2.0.1: +which@2.0.2, which@^2.0.1: version "2.0.2" resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1" integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA== dependencies: isexe "^2.0.0" -which@^1.2.9: +which@^1.1.1, which@^1.2.9, which@^1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a" integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ== dependencies: isexe "^2.0.0" -wide-align@1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457" - integrity sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA== +wide-align@^1.1.2: + version "1.1.5" + resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.5.tgz#df1d4c206854369ecf3c9a4898f1b23fbd9d15d3" + integrity sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg== dependencies: - string-width "^1.0.2 || 2" + string-width "^1.0.2 || 2 || 3 || 4" widest-line@^3.1.0: version "3.1.0" @@ -18913,50 +21834,89 @@ widest-line@^3.1.0: dependencies: string-width "^4.0.0" -window-size@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.2.0.tgz#b4315bb4214a3d7058ebeee892e13fa24d98b075" - integrity sha512-UD7d8HFA2+PZsbKyaOCEy8gMh1oDtHgJh1LfgjQ4zVXmYjAT/kvz3PueITKuqDiIXQe7yzpPnxX3lNc+AhQMyw== +widest-line@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/widest-line/-/widest-line-4.0.1.tgz#a0fc673aaba1ea6f0a0d35b3c2795c9a9cc2ebf2" + integrity sha512-o0cyEG0e8GPzT4iGHphIOh0cJOV8fivsXxddQasHPHfoZf1ZexrfeA21w2NaEN1RHE+fXlfISmOE8R9N3u3Qig== + dependencies: + string-width "^5.0.1" -word-wrap@^1.2.3, word-wrap@~1.2.3: - version "1.2.3" - resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c" - integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ== +windows-release@^5.0.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/windows-release/-/windows-release-5.1.1.tgz#7ac7019f9baeaea6c00ec889b11824f46c12ee8d" + integrity sha512-NMD00arvqcq2nwqc5Q6KtrSRHK+fVD31erE5FEMahAw5PmVCgD7MUXodq3pdZSUkqA9Cda2iWx6s1XYwiJWRmw== + dependencies: + execa "^5.1.1" + +winston-transport@^4.5.0: + version "4.6.0" + resolved "https://registry.yarnpkg.com/winston-transport/-/winston-transport-4.6.0.tgz#f1c1a665ad1b366df72199e27892721832a19e1b" + integrity sha512-wbBA9PbPAHxKiygo7ub7BYRiKxms0tpfU2ljtWzb3SjRjv5yl6Ozuy/TkXf00HTAt+Uylo3gSkNwzc4ME0wiIg== + dependencies: + logform "^2.3.2" + readable-stream "^3.6.0" + triple-beam "^1.3.0" + +winston@2.x: + version "2.4.7" + resolved "https://registry.yarnpkg.com/winston/-/winston-2.4.7.tgz#5791fe08ea7e90db090f1cb31ef98f32531062f1" + integrity sha512-vLB4BqzCKDnnZH9PHGoS2ycawueX4HLqENXQitvFHczhgW2vFpSOn31LZtVr1KU8YTw7DS4tM+cqyovxo8taVg== + dependencies: + async "^2.6.4" + colors "1.0.x" + cycle "1.0.x" + eyes "0.1.x" + isstream "0.1.x" + stack-trace "0.0.x" + +winston@^3.10.0: + version "3.11.0" + resolved "https://registry.yarnpkg.com/winston/-/winston-3.11.0.tgz#2d50b0a695a2758bb1c95279f0a88e858163ed91" + integrity sha512-L3yR6/MzZAOl0DsysUXHVjOwv8mKZ71TrA/41EIduGpOOV5LQVodqN+QdQ6BS6PJ/RdIshZhq84P/fStEZkk7g== + dependencies: + "@colors/colors" "^1.6.0" + "@dabh/diagnostics" "^2.0.2" + async "^3.2.3" + is-stream "^2.0.0" + logform "^2.4.0" + one-time "^1.0.0" + readable-stream "^3.4.0" + safe-stable-stringify "^2.3.1" + stack-trace "0.0.x" + triple-beam "^1.3.0" + winston-transport "^4.5.0" + +word-wrap@~1.2.3: + version "1.2.5" + resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.5.tgz#d2c45c6dd4fbce621a66f136cbe328afd0410b34" + integrity sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA== wordwrap@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb" integrity sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q== -worker-farm@^1.7.0: - version "1.7.0" - resolved "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.7.0.tgz#26a94c5391bbca926152002f69b84a4bf772e5a8" - integrity sha512-rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw== +wordwrapjs@^4.0.0: + version "4.0.1" + resolved "https://registry.yarnpkg.com/wordwrapjs/-/wordwrapjs-4.0.1.tgz#d9790bccfb110a0fc7836b5ebce0937b37a8b98f" + integrity sha512-kKlNACbvHrkpIw6oPeYDSmdCTu2hdMHoyXLTcUKala++lx5Y+wjJ/e474Jqv5abnVmwxw08DiTuHmw69lJGksA== dependencies: - errno "~0.1.7" - -worker-threads@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/worker-threads/-/worker-threads-1.0.0.tgz#2b49ea7c9692ba737d9148f2c9b2be65e14e3470" - integrity sha512-vK6Hhvph8oLxocEJIlc3YfGAZhm210uGzjZsXSu+JYLAQ/s/w4Tqgl60JrdH58hW8NSGP4m3bp8a92qPXgX05w== - -workerpool@6.1.0: - version "6.1.0" - resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.1.0.tgz#a8e038b4c94569596852de7a8ea4228eefdeb37b" - integrity sha512-toV7q9rWNYha963Pl/qyeZ6wG+3nnsyvolaNUS8+R5Wtw6qJPTxIlOP1ZSvcGhEJw+l3HMMmtiNo9Gl61G4GVg== + reduce-flatten "^2.0.0" + typical "^5.2.0" workerpool@6.2.1: version "6.2.1" resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.2.1.tgz#46fc150c17d826b86a008e5a4508656777e9c343" integrity sha512-ILEIE97kDZvF9Wb9f6h5aXK4swSlKGUcOEGiIYb2OOu/IrDU9iwj0fD//SsA6E5ibwJxpEvhullJY4Sl4GcpAw== -wrap-ansi@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85" - integrity sha512-vAaEaDM946gbNpH5pLVNR+vX2ht6n0Bt3GXwVB1AuAqZosOvHNF3P7wDnh8KLkSqgUh0uh77le7Owgoz+Z9XBw== +"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" + integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== dependencies: - string-width "^1.0.1" - strip-ansi "^3.0.1" + ansi-styles "^4.0.0" + string-width "^4.1.0" + strip-ansi "^6.0.0" wrap-ansi@^5.1.0: version "5.1.0" @@ -18967,7 +21927,7 @@ wrap-ansi@^5.1.0: string-width "^3.0.0" strip-ansi "^5.0.0" -wrap-ansi@^6.2.0: +wrap-ansi@^6.0.1, wrap-ansi@^6.2.0: version "6.2.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz#e9393ba07102e6c91a3b221478f0257cd2856e53" integrity sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA== @@ -18976,30 +21936,66 @@ wrap-ansi@^6.2.0: string-width "^4.1.0" strip-ansi "^6.0.0" -wrap-ansi@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" - integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== +wrap-ansi@^8.0.1, wrap-ansi@^8.1.0: + version "8.1.0" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214" + integrity sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ== dependencies: - ansi-styles "^4.0.0" - string-width "^4.1.0" - strip-ansi "^6.0.0" + ansi-styles "^6.1.0" + string-width "^5.0.1" + strip-ansi "^7.0.1" wrappy@1: version "1.0.2" resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ== +write-file-atomic@5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-5.0.1.tgz#68df4717c55c6fa4281a7860b4c2ba0a6d2b11e7" + integrity sha512-+QU2zd6OTD8XWIJCbffaiQeH9U73qIqafo1x6V1snCWYGJf6cVE0cDR4D8xRzcEnfI21IFrUPzPGtcPf8AC+Rw== + dependencies: + imurmurhash "^0.1.4" + signal-exit "^4.0.1" + +write-file-atomic@^3.0.3: + version "3.0.3" + resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-3.0.3.tgz#56bd5c5a5c70481cd19c571bd39ab965a5de56e8" + integrity sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q== + dependencies: + imurmurhash "^0.1.4" + is-typedarray "^1.0.0" + signal-exit "^3.0.2" + typedarray-to-buffer "^3.1.5" + +write-file-atomic@^4.0.1: + version "4.0.2" + resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-4.0.2.tgz#a9df01ae5b77858a027fd2e80768ee433555fcfd" + integrity sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg== + dependencies: + imurmurhash "^0.1.4" + signal-exit "^3.0.7" + ws@7.4.6: version "7.4.6" resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.6.tgz#5654ca8ecdeee47c33a9a4bf6d28e2be2980377c" integrity sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A== -ws@8.13.0, ws@^8.11.0, ws@^8.12.0: +ws@8.13.0: version "8.13.0" resolved "https://registry.yarnpkg.com/ws/-/ws-8.13.0.tgz#9a9fb92f93cf41512a0735c8f4dd09b8a1211cd0" integrity sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA== +ws@8.14.2: + version "8.14.2" + resolved "https://registry.yarnpkg.com/ws/-/ws-8.14.2.tgz#6c249a806eb2db7a20d26d51e7709eab7b2e6c7f" + integrity sha512-wEBG1ftX4jcglPxgFCMJmZ2PLtSbJ2Peg6TmpJFTbe9GZYOQCDPdMYu/Tm0/bGZkw8paZnJY45J4K2PZrLYq8g== + +ws@8.5.0: + version "8.5.0" + resolved "https://registry.yarnpkg.com/ws/-/ws-8.5.0.tgz#bfb4be96600757fe5382de12c670dab984a1ed4f" + integrity sha512-BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg== + ws@^3.0.0: version "3.3.3" resolved "https://registry.yarnpkg.com/ws/-/ws-3.3.3.tgz#f1cf84fe2d5e901ebce94efaece785f187a228f2" @@ -19021,6 +22017,16 @@ ws@^7.4.5, ws@^7.4.6, ws@^7.5.1: resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.9.tgz#54fa7db29f4c7cec68b1ddd3a89de099942bb591" integrity sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q== +ws@^8.11.0, ws@^8.12.0: + version "8.16.0" + resolved "https://registry.yarnpkg.com/ws/-/ws-8.16.0.tgz#d1cd774f36fbc07165066a60e40323eab6446fd4" + integrity sha512-HS0c//TP7Ina87TfiPUz1rQzMhHrl/SG2guqRcTOIUYD2q8uhUdNHZYJUaQ8aTGPzCh+c6oawMKW35nFl1dxyQ== + +xdg-basedir@^5.0.1, xdg-basedir@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-5.1.0.tgz#1efba19425e73be1bc6f2a6ceb52a3d2c884c0c9" + integrity sha512-GCPAHLvrIH13+c0SuacwvRYj2SxJXQ4kaVTT5xgL3kPrz56XxkF21IGhjSE1+W0aw7gpBWRGXLCPnPby6lSpmQ== + xhr-request-promise@^0.1.2: version "0.1.3" resolved "https://registry.yarnpkg.com/xhr-request-promise/-/xhr-request-promise-0.1.3.tgz#2d5f4b16d8c6c893be97f1a62b0ed4cf3ca5f96c" @@ -19068,10 +22074,13 @@ xmlchars@^2.2.0: resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb" integrity sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw== -xmlhttprequest@1.8.0: - version "1.8.0" - resolved "https://registry.yarnpkg.com/xmlhttprequest/-/xmlhttprequest-1.8.0.tgz#67fe075c5c24fef39f9d65f5f7b7fe75171968fc" - integrity sha512-58Im/U0mlVBLM38NdZjHyhuMtCqa61469k2YP/AaPbvCoV9aQGUpbJBj1QRm2ytRiVQBD/fsw7L2bJGDVQswBA== +xss@^1.0.14: + version "1.0.14" + resolved "https://registry.yarnpkg.com/xss/-/xss-1.0.14.tgz#4f3efbde75ad0d82e9921cc3c95e6590dd336694" + integrity sha512-og7TEJhXvn1a7kzZGQ7ETjdQVS2UfZyTlsEdDOqvQF7GoxNfY+0YLCzBy1kPdsDDx4QuNAonQPddpsn6Xl/7sw== + dependencies: + commander "^2.20.3" + cssfilter "0.0.10" xtend@^4.0.0, xtend@^4.0.1, xtend@^4.0.2, xtend@~4.0.0, xtend@~4.0.1: version "4.0.2" @@ -19085,11 +22094,6 @@ xtend@~2.1.1: dependencies: object-keys "~0.4.0" -y18n@^3.2.1: - version "3.2.2" - resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.2.tgz#85c901bd6470ce71fc4bb723ad209b70f7f28696" - integrity sha512-uGZHXkHnhF0XeeAPgnKfPv1bgKAYyVvmNL1xlKsPYZPaIHxGti2hHqvOCQv71XMsLxu1QjergkqogUnms5D3YQ== - y18n@^4.0.0: version "4.0.3" resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.3.tgz#b5f259c82cd6e336921efd7bfd8bf560de9eeedf" @@ -19129,11 +22133,16 @@ yaml-eslint-parser@^0.3.2: lodash "^4.17.20" yaml "^1.10.0" -yaml@1.10.2, yaml@^1.10.0, yaml@^1.10.2, yaml@^1.7.2: +yaml@1.10.2, yaml@^1.10.0, yaml@^1.10.2: version "1.10.2" resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b" integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg== +yaml@^2.1.3, yaml@^2.3.4: + version "2.3.4" + resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.3.4.tgz#53fc1d514be80aabf386dc6001eb29bf3b7523b2" + integrity sha512-8aAvwVUSHpfEqTQ4w/KMlf3HcRdt50E5ODIQJBw1fQ5RL34xabzxtUlzTXVqc4rkZsPbvrXKWnABCD7kWSmocA== + yargs-parser@20.2.4: version "20.2.4" resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.4.tgz#b42890f14566796f85ae8e3a25290d205f154a54" @@ -19147,14 +22156,6 @@ yargs-parser@^15.0.1: camelcase "^5.0.0" decamelize "^1.2.0" -yargs-parser@^16.1.0: - version "16.1.0" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-16.1.0.tgz#73747d53ae187e7b8dbe333f95714c76ea00ecf1" - integrity sha512-H/V41UNZQPkUMIT5h5hiwg4QKIY1RPvoBV4XcjUbRM8Bk2oKqqyZ0DIEbTFZB0XjbtSPG8SAa/0DxCQmiRgzKg== - dependencies: - camelcase "^5.0.0" - decamelize "^1.2.0" - yargs-parser@^18.1.2: version "18.1.3" resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.3.tgz#be68c4975c6b2abf469236b0c870362fab09a7b0" @@ -19163,20 +22164,12 @@ yargs-parser@^18.1.2: camelcase "^5.0.0" decamelize "^1.2.0" -yargs-parser@^2.4.1: - version "2.4.1" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-2.4.1.tgz#85568de3cf150ff49fa51825f03a8c880ddcc5c4" - integrity sha512-9pIKIJhnI5tonzG6OnCFlz/yln8xHYcGl+pn3xR0Vzff0vzN1PbNRaelgfgRUwZ3s4i3jvxT9WhmUGL4whnasA== - dependencies: - camelcase "^3.0.0" - lodash.assign "^4.0.6" - yargs-parser@^20.2.2, yargs-parser@^20.2.3: version "20.2.9" resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee" integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w== -yargs-parser@^21.1.1: +yargs-parser@^21.0.0, 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== @@ -19243,10 +22236,10 @@ yargs@^15.3.1: y18n "^4.0.0" yargs-parser "^18.1.2" -yargs@^17.0.0: - version "17.7.1" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.1.tgz#34a77645201d1a8fc5213ace787c220eabbd0967" - integrity sha512-cwiTb08Xuv5fqF4AovYacTFNxk62th7LKJ6BL9IGUpTJrWoU7/7WdQGTP2SjKf1dUNBGzDd28p/Yfs/GI6JrLw== +yargs@^17.0.0, yargs@^17.6.0: + 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" @@ -19256,25 +22249,13 @@ yargs@^17.0.0: 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" - integrity sha512-LqodLrnIDM3IFT+Hf/5sxBnEGECrfdC1uIbgZeJmESCSo4HoCAaKEus8MylXHAkdacGc0ye+Qa+dpkuom8uVYA== - dependencies: - cliui "^3.2.0" - decamelize "^1.1.1" - get-caller-file "^1.0.1" - lodash.assign "^4.0.3" - os-locale "^1.4.0" - read-pkg-up "^1.0.1" - require-directory "^2.1.1" - require-main-filename "^1.0.1" - set-blocking "^2.0.0" - string-width "^1.0.1" - which-module "^1.0.0" - window-size "^0.2.0" - y18n "^3.2.1" - yargs-parser "^2.4.1" +yauzl@^2.10.0: + version "2.10.0" + resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz#c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9" + integrity sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g== + dependencies: + buffer-crc32 "~0.2.3" + fd-slicer "~1.1.0" yn@3.1.1: version "3.1.1" @@ -19285,3 +22266,22 @@ yocto-queue@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b" integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q== + +yocto-queue@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-1.0.0.tgz#7f816433fb2cbc511ec8bf7d263c3b58a1a3c251" + integrity sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g== + +zip-stream@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/zip-stream/-/zip-stream-5.0.1.tgz#cf3293bba121cad98be2ec7f05991d81d9f18134" + integrity sha512-UfZ0oa0C8LI58wJ+moL46BDIMgCQbnsb+2PoiJYtonhBsMh2bq1eRBVkvjfVsqbEHd9/EgKPUuL9saSSsec8OA== + dependencies: + archiver-utils "^4.0.1" + compress-commons "^5.0.1" + readable-stream "^3.6.0" + +zod@3.22.4: + version "3.22.4" + resolved "https://registry.yarnpkg.com/zod/-/zod-3.22.4.tgz#f31c3a9386f61b1f228af56faa9255e845cf3fff" + integrity sha512-iC+8Io04lddc+mVqQ9AZ7OQ2MrUKGN+oIQyq1vemgt46jwCwLfhq7/pwnBnNXXXZb8VTVLKwp9EDkx+ryxIWmg==