From 2de1427d70fd3e42265290e2e3058fe2578b22a8 Mon Sep 17 00:00:00 2001 From: sripwoud Date: Wed, 31 Jan 2024 22:42:01 +0100 Subject: [PATCH] refactor: rename packages and change monorepo structure (#322) * rename and move packages to `pkgs` folder * pin typescript version to 5.1.6 see typescript eslint warning WARNING: You are currently running a version of TypeScript which is not officially supported by @typescript-eslint/typescript-estree. You may find that it works just fine, or you may not. SUPPORTED TYPESCRIPT VERSIONS: >=3.3.1 <5.2.0 YOUR TYPESCRIPT VERSION: 5.2.2 * fix tsconfig extends relative paths * update readme * fix jest preset --- .barrelsby.json | 2 +- .eslintignore | 6 + .eslintrc.yaml | 38 +- .github/workflows/release.yml | 2 +- .github/workflows/test.yml | 6 +- .knip.ts | 2 +- .prettierignore | 1 - Cargo.lock | 6 +- Cargo.toml | 4 +- README.md | 30 +- {circuits/circom => circom}/.gitignore | 0 {circuits/circom => circom}/README.md | 0 .../circom => circom}/benchmark/README.md | 0 .../circom => circom}/benchmark/benchmark.log | 0 {circuits/circom => circom}/ecdsa.circom | 0 .../generated/generate_witness.js | 0 .../circom => circom}/generated/main.wasm | Bin {circuits/circom => circom}/generated/prover | Bin .../generated/verification_key.json | 0 .../generated/witness_calculator.js | 0 {circuits/circom => circom}/main.circom | 0 {circuits/circom => circom}/membership.circom | 0 {circuits/circom => circom}/merkleTree.circom | 0 {circuits/circom => circom}/package.json | 0 .../circom => circom}/scripts/_client.ts | 0 .../circom => circom}/scripts/_prompt.ts | 0 {circuits/circom => circom}/scripts/_wrap.ts | 0 .../scripts/generate-calldata-base10.ts | 0 .../scripts/generate-calldata.ts | 0 .../scripts/maybe-fix-circom-imports.sh | 0 .../circom => circom}/scripts/verify-local.ts | 0 .../scripts/verify-onchain.ts | 0 .../circom => circom}/test/circuit.test.ts | 0 .../circom => circom}/test/data/input.json | 0 .../circom => circom}/test/data/proof.json | 0 .../circom => circom}/test/data/public.json | 0 .../circom => circom}/test/data/witness.wtns | Bin .../test/is_ordered_test.circom | 0 .../circom => circom}/test/jest.config.ts | 0 .../test/membership_test.circom | 0 .../test/merkle_tree_test.circom | 0 .../test/non_membership_test.circom | 0 .../test/test_ecdsa_check_pub_key.circom | 0 {circuits/circom => circom}/tsconfig.json | 2 +- package.json | 25 +- {@anonklub => pkgs}/cli/CHANGELOG.md | 0 {@anonklub => pkgs}/cli/README.md | 0 {@anonklub => pkgs}/cli/package.json | 0 {@anonklub => pkgs}/cli/src/Cli/index.ts | 0 {@anonklub => pkgs}/cli/src/Cli/interface.ts | 0 {@anonklub => pkgs}/cli/src/Prompt/index.ts | 0 .../cli/src/Prompt/interface.ts | 0 {@anonklub => pkgs}/cli/src/index.ts | 0 {@anonklub => pkgs}/cli/src/types.ts | 0 {@anonklub => pkgs}/cli/tsconfig.compile.json | 0 {@anonklub => pkgs}/cli/tsconfig.json | 0 .../merkle-tree-wasm}/Cargo.toml | 0 .../merkle-tree-wasm}/README.md | 0 .../merkle-tree-wasm}/package.json | 4 +- .../merkle-tree-wasm}/src/lib.rs | 0 .../merkle-tree-wasm}/src/merkle_tree_wasm.rs | 0 .../merkle-tree-worker/CHANGELOG.md | 0 .../merkle-tree-worker/README.md | 0 .../merkle-tree-worker/package.json | 0 .../merkle-tree-worker/src/index.ts | 0 .../merkle-tree-worker/src/interface.ts | 0 .../merkle-tree-worker/src/worker.ts | 0 .../merkle-tree-worker/tsconfig.compile.json | 0 .../merkle-tree-worker/tsconfig.json | 2 +- {@anonklub => pkgs}/proof/CHANGELOG.md | 0 {@anonklub => pkgs}/proof/package.json | 0 .../proof/src/ExcludableMerkleTree.ts | 0 {@anonklub => pkgs}/proof/src/MerkleTree.ts | 0 {@anonklub => pkgs}/proof/src/ProofRequest.ts | 0 {@anonklub => pkgs}/proof/src/fetch.d.ts | 0 {@anonklub => pkgs}/proof/src/helpers.ts | 0 {@anonklub => pkgs}/proof/src/index.ts | 0 {@anonklub => pkgs}/proof/src/poseidon.ts | 0 .../proof/test/ProofRequest.test.ts | 0 .../proof/test/data/constants.ts | 0 {@anonklub => pkgs}/proof/test/jest.config.ts | 0 {@anonklub => pkgs}/proof/test/setup.ts | 0 .../proof/tsconfig.compile.json | 0 {@anonklub => pkgs}/proof/tsconfig.json | 0 {@anonklub => pkgs}/query/CHANGELOG.md | 0 {@anonklub => pkgs}/query/package.json | 0 .../query/src/AnonymitySet/index.ts | 0 .../query/src/AnonymitySet/interface.ts | 0 {@anonklub => pkgs}/query/src/CONSTANTS.ts | 0 {@anonklub => pkgs}/query/src/fetch-json.ts | 0 {@anonklub => pkgs}/query/src/index.ts | 0 .../src/requests/EnsProposalVotersRequest.ts | 0 .../requests/Erc20BalanceAnonSetRequest.ts | 0 .../src/requests/EthBalanceAnonSetRequest.ts | 0 .../query/src/requests/index.ts | 0 {@anonklub => pkgs}/query/src/types.ts | 0 .../query/test/AnonymitySet.test.ts | 0 {@anonklub => pkgs}/query/test/jest.config.ts | 0 .../query/tsconfig.compile.json | 0 {@anonklub => pkgs}/query/tsconfig.json | 0 .../spartan-ecdsa-wasm}/Cargo.toml | 4 +- .../spartan-ecdsa-wasm}/package.json | 4 +- .../spartan-ecdsa-wasm}/src/eth_membership.rs | 0 .../spartan-ecdsa-wasm}/src/lib.rs | 0 .../spartan-ecdsa-wasm}/src/utils.rs | 0 .../spartan-ecdsa-worker/CHANGELOG.md | 0 .../spartan-ecdsa-worker/README.md | 0 .../spartan-ecdsa-worker/package.json | 0 .../spartan-ecdsa-worker/src/index.ts | 0 .../spartan-ecdsa-worker/src/interface.ts | 0 .../spartan-ecdsa-worker/src/utils.ts | 0 .../spartan-ecdsa-worker/src/worker.ts | 0 .../tsconfig.compile.json | 0 .../spartan-ecdsa-worker/tsconfig.json | 0 pnpm-lock.yaml | 659 ++++++++++-------- pnpm-workspace.yaml | 7 +- test/jest-preset.js | 2 +- turbo.json | 34 +- 118 files changed, 443 insertions(+), 397 deletions(-) rename {circuits/circom => circom}/.gitignore (100%) rename {circuits/circom => circom}/README.md (100%) rename {circuits/circom => circom}/benchmark/README.md (100%) rename {circuits/circom => circom}/benchmark/benchmark.log (100%) rename {circuits/circom => circom}/ecdsa.circom (100%) rename {circuits/circom => circom}/generated/generate_witness.js (100%) rename {circuits/circom => circom}/generated/main.wasm (100%) rename {circuits/circom => circom}/generated/prover (100%) rename {circuits/circom => circom}/generated/verification_key.json (100%) rename {circuits/circom => circom}/generated/witness_calculator.js (100%) rename {circuits/circom => circom}/main.circom (100%) rename {circuits/circom => circom}/membership.circom (100%) rename {circuits/circom => circom}/merkleTree.circom (100%) rename {circuits/circom => circom}/package.json (100%) rename {circuits/circom => circom}/scripts/_client.ts (100%) rename {circuits/circom => circom}/scripts/_prompt.ts (100%) rename {circuits/circom => circom}/scripts/_wrap.ts (100%) rename {circuits/circom => circom}/scripts/generate-calldata-base10.ts (100%) rename {circuits/circom => circom}/scripts/generate-calldata.ts (100%) rename {circuits/circom => circom}/scripts/maybe-fix-circom-imports.sh (100%) rename {circuits/circom => circom}/scripts/verify-local.ts (100%) rename {circuits/circom => circom}/scripts/verify-onchain.ts (100%) rename {circuits/circom => circom}/test/circuit.test.ts (100%) rename {circuits/circom => circom}/test/data/input.json (100%) rename {circuits/circom => circom}/test/data/proof.json (100%) rename {circuits/circom => circom}/test/data/public.json (100%) rename {circuits/circom => circom}/test/data/witness.wtns (100%) rename {circuits/circom => circom}/test/is_ordered_test.circom (100%) rename {circuits/circom => circom}/test/jest.config.ts (100%) rename {circuits/circom => circom}/test/membership_test.circom (100%) rename {circuits/circom => circom}/test/merkle_tree_test.circom (100%) rename {circuits/circom => circom}/test/non_membership_test.circom (100%) rename {circuits/circom => circom}/test/test_ecdsa_check_pub_key.circom (100%) rename {circuits/circom => circom}/tsconfig.json (82%) rename {@anonklub => pkgs}/cli/CHANGELOG.md (100%) rename {@anonklub => pkgs}/cli/README.md (100%) rename {@anonklub => pkgs}/cli/package.json (100%) rename {@anonklub => pkgs}/cli/src/Cli/index.ts (100%) rename {@anonklub => pkgs}/cli/src/Cli/interface.ts (100%) rename {@anonklub => pkgs}/cli/src/Prompt/index.ts (100%) rename {@anonklub => pkgs}/cli/src/Prompt/interface.ts (100%) rename {@anonklub => pkgs}/cli/src/index.ts (100%) rename {@anonklub => pkgs}/cli/src/types.ts (100%) rename {@anonklub => pkgs}/cli/tsconfig.compile.json (100%) rename {@anonklub => pkgs}/cli/tsconfig.json (100%) rename {merkle-tree-wasm => pkgs/merkle-tree-wasm}/Cargo.toml (100%) rename {merkle-tree-wasm => pkgs/merkle-tree-wasm}/README.md (100%) rename {merkle-tree-wasm => pkgs/merkle-tree-wasm}/package.json (69%) rename {merkle-tree-wasm => pkgs/merkle-tree-wasm}/src/lib.rs (100%) rename {merkle-tree-wasm => pkgs/merkle-tree-wasm}/src/merkle_tree_wasm.rs (100%) rename {workers => pkgs}/merkle-tree-worker/CHANGELOG.md (100%) rename {workers => pkgs}/merkle-tree-worker/README.md (100%) rename {workers => pkgs}/merkle-tree-worker/package.json (100%) rename {workers => pkgs}/merkle-tree-worker/src/index.ts (100%) rename {workers => pkgs}/merkle-tree-worker/src/interface.ts (100%) rename {workers => pkgs}/merkle-tree-worker/src/worker.ts (100%) rename {workers => pkgs}/merkle-tree-worker/tsconfig.compile.json (100%) rename {workers => pkgs}/merkle-tree-worker/tsconfig.json (79%) rename {@anonklub => pkgs}/proof/CHANGELOG.md (100%) rename {@anonklub => pkgs}/proof/package.json (100%) rename {@anonklub => pkgs}/proof/src/ExcludableMerkleTree.ts (100%) rename {@anonklub => pkgs}/proof/src/MerkleTree.ts (100%) rename {@anonklub => pkgs}/proof/src/ProofRequest.ts (100%) rename {@anonklub => pkgs}/proof/src/fetch.d.ts (100%) rename {@anonklub => pkgs}/proof/src/helpers.ts (100%) rename {@anonklub => pkgs}/proof/src/index.ts (100%) rename {@anonklub => pkgs}/proof/src/poseidon.ts (100%) rename {@anonklub => pkgs}/proof/test/ProofRequest.test.ts (100%) rename {@anonklub => pkgs}/proof/test/data/constants.ts (100%) rename {@anonklub => pkgs}/proof/test/jest.config.ts (100%) rename {@anonklub => pkgs}/proof/test/setup.ts (100%) rename {@anonklub => pkgs}/proof/tsconfig.compile.json (100%) rename {@anonklub => pkgs}/proof/tsconfig.json (100%) rename {@anonklub => pkgs}/query/CHANGELOG.md (100%) rename {@anonklub => pkgs}/query/package.json (100%) rename {@anonklub => pkgs}/query/src/AnonymitySet/index.ts (100%) rename {@anonklub => pkgs}/query/src/AnonymitySet/interface.ts (100%) rename {@anonklub => pkgs}/query/src/CONSTANTS.ts (100%) rename {@anonklub => pkgs}/query/src/fetch-json.ts (100%) rename {@anonklub => pkgs}/query/src/index.ts (100%) rename {@anonklub => pkgs}/query/src/requests/EnsProposalVotersRequest.ts (100%) rename {@anonklub => pkgs}/query/src/requests/Erc20BalanceAnonSetRequest.ts (100%) rename {@anonklub => pkgs}/query/src/requests/EthBalanceAnonSetRequest.ts (100%) rename {@anonklub => pkgs}/query/src/requests/index.ts (100%) rename {@anonklub => pkgs}/query/src/types.ts (100%) rename {@anonklub => pkgs}/query/test/AnonymitySet.test.ts (100%) rename {@anonklub => pkgs}/query/test/jest.config.ts (100%) rename {@anonklub => pkgs}/query/tsconfig.compile.json (100%) rename {@anonklub => pkgs}/query/tsconfig.json (100%) rename {circuits/spartan => pkgs/spartan-ecdsa-wasm}/Cargo.toml (85%) rename {circuits/spartan => pkgs/spartan-ecdsa-wasm}/package.json (80%) rename {circuits/spartan => pkgs/spartan-ecdsa-wasm}/src/eth_membership.rs (100%) rename {circuits/spartan => pkgs/spartan-ecdsa-wasm}/src/lib.rs (100%) rename {circuits/spartan => pkgs/spartan-ecdsa-wasm}/src/utils.rs (100%) rename {workers => pkgs}/spartan-ecdsa-worker/CHANGELOG.md (100%) rename {workers => pkgs}/spartan-ecdsa-worker/README.md (100%) rename {workers => pkgs}/spartan-ecdsa-worker/package.json (100%) rename {workers => pkgs}/spartan-ecdsa-worker/src/index.ts (100%) rename {workers => pkgs}/spartan-ecdsa-worker/src/interface.ts (100%) rename {workers => pkgs}/spartan-ecdsa-worker/src/utils.ts (100%) rename {workers => pkgs}/spartan-ecdsa-worker/src/worker.ts (100%) rename {workers => pkgs}/spartan-ecdsa-worker/tsconfig.compile.json (100%) rename {workers => pkgs}/spartan-ecdsa-worker/tsconfig.json (100%) diff --git a/.barrelsby.json b/.barrelsby.json index dfb9b0fc..8338c293 100644 --- a/.barrelsby.json +++ b/.barrelsby.json @@ -1,8 +1,8 @@ { "directory": [ - "@anonklub/query/src/requests", "discord-bot/src/lib", "discord-bot/src/lib/decorators", + "pkgs/query/src/requests", "query-api/src/api/controllers/requests", "query-api/src/api/services", "query-api/src/api/repositories", diff --git a/.eslintignore b/.eslintignore index 5b6262f2..32fd5710 100644 --- a/.eslintignore +++ b/.eslintignore @@ -20,3 +20,9 @@ next-env.d.ts next.config.js public + +.turbo +cache +queries +target + diff --git a/.eslintrc.yaml b/.eslintrc.yaml index 43ded346..7678fbff 100644 --- a/.eslintrc.yaml +++ b/.eslintrc.yaml @@ -2,17 +2,17 @@ extends: ['@sripwoud/eslint-config-with-jest'] parserOptions: project: [ - '@anonklub/proof/tsconfig.json', - '@anonklub/cli/tsconfig.json', - '@anonklub/query/tsconfig.json', - 'circuits/circom/tsconfig.json', + 'circom/tsconfig.json', 'discord-bot/tsconfig.json', - 'test/tsconfig.json', + 'pkgs/cli/tsconfig.json', + 'pkgs/merkle-tree-worker/tsconfig.json', + 'pkgs/proof/tsconfig.json', + 'pkgs/query/tsconfig.json', + 'pkgs/spartan-ecdsa-worker/tsconfig.json', 'query-api/tsconfig.json', + 'test/tsconfig.json', 'ui/tsconfig.json', 'tsconfig.json', - 'workers/merkle-tree-worker/tsconfig.json', - 'workers/spartan-ecdsa-worker/tsconfig.json', ] rules: @@ -31,14 +31,14 @@ overrides: - files: ['test/jest-preset.js'] rules: '@typescript-eslint/no-var-requires': off - - files: ['@anonklub/proof/test/ProofRequest.test.ts'] + - files: ['pkgs/proof/test/ProofRequest.test.ts'] rules: '@typescript-eslint/dot-notation': off - files: [ - '@anonklub/cli/src/cli/index.ts', - '@anonklub/proof/src/ProofRequest/index.ts', - '@anonklub/proof/test/ProofRequest.test.ts', + 'pkgs/cli/src/cli/index.ts', + 'pkgs/proof/src/ProofRequest/index.ts', + 'pkgs/proof/test/ProofRequest.test.ts', ] rules: '@typescript-eslint/restrict-template-expressions': off @@ -55,9 +55,9 @@ overrides: [error, { checksVoidReturn: { attributes: false } }] - files: [ - 'circuits/circom/scripts/*.ts', - '@anonklub/cli/src/index.ts', - '@anonklub/cli/src/Cli/index.ts', + 'pkgs/cli/src/index.ts', + 'pkgs/cli/src/Cli/index.ts', + 'circom/scripts/*.ts', 'query- api/src/index.ts', 'ui/src/lib/config.ts', ] @@ -74,15 +74,9 @@ overrides: rules: '@typescript-eslint/ban-ts-comment': 'off' - files: - [ - 'query-api/test/unit/*Controller.test.ts', - 'circuits/circom/test/circuit.test.ts', - ] + ['circom/test/circuit.test.ts', 'query-api/test/unit/*Controller.test.ts'] rules: jest/expect-expect: 'off' - - files: ['shared/src/index.ts'] - rules: - 'sort/exports': 'off' - - files: ['@anonklub/cli/src/Prompt/index.ts'] + - files: ['pkgs/cli/src/Prompt/index.ts'] rules: '@typescript-eslint/naming-convention': off diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 13fc0c87..1a611952 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -5,7 +5,7 @@ on: branches: ['main'] paths: [ - '@anonklub/**', + 'pkgs/**', 'circuits/spartan/**', 'merkle-tree-wasm/**', '!**/*.md', diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 133769d0..97316279 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -7,7 +7,7 @@ on: branches: [main, staging] paths: [ - '@anonklub/**/*.{json,ts}', + 'pkgs/**/*.{json,ts}', 'contracts/**/*.sol', 'query-api/**/*.{js,json,ts,graphql}', 'test/**/*.{js,ts}', @@ -18,7 +18,7 @@ on: branches: [main, staging] paths: [ - '@anonklub/**/*.{json,ts}', + 'pkgs/**/*.{json,ts}', 'contracts/**/*.sol', 'test/**/*.{js,ts}', 'query-api/**/*.{js,json,ts,graphql}', @@ -70,7 +70,7 @@ jobs: run: pnpm compile.wasm - name: Install node deps - run: pnpm --filter=!@anonklub/infra i --ignore-scripts + run: pnpm i --ignore-scripts - name: Run tests env: diff --git a/.knip.ts b/.knip.ts index 0bf1571b..de85c2f3 100644 --- a/.knip.ts +++ b/.knip.ts @@ -2,7 +2,7 @@ import type { KnipConfig } from 'knip' const config: KnipConfig = { ignore: [ - 'circuits/circom/generated/**', + 'circom/generated/**', 'contracts/lib/openzeppelin-contracts/**', 'discord-bot/src/lib/logger.ts', 'query-api/src/api/controllers/AnonymitySet.ts', diff --git a/.prettierignore b/.prettierignore index 2c4b3e8c..0c4eb6e1 100644 --- a/.prettierignore +++ b/.prettierignore @@ -27,4 +27,3 @@ contracts/out package.json target -wasm-pkg diff --git a/Cargo.lock b/Cargo.lock index 1defc1ea..63630577 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1904,7 +1904,7 @@ dependencies = [ [[package]] name = "merkle-tree-wasm" -version = "0.1.0" +version = "1.0.0" dependencies = [ "ark-ff", "ark-secp256k1", @@ -3028,8 +3028,8 @@ dependencies = [ ] [[package]] -name = "spartan" -version = "0.1.0" +name = "spartan-ecdsa-wasm" +version = "1.0.0" dependencies = [ "ark-ec", "ark-ff", diff --git a/Cargo.toml b/Cargo.toml index e26eda0e..422973f6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,8 +3,8 @@ resolver = "2" members = [ - "merkle-tree-wasm", - "circuits/spartan" + "pkgs/merkle-tree-wasm", + "pkgs/spartan-ecdsa-wasm" ] [profile.release] diff --git a/README.md b/README.md index 489a684f..215b5e0e 100644 --- a/README.md +++ b/README.md @@ -57,21 +57,21 @@

-| Content | Description | Status | Live Version | -| ------------------------------------------------------------ | ---------------------------------------------------------------------------------------------------------------------------------------------------------- | :----------------------------------: | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| [circuits/circom](circuits/circom) | Circom circuits | :heavy_check_mark: | | -| [circuits/spartan](circuits/spartan) | Spartan/Sapir circuits & corresponding wasm TS package. | :heavy_check_mark: | | -| [contracts](contracts) | Solidity contracts | :heavy_check_mark: | [Groth16Verifier](https://sepolia.etherscan.io/address/0x893f293e3918a179bf87fb772206e9927db61b0c#code) [AnonMinter](https://sepolia.etherscan.io/address/0xcc639e338f9fb382d76f30928559cf14943600e0#code) | -| [discord-bot](discord-bot) | Discord Verification Bot | :hourglass_flowing_sand: IN PROGRESS | [anonklub-discord-bot.fly.dev](https://anonklub-discord-bot.fly.dev) | -| [merkle-tree-wasm](merkle-tree-wasm) | Merkle tree Rust crate & corresponding wasm TS package | :heavy_check_mark: | | -|nullifier| | :calendar: TO DO -| [queries/crypto_ethereum](queries/crypto_ethereum) | Google [`bigquery-public-data.crypto_ethereum`](https://console.cloud.google.com/marketplace/product/ethereum/crypto-ethereum-blockchain) queries examples | :heavy_check_mark: | | -| [queries/dune_analytics](queries/dune_analytics) | [Dune Analytics](https://dune.com/) queries examples | :heavy_check_mark: | | -| [queries/the_graph](queries/the_graph) | [The Graph](https://thegraph.com/en/) queries examples | :heavy_check_mark: | | -| [query-api](query-api) | Query API server | :heavy_check_mark: | [anonset.fly.dev](https://anonset.fly.dev) | -| [ui](ui) | User Interface (fetch anonymity sets, generate or verify membership proofs) | :heavy_check_mark: | [anonklub.fly.dev](https://anonklub.fly.dev) | -| [workers/merkle-tree-worker](workers/merkle-tree-worker) | Web worker wrapper of the [@anonklub/merkle-tree-wasm](merkle-tree-wasm/Cargo.toml) wasm package | :heavy_check_mark: | | -| [workers/spartan-ecdsa-worker](workers/spartan-ecdsa-worker) | Web worker wrapper of the [@anonklub/spartan](circuits/spartan/Cargo.toml) wasm package | :heavy_check_mark: | | +| Content | Description | Status | Live Version | +| ------------------------------------------------------ | ---------------------------------------------------------------------------------------------------------------------------------------------------------- | :----------------------------------: | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| [circom](circom) | Circom circuits | :heavy_check_mark: | | +| [discord-bot](discord-bot) | Discord Verification Bot | :hourglass_flowing_sand: IN PROGRESS | [anonklub-discord-bot.fly.dev](https://anonklub-discord-bot.fly.dev) | +| [contracts](contracts) | Solidity contracts | :heavy_check_mark: | [Groth16Verifier](https://sepolia.etherscan.io/address/0x893f293e3918a179bf87fb772206e9927db61b0c#code) [AnonMinter](https://sepolia.etherscan.io/address/0xcc639e338f9fb382d76f30928559cf14943600e0#code) | +| nullifier | | :calendar: TO DO | +| [pkgs/merkle-tree-wasm](pkgs/merkle-tree-wasm) | Merkle tree Rust crate & corresponding wasm TS package | :heavy_check_mark: | | +| [pkgs/merkle-tree-worker](pkgs/merkle-tree-worker) | Web worker wrapper of the [@anonklub/merkle-tree-wasm](merkle-tree-wasm/Cargo.toml) wasm package | :heavy_check_mark: | | +| [pkgs/spartan-ecdsa-wasm](pkgs/spartan-ecdsa-wasm) | Spartan/Sapir circuits & corresponding wasm TS package. | :heavy_check_mark: | | +| [pkgs/spartan-ecdsa-worker](pkgs/spartan-ecdsa-worker) | Web worker wrapper of the [@anonklub/spartan](circuits/spartan/Cargo.toml) wasm package | :heavy_check_mark: | | +| [queries/crypto_ethereum](queries/crypto_ethereum) | Google [`bigquery-public-data.crypto_ethereum`](https://console.cloud.google.com/marketplace/product/ethereum/crypto-ethereum-blockchain) queries examples | :heavy_check_mark: | | +| [queries/dune_analytics](queries/dune_analytics) | [Dune Analytics](https://dune.com/) queries examples | :heavy_check_mark: | | +| [queries/the_graph](queries/the_graph) | [The Graph](https://thegraph.com/en/) queries examples | :heavy_check_mark: | | +| [query-api](query-api) | Query API server | :heavy_check_mark: | [anonset.fly.dev](https://anonset.fly.dev) | +| [ui](ui) | User Interface (fetch anonymity sets, generate or verify membership proofs) | :heavy_check_mark: | [anonklub.fly.dev](https://anonklub.fly.dev) | ## Environment diff --git a/circuits/circom/.gitignore b/circom/.gitignore similarity index 100% rename from circuits/circom/.gitignore rename to circom/.gitignore diff --git a/circuits/circom/README.md b/circom/README.md similarity index 100% rename from circuits/circom/README.md rename to circom/README.md diff --git a/circuits/circom/benchmark/README.md b/circom/benchmark/README.md similarity index 100% rename from circuits/circom/benchmark/README.md rename to circom/benchmark/README.md diff --git a/circuits/circom/benchmark/benchmark.log b/circom/benchmark/benchmark.log similarity index 100% rename from circuits/circom/benchmark/benchmark.log rename to circom/benchmark/benchmark.log diff --git a/circuits/circom/ecdsa.circom b/circom/ecdsa.circom similarity index 100% rename from circuits/circom/ecdsa.circom rename to circom/ecdsa.circom diff --git a/circuits/circom/generated/generate_witness.js b/circom/generated/generate_witness.js similarity index 100% rename from circuits/circom/generated/generate_witness.js rename to circom/generated/generate_witness.js diff --git a/circuits/circom/generated/main.wasm b/circom/generated/main.wasm similarity index 100% rename from circuits/circom/generated/main.wasm rename to circom/generated/main.wasm diff --git a/circuits/circom/generated/prover b/circom/generated/prover similarity index 100% rename from circuits/circom/generated/prover rename to circom/generated/prover diff --git a/circuits/circom/generated/verification_key.json b/circom/generated/verification_key.json similarity index 100% rename from circuits/circom/generated/verification_key.json rename to circom/generated/verification_key.json diff --git a/circuits/circom/generated/witness_calculator.js b/circom/generated/witness_calculator.js similarity index 100% rename from circuits/circom/generated/witness_calculator.js rename to circom/generated/witness_calculator.js diff --git a/circuits/circom/main.circom b/circom/main.circom similarity index 100% rename from circuits/circom/main.circom rename to circom/main.circom diff --git a/circuits/circom/membership.circom b/circom/membership.circom similarity index 100% rename from circuits/circom/membership.circom rename to circom/membership.circom diff --git a/circuits/circom/merkleTree.circom b/circom/merkleTree.circom similarity index 100% rename from circuits/circom/merkleTree.circom rename to circom/merkleTree.circom diff --git a/circuits/circom/package.json b/circom/package.json similarity index 100% rename from circuits/circom/package.json rename to circom/package.json diff --git a/circuits/circom/scripts/_client.ts b/circom/scripts/_client.ts similarity index 100% rename from circuits/circom/scripts/_client.ts rename to circom/scripts/_client.ts diff --git a/circuits/circom/scripts/_prompt.ts b/circom/scripts/_prompt.ts similarity index 100% rename from circuits/circom/scripts/_prompt.ts rename to circom/scripts/_prompt.ts diff --git a/circuits/circom/scripts/_wrap.ts b/circom/scripts/_wrap.ts similarity index 100% rename from circuits/circom/scripts/_wrap.ts rename to circom/scripts/_wrap.ts diff --git a/circuits/circom/scripts/generate-calldata-base10.ts b/circom/scripts/generate-calldata-base10.ts similarity index 100% rename from circuits/circom/scripts/generate-calldata-base10.ts rename to circom/scripts/generate-calldata-base10.ts diff --git a/circuits/circom/scripts/generate-calldata.ts b/circom/scripts/generate-calldata.ts similarity index 100% rename from circuits/circom/scripts/generate-calldata.ts rename to circom/scripts/generate-calldata.ts diff --git a/circuits/circom/scripts/maybe-fix-circom-imports.sh b/circom/scripts/maybe-fix-circom-imports.sh similarity index 100% rename from circuits/circom/scripts/maybe-fix-circom-imports.sh rename to circom/scripts/maybe-fix-circom-imports.sh diff --git a/circuits/circom/scripts/verify-local.ts b/circom/scripts/verify-local.ts similarity index 100% rename from circuits/circom/scripts/verify-local.ts rename to circom/scripts/verify-local.ts diff --git a/circuits/circom/scripts/verify-onchain.ts b/circom/scripts/verify-onchain.ts similarity index 100% rename from circuits/circom/scripts/verify-onchain.ts rename to circom/scripts/verify-onchain.ts diff --git a/circuits/circom/test/circuit.test.ts b/circom/test/circuit.test.ts similarity index 100% rename from circuits/circom/test/circuit.test.ts rename to circom/test/circuit.test.ts diff --git a/circuits/circom/test/data/input.json b/circom/test/data/input.json similarity index 100% rename from circuits/circom/test/data/input.json rename to circom/test/data/input.json diff --git a/circuits/circom/test/data/proof.json b/circom/test/data/proof.json similarity index 100% rename from circuits/circom/test/data/proof.json rename to circom/test/data/proof.json diff --git a/circuits/circom/test/data/public.json b/circom/test/data/public.json similarity index 100% rename from circuits/circom/test/data/public.json rename to circom/test/data/public.json diff --git a/circuits/circom/test/data/witness.wtns b/circom/test/data/witness.wtns similarity index 100% rename from circuits/circom/test/data/witness.wtns rename to circom/test/data/witness.wtns diff --git a/circuits/circom/test/is_ordered_test.circom b/circom/test/is_ordered_test.circom similarity index 100% rename from circuits/circom/test/is_ordered_test.circom rename to circom/test/is_ordered_test.circom diff --git a/circuits/circom/test/jest.config.ts b/circom/test/jest.config.ts similarity index 100% rename from circuits/circom/test/jest.config.ts rename to circom/test/jest.config.ts diff --git a/circuits/circom/test/membership_test.circom b/circom/test/membership_test.circom similarity index 100% rename from circuits/circom/test/membership_test.circom rename to circom/test/membership_test.circom diff --git a/circuits/circom/test/merkle_tree_test.circom b/circom/test/merkle_tree_test.circom similarity index 100% rename from circuits/circom/test/merkle_tree_test.circom rename to circom/test/merkle_tree_test.circom diff --git a/circuits/circom/test/non_membership_test.circom b/circom/test/non_membership_test.circom similarity index 100% rename from circuits/circom/test/non_membership_test.circom rename to circom/test/non_membership_test.circom diff --git a/circuits/circom/test/test_ecdsa_check_pub_key.circom b/circom/test/test_ecdsa_check_pub_key.circom similarity index 100% rename from circuits/circom/test/test_ecdsa_check_pub_key.circom rename to circom/test/test_ecdsa_check_pub_key.circom diff --git a/circuits/circom/tsconfig.json b/circom/tsconfig.json similarity index 82% rename from circuits/circom/tsconfig.json rename to circom/tsconfig.json index 1dccfd4e..960dcf14 100644 --- a/circuits/circom/tsconfig.json +++ b/circom/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig.json", + "extends": "../tsconfig.json", "compilerOptions": { "lib": ["es2020"], diff --git a/package.json b/package.json index eafaaf09..7b64a772 100644 --- a/package.json +++ b/package.json @@ -31,24 +31,22 @@ "tsconfig-paths": "^4.2.0", "ttab": "^0.8.0", "turbo": "^1.10.16", - "typescript": "^5.0.4" + "typescript": "5.1.6" }, "scripts": { - "pnpm:devPreinstall": "bash -c '[[ ! -f merkle-tree-wasm/wasm-pkg/package.json && ! -f circuits/spartan/wasm-pkg/package.json ]]' && pnpm compile.wasm || return 0", - "compile.wasm": "pnpm --filter @anonklub/merkle-tree compile && pnpm --filter @anonklub/spartan-ecdsa compile", + "pnpm:devPreinstall": "bash -c '[[ ! -f pkgs/merkle-tree-wasm/dist/package.json && ! -f pkgs/spartan-ecdsa-wasm/dist/package.json ]]' && pnpm compile.wasm || return 0", + "compile.wasm": "pnpm --filter merkle-tree-wasm compile && pnpm --filter spartan-ecdsa-wasm compile", "compile": "turbo run compile", "build": "pnpm run compile && turbo run build", "build.docker.discord": "docker build -f discord-bot/Dockerfile . -t discord-bot", "build.docker.query": "docker build -f query-api/Dockerfile . -t query-api", "build.docker.ui": "docker build -f ui/Dockerfile . -t anonklub-ui", "compile-wasm": "pnpm run compile-merkle-wasm && pnpm run compile-spartan-wasm", - "compile-merkle-wasm": "pnpm --filter @anonklub/merkle-tree compile", - "compile-spartan-wasm": "pnpm --filter @anonklub/spartan-ecdsa compile", + "compile-merkle-wasm": "pnpm --filter pkgs/merkle-tree compile", + "compile-spartan-wasm": "pnpm --filter pkgs/spartan-ecdsa compile", "barrels": "barrelsby --config .barrelsby.json", - "clean": "find . -name 'node_modules' -type d -prune -exec rm -rf '{}' +", + "clean": "find . \\( -name 'node_modules' -o -name 'dist' -o -name 'next' \\) -type d -prune -exec rm -rf '{}' +", "start.query-api": "pnpm --filter query-api start.dev", - "pre.demo": "ttab -w 'pnpm run start.prove-api'", - "demo": "pnpm run pre.demo && sleep 5 && pnpm run --filter @anonklub/demo start", "fix": "turbo _format.fix _lint.fix", "_format": "prettier -c .", "format": "turbo run _format", @@ -59,7 +57,7 @@ "lint": "turbo run _lint", "_lint.fix": "eslint . --ext .js,.ts,.tsx --fix", "lint.fix": "turbo run _lint.fix", - "publish-packages": "turbo --filter='./@anonklub/*' build && changeset version && changeset publish", + "publish-packages": "turbo --filter='./pkgs/*' build && changeset version && changeset publish", "test.watch": "jest --watch", "_test": "jest", "test": "turbo run _test", @@ -67,15 +65,12 @@ "validate": "turbo run _format _lint build --cache-dir=.turbo" }, "workspaces": [ - "@anonklub/*", "contracts", - "circuits/**", + "circom", "discord-bot", - "merkle-tree-wasm", - "merkle-tree-wasm/wasm-pkg", + "pkgs/*", "query-api", "test", - "ui", - "workers/*" + "ui" ] } diff --git a/@anonklub/cli/CHANGELOG.md b/pkgs/cli/CHANGELOG.md similarity index 100% rename from @anonklub/cli/CHANGELOG.md rename to pkgs/cli/CHANGELOG.md diff --git a/@anonklub/cli/README.md b/pkgs/cli/README.md similarity index 100% rename from @anonklub/cli/README.md rename to pkgs/cli/README.md diff --git a/@anonklub/cli/package.json b/pkgs/cli/package.json similarity index 100% rename from @anonklub/cli/package.json rename to pkgs/cli/package.json diff --git a/@anonklub/cli/src/Cli/index.ts b/pkgs/cli/src/Cli/index.ts similarity index 100% rename from @anonklub/cli/src/Cli/index.ts rename to pkgs/cli/src/Cli/index.ts diff --git a/@anonklub/cli/src/Cli/interface.ts b/pkgs/cli/src/Cli/interface.ts similarity index 100% rename from @anonklub/cli/src/Cli/interface.ts rename to pkgs/cli/src/Cli/interface.ts diff --git a/@anonklub/cli/src/Prompt/index.ts b/pkgs/cli/src/Prompt/index.ts similarity index 100% rename from @anonklub/cli/src/Prompt/index.ts rename to pkgs/cli/src/Prompt/index.ts diff --git a/@anonklub/cli/src/Prompt/interface.ts b/pkgs/cli/src/Prompt/interface.ts similarity index 100% rename from @anonklub/cli/src/Prompt/interface.ts rename to pkgs/cli/src/Prompt/interface.ts diff --git a/@anonklub/cli/src/index.ts b/pkgs/cli/src/index.ts similarity index 100% rename from @anonklub/cli/src/index.ts rename to pkgs/cli/src/index.ts diff --git a/@anonklub/cli/src/types.ts b/pkgs/cli/src/types.ts similarity index 100% rename from @anonklub/cli/src/types.ts rename to pkgs/cli/src/types.ts diff --git a/@anonklub/cli/tsconfig.compile.json b/pkgs/cli/tsconfig.compile.json similarity index 100% rename from @anonklub/cli/tsconfig.compile.json rename to pkgs/cli/tsconfig.compile.json diff --git a/@anonklub/cli/tsconfig.json b/pkgs/cli/tsconfig.json similarity index 100% rename from @anonklub/cli/tsconfig.json rename to pkgs/cli/tsconfig.json diff --git a/merkle-tree-wasm/Cargo.toml b/pkgs/merkle-tree-wasm/Cargo.toml similarity index 100% rename from merkle-tree-wasm/Cargo.toml rename to pkgs/merkle-tree-wasm/Cargo.toml diff --git a/merkle-tree-wasm/README.md b/pkgs/merkle-tree-wasm/README.md similarity index 100% rename from merkle-tree-wasm/README.md rename to pkgs/merkle-tree-wasm/README.md diff --git a/merkle-tree-wasm/package.json b/pkgs/merkle-tree-wasm/package.json similarity index 69% rename from merkle-tree-wasm/package.json rename to pkgs/merkle-tree-wasm/package.json index af8e5d1d..bcce46d1 100644 --- a/merkle-tree-wasm/package.json +++ b/pkgs/merkle-tree-wasm/package.json @@ -1,9 +1,9 @@ { - "name": "@anonklub/merkle-tree", + "name": "merkle-tree-wasm", "main": "index.js", "scripts": { "check-wasm-pack": "command -v wasm-pack >/dev/null 2>&1 || echo \"wasm-pack is not installed\"\n", - "compile": "pnpm run check-wasm-pack && wasm-pack build . --target bundler --out-dir wasm-pkg --out-name index --scope anonklub" + "compile": "pnpm run check-wasm-pack && wasm-pack build . --target bundler --out-dir dist --out-name index --scope anonklub" }, "private": true } diff --git a/merkle-tree-wasm/src/lib.rs b/pkgs/merkle-tree-wasm/src/lib.rs similarity index 100% rename from merkle-tree-wasm/src/lib.rs rename to pkgs/merkle-tree-wasm/src/lib.rs diff --git a/merkle-tree-wasm/src/merkle_tree_wasm.rs b/pkgs/merkle-tree-wasm/src/merkle_tree_wasm.rs similarity index 100% rename from merkle-tree-wasm/src/merkle_tree_wasm.rs rename to pkgs/merkle-tree-wasm/src/merkle_tree_wasm.rs diff --git a/workers/merkle-tree-worker/CHANGELOG.md b/pkgs/merkle-tree-worker/CHANGELOG.md similarity index 100% rename from workers/merkle-tree-worker/CHANGELOG.md rename to pkgs/merkle-tree-worker/CHANGELOG.md diff --git a/workers/merkle-tree-worker/README.md b/pkgs/merkle-tree-worker/README.md similarity index 100% rename from workers/merkle-tree-worker/README.md rename to pkgs/merkle-tree-worker/README.md diff --git a/workers/merkle-tree-worker/package.json b/pkgs/merkle-tree-worker/package.json similarity index 100% rename from workers/merkle-tree-worker/package.json rename to pkgs/merkle-tree-worker/package.json diff --git a/workers/merkle-tree-worker/src/index.ts b/pkgs/merkle-tree-worker/src/index.ts similarity index 100% rename from workers/merkle-tree-worker/src/index.ts rename to pkgs/merkle-tree-worker/src/index.ts diff --git a/workers/merkle-tree-worker/src/interface.ts b/pkgs/merkle-tree-worker/src/interface.ts similarity index 100% rename from workers/merkle-tree-worker/src/interface.ts rename to pkgs/merkle-tree-worker/src/interface.ts diff --git a/workers/merkle-tree-worker/src/worker.ts b/pkgs/merkle-tree-worker/src/worker.ts similarity index 100% rename from workers/merkle-tree-worker/src/worker.ts rename to pkgs/merkle-tree-worker/src/worker.ts diff --git a/workers/merkle-tree-worker/tsconfig.compile.json b/pkgs/merkle-tree-worker/tsconfig.compile.json similarity index 100% rename from workers/merkle-tree-worker/tsconfig.compile.json rename to pkgs/merkle-tree-worker/tsconfig.compile.json diff --git a/workers/merkle-tree-worker/tsconfig.json b/pkgs/merkle-tree-worker/tsconfig.json similarity index 79% rename from workers/merkle-tree-worker/tsconfig.json rename to pkgs/merkle-tree-worker/tsconfig.json index ac8a2170..d246dda6 100644 --- a/workers/merkle-tree-worker/tsconfig.json +++ b/pkgs/merkle-tree-worker/tsconfig.json @@ -7,7 +7,7 @@ "strictPropertyInitialization": false, "lib": ["webWorker", "DOM"], "paths": { - "@anonklub/merkle-tree-wasm": ["../../merkle_tree_wasm/wasm-pkg"] + "@anonklub/merkle-tree-wasm": ["../merkle_tree_wasm/dist"] } }, "include": ["src"] diff --git a/@anonklub/proof/CHANGELOG.md b/pkgs/proof/CHANGELOG.md similarity index 100% rename from @anonklub/proof/CHANGELOG.md rename to pkgs/proof/CHANGELOG.md diff --git a/@anonklub/proof/package.json b/pkgs/proof/package.json similarity index 100% rename from @anonklub/proof/package.json rename to pkgs/proof/package.json diff --git a/@anonklub/proof/src/ExcludableMerkleTree.ts b/pkgs/proof/src/ExcludableMerkleTree.ts similarity index 100% rename from @anonklub/proof/src/ExcludableMerkleTree.ts rename to pkgs/proof/src/ExcludableMerkleTree.ts diff --git a/@anonklub/proof/src/MerkleTree.ts b/pkgs/proof/src/MerkleTree.ts similarity index 100% rename from @anonklub/proof/src/MerkleTree.ts rename to pkgs/proof/src/MerkleTree.ts diff --git a/@anonklub/proof/src/ProofRequest.ts b/pkgs/proof/src/ProofRequest.ts similarity index 100% rename from @anonklub/proof/src/ProofRequest.ts rename to pkgs/proof/src/ProofRequest.ts diff --git a/@anonklub/proof/src/fetch.d.ts b/pkgs/proof/src/fetch.d.ts similarity index 100% rename from @anonklub/proof/src/fetch.d.ts rename to pkgs/proof/src/fetch.d.ts diff --git a/@anonklub/proof/src/helpers.ts b/pkgs/proof/src/helpers.ts similarity index 100% rename from @anonklub/proof/src/helpers.ts rename to pkgs/proof/src/helpers.ts diff --git a/@anonklub/proof/src/index.ts b/pkgs/proof/src/index.ts similarity index 100% rename from @anonklub/proof/src/index.ts rename to pkgs/proof/src/index.ts diff --git a/@anonklub/proof/src/poseidon.ts b/pkgs/proof/src/poseidon.ts similarity index 100% rename from @anonklub/proof/src/poseidon.ts rename to pkgs/proof/src/poseidon.ts diff --git a/@anonklub/proof/test/ProofRequest.test.ts b/pkgs/proof/test/ProofRequest.test.ts similarity index 100% rename from @anonklub/proof/test/ProofRequest.test.ts rename to pkgs/proof/test/ProofRequest.test.ts diff --git a/@anonklub/proof/test/data/constants.ts b/pkgs/proof/test/data/constants.ts similarity index 100% rename from @anonklub/proof/test/data/constants.ts rename to pkgs/proof/test/data/constants.ts diff --git a/@anonklub/proof/test/jest.config.ts b/pkgs/proof/test/jest.config.ts similarity index 100% rename from @anonklub/proof/test/jest.config.ts rename to pkgs/proof/test/jest.config.ts diff --git a/@anonklub/proof/test/setup.ts b/pkgs/proof/test/setup.ts similarity index 100% rename from @anonklub/proof/test/setup.ts rename to pkgs/proof/test/setup.ts diff --git a/@anonklub/proof/tsconfig.compile.json b/pkgs/proof/tsconfig.compile.json similarity index 100% rename from @anonklub/proof/tsconfig.compile.json rename to pkgs/proof/tsconfig.compile.json diff --git a/@anonklub/proof/tsconfig.json b/pkgs/proof/tsconfig.json similarity index 100% rename from @anonklub/proof/tsconfig.json rename to pkgs/proof/tsconfig.json diff --git a/@anonklub/query/CHANGELOG.md b/pkgs/query/CHANGELOG.md similarity index 100% rename from @anonklub/query/CHANGELOG.md rename to pkgs/query/CHANGELOG.md diff --git a/@anonklub/query/package.json b/pkgs/query/package.json similarity index 100% rename from @anonklub/query/package.json rename to pkgs/query/package.json diff --git a/@anonklub/query/src/AnonymitySet/index.ts b/pkgs/query/src/AnonymitySet/index.ts similarity index 100% rename from @anonklub/query/src/AnonymitySet/index.ts rename to pkgs/query/src/AnonymitySet/index.ts diff --git a/@anonklub/query/src/AnonymitySet/interface.ts b/pkgs/query/src/AnonymitySet/interface.ts similarity index 100% rename from @anonklub/query/src/AnonymitySet/interface.ts rename to pkgs/query/src/AnonymitySet/interface.ts diff --git a/@anonklub/query/src/CONSTANTS.ts b/pkgs/query/src/CONSTANTS.ts similarity index 100% rename from @anonklub/query/src/CONSTANTS.ts rename to pkgs/query/src/CONSTANTS.ts diff --git a/@anonklub/query/src/fetch-json.ts b/pkgs/query/src/fetch-json.ts similarity index 100% rename from @anonklub/query/src/fetch-json.ts rename to pkgs/query/src/fetch-json.ts diff --git a/@anonklub/query/src/index.ts b/pkgs/query/src/index.ts similarity index 100% rename from @anonklub/query/src/index.ts rename to pkgs/query/src/index.ts diff --git a/@anonklub/query/src/requests/EnsProposalVotersRequest.ts b/pkgs/query/src/requests/EnsProposalVotersRequest.ts similarity index 100% rename from @anonklub/query/src/requests/EnsProposalVotersRequest.ts rename to pkgs/query/src/requests/EnsProposalVotersRequest.ts diff --git a/@anonklub/query/src/requests/Erc20BalanceAnonSetRequest.ts b/pkgs/query/src/requests/Erc20BalanceAnonSetRequest.ts similarity index 100% rename from @anonklub/query/src/requests/Erc20BalanceAnonSetRequest.ts rename to pkgs/query/src/requests/Erc20BalanceAnonSetRequest.ts diff --git a/@anonklub/query/src/requests/EthBalanceAnonSetRequest.ts b/pkgs/query/src/requests/EthBalanceAnonSetRequest.ts similarity index 100% rename from @anonklub/query/src/requests/EthBalanceAnonSetRequest.ts rename to pkgs/query/src/requests/EthBalanceAnonSetRequest.ts diff --git a/@anonklub/query/src/requests/index.ts b/pkgs/query/src/requests/index.ts similarity index 100% rename from @anonklub/query/src/requests/index.ts rename to pkgs/query/src/requests/index.ts diff --git a/@anonklub/query/src/types.ts b/pkgs/query/src/types.ts similarity index 100% rename from @anonklub/query/src/types.ts rename to pkgs/query/src/types.ts diff --git a/@anonklub/query/test/AnonymitySet.test.ts b/pkgs/query/test/AnonymitySet.test.ts similarity index 100% rename from @anonklub/query/test/AnonymitySet.test.ts rename to pkgs/query/test/AnonymitySet.test.ts diff --git a/@anonklub/query/test/jest.config.ts b/pkgs/query/test/jest.config.ts similarity index 100% rename from @anonklub/query/test/jest.config.ts rename to pkgs/query/test/jest.config.ts diff --git a/@anonklub/query/tsconfig.compile.json b/pkgs/query/tsconfig.compile.json similarity index 100% rename from @anonklub/query/tsconfig.compile.json rename to pkgs/query/tsconfig.compile.json diff --git a/@anonklub/query/tsconfig.json b/pkgs/query/tsconfig.json similarity index 100% rename from @anonklub/query/tsconfig.json rename to pkgs/query/tsconfig.json diff --git a/circuits/spartan/Cargo.toml b/pkgs/spartan-ecdsa-wasm/Cargo.toml similarity index 85% rename from circuits/spartan/Cargo.toml rename to pkgs/spartan-ecdsa-wasm/Cargo.toml index 4378a45d..f4ec72ea 100644 --- a/circuits/spartan/Cargo.toml +++ b/pkgs/spartan-ecdsa-wasm/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "spartan" +name = "spartan-ecdsa-wasm" version = "1.0.0" edition = "2021" @@ -20,4 +20,4 @@ sapir = { git = "https://github.com/personaelabs/sapir.git", features = [ ], branch = "main" } wasm-bindgen = "0.2.89" web-sys = "0.3.66" -merkle-tree-wasm = { path = "../../merkle-tree-wasm" } +merkle-tree-wasm = { path = "../merkle-tree-wasm" } diff --git a/circuits/spartan/package.json b/pkgs/spartan-ecdsa-wasm/package.json similarity index 80% rename from circuits/spartan/package.json rename to pkgs/spartan-ecdsa-wasm/package.json index a5d0343d..b74adaa2 100644 --- a/circuits/spartan/package.json +++ b/pkgs/spartan-ecdsa-wasm/package.json @@ -1,10 +1,10 @@ { - "name": "@anonklub/spartan-ecdsa", + "name": "spartan-ecdsa-wasm", "main": "index.js", "type": "module", "scripts": { "check-wasm-pack": "command -v wasm-pack >/dev/null 2>&1 || echo \"wasm-pack is not installed\"\n", - "compile": "pnpm run check-wasm-pack && wasm-pack build . --target bundler --out-dir wasm-pkg --out-name index --scope anonklub" + "compile": "pnpm run check-wasm-pack && wasm-pack build . --target bundler --out-dir dist --out-name index --scope anonklub" }, "dependencies": { "pako": "^2.1.0", diff --git a/circuits/spartan/src/eth_membership.rs b/pkgs/spartan-ecdsa-wasm/src/eth_membership.rs similarity index 100% rename from circuits/spartan/src/eth_membership.rs rename to pkgs/spartan-ecdsa-wasm/src/eth_membership.rs diff --git a/circuits/spartan/src/lib.rs b/pkgs/spartan-ecdsa-wasm/src/lib.rs similarity index 100% rename from circuits/spartan/src/lib.rs rename to pkgs/spartan-ecdsa-wasm/src/lib.rs diff --git a/circuits/spartan/src/utils.rs b/pkgs/spartan-ecdsa-wasm/src/utils.rs similarity index 100% rename from circuits/spartan/src/utils.rs rename to pkgs/spartan-ecdsa-wasm/src/utils.rs diff --git a/workers/spartan-ecdsa-worker/CHANGELOG.md b/pkgs/spartan-ecdsa-worker/CHANGELOG.md similarity index 100% rename from workers/spartan-ecdsa-worker/CHANGELOG.md rename to pkgs/spartan-ecdsa-worker/CHANGELOG.md diff --git a/workers/spartan-ecdsa-worker/README.md b/pkgs/spartan-ecdsa-worker/README.md similarity index 100% rename from workers/spartan-ecdsa-worker/README.md rename to pkgs/spartan-ecdsa-worker/README.md diff --git a/workers/spartan-ecdsa-worker/package.json b/pkgs/spartan-ecdsa-worker/package.json similarity index 100% rename from workers/spartan-ecdsa-worker/package.json rename to pkgs/spartan-ecdsa-worker/package.json diff --git a/workers/spartan-ecdsa-worker/src/index.ts b/pkgs/spartan-ecdsa-worker/src/index.ts similarity index 100% rename from workers/spartan-ecdsa-worker/src/index.ts rename to pkgs/spartan-ecdsa-worker/src/index.ts diff --git a/workers/spartan-ecdsa-worker/src/interface.ts b/pkgs/spartan-ecdsa-worker/src/interface.ts similarity index 100% rename from workers/spartan-ecdsa-worker/src/interface.ts rename to pkgs/spartan-ecdsa-worker/src/interface.ts diff --git a/workers/spartan-ecdsa-worker/src/utils.ts b/pkgs/spartan-ecdsa-worker/src/utils.ts similarity index 100% rename from workers/spartan-ecdsa-worker/src/utils.ts rename to pkgs/spartan-ecdsa-worker/src/utils.ts diff --git a/workers/spartan-ecdsa-worker/src/worker.ts b/pkgs/spartan-ecdsa-worker/src/worker.ts similarity index 100% rename from workers/spartan-ecdsa-worker/src/worker.ts rename to pkgs/spartan-ecdsa-worker/src/worker.ts diff --git a/workers/spartan-ecdsa-worker/tsconfig.compile.json b/pkgs/spartan-ecdsa-worker/tsconfig.compile.json similarity index 100% rename from workers/spartan-ecdsa-worker/tsconfig.compile.json rename to pkgs/spartan-ecdsa-worker/tsconfig.compile.json diff --git a/workers/spartan-ecdsa-worker/tsconfig.json b/pkgs/spartan-ecdsa-worker/tsconfig.json similarity index 100% rename from workers/spartan-ecdsa-worker/tsconfig.json rename to pkgs/spartan-ecdsa-worker/tsconfig.json diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 951629a7..bb75736c 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -32,19 +32,19 @@ importers: version: 29.5.11 '@types/node': specifier: ^18.11.15 - version: 18.19.10 + version: 18.19.11 barrelsby: specifier: ^2.5.1 version: 2.8.1 eslint-config-next: specifier: ^13.4.2 - version: 13.5.6(eslint@8.56.0)(typescript@5.2.2) + version: 13.5.6(eslint@8.56.0)(typescript@5.1.6) find-up-cli: specifier: ^5.0.0 version: 5.0.0 jest: specifier: ^29.6.2 - version: 29.7.0(@types/node@18.19.10)(ts-node@10.9.2) + version: 29.7.0(@types/node@18.19.11)(ts-node@10.9.2) jest-chain: specifier: ^1.1.6 version: 1.1.6 @@ -56,7 +56,7 @@ importers: version: 3.0.3 jest-mock-extended: specifier: ^3.0.5 - version: 3.0.5(jest@29.7.0)(typescript@5.2.2) + version: 3.0.5(jest@29.7.0)(typescript@5.1.6) jest-silent-reporter: specifier: ^0.5.0 version: 0.5.0 @@ -74,13 +74,13 @@ importers: version: 0.1.14 ts-jest: specifier: ^29.1.1 - version: 29.1.2(@babel/core@7.23.9)(jest@29.7.0)(typescript@5.2.2) + version: 29.1.2(@babel/core@7.23.9)(jest@29.7.0)(typescript@5.1.6) ts-node: specifier: ^10.9.1 - version: 10.9.2(@types/node@18.19.10)(typescript@5.2.2) + version: 10.9.2(@types/node@18.19.11)(typescript@5.1.6) ts-node-dev: specifier: ^2.0.0 - version: 2.0.0(@types/node@18.19.10)(typescript@5.2.2) + version: 2.0.0(@types/node@18.19.11)(typescript@5.1.6) tsconfig-paths: specifier: ^4.2.0 version: 4.2.0 @@ -89,73 +89,12 @@ importers: version: 0.8.0 turbo: specifier: ^1.10.16 - version: 1.11.3 + version: 1.12.1 typescript: - specifier: ^5.0.4 - version: 5.2.2 + specifier: 5.1.6 + version: 5.1.6 - '@anonklub/cli': - dependencies: - '@anonklub/proof': - specifier: 2.0.0 - version: 2.0.0 - '@anonklub/query': - specifier: 1.1.0 - version: 1.1.0 - '@noble/secp256k1': - specifier: ^1.7.0 - version: 1.7.1 - delay: - specifier: ^5.0.0 - version: 5.0.0 - ethers: - specifier: ^5.7.2 - version: 5.7.2 - inquirer: - specifier: ^8 - version: 8.2.6 - inquirer-fuzzy-path: - specifier: ^2.3.0 - version: 2.3.0 - ora: - specifier: ^5 - version: 5.4.1 - snarkjs: - specifier: ^0.7.0 - version: 0.7.3 - terminal-link: - specifier: 2.1.1 - version: 2.1.1 - devDependencies: - '@types/inquirer': - specifier: ^9.0.3 - version: 9.0.7 - '@types/yargs': - specifier: ^17.0.24 - version: 17.0.32 - - '@anonklub/proof': - dependencies: - '@noble/secp256k1': - specifier: ^1.7.0 - version: 1.7.1 - circomlibjs: - specifier: ^0.1.7 - version: 0.1.7 - ethers: - specifier: ^5.7.2 - version: 5.7.2 - undici: - specifier: ^5.21.2 - version: 5.28.2 - - '@anonklub/query': - dependencies: - class-validator: - specifier: ^0.14.0 - version: 0.14.1 - - circuits/circom: + circom: devDependencies: '@anonklub/proof': specifier: 2.0.0 @@ -203,29 +142,11 @@ importers: specifier: 0.3.27 version: 0.3.27(typescript@5.2.2)(zod@3.22.4) - circuits/spartan: - dependencies: - pako: - specifier: ^2.1.0 - version: 2.1.0 - spartan-ecdsa-circuits: - specifier: ^1.0.0 - version: 1.0.0 - devDependencies: - ts-node: - specifier: ^10.9.1 - version: 10.9.2(@swc/core@1.3.107)(@types/node@20.11.10)(typescript@5.2.2) - typescript: - specifier: 5.2.2 - version: 5.2.2 - - circuits/spartan/wasm-pkg: {} - contracts: devDependencies: solhint: specifier: ^3.4.1 - version: 3.6.2(typescript@5.2.2) + version: 3.6.2(typescript@5.1.6) discord-bot: dependencies: @@ -261,7 +182,7 @@ importers: version: 0.10.0 viem: specifier: ^2.4.1 - version: 2.6.1(typescript@5.2.2)(zod@3.22.4) + version: 2.7.1(typescript@5.2.2)(zod@3.22.4) devDependencies: '@types/express': specifier: ^4.17.17 @@ -270,9 +191,105 @@ importers: specifier: ^5.1.6 version: 5.2.2 - merkle-tree-wasm: {} + pkgs/cli: + dependencies: + '@anonklub/proof': + specifier: 2.0.0 + version: 2.0.0 + '@anonklub/query': + specifier: 1.1.0 + version: 1.1.0 + '@noble/secp256k1': + specifier: ^1.7.0 + version: 1.7.1 + delay: + specifier: ^5.0.0 + version: 5.0.0 + ethers: + specifier: ^5.7.2 + version: 5.7.2 + inquirer: + specifier: ^8 + version: 8.2.6 + inquirer-fuzzy-path: + specifier: ^2.3.0 + version: 2.3.0 + ora: + specifier: ^5 + version: 5.4.1 + snarkjs: + specifier: ^0.7.0 + version: 0.7.3 + terminal-link: + specifier: 2.1.1 + version: 2.1.1 + devDependencies: + '@types/inquirer': + specifier: ^9.0.3 + version: 9.0.7 + '@types/yargs': + specifier: ^17.0.24 + version: 17.0.32 - merkle-tree-wasm/wasm-pkg: {} + pkgs/merkle-tree-wasm: {} + + pkgs/merkle-tree-worker: + dependencies: + '@anonklub/merkle-tree-wasm': + specifier: 1.0.0 + version: 1.0.0 + comlink: + specifier: ^4.4.1 + version: 4.4.1 + + pkgs/proof: + dependencies: + '@noble/secp256k1': + specifier: ^1.7.0 + version: 1.7.1 + circomlibjs: + specifier: ^0.1.7 + version: 0.1.7 + ethers: + specifier: ^5.7.2 + version: 5.7.2 + undici: + specifier: ^5.21.2 + version: 5.28.2 + + pkgs/query: + dependencies: + class-validator: + specifier: ^0.14.0 + version: 0.14.1 + + pkgs/spartan-ecdsa-wasm: + dependencies: + pako: + specifier: ^2.1.0 + version: 2.1.0 + spartan-ecdsa-circuits: + specifier: ^1.0.0 + version: 1.0.0 + devDependencies: + ts-node: + specifier: ^10.9.1 + version: 10.9.2(@swc/core@1.3.107)(@types/node@20.11.13)(typescript@5.2.2) + typescript: + specifier: 5.2.2 + version: 5.2.2 + + pkgs/spartan-ecdsa-worker: + dependencies: + '@anonklub/spartan': + specifier: 1.0.0 + version: 1.0.0 + comlink: + specifier: ^4.4.1 + version: 4.4.1 + viem: + specifier: ^2.0.10 + version: 2.7.1(typescript@5.1.6)(zod@3.22.4) query-api: dependencies: @@ -287,7 +304,7 @@ importers: version: 0.3.4(@graphql-tools/utils@9.2.1)(graphql@16.8.1)(react-native@0.73.3) '@graphql-mesh/graphql': specifier: ^0.33.4 - version: 0.33.10(@types/node@20.11.10)(graphql@16.8.1)(react-native@0.73.3) + version: 0.33.10(@types/node@20.11.13)(graphql@16.8.1)(react-native@0.73.3) '@graphql-mesh/http': specifier: ^0.3.19 version: 0.3.29(@graphql-mesh/cross-helpers@0.3.4)(@graphql-mesh/types@0.93.2)(@graphql-mesh/utils@0.93.2)(@graphql-tools/utils@9.2.1)(graphql@16.8.1)(tslib@2.6.2) @@ -348,7 +365,7 @@ importers: devDependencies: '@graphprotocol/client-cli': specifier: ^2.2.22 - version: 2.2.22(@babel/core@7.23.9)(@envelop/core@3.0.6)(@graphql-mesh/cross-helpers@0.3.4)(@graphql-mesh/store@0.93.1)(@graphql-mesh/types@0.93.2)(@graphql-mesh/utils@0.93.2)(@graphql-tools/delegate@9.0.35)(@graphql-tools/merge@8.4.2)(@graphql-tools/utils@9.2.1)(@graphql-tools/wrap@9.4.2)(@swc/core@1.3.107)(@types/node@20.11.10)(graphql-tag@2.12.6)(graphql@16.8.1)(react-native@0.73.3) + version: 2.2.22(@babel/core@7.23.9)(@envelop/core@3.0.6)(@graphql-mesh/cross-helpers@0.3.4)(@graphql-mesh/store@0.93.1)(@graphql-mesh/types@0.93.2)(@graphql-mesh/utils@0.93.2)(@graphql-tools/delegate@9.0.35)(@graphql-tools/merge@8.4.2)(@graphql-tools/utils@9.2.1)(@graphql-tools/wrap@9.4.2)(@swc/core@1.3.107)(@types/node@20.11.13)(graphql-tag@2.12.6)(graphql@16.8.1)(react-native@0.73.3) '@nestjs/cli': specifier: ^10.0.0 version: 10.3.0(@swc/cli@0.1.65)(@swc/core@1.3.107) @@ -372,7 +389,7 @@ importers: version: 0.7.34 '@types/node': specifier: ^20.3.1 - version: 20.11.10 + version: 20.11.13 '@types/supertest': specifier: ^2.0.12 version: 2.0.16 @@ -476,27 +493,6 @@ importers: specifier: 0.3.0 version: 0.3.0(prettier@2.8.8) - workers/merkle-tree-worker: - dependencies: - '@anonklub/merkle-tree-wasm': - specifier: 1.0.0 - version: 1.0.0 - comlink: - specifier: ^4.4.1 - version: 4.4.1 - - workers/spartan-ecdsa-worker: - dependencies: - '@anonklub/spartan': - specifier: 1.0.0 - version: 1.0.0 - comlink: - specifier: ^4.4.1 - version: 4.4.1 - viem: - specifier: ^2.0.10 - version: 2.6.1(typescript@5.2.2)(zod@3.22.4) - packages: /@aashutoshrathi/word-wrap@1.2.6: @@ -602,7 +598,7 @@ packages: dependencies: '@anonklub/spartan': 1.0.0 comlink: 4.4.1 - viem: 2.6.1(typescript@5.2.2)(zod@3.22.4) + viem: 2.7.1(typescript@5.2.2)(zod@3.22.4) transitivePeerDependencies: - bufferutil - typescript @@ -728,8 +724,8 @@ packages: lru-cache: 5.1.1 semver: 6.3.1 - /@babel/helper-create-class-features-plugin@7.23.9(@babel/core@7.23.9): - resolution: {integrity: sha512-B2L9neXTIyPQoXDm+NtovPvG6VOLWnaXu3BIeVDWwdKFgG30oNa6CqVGiJPDWQwIAK49t9gnQI9c6K6RzabiKw==} + /@babel/helper-create-class-features-plugin@7.23.10(@babel/core@7.23.9): + resolution: {integrity: sha512-2XpP2XhkXzgxecPNEEK8Vz8Asj9aRxt08oKOqtiZoqV2UGZ5T+EkyP9sXQ9nwMxBIG34a7jmasVqoMop7VdPUw==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0 @@ -958,7 +954,7 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.23.9 - '@babel/helper-create-class-features-plugin': 7.23.9(@babel/core@7.23.9) + '@babel/helper-create-class-features-plugin': 7.23.10(@babel/core@7.23.9) '@babel/helper-plugin-utils': 7.22.5 /@babel/plugin-proposal-export-default-from@7.23.3(@babel/core@7.23.9): @@ -1291,7 +1287,7 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.23.9 - '@babel/helper-create-class-features-plugin': 7.23.9(@babel/core@7.23.9) + '@babel/helper-create-class-features-plugin': 7.23.10(@babel/core@7.23.9) '@babel/helper-plugin-utils': 7.22.5 /@babel/plugin-transform-class-static-block@7.23.4(@babel/core@7.23.9): @@ -1301,7 +1297,7 @@ packages: '@babel/core': ^7.12.0 dependencies: '@babel/core': 7.23.9 - '@babel/helper-create-class-features-plugin': 7.23.9(@babel/core@7.23.9) + '@babel/helper-create-class-features-plugin': 7.23.10(@babel/core@7.23.9) '@babel/helper-plugin-utils': 7.22.5 '@babel/plugin-syntax-class-static-block': 7.14.5(@babel/core@7.23.9) @@ -1600,7 +1596,7 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.23.9 - '@babel/helper-create-class-features-plugin': 7.23.9(@babel/core@7.23.9) + '@babel/helper-create-class-features-plugin': 7.23.10(@babel/core@7.23.9) '@babel/helper-plugin-utils': 7.22.5 /@babel/plugin-transform-private-property-in-object@7.23.4(@babel/core@7.23.9): @@ -1611,7 +1607,7 @@ packages: dependencies: '@babel/core': 7.23.9 '@babel/helper-annotate-as-pure': 7.22.5 - '@babel/helper-create-class-features-plugin': 7.23.9(@babel/core@7.23.9) + '@babel/helper-create-class-features-plugin': 7.23.10(@babel/core@7.23.9) '@babel/helper-plugin-utils': 7.22.5 '@babel/plugin-syntax-private-property-in-object': 7.14.5(@babel/core@7.23.9) @@ -1753,7 +1749,7 @@ packages: dependencies: '@babel/core': 7.23.9 '@babel/helper-annotate-as-pure': 7.22.5 - '@babel/helper-create-class-features-plugin': 7.23.9(@babel/core@7.23.9) + '@babel/helper-create-class-features-plugin': 7.23.10(@babel/core@7.23.9) '@babel/helper-plugin-utils': 7.22.5 '@babel/plugin-syntax-typescript': 7.23.3(@babel/core@7.23.9) @@ -2805,7 +2801,7 @@ packages: tslib: 2.6.2 dev: true - /@graphprotocol/client-cli@2.2.22(@babel/core@7.23.9)(@envelop/core@3.0.6)(@graphql-mesh/cross-helpers@0.3.4)(@graphql-mesh/store@0.93.1)(@graphql-mesh/types@0.93.2)(@graphql-mesh/utils@0.93.2)(@graphql-tools/delegate@9.0.35)(@graphql-tools/merge@8.4.2)(@graphql-tools/utils@9.2.1)(@graphql-tools/wrap@9.4.2)(@swc/core@1.3.107)(@types/node@20.11.10)(graphql-tag@2.12.6)(graphql@16.8.1)(react-native@0.73.3): + /@graphprotocol/client-cli@2.2.22(@babel/core@7.23.9)(@envelop/core@3.0.6)(@graphql-mesh/cross-helpers@0.3.4)(@graphql-mesh/store@0.93.1)(@graphql-mesh/types@0.93.2)(@graphql-mesh/utils@0.93.2)(@graphql-tools/delegate@9.0.35)(@graphql-tools/merge@8.4.2)(@graphql-tools/utils@9.2.1)(@graphql-tools/wrap@9.4.2)(@swc/core@1.3.107)(@types/node@20.11.13)(graphql-tag@2.12.6)(graphql@16.8.1)(react-native@0.73.3): resolution: {integrity: sha512-PIi8rFibYZVup+0jb08399RmbGF1ZrqUe6RXzLtKZBT57OWIMWwsFvdJyUAdr8Y8f0rrMn6A+Oy4nP1lf3hc1g==} hasBin: true peerDependencies: @@ -2816,8 +2812,8 @@ packages: '@graphprotocol/client-auto-type-merging': 1.0.25(@graphql-mesh/types@0.93.2)(@graphql-mesh/utils@0.93.2)(@graphql-tools/delegate@9.0.35)(graphql@16.8.1) '@graphprotocol/client-block-tracking': 1.0.14(@graphql-tools/delegate@9.0.35)(graphql@16.8.1) '@graphprotocol/client-polling-live': 1.1.1(@envelop/core@3.0.6)(@graphql-tools/merge@8.4.2)(graphql@16.8.1) - '@graphql-mesh/cli': 0.82.35(@babel/core@7.23.9)(@swc/core@1.3.107)(@types/node@20.11.10)(graphql-tag@2.12.6)(graphql@16.8.1)(react-native@0.73.3) - '@graphql-mesh/graphql': 0.93.1(@graphql-mesh/cross-helpers@0.3.4)(@graphql-mesh/store@0.93.1)(@graphql-mesh/types@0.93.2)(@graphql-mesh/utils@0.93.2)(@graphql-tools/utils@9.2.1)(@types/node@20.11.10)(graphql@16.8.1)(tslib@2.6.2) + '@graphql-mesh/cli': 0.82.35(@babel/core@7.23.9)(@swc/core@1.3.107)(@types/node@20.11.13)(graphql-tag@2.12.6)(graphql@16.8.1)(react-native@0.73.3) + '@graphql-mesh/graphql': 0.93.1(@graphql-mesh/cross-helpers@0.3.4)(@graphql-mesh/store@0.93.1)(@graphql-mesh/types@0.93.2)(@graphql-mesh/utils@0.93.2)(@graphql-tools/utils@9.2.1)(@types/node@20.11.13)(graphql@16.8.1)(tslib@2.6.2) graphql: 16.8.1 tslib: 2.6.2 transitivePeerDependencies: @@ -3086,7 +3082,7 @@ packages: tslib: 2.6.2 dev: true - /@graphql-mesh/cli@0.82.35(@babel/core@7.23.9)(@swc/core@1.3.107)(@types/node@20.11.10)(graphql-tag@2.12.6)(graphql@16.8.1)(react-native@0.73.3): + /@graphql-mesh/cli@0.82.35(@babel/core@7.23.9)(@swc/core@1.3.107)(@types/node@20.11.13)(graphql-tag@2.12.6)(graphql@16.8.1)(react-native@0.73.3): resolution: {integrity: sha512-5IuXpk+Zpg05u6qNPX19VzC5/HCiLdDRF6EPZ3ze57FIRgGA3YsB1CUGga6Ky3inalURYwx0kWqmdjbdKZYx1w==} hasBin: true peerDependencies: @@ -3120,7 +3116,7 @@ packages: open: 7.4.2 pascal-case: 3.1.2 rimraf: 5.0.5 - ts-node: 10.9.2(@swc/core@1.3.107)(@types/node@20.11.10)(typescript@5.2.2) + ts-node: 10.9.2(@swc/core@1.3.107)(@types/node@20.11.13)(typescript@5.2.2) tsconfig-paths: 4.2.0 tslib: 2.6.2 typescript: 5.2.2 @@ -3204,7 +3200,7 @@ packages: - react-native - react-native-windows - /@graphql-mesh/graphql@0.33.10(@types/node@20.11.10)(graphql@16.8.1)(react-native@0.73.3): + /@graphql-mesh/graphql@0.33.10(@types/node@20.11.13)(graphql@16.8.1)(react-native@0.73.3): resolution: {integrity: sha512-dg02EHJUSX96DkMAgucm/RRc+QCyFqT8ODgl8q/QXm1x433vTgT+dhcihevCsqHD8uFUbWSrBjq7Poxo9oB7Hg==} peerDependencies: graphql: '*' @@ -3215,7 +3211,7 @@ packages: '@graphql-mesh/types': 0.89.5(graphql@16.8.1)(react-native@0.73.3) '@graphql-mesh/utils': 0.43.6(graphql@16.8.1)(react-native@0.73.3) '@graphql-tools/delegate': 9.0.23(graphql@16.8.1) - '@graphql-tools/url-loader': 7.17.4(@types/node@20.11.10)(graphql@16.8.1) + '@graphql-tools/url-loader': 7.17.4(@types/node@20.11.13)(graphql@16.8.1) '@graphql-tools/utils': 9.1.4(graphql@16.8.1) '@graphql-tools/wrap': 9.3.2(graphql@16.8.1) graphql: 16.8.1 @@ -3230,7 +3226,7 @@ packages: - utf-8-validate dev: false - /@graphql-mesh/graphql@0.93.1(@graphql-mesh/cross-helpers@0.3.4)(@graphql-mesh/store@0.93.1)(@graphql-mesh/types@0.93.2)(@graphql-mesh/utils@0.93.2)(@graphql-tools/utils@9.2.1)(@types/node@20.11.10)(graphql@16.8.1)(tslib@2.6.2): + /@graphql-mesh/graphql@0.93.1(@graphql-mesh/cross-helpers@0.3.4)(@graphql-mesh/store@0.93.1)(@graphql-mesh/types@0.93.2)(@graphql-mesh/utils@0.93.2)(@graphql-tools/utils@9.2.1)(@types/node@20.11.13)(graphql@16.8.1)(tslib@2.6.2): resolution: {integrity: sha512-1G2/1jkl1VPWhsZsUBwFQI5d9OxxEc+CMxy5ef0qI2WEXqIocOxMhEY53cc+tCSbuXR99rxos+KD/8Z6ZasaOQ==} peerDependencies: '@graphql-mesh/cross-helpers': ^0.3.4 @@ -3247,7 +3243,7 @@ packages: '@graphql-mesh/types': 0.93.2(@graphql-mesh/store@0.93.1)(@graphql-tools/utils@9.2.1)(graphql@16.8.1)(tslib@2.6.2) '@graphql-mesh/utils': 0.93.2(@graphql-mesh/cross-helpers@0.3.4)(@graphql-mesh/types@0.93.2)(@graphql-tools/utils@9.2.1)(graphql@16.8.1)(tslib@2.6.2) '@graphql-tools/delegate': 9.0.35(graphql@16.8.1) - '@graphql-tools/url-loader': 7.17.18(@types/node@20.11.10)(graphql@16.8.1) + '@graphql-tools/url-loader': 7.17.18(@types/node@20.11.13)(graphql@16.8.1) '@graphql-tools/utils': 9.2.1(graphql@16.8.1) '@graphql-tools/wrap': 9.4.2(graphql@16.8.1) graphql: 16.8.1 @@ -3735,7 +3731,7 @@ packages: - utf-8-validate dev: false - /@graphql-tools/executor-http@0.1.1(@types/node@20.11.10)(graphql@16.8.1): + /@graphql-tools/executor-http@0.1.1(@types/node@20.11.13)(graphql@16.8.1): resolution: {integrity: sha512-bFE6StI7CJEIYGRkAnTYxutSV4OtC1c4MQU3nStOYZZO7KmzIgEQZ4ygPSPrRb+jtRsMCBEqPqlYOD4Rq02aMw==} peerDependencies: graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0 @@ -3746,7 +3742,7 @@ packages: dset: 3.1.2 extract-files: 11.0.0 graphql: 16.8.1 - meros: 1.2.1(@types/node@20.11.10) + meros: 1.2.1(@types/node@20.11.13) tslib: 2.6.2 value-or-promise: 1.0.12 transitivePeerDependencies: @@ -3754,7 +3750,7 @@ packages: - encoding dev: false - /@graphql-tools/executor-http@0.1.10(@types/node@20.11.10)(graphql@16.8.1): + /@graphql-tools/executor-http@0.1.10(@types/node@20.11.13)(graphql@16.8.1): resolution: {integrity: sha512-hnAfbKv0/lb9s31LhWzawQ5hghBfHS+gYWtqxME6Rl0Aufq9GltiiLBcl7OVVOnkLF0KhwgbYP1mB5VKmgTGpg==} peerDependencies: graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0 @@ -3765,7 +3761,7 @@ packages: dset: 3.1.3 extract-files: 11.0.0 graphql: 16.8.1 - meros: 1.3.0(@types/node@20.11.10) + meros: 1.3.0(@types/node@20.11.13) tslib: 2.6.2 value-or-promise: 1.0.12 transitivePeerDependencies: @@ -4039,7 +4035,7 @@ packages: graphql: 16.8.1 tslib: 2.6.2 - /@graphql-tools/url-loader@7.17.18(@types/node@20.11.10)(graphql@16.8.1): + /@graphql-tools/url-loader@7.17.18(@types/node@20.11.13)(graphql@16.8.1): resolution: {integrity: sha512-ear0CiyTj04jCVAxi7TvgbnGDIN2HgqzXzwsfcqiVg9cvjT40NcMlZ2P1lZDgqMkZ9oyLTV8Bw6j+SyG6A+xPw==} peerDependencies: graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0 @@ -4047,7 +4043,7 @@ packages: '@ardatan/sync-fetch': 0.0.1 '@graphql-tools/delegate': 9.0.35(graphql@16.8.1) '@graphql-tools/executor-graphql-ws': 0.0.14(graphql@16.8.1) - '@graphql-tools/executor-http': 0.1.10(@types/node@20.11.10)(graphql@16.8.1) + '@graphql-tools/executor-http': 0.1.10(@types/node@20.11.13)(graphql@16.8.1) '@graphql-tools/executor-legacy-ws': 0.0.11(graphql@16.8.1) '@graphql-tools/utils': 9.2.1(graphql@16.8.1) '@graphql-tools/wrap': 9.4.2(graphql@16.8.1) @@ -4065,7 +4061,7 @@ packages: - utf-8-validate dev: true - /@graphql-tools/url-loader@7.17.4(@types/node@20.11.10)(graphql@16.8.1): + /@graphql-tools/url-loader@7.17.4(@types/node@20.11.13)(graphql@16.8.1): resolution: {integrity: sha512-nB2fhkn4LTYjU2qoTOBZYmWQRVYsCI0K2LScwD49QVMNAPWthg/lHao4hFUe70aTInT8oquvl8d0rIb7fRWOvA==} peerDependencies: graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0 @@ -4073,12 +4069,12 @@ packages: '@ardatan/sync-fetch': 0.0.1 '@graphql-tools/delegate': 9.0.23(graphql@16.8.1) '@graphql-tools/executor-graphql-ws': 0.0.7(graphql@16.8.1) - '@graphql-tools/executor-http': 0.1.1(@types/node@20.11.10)(graphql@16.8.1) + '@graphql-tools/executor-http': 0.1.1(@types/node@20.11.13)(graphql@16.8.1) '@graphql-tools/executor-legacy-ws': 0.0.6(graphql@16.8.1) '@graphql-tools/utils': 9.1.4(graphql@16.8.1) '@graphql-tools/wrap': 9.3.2(graphql@16.8.1) '@types/ws': 8.5.10 - '@whatwg-node/fetch': 0.6.9(@types/node@20.11.10) + '@whatwg-node/fetch': 0.6.9(@types/node@20.11.13) graphql: 16.8.1 isomorphic-ws: 5.0.0(ws@8.12.0) tslib: 2.6.2 @@ -4261,7 +4257,7 @@ packages: engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} dependencies: '@jest/types': 29.6.3 - '@types/node': 18.19.10 + '@types/node': 18.19.11 chalk: 4.1.2 jest-message-util: 29.7.0 jest-util: 29.7.0 @@ -4282,14 +4278,14 @@ packages: '@jest/test-result': 29.7.0 '@jest/transform': 29.7.0 '@jest/types': 29.6.3 - '@types/node': 18.19.10 + '@types/node': 18.19.11 ansi-escapes: 4.3.2 chalk: 4.1.2 ci-info: 3.9.0 exit: 0.1.2 graceful-fs: 4.2.11 jest-changed-files: 29.7.0 - jest-config: 29.7.0(@types/node@18.19.10)(ts-node@10.9.2) + jest-config: 29.7.0(@types/node@18.19.11)(ts-node@10.9.2) jest-haste-map: 29.7.0 jest-message-util: 29.7.0 jest-regex-util: 29.6.3 @@ -4323,7 +4319,7 @@ packages: dependencies: '@jest/fake-timers': 29.7.0 '@jest/types': 29.6.3 - '@types/node': 18.19.10 + '@types/node': 18.19.11 jest-mock: 29.7.0 /@jest/expect-utils@29.7.0: @@ -4349,7 +4345,7 @@ packages: dependencies: '@jest/types': 29.6.3 '@sinonjs/fake-timers': 10.3.0 - '@types/node': 18.19.10 + '@types/node': 18.19.11 jest-message-util: 29.7.0 jest-mock: 29.7.0 jest-util: 29.7.0 @@ -4381,7 +4377,7 @@ packages: '@jest/transform': 29.7.0 '@jest/types': 29.6.3 '@jridgewell/trace-mapping': 0.3.22 - '@types/node': 18.19.10 + '@types/node': 18.19.11 chalk: 4.1.2 collect-v8-coverage: 1.0.2 exit: 0.1.2 @@ -4467,7 +4463,7 @@ packages: dependencies: '@types/istanbul-lib-coverage': 2.0.6 '@types/istanbul-reports': 3.0.4 - '@types/node': 18.19.10 + '@types/node': 18.19.11 '@types/yargs': 15.0.19 chalk: 4.1.2 @@ -4478,7 +4474,7 @@ packages: '@jest/schemas': 29.6.3 '@types/istanbul-lib-coverage': 2.0.6 '@types/istanbul-reports': 3.0.4 - '@types/node': 18.19.10 + '@types/node': 18.19.11 '@types/yargs': 17.0.32 chalk: 4.1.2 @@ -5876,16 +5872,16 @@ packages: eslint-plugin-promise: ^6.1.1 eslint-plugin-sort: ^2.4.0 dependencies: - '@typescript-eslint/eslint-plugin': 5.62.0(@typescript-eslint/parser@5.62.0)(eslint@8.56.0)(typescript@5.2.2) - '@typescript-eslint/parser': 5.62.0(eslint@8.56.0)(typescript@5.2.2) + '@typescript-eslint/eslint-plugin': 5.62.0(@typescript-eslint/parser@5.62.0)(eslint@8.56.0)(typescript@5.1.6) + '@typescript-eslint/parser': 5.62.0(eslint@8.56.0)(typescript@5.1.6) eslint: 8.56.0 eslint-config-prettier: 8.10.0(eslint@8.56.0) - eslint-config-standard-with-typescript: 24.0.0(@typescript-eslint/eslint-plugin@5.62.0)(eslint-plugin-import@2.29.1)(eslint-plugin-n@15.7.0)(eslint-plugin-promise@6.1.1)(eslint@8.56.0)(typescript@5.2.2) + eslint-config-standard-with-typescript: 24.0.0(@typescript-eslint/eslint-plugin@5.62.0)(eslint-plugin-import@2.29.1)(eslint-plugin-n@15.7.0)(eslint-plugin-promise@6.1.1)(eslint@8.56.0)(typescript@5.1.6) eslint-plugin-import: 2.29.1(@typescript-eslint/parser@5.62.0)(eslint@8.56.0) - eslint-plugin-jest: 27.6.3(@typescript-eslint/eslint-plugin@5.62.0)(eslint@8.56.0)(jest@29.7.0)(typescript@5.2.2) + eslint-plugin-jest: 27.6.3(@typescript-eslint/eslint-plugin@5.62.0)(eslint@8.56.0)(jest@29.7.0)(typescript@5.1.6) eslint-plugin-n: 15.7.0(eslint@8.56.0) eslint-plugin-promise: 6.1.1(eslint@8.56.0) - eslint-plugin-sort: 2.11.0(eslint@8.56.0)(typescript@5.2.2) + eslint-plugin-sort: 2.11.0(eslint@8.56.0)(typescript@5.1.6) dev: true /@sripwoud/prettier-config@1.0.4(prettier@2.8.8): @@ -6267,7 +6263,7 @@ packages: resolution: {integrity: sha512-fB3Zu92ucau0iQ0JMCFQE7b/dv8Ot07NI3KaZIkIUNXq82k4eBAqUaneXfleGY9JWskeS9y+u0nXMyspcuQrCg==} dependencies: '@types/connect': 3.4.38 - '@types/node': 20.11.10 + '@types/node': 20.11.13 dev: true /@types/cacheable-request@6.0.3: @@ -6275,14 +6271,14 @@ packages: dependencies: '@types/http-cache-semantics': 4.0.4 '@types/keyv': 3.1.4 - '@types/node': 20.11.10 + '@types/node': 20.11.13 '@types/responselike': 1.0.3 dev: true /@types/connect@3.4.38: resolution: {integrity: sha512-K6uROf1LD88uDQqJCktA4yzL1YYAK6NgfsI0v/mTgyPKWsX1CnJ0XPSDhViejru1GcRkLWb8RlzFYJRqGUbaug==} dependencies: - '@types/node': 20.11.10 + '@types/node': 20.11.13 /@types/cookiejar@2.1.5: resolution: {integrity: sha512-he+DHOWReW0nghN24E1WUqM0efK4kI9oTqDm6XmK8ZPe2djZ90BSNdGnIyCLzCPw7/pogPlGbzI2wHGGmi4O/Q==} @@ -6315,7 +6311,7 @@ packages: /@types/express-serve-static-core@4.17.42: resolution: {integrity: sha512-ckM3jm2bf/MfB3+spLPWYPUH573plBFwpOhqQ2WottxYV85j1HQFlxmnTq57X1yHY9awZPig06hL/cLMgNWHIQ==} dependencies: - '@types/node': 20.11.10 + '@types/node': 20.11.13 '@types/qs': 6.9.11 '@types/range-parser': 1.2.7 '@types/send': 0.17.4 @@ -6333,7 +6329,7 @@ packages: /@types/graceful-fs@4.1.9: resolution: {integrity: sha512-olP3sd1qOEe5dXTSaFvQG+02VdRXcdytWLAZsAq1PecU8uqQAhkrnbli7DagjtXKW/Bl7YJbUsa8MPcuc8LHEQ==} dependencies: - '@types/node': 18.19.10 + '@types/node': 18.19.11 dev: true /@types/http-cache-semantics@4.0.4: @@ -6382,7 +6378,7 @@ packages: /@types/keyv@3.1.4: resolution: {integrity: sha512-BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg==} dependencies: - '@types/node': 20.11.10 + '@types/node': 20.11.13 dev: true /@types/methods@1.1.4: @@ -6407,13 +6403,13 @@ packages: /@types/node@12.20.55: resolution: {integrity: sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ==} - /@types/node@18.19.10: - resolution: {integrity: sha512-IZD8kAM02AW1HRDTPOlz3npFava678pr8Ie9Vp8uRhBROXAv8MXT2pCnGZZAKYdromsNQLHQcfWQ6EOatVLtqA==} + /@types/node@18.19.11: + resolution: {integrity: sha512-hzdHPKpDdp5bEcRq1XTlZ2ntVjLcHCTV73dEcGg02eSY/+9AZ+jlfz6i00+zOrunMWenjHuI49J8J7Y9uz50JQ==} dependencies: undici-types: 5.26.5 - /@types/node@20.11.10: - resolution: {integrity: sha512-rZEfe/hJSGYmdfX9tvcPMYeYPW2sNl50nsw4jZmRcaG0HIAb0WYEpsB05GOb53vjqpyE9GUhlDQ4jLSoB5q9kg==} + /@types/node@20.11.13: + resolution: {integrity: sha512-5G4zQwdiQBSWYTDAH1ctw2eidqdhMJaNsiIDKHFr55ihz5Trl2qqR8fdrT732yPBho5gkNxXm67OxWFBqX9aPg==} dependencies: undici-types: 5.26.5 @@ -6442,7 +6438,7 @@ packages: /@types/responselike@1.0.3: resolution: {integrity: sha512-H/+L+UkTV33uf49PH5pCAUBVPNj2nDBXTN+qS1dOwyyg24l3CcicicCA7ca+HMvJBZcFgl5r8e+RR6elsb4Lyw==} dependencies: - '@types/node': 20.11.10 + '@types/node': 20.11.13 dev: true /@types/scheduler@0.16.8: @@ -6456,7 +6452,7 @@ packages: resolution: {integrity: sha512-x2EM6TJOybec7c52BX0ZspPodMsQUd5L6PRwOunVyVUhXiBSKf3AezDL8Dgvgt5o0UfKNfuA0eMLr2wLT4AiBA==} dependencies: '@types/mime': 1.3.5 - '@types/node': 20.11.10 + '@types/node': 20.11.13 dev: true /@types/serve-static@1.15.5: @@ -6464,7 +6460,7 @@ packages: dependencies: '@types/http-errors': 2.0.4 '@types/mime': 3.0.4 - '@types/node': 20.11.10 + '@types/node': 20.11.13 dev: true /@types/stack-utils@2.0.3: @@ -6483,7 +6479,7 @@ packages: dependencies: '@types/cookiejar': 2.1.5 '@types/methods': 1.1.4 - '@types/node': 20.11.10 + '@types/node': 20.11.13 dev: true /@types/supertest@2.0.16: @@ -6495,7 +6491,7 @@ packages: /@types/through@0.0.33: resolution: {integrity: sha512-HsJ+z3QuETzP3cswwtzt2vEIiHBk/dCcHGhbmG5X3ecnwFD/lPrMpliGXxSCg03L9AhrdwA4Oz/qfspkDW+xGQ==} dependencies: - '@types/node': 20.11.10 + '@types/node': 20.11.13 dev: true /@types/trusted-types@2.0.7: @@ -6508,18 +6504,18 @@ packages: /@types/ws@7.4.7: resolution: {integrity: sha512-JQbbmxZTZehdc2iszGKs5oC3NFnjeay7mtAWrdt7qNtAVK0g19muApzAy4bm9byz79xa2ZnO/BOBC2R8RC5Lww==} dependencies: - '@types/node': 20.11.10 + '@types/node': 20.11.13 dev: false /@types/ws@8.5.10: resolution: {integrity: sha512-vmQSUcfalpIq0R9q7uTo2lXs6eGIpt9wtnLdMv9LVpIjCA/+ufZRozlVoVelIYixx1ugCBKDhn89vnsEGOCx9A==} dependencies: - '@types/node': 20.11.10 + '@types/node': 20.11.13 /@types/ws@8.5.9: resolution: {integrity: sha512-jbdrY0a8lxfdTp/+r7Z4CkycbOFN8WX+IOchLJr3juT/xzbJ8URyTVSJ/hvNdadTgM1mnedb47n+Y31GsFnQlg==} dependencies: - '@types/node': 20.11.10 + '@types/node': 20.11.13 dev: false /@types/yargs-parser@21.0.3: @@ -6535,7 +6531,7 @@ packages: dependencies: '@types/yargs-parser': 21.0.3 - /@typescript-eslint/eslint-plugin@5.62.0(@typescript-eslint/parser@5.62.0)(eslint@8.56.0)(typescript@5.2.2): + /@typescript-eslint/eslint-plugin@5.62.0(@typescript-eslint/parser@5.62.0)(eslint@8.56.0)(typescript@5.1.6): resolution: {integrity: sha512-TiZzBSJja/LbhNPvk6yc0JrX9XqhQ0hdh6M2svYfsHGejaKFIAGd9MQ+ERIMzLGlN/kZoYIgdxFV0PuljTKXag==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -6547,36 +6543,36 @@ packages: optional: true dependencies: '@eslint-community/regexpp': 4.10.0 - '@typescript-eslint/parser': 5.62.0(eslint@8.56.0)(typescript@5.2.2) + '@typescript-eslint/parser': 5.62.0(eslint@8.56.0)(typescript@5.1.6) '@typescript-eslint/scope-manager': 5.62.0 - '@typescript-eslint/type-utils': 5.62.0(eslint@8.56.0)(typescript@5.2.2) - '@typescript-eslint/utils': 5.62.0(eslint@8.56.0)(typescript@5.2.2) + '@typescript-eslint/type-utils': 5.62.0(eslint@8.56.0)(typescript@5.1.6) + '@typescript-eslint/utils': 5.62.0(eslint@8.56.0)(typescript@5.1.6) debug: 4.3.4 eslint: 8.56.0 graphemer: 1.4.0 ignore: 5.3.0 natural-compare-lite: 1.4.0 semver: 7.5.4 - tsutils: 3.21.0(typescript@5.2.2) - typescript: 5.2.2 + tsutils: 3.21.0(typescript@5.1.6) + typescript: 5.1.6 transitivePeerDependencies: - supports-color dev: true - /@typescript-eslint/experimental-utils@5.62.0(eslint@8.56.0)(typescript@5.2.2): + /@typescript-eslint/experimental-utils@5.62.0(eslint@8.56.0)(typescript@5.1.6): resolution: {integrity: sha512-RTXpeB3eMkpoclG3ZHft6vG/Z30azNHuqY6wKPBHlVMZFuEvrtlEDe8gMqDb+SO+9hjC/pLekeSCryf9vMZlCw==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 dependencies: - '@typescript-eslint/utils': 5.62.0(eslint@8.56.0)(typescript@5.2.2) + '@typescript-eslint/utils': 5.62.0(eslint@8.56.0)(typescript@5.1.6) eslint: 8.56.0 transitivePeerDependencies: - supports-color - typescript dev: true - /@typescript-eslint/parser@5.62.0(eslint@8.56.0)(typescript@5.2.2): + /@typescript-eslint/parser@5.62.0(eslint@8.56.0)(typescript@5.1.6): resolution: {integrity: sha512-VlJEV0fOQ7BExOsHYAGrgbEiZoi8D+Bl2+f6V2RrXerRSylnp+ZBHmPvaIa8cz0Ajx7WO7Z5RqfgYg7ED1nRhA==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -6588,15 +6584,15 @@ packages: dependencies: '@typescript-eslint/scope-manager': 5.62.0 '@typescript-eslint/types': 5.62.0 - '@typescript-eslint/typescript-estree': 5.62.0(typescript@5.2.2) + '@typescript-eslint/typescript-estree': 5.62.0(typescript@5.1.6) debug: 4.3.4 eslint: 8.56.0 - typescript: 5.2.2 + typescript: 5.1.6 transitivePeerDependencies: - supports-color dev: true - /@typescript-eslint/parser@6.20.0(eslint@8.56.0)(typescript@5.2.2): + /@typescript-eslint/parser@6.20.0(eslint@8.56.0)(typescript@5.1.6): resolution: {integrity: sha512-bYerPDF/H5v6V76MdMYhjwmwgMA+jlPVqjSDq2cRqMi8bP5sR3Z+RLOiOMad3nsnmDVmn2gAFCyNgh/dIrfP/w==} engines: {node: ^16.0.0 || >=18.0.0} peerDependencies: @@ -6608,11 +6604,11 @@ packages: dependencies: '@typescript-eslint/scope-manager': 6.20.0 '@typescript-eslint/types': 6.20.0 - '@typescript-eslint/typescript-estree': 6.20.0(typescript@5.2.2) + '@typescript-eslint/typescript-estree': 6.20.0(typescript@5.1.6) '@typescript-eslint/visitor-keys': 6.20.0 debug: 4.3.4 eslint: 8.56.0 - typescript: 5.2.2 + typescript: 5.1.6 transitivePeerDependencies: - supports-color dev: true @@ -6633,7 +6629,7 @@ packages: '@typescript-eslint/visitor-keys': 6.20.0 dev: true - /@typescript-eslint/type-utils@5.62.0(eslint@8.56.0)(typescript@5.2.2): + /@typescript-eslint/type-utils@5.62.0(eslint@8.56.0)(typescript@5.1.6): resolution: {integrity: sha512-xsSQreu+VnfbqQpW5vnCJdq1Z3Q0U31qiWmRhr98ONQmcp/yhiPJFPq8MXiJVLiksmOKSjIldZzkebzHuCGzew==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -6643,12 +6639,12 @@ packages: typescript: optional: true dependencies: - '@typescript-eslint/typescript-estree': 5.62.0(typescript@5.2.2) - '@typescript-eslint/utils': 5.62.0(eslint@8.56.0)(typescript@5.2.2) + '@typescript-eslint/typescript-estree': 5.62.0(typescript@5.1.6) + '@typescript-eslint/utils': 5.62.0(eslint@8.56.0)(typescript@5.1.6) debug: 4.3.4 eslint: 8.56.0 - tsutils: 3.21.0(typescript@5.2.2) - typescript: 5.2.2 + tsutils: 3.21.0(typescript@5.1.6) + typescript: 5.1.6 transitivePeerDependencies: - supports-color dev: true @@ -6663,7 +6659,7 @@ packages: engines: {node: ^16.0.0 || >=18.0.0} dev: true - /@typescript-eslint/typescript-estree@5.62.0(typescript@5.2.2): + /@typescript-eslint/typescript-estree@5.62.0(typescript@5.1.6): resolution: {integrity: sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -6678,13 +6674,13 @@ packages: globby: 11.1.0 is-glob: 4.0.3 semver: 7.5.4 - tsutils: 3.21.0(typescript@5.2.2) - typescript: 5.2.2 + tsutils: 3.21.0(typescript@5.1.6) + typescript: 5.1.6 transitivePeerDependencies: - supports-color dev: true - /@typescript-eslint/typescript-estree@6.20.0(typescript@5.2.2): + /@typescript-eslint/typescript-estree@6.20.0(typescript@5.1.6): resolution: {integrity: sha512-RnRya9q5m6YYSpBN7IzKu9FmLcYtErkDkc8/dKv81I9QiLLtVBHrjz+Ev/crAqgMNW2FCsoZF4g2QUylMnJz+g==} engines: {node: ^16.0.0 || >=18.0.0} peerDependencies: @@ -6700,13 +6696,13 @@ packages: is-glob: 4.0.3 minimatch: 9.0.3 semver: 7.5.4 - ts-api-utils: 1.0.3(typescript@5.2.2) - typescript: 5.2.2 + ts-api-utils: 1.0.3(typescript@5.1.6) + typescript: 5.1.6 transitivePeerDependencies: - supports-color dev: true - /@typescript-eslint/utils@5.62.0(eslint@8.56.0)(typescript@5.2.2): + /@typescript-eslint/utils@5.62.0(eslint@8.56.0)(typescript@5.1.6): resolution: {integrity: sha512-n8oxjeb5aIbPFEtmQxQYOLI0i9n5ySBEY/ZEHHZqKQSFnxio1rv6dthascc9dLuwrL0RC5mPCxB7vnAVGAYWAQ==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -6717,7 +6713,7 @@ packages: '@types/semver': 7.5.6 '@typescript-eslint/scope-manager': 5.62.0 '@typescript-eslint/types': 5.62.0 - '@typescript-eslint/typescript-estree': 5.62.0(typescript@5.2.2) + '@typescript-eslint/typescript-estree': 5.62.0(typescript@5.1.6) eslint: 8.56.0 eslint-scope: 5.1.1 semver: 7.5.4 @@ -7504,11 +7500,11 @@ packages: - encoding dev: false - /@whatwg-node/fetch@0.6.9(@types/node@20.11.10): + /@whatwg-node/fetch@0.6.9(@types/node@20.11.13): resolution: {integrity: sha512-JfrBCJdMu9n9OARc0e/hPHcD98/8Nz1CKSdGYDg6VbObDkV/Ys30xe5i/wPOatYbxuvatj1kfWeHf7iNX3i17w==} dependencies: '@peculiar/webcrypto': 1.4.5 - '@whatwg-node/node-fetch': 0.0.5(@types/node@20.11.10) + '@whatwg-node/node-fetch': 0.0.5(@types/node@20.11.13) busboy: 1.6.0 urlpattern-polyfill: 6.0.2 web-streams-polyfill: 3.3.2 @@ -7525,12 +7521,12 @@ packages: urlpattern-polyfill: 8.0.2 web-streams-polyfill: 3.3.2 - /@whatwg-node/node-fetch@0.0.5(@types/node@20.11.10): + /@whatwg-node/node-fetch@0.0.5(@types/node@20.11.13): resolution: {integrity: sha512-hbccmaSZaItdsRuBKBEEhLoO+5oXJPxiyd0kG2xXd0Dh3Rt+vZn4pADHxuSiSHLd9CM+S2z4+IxlEGbWUgiz9g==} peerDependencies: '@types/node': ^18.0.6 dependencies: - '@types/node': 20.11.10 + '@types/node': 20.11.13 '@whatwg-node/events': 0.0.2 busboy: 1.6.0 tslib: 2.6.2 @@ -7627,6 +7623,21 @@ packages: zod: 3.22.4 dev: false + /abitype@1.0.0(typescript@5.1.6)(zod@3.22.4): + resolution: {integrity: sha512-NMeMah//6bJ56H5XRj8QCV4AwuW6hB6zqz2LnhhLdcWVQOsXki6/Pn3APeqxCma62nXIcmZWdu1DlHWS74umVQ==} + peerDependencies: + typescript: '>=5.0.4' + zod: ^3 >=3.22.0 + peerDependenciesMeta: + typescript: + optional: true + zod: + optional: true + dependencies: + typescript: 5.1.6 + zod: 3.22.4 + dev: false + /abitype@1.0.0(typescript@5.2.2)(zod@3.22.4): resolution: {integrity: sha512-NMeMah//6bJ56H5XRj8QCV4AwuW6hB6zqz2LnhhLdcWVQOsXki6/Pn3APeqxCma62nXIcmZWdu1DlHWS74umVQ==} peerDependencies: @@ -8477,7 +8488,7 @@ packages: hasBin: true dependencies: caniuse-lite: 1.0.30001581 - electron-to-chromium: 1.4.650 + electron-to-chromium: 1.4.651 node-releases: 2.0.14 update-browserslist-db: 1.0.13(browserslist@4.22.3) @@ -8772,7 +8783,7 @@ packages: engines: {node: '>=12.13.0'} hasBin: true dependencies: - '@types/node': 20.11.10 + '@types/node': 20.11.13 escape-string-regexp: 4.0.0 is-wsl: 2.2.0 lighthouse-logger: 1.4.2 @@ -8787,7 +8798,7 @@ packages: /chromium-edge-launcher@1.0.0: resolution: {integrity: sha512-pgtgjNKZ7i5U++1g1PWv75umkHvhVTDOQIZ+sjeUX9483S7Y6MUvO0lrd7ShGlQlFHMN4SwKTCq/X8hWrbv2KA==} dependencies: - '@types/node': 20.11.10 + '@types/node': 20.11.13 escape-string-regexp: 4.0.0 is-wsl: 2.2.0 lighthouse-logger: 1.4.2 @@ -9180,6 +9191,22 @@ packages: js-yaml: 3.14.1 parse-json: 4.0.0 + /cosmiconfig@8.3.6(typescript@5.1.6): + resolution: {integrity: sha512-kcZ6+W5QzcJ3P1Mt+83OUv/oHFqZHIx8DuxG6eZ5RGMERoLqp4BuGjhHLYGK+Kf5XVkQvqBSmAy/nGWN3qDgEA==} + engines: {node: '>=14'} + peerDependencies: + typescript: '>=4.9.5' + peerDependenciesMeta: + typescript: + optional: true + dependencies: + import-fresh: 3.3.0 + js-yaml: 4.1.0 + parse-json: 5.2.0 + path-type: 4.0.0 + typescript: 5.1.6 + dev: true + /cosmiconfig@8.3.6(typescript@5.2.2): resolution: {integrity: sha512-kcZ6+W5QzcJ3P1Mt+83OUv/oHFqZHIx8DuxG6eZ5RGMERoLqp4BuGjhHLYGK+Kf5XVkQvqBSmAy/nGWN3qDgEA==} engines: {node: '>=14'} @@ -9212,7 +9239,7 @@ packages: typescript: 5.3.3 dev: true - /create-jest@29.7.0(@types/node@18.19.10)(ts-node@10.9.2): + /create-jest@29.7.0(@types/node@18.19.11)(ts-node@10.9.2): resolution: {integrity: sha512-Adz2bdH0Vq3F53KEMJOoftQFutWCukm6J24wbPWRO4k1kMY7gS7ds/uoJkNuV8wDCtWWnuwGcJwpWcih+zEW1Q==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} hasBin: true @@ -9221,7 +9248,7 @@ packages: chalk: 4.1.2 exit: 0.1.2 graceful-fs: 4.2.11 - jest-config: 29.7.0(@types/node@18.19.10)(ts-node@10.9.2) + jest-config: 29.7.0(@types/node@18.19.11)(ts-node@10.9.2) jest-util: 29.7.0 prompts: 2.4.2 transitivePeerDependencies: @@ -9693,8 +9720,8 @@ packages: dependencies: jake: 10.8.7 - /electron-to-chromium@1.4.650: - resolution: {integrity: sha512-sYSQhJCJa4aGA1wYol5cMQgekDBlbVfTRavlGZVr3WZpDdOPcp6a6xUnFfrt8TqZhsBYYbDxJZCjGfHuGupCRQ==} + /electron-to-chromium@1.4.651: + resolution: {integrity: sha512-jjks7Xx+4I7dslwsbaFocSwqBbGHQmuXBJUK9QBZTIrzPq3pzn6Uf2szFSP728FtLYE3ldiccmlkOM/zhGKCpA==} /elliptic@6.5.4: resolution: {integrity: sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==} @@ -9923,7 +9950,7 @@ packages: optionalDependencies: source-map: 0.6.1 - /eslint-config-next@13.5.6(eslint@8.56.0)(typescript@5.2.2): + /eslint-config-next@13.5.6(eslint@8.56.0)(typescript@5.1.6): resolution: {integrity: sha512-o8pQsUHTo9aHqJ2YiZDym5gQAMRf7O2HndHo/JZeY7TDD+W4hk6Ma8Vw54RHiBeb7OWWO5dPirQB+Is/aVQ7Kg==} peerDependencies: eslint: ^7.23.0 || ^8.0.0 @@ -9934,7 +9961,7 @@ packages: dependencies: '@next/eslint-plugin-next': 13.5.6 '@rushstack/eslint-patch': 1.7.2 - '@typescript-eslint/parser': 6.20.0(eslint@8.56.0)(typescript@5.2.2) + '@typescript-eslint/parser': 6.20.0(eslint@8.56.0)(typescript@5.1.6) eslint: 8.56.0 eslint-import-resolver-node: 0.3.9 eslint-import-resolver-typescript: 3.6.1(@typescript-eslint/parser@6.20.0)(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.29.1)(eslint@8.56.0) @@ -9942,7 +9969,7 @@ packages: eslint-plugin-jsx-a11y: 6.8.0(eslint@8.56.0) eslint-plugin-react: 7.33.2(eslint@8.56.0) eslint-plugin-react-hooks: 4.6.0(eslint@8.56.0) - typescript: 5.2.2 + typescript: 5.1.6 transitivePeerDependencies: - eslint-import-resolver-webpack - supports-color @@ -9957,7 +9984,7 @@ packages: eslint: 8.56.0 dev: true - /eslint-config-standard-with-typescript@24.0.0(@typescript-eslint/eslint-plugin@5.62.0)(eslint-plugin-import@2.29.1)(eslint-plugin-n@15.7.0)(eslint-plugin-promise@6.1.1)(eslint@8.56.0)(typescript@5.2.2): + /eslint-config-standard-with-typescript@24.0.0(@typescript-eslint/eslint-plugin@5.62.0)(eslint-plugin-import@2.29.1)(eslint-plugin-n@15.7.0)(eslint-plugin-promise@6.1.1)(eslint@8.56.0)(typescript@5.1.6): resolution: {integrity: sha512-vEnGXZ5aiR1enl9652iIP4nTpY3GPcNEwuhrsPbKO3Ce3D6T3yCqZdkUPk8nJetfdL/yO0DLsHg2d/l9iECIdg==} peerDependencies: '@typescript-eslint/eslint-plugin': ^5.0.0 @@ -9967,14 +9994,14 @@ packages: eslint-plugin-promise: ^6.0.0 typescript: '*' dependencies: - '@typescript-eslint/eslint-plugin': 5.62.0(@typescript-eslint/parser@5.62.0)(eslint@8.56.0)(typescript@5.2.2) - '@typescript-eslint/parser': 5.62.0(eslint@8.56.0)(typescript@5.2.2) + '@typescript-eslint/eslint-plugin': 5.62.0(@typescript-eslint/parser@5.62.0)(eslint@8.56.0)(typescript@5.1.6) + '@typescript-eslint/parser': 5.62.0(eslint@8.56.0)(typescript@5.1.6) eslint: 8.56.0 eslint-config-standard: 17.0.0(eslint-plugin-import@2.29.1)(eslint-plugin-n@15.7.0)(eslint-plugin-promise@6.1.1)(eslint@8.56.0) eslint-plugin-import: 2.29.1(@typescript-eslint/parser@5.62.0)(eslint@8.56.0) eslint-plugin-n: 15.7.0(eslint@8.56.0) eslint-plugin-promise: 6.1.1(eslint@8.56.0) - typescript: 5.2.2 + typescript: 5.1.6 transitivePeerDependencies: - supports-color dev: true @@ -10047,7 +10074,7 @@ packages: eslint-import-resolver-webpack: optional: true dependencies: - '@typescript-eslint/parser': 5.62.0(eslint@8.56.0)(typescript@5.2.2) + '@typescript-eslint/parser': 5.62.0(eslint@8.56.0)(typescript@5.1.6) debug: 3.2.7 eslint: 8.56.0 eslint-import-resolver-node: 0.3.9 @@ -10076,7 +10103,7 @@ packages: eslint-import-resolver-webpack: optional: true dependencies: - '@typescript-eslint/parser': 6.20.0(eslint@8.56.0)(typescript@5.2.2) + '@typescript-eslint/parser': 6.20.0(eslint@8.56.0)(typescript@5.1.6) debug: 3.2.7 eslint: 8.56.0 eslint-import-resolver-node: 0.3.9 @@ -10106,7 +10133,7 @@ packages: '@typescript-eslint/parser': optional: true dependencies: - '@typescript-eslint/parser': 5.62.0(eslint@8.56.0)(typescript@5.2.2) + '@typescript-eslint/parser': 5.62.0(eslint@8.56.0)(typescript@5.1.6) array-includes: 3.1.7 array.prototype.findlastindex: 1.2.3 array.prototype.flat: 1.3.2 @@ -10141,7 +10168,7 @@ packages: '@typescript-eslint/parser': optional: true dependencies: - '@typescript-eslint/parser': 6.20.0(eslint@8.56.0)(typescript@5.2.2) + '@typescript-eslint/parser': 6.20.0(eslint@8.56.0)(typescript@5.1.6) array-includes: 3.1.7 array.prototype.findlastindex: 1.2.3 array.prototype.flat: 1.3.2 @@ -10166,7 +10193,7 @@ packages: - supports-color dev: true - /eslint-plugin-jest@27.6.3(@typescript-eslint/eslint-plugin@5.62.0)(eslint@8.56.0)(jest@29.7.0)(typescript@5.2.2): + /eslint-plugin-jest@27.6.3(@typescript-eslint/eslint-plugin@5.62.0)(eslint@8.56.0)(jest@29.7.0)(typescript@5.1.6): resolution: {integrity: sha512-+YsJFVH6R+tOiO3gCJon5oqn4KWc+mDq2leudk8mrp8RFubLOo9CVyi3cib4L7XMpxExmkmBZQTPDYVBzgpgOA==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} peerDependencies: @@ -10179,10 +10206,10 @@ packages: jest: optional: true dependencies: - '@typescript-eslint/eslint-plugin': 5.62.0(@typescript-eslint/parser@5.62.0)(eslint@8.56.0)(typescript@5.2.2) - '@typescript-eslint/utils': 5.62.0(eslint@8.56.0)(typescript@5.2.2) + '@typescript-eslint/eslint-plugin': 5.62.0(@typescript-eslint/parser@5.62.0)(eslint@8.56.0)(typescript@5.1.6) + '@typescript-eslint/utils': 5.62.0(eslint@8.56.0)(typescript@5.1.6) eslint: 8.56.0 - jest: 29.7.0(@types/node@18.19.10)(ts-node@10.9.2) + jest: 29.7.0(@types/node@18.19.11)(ts-node@10.9.2) transitivePeerDependencies: - supports-color - typescript @@ -10273,12 +10300,12 @@ packages: string.prototype.matchall: 4.0.10 dev: true - /eslint-plugin-sort@2.11.0(eslint@8.56.0)(typescript@5.2.2): + /eslint-plugin-sort@2.11.0(eslint@8.56.0)(typescript@5.1.6): resolution: {integrity: sha512-Rvt4XZI42KfyBvjvtcoKFEWg6L/nAKfMBagxKwipNfQd6zetwyHgh284XC1rlRzxY7scn0yfKgqdMILQIyKdlA==} peerDependencies: eslint: '>=6' dependencies: - '@typescript-eslint/experimental-utils': 5.62.0(eslint@8.56.0)(typescript@5.2.2) + '@typescript-eslint/experimental-utils': 5.62.0(eslint@8.56.0)(typescript@5.1.6) eslint: 8.56.0 isomorphic-resolve: 1.0.0 natural-compare: 1.4.0 @@ -12498,7 +12525,7 @@ packages: '@jest/expect': 29.7.0 '@jest/test-result': 29.7.0 '@jest/types': 29.6.3 - '@types/node': 18.19.10 + '@types/node': 18.19.11 chalk: 4.1.2 co: 4.6.0 dedent: 1.5.1 @@ -12519,7 +12546,7 @@ packages: - supports-color dev: true - /jest-cli@29.7.0(@types/node@18.19.10)(ts-node@10.9.2): + /jest-cli@29.7.0(@types/node@18.19.11)(ts-node@10.9.2): resolution: {integrity: sha512-OVVobw2IubN/GSYsxETi+gOe7Ka59EFMR/twOU3Jb2GnKKeMGJB5SGUUrEz3SFVmJASUdZUzy83sLNNQ2gZslg==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} hasBin: true @@ -12533,10 +12560,10 @@ packages: '@jest/test-result': 29.7.0 '@jest/types': 29.6.3 chalk: 4.1.2 - create-jest: 29.7.0(@types/node@18.19.10)(ts-node@10.9.2) + create-jest: 29.7.0(@types/node@18.19.11)(ts-node@10.9.2) exit: 0.1.2 import-local: 3.1.0 - jest-config: 29.7.0(@types/node@18.19.10)(ts-node@10.9.2) + jest-config: 29.7.0(@types/node@18.19.11)(ts-node@10.9.2) jest-util: 29.7.0 jest-validate: 29.7.0 yargs: 17.7.2 @@ -12547,7 +12574,7 @@ packages: - ts-node dev: true - /jest-config@29.7.0(@types/node@18.19.10)(ts-node@10.9.2): + /jest-config@29.7.0(@types/node@18.19.11)(ts-node@10.9.2): resolution: {integrity: sha512-uXbpfeQ7R6TZBqI3/TxCU4q4ttk3u0PJeC+E0zbfSoSjq6bJ7buBPxzQPL0ifrkY4DNu4JUdk0ImlBUYi840eQ==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} peerDependencies: @@ -12562,7 +12589,7 @@ packages: '@babel/core': 7.23.9 '@jest/test-sequencer': 29.7.0 '@jest/types': 29.6.3 - '@types/node': 18.19.10 + '@types/node': 18.19.11 babel-jest: 29.7.0(@babel/core@7.23.9) chalk: 4.1.2 ci-info: 3.9.0 @@ -12582,7 +12609,7 @@ packages: pretty-format: 29.7.0 slash: 3.0.0 strip-json-comments: 3.1.1 - ts-node: 10.9.2(@types/node@18.19.10)(typescript@5.2.2) + ts-node: 10.9.2(@types/node@18.19.11)(typescript@5.1.6) transitivePeerDependencies: - babel-plugin-macros - supports-color @@ -12623,7 +12650,7 @@ packages: '@jest/environment': 29.7.0 '@jest/fake-timers': 29.7.0 '@jest/types': 29.6.3 - '@types/node': 18.19.10 + '@types/node': 18.19.11 jest-mock: 29.7.0 jest-util: 29.7.0 @@ -12636,7 +12663,7 @@ packages: jest: optional: true dependencies: - jest: 29.7.0(@types/node@18.19.10)(ts-node@10.9.2) + jest: 29.7.0(@types/node@18.19.11)(ts-node@10.9.2) jest-diff: 29.7.0 jest-get-type: 29.6.3 dev: true @@ -12660,7 +12687,7 @@ packages: dependencies: '@jest/types': 29.6.3 '@types/graceful-fs': 4.1.9 - '@types/node': 18.19.10 + '@types/node': 18.19.11 anymatch: 3.1.3 fb-watchman: 2.0.2 graceful-fs: 4.2.11 @@ -12705,15 +12732,15 @@ packages: slash: 3.0.0 stack-utils: 2.0.6 - /jest-mock-extended@3.0.5(jest@29.7.0)(typescript@5.2.2): + /jest-mock-extended@3.0.5(jest@29.7.0)(typescript@5.1.6): resolution: {integrity: sha512-/eHdaNPUAXe7f65gHH5urc8SbRVWjYxBqmCgax2uqOBJy8UUcCBMN1upj1eZ8y/i+IqpyEm4Kq0VKss/GCCTdw==} peerDependencies: jest: ^24.0.0 || ^25.0.0 || ^26.0.0 || ^27.0.0 || ^28.0.0 || ^29.0.0 typescript: ^3.0.0 || ^4.0.0 || ^5.0.0 dependencies: - jest: 29.7.0(@types/node@18.19.10)(ts-node@10.9.2) - ts-essentials: 7.0.3(typescript@5.2.2) - typescript: 5.2.2 + jest: 29.7.0(@types/node@18.19.11)(ts-node@10.9.2) + ts-essentials: 7.0.3(typescript@5.1.6) + typescript: 5.1.6 dev: true /jest-mock@29.7.0: @@ -12721,7 +12748,7 @@ packages: engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} dependencies: '@jest/types': 29.6.3 - '@types/node': 18.19.10 + '@types/node': 18.19.11 jest-util: 29.7.0 /jest-pnp-resolver@1.2.3(jest-resolve@29.7.0): @@ -12775,7 +12802,7 @@ packages: '@jest/test-result': 29.7.0 '@jest/transform': 29.7.0 '@jest/types': 29.6.3 - '@types/node': 18.19.10 + '@types/node': 18.19.11 chalk: 4.1.2 emittery: 0.13.1 graceful-fs: 4.2.11 @@ -12806,7 +12833,7 @@ packages: '@jest/test-result': 29.7.0 '@jest/transform': 29.7.0 '@jest/types': 29.6.3 - '@types/node': 18.19.10 + '@types/node': 18.19.11 chalk: 4.1.2 cjs-module-lexer: 1.2.3 collect-v8-coverage: 1.0.2 @@ -12865,7 +12892,7 @@ packages: engines: {node: '>= 10.14.2'} dependencies: '@jest/types': 26.6.2 - '@types/node': 18.19.10 + '@types/node': 18.19.11 chalk: 4.1.2 graceful-fs: 4.2.11 is-ci: 2.0.0 @@ -12877,7 +12904,7 @@ packages: engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} dependencies: '@jest/types': 29.6.3 - '@types/node': 18.19.10 + '@types/node': 18.19.11 chalk: 4.1.2 ci-info: 3.9.0 graceful-fs: 4.2.11 @@ -12910,7 +12937,7 @@ packages: dependencies: ansi-escapes: 6.2.0 chalk: 5.3.0 - jest: 29.7.0(@types/node@18.19.10)(ts-node@10.9.2) + jest: 29.7.0(@types/node@18.19.11)(ts-node@10.9.2) jest-regex-util: 29.6.3 jest-watcher: 29.7.0 slash: 5.1.0 @@ -12924,7 +12951,7 @@ packages: dependencies: '@jest/test-result': 29.7.0 '@jest/types': 29.6.3 - '@types/node': 18.19.10 + '@types/node': 18.19.11 ansi-escapes: 4.3.2 chalk: 4.1.2 emittery: 0.13.1 @@ -12936,7 +12963,7 @@ packages: resolution: {integrity: sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==} engines: {node: '>= 10.13.0'} dependencies: - '@types/node': 20.11.10 + '@types/node': 20.11.13 merge-stream: 2.0.0 supports-color: 8.1.1 dev: true @@ -12945,12 +12972,12 @@ packages: resolution: {integrity: sha512-eIz2msL/EzL9UFTFFx7jBTkeZfku0yUAyZZZmJ93H2TYEiroIx2PQjEXcwYtYl8zXCxb+PAmA2hLIt/6ZEkPHw==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} dependencies: - '@types/node': 18.19.10 + '@types/node': 18.19.11 jest-util: 29.7.0 merge-stream: 2.0.0 supports-color: 8.1.1 - /jest@29.7.0(@types/node@18.19.10)(ts-node@10.9.2): + /jest@29.7.0(@types/node@18.19.11)(ts-node@10.9.2): resolution: {integrity: sha512-NIy3oAFp9shda19hy4HK0HRTWKtPJmGdnvywu01nOqNC2vZg+Z+fvJDxpMQA88eb2I9EcafcdjYgsDthnYTvGw==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} hasBin: true @@ -12963,7 +12990,7 @@ packages: '@jest/core': 29.7.0(ts-node@10.9.2) '@jest/types': 29.6.3 import-local: 3.1.0 - jest-cli: 29.7.0(@types/node@18.19.10)(ts-node@10.9.2) + jest-cli: 29.7.0(@types/node@18.19.11)(ts-node@10.9.2) transitivePeerDependencies: - '@types/node' - babel-plugin-macros @@ -13717,7 +13744,7 @@ packages: resolution: {integrity: sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==} engines: {node: '>= 8'} - /meros@1.2.1(@types/node@20.11.10): + /meros@1.2.1(@types/node@20.11.13): resolution: {integrity: sha512-R2f/jxYqCAGI19KhAvaxSOxALBMkaXWH2a7rOyqQw+ZmizX5bKkEYWLzdhC+U82ZVVPVp6MCXe3EkVligh+12g==} engines: {node: '>=13'} peerDependencies: @@ -13726,10 +13753,10 @@ packages: '@types/node': optional: true dependencies: - '@types/node': 20.11.10 + '@types/node': 20.11.13 dev: false - /meros@1.3.0(@types/node@20.11.10): + /meros@1.3.0(@types/node@20.11.13): resolution: {integrity: sha512-2BNGOimxEz5hmjUG2FwoxCt5HN7BXdaWyFqEwxPTrJzVdABtrL4TiHTcsWSFAxPQ/tOnEaQEJh3qWq71QRMY+w==} engines: {node: '>=13'} peerDependencies: @@ -13738,7 +13765,7 @@ packages: '@types/node': optional: true dependencies: - '@types/node': 20.11.10 + '@types/node': 20.11.13 dev: true /methods@1.1.2: @@ -15078,7 +15105,7 @@ packages: dependencies: lilconfig: 3.0.0 postcss: 8.4.33 - ts-node: 10.9.2(@types/node@18.19.10)(typescript@5.2.2) + ts-node: 10.9.2(@types/node@18.19.11)(typescript@5.1.6) yaml: 2.3.4 dev: false @@ -16349,7 +16376,7 @@ packages: logplease: 1.2.15 r1csfile: 0.0.47 - /solhint@3.6.2(typescript@5.2.2): + /solhint@3.6.2(typescript@5.1.6): resolution: {integrity: sha512-85EeLbmkcPwD+3JR7aEMKsVC9YrRSxd4qkXuMzrlf7+z2Eqdfm1wHWq1ffTuo5aDhoZxp2I9yF3QkxZOxOL7aQ==} hasBin: true dependencies: @@ -16359,7 +16386,7 @@ packages: ast-parents: 0.0.1 chalk: 4.1.2 commander: 10.0.1 - cosmiconfig: 8.3.6(typescript@5.2.2) + cosmiconfig: 8.3.6(typescript@5.1.6) fast-diff: 1.3.0 glob: 8.1.0 ignore: 5.3.0 @@ -17205,28 +17232,28 @@ packages: resolution: {integrity: sha512-kloPhf1hq3JbCPOTYoOWDKxebWjNb2o/LKnNfkWhxVVisFFmMJPPdJeGoGmM+iRLyoXAR61e08Pb+vUXINg8aA==} dev: true - /ts-api-utils@1.0.3(typescript@5.2.2): + /ts-api-utils@1.0.3(typescript@5.1.6): resolution: {integrity: sha512-wNMeqtMz5NtwpT/UZGY5alT+VoKdSsOOP/kqHFcUW1P/VRhH2wJ48+DN2WwUliNbQ976ETwDL0Ifd2VVvgonvg==} engines: {node: '>=16.13.0'} peerDependencies: typescript: '>=4.2.0' dependencies: - typescript: 5.2.2 + typescript: 5.1.6 dev: true - /ts-essentials@7.0.3(typescript@5.2.2): + /ts-essentials@7.0.3(typescript@5.1.6): resolution: {integrity: sha512-8+gr5+lqO3G84KdiTSMRLtuyJ+nTBVRKuCrK4lidMPdVeEp0uqC875uE5NMcaA7YYMN7XsNiFQuMvasF8HT/xQ==} peerDependencies: typescript: '>=3.7.0' dependencies: - typescript: 5.2.2 + typescript: 5.1.6 dev: true /ts-interface-checker@0.1.13: resolution: {integrity: sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==} dev: false - /ts-jest@29.1.2(@babel/core@7.23.9)(jest@29.7.0)(typescript@5.2.2): + /ts-jest@29.1.2(@babel/core@7.23.9)(jest@29.7.0)(typescript@5.1.6): resolution: {integrity: sha512-br6GJoH/WUX4pu7FbZXuWGKGNDuU7b8Uj77g/Sp7puZV6EXzuByl6JrECvm0MzVzSTkSHWTihsXt+5XYER5b+g==} engines: {node: ^16.10.0 || ^18.0.0 || >=20.0.0} hasBin: true @@ -17250,13 +17277,13 @@ packages: '@babel/core': 7.23.9 bs-logger: 0.2.6 fast-json-stable-stringify: 2.1.0 - jest: 29.7.0(@types/node@18.19.10)(ts-node@10.9.2) + jest: 29.7.0(@types/node@18.19.11)(ts-node@10.9.2) jest-util: 29.7.0 json5: 2.2.3 lodash.memoize: 4.1.2 make-error: 1.3.6 semver: 7.5.4 - typescript: 5.2.2 + typescript: 5.1.6 yargs-parser: 21.1.1 dev: true @@ -17280,7 +17307,7 @@ packages: resolution: {integrity: sha512-k43M7uCG1AkTyxgnmI5MPwKoUvS/bRvLvUb7+Pgpdlmok8AoqmUaZxUUw8zKM5B1lqZrt41GjYgnvAi0fppqgQ==} dev: false - /ts-node-dev@2.0.0(@types/node@18.19.10)(typescript@5.2.2): + /ts-node-dev@2.0.0(@types/node@18.19.11)(typescript@5.1.6): resolution: {integrity: sha512-ywMrhCfH6M75yftYvrvNarLEY+SUXtUvU8/0Z6llrHQVBx12GiFk5sStF8UdfE/yfzk9IAq7O5EEbTQsxlBI8w==} engines: {node: '>=0.8.0'} hasBin: true @@ -17299,16 +17326,16 @@ packages: rimraf: 2.7.1 source-map-support: 0.5.21 tree-kill: 1.2.2 - ts-node: 10.9.2(@types/node@18.19.10)(typescript@5.2.2) + ts-node: 10.9.2(@types/node@18.19.11)(typescript@5.1.6) tsconfig: 7.0.0 - typescript: 5.2.2 + typescript: 5.1.6 transitivePeerDependencies: - '@swc/core' - '@swc/wasm' - '@types/node' dev: true - /ts-node@10.9.2(@swc/core@1.3.107)(@types/node@20.11.10)(typescript@5.2.2): + /ts-node@10.9.2(@swc/core@1.3.107)(@types/node@20.11.13)(typescript@5.2.2): resolution: {integrity: sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==} hasBin: true peerDependencies: @@ -17328,7 +17355,7 @@ packages: '@tsconfig/node12': 1.0.11 '@tsconfig/node14': 1.0.3 '@tsconfig/node16': 1.0.4 - '@types/node': 20.11.10 + '@types/node': 20.11.13 acorn: 8.11.3 acorn-walk: 8.3.2 arg: 4.1.3 @@ -17340,7 +17367,7 @@ packages: yn: 3.1.1 dev: true - /ts-node@10.9.2(@types/node@18.19.10)(typescript@5.2.2): + /ts-node@10.9.2(@types/node@18.19.11)(typescript@5.1.6): resolution: {integrity: sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==} hasBin: true peerDependencies: @@ -17359,14 +17386,14 @@ packages: '@tsconfig/node12': 1.0.11 '@tsconfig/node14': 1.0.3 '@tsconfig/node16': 1.0.4 - '@types/node': 18.19.10 + '@types/node': 18.19.11 acorn: 8.11.3 acorn-walk: 8.3.2 arg: 4.1.3 create-require: 1.1.1 diff: 4.0.2 make-error: 1.3.6 - typescript: 5.2.2 + typescript: 5.1.6 v8-compile-cache-lib: 3.0.1 yn: 3.1.1 @@ -17423,14 +17450,14 @@ packages: /tslib@2.6.2: resolution: {integrity: sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==} - /tsutils@3.21.0(typescript@5.2.2): + /tsutils@3.21.0(typescript@5.1.6): resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==} engines: {node: '>= 6'} peerDependencies: typescript: '>=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta' dependencies: tslib: 1.14.1 - typescript: 5.2.2 + typescript: 5.1.6 dev: true /ttab@0.8.0: @@ -17453,64 +17480,64 @@ packages: yargs: 17.7.2 dev: true - /turbo-darwin-64@1.11.3: - resolution: {integrity: sha512-IsOOg2bVbIt3o/X8Ew9fbQp5t1hTHN3fGNQYrPQwMR2W1kIAC6RfbVD4A9OeibPGyEPUpwOH79hZ9ydFH5kifw==} + /turbo-darwin-64@1.12.1: + resolution: {integrity: sha512-Cq760v0vJH5vQbK0uJZS8msqzYuZZXYdcpFeqBqrdIT5Kfd7tHjo94d9L1lZLP4eoSyXs4CUVnOw7MqD8dHnfQ==} cpu: [x64] os: [darwin] requiresBuild: true dev: true optional: true - /turbo-darwin-arm64@1.11.3: - resolution: {integrity: sha512-FsJL7k0SaPbJzI/KCnrf/fi3PgCDCjTliMc/kEFkuWVA6Httc3Q4lxyLIIinz69q6JTx8wzh6yznUMzJRI3+dg==} + /turbo-darwin-arm64@1.12.1: + resolution: {integrity: sha512-RlKegAYEvHBa1K+fl9d4iz0jFUw7LdEsTXlg1ppFIrl234bQ5y3ON8LBhLsf9M2ADzNzgT7Io33H0Cju0zneMg==} cpu: [arm64] os: [darwin] requiresBuild: true dev: true optional: true - /turbo-linux-64@1.11.3: - resolution: {integrity: sha512-SvW7pvTVRGsqtSkII5w+wriZXvxqkluw5FO/MNAdFw0qmoov+PZ237+37/NgArqE3zVn1GX9P6nUx9VO+xcQAg==} + /turbo-linux-64@1.12.1: + resolution: {integrity: sha512-S6bvCEEkJvPxH7hMcGDDJFCFWk4/lpDGsQun6vzcj0gqbj5BMqw3xNrpPQDhg18+9oRQJG5F6M48pSgim7XZDg==} cpu: [x64] os: [linux] requiresBuild: true dev: true optional: true - /turbo-linux-arm64@1.11.3: - resolution: {integrity: sha512-YhUfBi1deB3m+3M55X458J6B7RsIS7UtM3P1z13cUIhF+pOt65BgnaSnkHLwETidmhRh8Dl3GelaQGrB3RdCDw==} + /turbo-linux-arm64@1.12.1: + resolution: {integrity: sha512-QLy+Q3rIHXbTT1m49Sv7FO+z0TqH8L2Q18UlUu3TULm5bWzv5DVnvOebvFtTOHF3nAdr1CK0QiqhMrEPn++IKg==} cpu: [arm64] os: [linux] requiresBuild: true dev: true optional: true - /turbo-windows-64@1.11.3: - resolution: {integrity: sha512-s+vEnuM2TiZuAUUUpmBHDr6vnNbJgj+5JYfnYmVklYs16kXh+EppafYQOAkcRIMAh7GjV3pLq5/uGqc7seZeHA==} + /turbo-windows-64@1.12.1: + resolution: {integrity: sha512-Ih7SP/jJ1rlNbti7RTvdV3u9GeM91mOaAtZssShBrncqV5Mzb+MDqF4aAv1prDVo56ME0GXEd6tFNrQRFYjgEA==} cpu: [x64] os: [win32] requiresBuild: true dev: true optional: true - /turbo-windows-arm64@1.11.3: - resolution: {integrity: sha512-ZR5z5Zpc7cASwfdRAV5yNScCZBsgGSbcwiA/u3farCacbPiXsfoWUkz28iyrx21/TRW0bi6dbsB2v17swa8bjw==} + /turbo-windows-arm64@1.12.1: + resolution: {integrity: sha512-jzUMzaBsGHq2NHotAT/jRaoxetdohmDNEt2WjiN1B8AM6wNKcufGVHk0GMoDbm1pcSi4HZOSf1gN+AlII6l3Dg==} cpu: [arm64] os: [win32] requiresBuild: true dev: true optional: true - /turbo@1.11.3: - resolution: {integrity: sha512-RCJOUFcFMQNIGKSjC9YmA5yVP1qtDiBA0Lv9VIgrXraI5Da1liVvl3VJPsoDNIR9eFMyA/aagx1iyj6UWem5hA==} + /turbo@1.12.1: + resolution: {integrity: sha512-7e+BYijfIuVtv6kfBl/KKOsu67JVdsHK3FNI4++NTYe/Ju+DAKQDKoPJ8wqthZo1QzUzeabvc/WCL41pwY7xug==} hasBin: true optionalDependencies: - turbo-darwin-64: 1.11.3 - turbo-darwin-arm64: 1.11.3 - turbo-linux-64: 1.11.3 - turbo-linux-arm64: 1.11.3 - turbo-windows-64: 1.11.3 - turbo-windows-arm64: 1.11.3 + turbo-darwin-64: 1.12.1 + turbo-darwin-arm64: 1.12.1 + turbo-linux-64: 1.12.1 + turbo-linux-arm64: 1.12.1 + turbo-windows-64: 1.12.1 + turbo-windows-arm64: 1.12.1 dev: true /type-check@0.3.2: @@ -17626,6 +17653,11 @@ packages: resolution: {integrity: sha512-v3UJF8xm68BBj6AF4oQML3ikrfK2c9EmZUyLOfShpJuItAqVBHWP/KtpGinkSsIiP6EZyyb6Z3NXyW9dgS9X1w==} dev: false + /typescript@5.1.6: + resolution: {integrity: sha512-zaWCozRZ6DLEWAWFrVDz1H6FVXzUSfTy5FUMWsQlU8Ym5JP9eO4xkTIROFCQvhQf61z6O/G6ugw3SgAnvvm+HA==} + engines: {node: '>=14.17'} + hasBin: true + /typescript@5.2.2: resolution: {integrity: sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==} engines: {node: '>=14.17'} @@ -18007,8 +18039,31 @@ packages: - zod dev: false - /viem@2.6.1(typescript@5.2.2)(zod@3.22.4): - resolution: {integrity: sha512-565cKS2fQ8XU9sfQo5NGAZXdKwPFjof4nO3NUyElVHKqKw9l5/y2iDDMEubvxm09rBlzibJ+Sw/mI4jnnkQE4g==} + /viem@2.7.1(typescript@5.1.6)(zod@3.22.4): + resolution: {integrity: sha512-izAX2KedTFnI2l0ZshtnlK2ZuDvSlKeuaanWyNwC4ffDgrCGtwX1bvVXO3Krh53lZgqvjd8UGpjGaBl3WqJ4yQ==} + peerDependencies: + typescript: '>=5.0.4' + peerDependenciesMeta: + typescript: + optional: true + dependencies: + '@adraffy/ens-normalize': 1.10.0 + '@noble/curves': 1.2.0 + '@noble/hashes': 1.3.2 + '@scure/bip32': 1.3.2 + '@scure/bip39': 1.2.1 + abitype: 1.0.0(typescript@5.1.6)(zod@3.22.4) + isows: 1.0.3(ws@8.13.0) + typescript: 5.1.6 + ws: 8.13.0 + transitivePeerDependencies: + - bufferutil + - utf-8-validate + - zod + dev: false + + /viem@2.7.1(typescript@5.2.2)(zod@3.22.4): + resolution: {integrity: sha512-izAX2KedTFnI2l0ZshtnlK2ZuDvSlKeuaanWyNwC4ffDgrCGtwX1bvVXO3Krh53lZgqvjd8UGpjGaBl3WqJ4yQ==} peerDependencies: typescript: '>=5.0.4' peerDependenciesMeta: diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index 7afdfc18..1c9603b6 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -1,11 +1,8 @@ packages: - - '@anonklub/*' - - circuits/** + - circom - contracts - discord-bot + - 'pkgs/*' - test - ui - - merkle-tree-wasm - - merkle-tree-wasm/wasm-pkg - query-api - - workers/* diff --git a/test/jest-preset.js b/test/jest-preset.js index 2fbb428a..df8ea418 100644 --- a/test/jest-preset.js +++ b/test/jest-preset.js @@ -2,7 +2,7 @@ const tsJestPreset = require('ts-jest/jest-preset') const { join } = require('path') const projects = [ - ...['proof', 'query'].map((name) => `@anonklub/${name}`), + ...['proof', 'query'].map((name) => `pkgs/${name}`), 'query-api', ].map((name) => join(__dirname, '..', name, 'test')) diff --git a/turbo.json b/turbo.json index 61623feb..b1d6836f 100644 --- a/turbo.json +++ b/turbo.json @@ -4,15 +4,15 @@ "//#barrels": { "inputs": [ "*.{js,jsx,ts,tsx}", - "{@anonklub,circuits,discord-bot,query-api,ui}/**/{src,test}/**/*.{js,jsx,ts,tsx}", - "!{@anonklub,circuits,discord-bot,query-api,ui}/**/{build,dist,node_modules,.next}/**" + "{pkgs/query,discord-bot,query-api,test,ui}/**/{src,test}/**/*.{js,jsx,ts,tsx}", + "!{pkgs/query,discord-bot,query-api,ui}/**/{build,dist,node_modules,.next}/**" ] }, "//#_format": { "inputs": [ "*.{cjs,js,jsx,ts,tsx,yaml,yml,json,md,mdx,css,html,graphql}", - "{.github,@anonklub,circuits,discord-bot,query-api,ui}/**/*.{cjs,js,jsx,ts,tsx,yaml,yml,json,md,mdx,css,html,graphql}", - "!{@anonklub,circuits,discord-bot,query-api,ui}/**/{build,dist,node_modules,.next}/**" + "{.github,pkgs,circom,discord-bot,query-api,ui}/**/*.{cjs,js,jsx,ts,tsx,yaml,yml,json,md,mdx,css,html,graphql}", + "!{pkgs,circom,discord-bot,query-api,ui}/**/{build,dist,node_modules,.next}/**" ] }, "_format": { @@ -26,16 +26,16 @@ "//#_format.fix": { "inputs": [ "*.{cjs,js,jsx,ts,tsx,yaml,yml,json,md,mdx,css,html,graphql}", - "{.github,@anonklub,circuits,discord-bot,query-api,ui}/**/*.{cjs,js,jsx,ts,tsx,yaml,yml,json,md,mdx,css,html,graphql}", - "!{@anonklub,circuits,discord-bot,query-api,ui}/**/{build,dist,node_modules,.next}/**" + "{.github,pkgs,circom,discord-bot,query-api,ui}/**/*.{cjs,js,jsx,ts,tsx,yaml,yml,json,md,mdx,css,html,graphql}", + "!{pkgs,circom,discord-bot,query-api,ui}/**/{build,dist,node_modules,.next}/**" ] }, "//#_knip": { "inputs": [ "*.{cjs,js,jsx,ts,tsx}", "package.json", - "{@anonklub,circuits,discord-bot,query-api,ui}/**/{package.json,*.{cjs,js,jsx,ts,tsx}}", - "!{@anonklub,circuits,discord-bot,query-api,ui}/**/{build,dist,node_modules,.next}/**" + "{pkgs,circom,discord-bot,query-api,ui}/**/{package.json,*.{cjs,js,jsx,ts,tsx}}", + "!{pkgs,circom,discord-bot,query-api,ui}/**/{build,dist,node_modules,.next}/**" ] }, "_lint": { @@ -45,8 +45,8 @@ "//#_lint": { "inputs": [ "*.{cjs,js,jsx,ts,tsx}", - "{@anonklub,circuits,discord-bot,query-api,ui}/**/*.{cjs,js,jsx,ts,tsx}", - "!{@anonklub,circuits,discord-bot,query-api,ui}/**/{build,dist,node_modules,.next}/**" + "{pkgs,circom,discord-bot,query-api,test,ui}/**/*.{cjs,js,jsx,ts,tsx}", + "!{pkgs,circom,discord-bot,query-api,ui}/**/{build,dist,node_modules,.next}/**" ] }, "_lint.fix": { @@ -56,22 +56,22 @@ "//#_lint.fix": { "inputs": [ "*.{cjs,js,jsx,ts,tsx}", - "{@anonklub,circuits,discord-bot,query-api,ui}/**/*.{cjs,js,jsx,ts,tsx}", - "!{@anonklub,circuits,discord-bot,query-api,ui}/**/{build,dist,node_modules,.next}/**" + "{pkgs,circom,discord-bot,query-api,test,ui}/**/*.{cjs,js,jsx,ts,tsx}", + "!{pkgs,circom,discord-bot,query-api,ui}/**/{build,dist,node_modules,.next}/**" ] }, "typecheck": { "inputs": [ "*.{js,jsx,ts,tsx}", - "{@anonklub,circuits,discord-bot,query-api,ui}/**/{src,test}/**/*.{js,jsx,ts,tsx}", - "!{@anonklub,circuits,discord-bot,query-api,ui}/**/{build,dist,node_modules,.next}/**" + "{pkgs,circom,discord-bot,query-api,test,ui}/**/{src,test}/**/*.{js,jsx,ts,tsx}", + "!{pkgs,circom,discord-bot,query-api,ui}/**/{build,dist,node_modules,.next}/**" ] }, "build": { "dependsOn": ["^build", "build.graph"], "outputs": [ - "{@anonklub,query-api,ui}/**/{build,dist}/**", - "!{@anonklub,query-api,ui}/**/node_modules/**" + "{pkgs,query-api,ui}/**/{build,dist}/**", + "!{pkgs,query-api,ui}/**/node_modules/**" ] }, "build.graph": { @@ -80,7 +80,7 @@ "//#_test": { "dependsOn": ["^build"], "inputs": [ - "{@anonklub,circuits/circom,query-api}/{src,test}/**/*.{js,jsx,ts,tsx}" + "{pkgs/{proof,query},circom,query-api}/{src,test}/**/*.{js,jsx,ts,tsx}" ] }, "_test": {