diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 8352de555..8bad3e3cc 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -6,6 +6,11 @@ updates: schedule: interval: daily open-pull-requests-limit: 10 + cooldown: + default-days: 7 + semver-major-days: 30 + semver-minor-days: 14 + semver-patch-days: 7 ignore: - dependency-name: "*" update-types: @@ -33,6 +38,11 @@ updates: schedule: interval: daily open-pull-requests-limit: 10 + cooldown: + default-days: 7 + semver-major-days: 30 + semver-minor-days: 14 + semver-patch-days: 7 ignore: - dependency-name: "*" update-types: @@ -44,6 +54,8 @@ updates: directory: "/docker/backend" schedule: interval: weekly + cooldown: + default-days: 7 ignore: - dependency-name: "*" update-types: @@ -53,6 +65,8 @@ updates: directory: "/docker/frontend" schedule: interval: weekly + cooldown: + default-days: 7 ignore: - dependency-name: "*" update-types: @@ -62,6 +76,8 @@ updates: directory: "/" schedule: interval: weekly + cooldown: + default-days: 7 ignore: - dependency-name: "*" update-types: diff --git a/.github/nginx-check/Dockerfile.docker b/.github/nginx-check/Dockerfile.docker new file mode 100644 index 000000000..68776f088 --- /dev/null +++ b/.github/nginx-check/Dockerfile.docker @@ -0,0 +1,17 @@ +FROM nginx:1.30.1-alpine + +# Validate the config set loaded by the mempool/frontend docker image. +# Build context: repo root +COPY nginx.conf http-basic.conf /etc/nginx/ +COPY nginx-mempool.conf /etc/nginx/conf.d/ + +# Replay the transforms applied by docker/init.sh (with the default values +# docker/frontend/entrypoint.sh substitutes at container start) +RUN sed -i \ + -e "s!127.0.0.1:80!0.0.0.0:8080!g" \ + -e "s!127.0.0.1!0.0.0.0!g" \ + -e "s!user nobody;!!g" \ + -e "s!/etc/nginx/nginx-mempool.conf!/etc/nginx/conf.d/nginx-mempool.conf!g" \ + /etc/nginx/nginx.conf + +CMD ["nginx", "-t"] diff --git a/.github/nginx-check/Dockerfile.production b/.github/nginx-check/Dockerfile.production new file mode 100644 index 000000000..cb91c2fc6 --- /dev/null +++ b/.github/nginx-check/Dockerfile.production @@ -0,0 +1,13 @@ +FROM nginx:1.30.1-alpine + +# Stage the config the way production/install does: the repo is available at +# ${NGINX_ETC_FOLDER}/mempool and production/nginx/nginx.conf becomes the main +# config, with __NGINX_USER__ and __NGINX_ETC_FOLDER__ substituted. +# Build context: production/ +COPY nginx /etc/nginx/mempool/production/nginx + +RUN cp /etc/nginx/mempool/production/nginx/nginx.conf /etc/nginx/nginx.conf && \ + sed -i "s!__NGINX_USER__!nginx!" /etc/nginx/nginx.conf && \ + sed -i "s!__NGINX_ETC_FOLDER__!/etc/nginx!" /etc/nginx/nginx.conf + +CMD ["nginx", "-t"] diff --git a/.github/workflows/backend-integration.yml b/.github/workflows/backend-integration.yml index f1a7290c4..43f76b3c1 100644 --- a/.github/workflows/backend-integration.yml +++ b/.github/workflows/backend-integration.yml @@ -2,11 +2,14 @@ name: Backend Integration Tests with MariaDB on: pull_request: - types: [opened, review_requested, synchronize] + types: [opened, synchronize] push: branches: - master +permissions: + contents: read + jobs: backend-integration: if: "(github.event_name == 'pull_request' && !contains(github.event.pull_request.labels.*.name, 'ops') && !contains(github.head_ref, 'ops/')) || github.event_name == 'push'" @@ -20,12 +23,12 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3 with: path: ${{ matrix.node }}/integration - name: Setup Node - uses: actions/setup-node@v3 + uses: actions/setup-node@3235b876344d2a9aa001b8d1453c930bba69e610 # v3 with: node-version: ${{ matrix.node }} registry-url: "https://registry.npmjs.org" @@ -33,7 +36,7 @@ jobs: cache-dependency-path: '${{ matrix.node }}/integration/backend/package-lock.json' - name: Cache node modules - uses: actions/cache@v4 + uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4 with: path: ${{ matrix.node }}/integration/backend/node_modules key: ${{ runner.os }}-backend-integration-node-${{ matrix.node }}-${{ hashFiles('${{ matrix.node }}/integration/backend/package-lock.json') }} @@ -47,7 +50,7 @@ jobs: working-directory: ${{ matrix.node }}/integration - name: Cache Rust dependencies - uses: actions/cache@v4 + uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4 with: path: | ~/.cargo/bin/ @@ -66,7 +69,7 @@ jobs: toolchain: ${{ steps.gettoolchain.outputs.toolchain }} - name: Install dependencies - run: npm ci + run: bash meta/scripts/check-install-scripts.sh && npm ci working-directory: ${{ matrix.node }}/integration/backend - name: Build backend diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f7dfea172..cb1e247ff 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -2,11 +2,14 @@ name: CI Pipeline for the Backend and Frontend on: pull_request: - types: [opened, review_requested, synchronize] + types: [opened, synchronize] push: branches: - master +permissions: + contents: read + jobs: backend: if: "(github.event_name == 'pull_request' && !contains(github.event.pull_request.labels.*.name, 'ops') && !contains(github.head_ref, 'ops/')) || github.event_name == 'push'" @@ -20,20 +23,23 @@ jobs: name: Backend (${{ matrix.flavor }}) - node ${{ matrix.node }} steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3 with: path: ${{ matrix.node }}/${{ matrix.flavor }} - name: Setup Node - uses: actions/setup-node@v3 + uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4 with: node-version: ${{ matrix.node }} registry-url: "https://registry.npmjs.org" cache: 'npm' cache-dependency-path: '${{ matrix.node }}/${{ matrix.flavor }}/backend/package-lock.json' + - name: Install npm 11.12.0 + run: npm install -g npm@11.12.0 + - name: Cache node modules - uses: actions/cache@v4 + uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4 with: path: ${{ matrix.node }}/${{ matrix.flavor }}/backend/node_modules key: ${{ runner.os }}-backend-${{ matrix.flavor }}-node-${{ matrix.node }}-${{ hashFiles('${{ matrix.node }}/${{ matrix.flavor }}/backend/package-lock.json') }} @@ -47,7 +53,7 @@ jobs: working-directory: ${{ matrix.node }}/${{ matrix.flavor }} - name: Cache Rust dependencies - uses: actions/cache@v4 + uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4 with: path: | ~/.cargo/bin/ @@ -69,12 +75,12 @@ jobs: - name: Install if: ${{ matrix.flavor == 'dev'}} - run: npm ci + run: bash meta/scripts/check-install-scripts.sh && npm ci working-directory: ${{ matrix.node }}/${{ matrix.flavor }}/backend - name: Install (Prod dependencies only) if: ${{ matrix.flavor == 'prod'}} - run: npm ci --omit=dev --omit=optional + run: bash meta/scripts/check-install-scripts.sh && npm ci --omit=dev --omit=optional working-directory: ${{ matrix.node }}/${{ matrix.flavor }}/backend - name: Lint @@ -100,20 +106,23 @@ jobs: runs-on: mempool-ci steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3 with: path: assets - name: Setup Node - uses: actions/setup-node@v3 + uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4 with: node-version: ${{ matrix.node }} registry-url: "https://registry.npmjs.org" cache: 'npm' cache-dependency-path: 'assets/frontend/package-lock.json' + - name: Install npm 11.12.0 + run: npm install -g npm@11.12.0 + - name: Cache node modules for frontend - uses: actions/cache@v4 + uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4 with: path: assets/frontend/node_modules key: ${{ runner.os }}-cache-frontend-node-${{ matrix.node }}-${{ hashFiles('assets/frontend/package-lock.json') }} @@ -122,13 +131,13 @@ jobs: ${{ runner.os }}-cache-frontend- - name: Install (Prod dependencies only) - run: npm ci --omit=dev --omit=optional + run: bash meta/scripts/check-install-scripts.sh && npm ci --omit=dev --omit=optional working-directory: assets/frontend - name: Restore cached mining pool assets continue-on-error: true id: cache-mining-pool-restore - uses: actions/cache/restore@v4 + uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4 with: path: | mining-pool-assets.zip @@ -137,7 +146,7 @@ jobs: - name: Restore promo video assets continue-on-error: true id: cache-promo-video-restore - uses: actions/cache/restore@v4 + uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4 with: path: | promo-video-assets.zip @@ -170,20 +179,20 @@ jobs: run: zip -jrq promo-video-assets.zip assets/frontend/src/resources/promo-video/* - name: Upload mining pool assets as artifact - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4 with: name: mining-pool-assets path: mining-pool-assets.zip - name: Upload promo video assets as artifact - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4 with: name: promo-video-assets path: promo-video-assets.zip - name: Save mining pool assets cache id: cache-mining-pool-save - uses: actions/cache/save@v4 + uses: actions/cache/save@0057852bfaa89a56745cba8c7296529d2fc39830 # v4 with: path: | mining-pool-assets.zip @@ -191,7 +200,7 @@ jobs: - name: Save promo video assets cache id: cache-promo-video-save - uses: actions/cache/save@v4 + uses: actions/cache/save@0057852bfaa89a56745cba8c7296529d2fc39830 # v4 with: path: | promo-video-assets.zip @@ -210,20 +219,23 @@ jobs: name: Frontend (${{ matrix.flavor }}) - node ${{ matrix.node }} steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3 with: path: ${{ matrix.node }}/${{ matrix.flavor }} - name: Setup Node - uses: actions/setup-node@v3 + uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4 with: node-version: ${{ matrix.node }} registry-url: "https://registry.npmjs.org" cache: 'npm' cache-dependency-path: '${{ matrix.node }}/${{ matrix.flavor }}/frontend/package-lock.json' + - name: Install npm 11.12.0 + run: npm install -g npm@11.12.0 + - name: Cache node modules - uses: actions/cache@v4 + uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4 with: path: ${{ matrix.node }}/${{ matrix.flavor }}/frontend/node_modules key: ${{ runner.os }}-frontend-${{ matrix.flavor }}-node-${{ matrix.node }}-${{ hashFiles('${{ matrix.node }}/${{ matrix.flavor }}/frontend/package-lock.json') }} @@ -232,13 +244,13 @@ jobs: ${{ runner.os }}-frontend-${{ matrix.flavor }}- - name: Install (Prod dependencies only) - run: npm ci --omit=dev --omit=optional + run: bash meta/scripts/check-install-scripts.sh && npm ci --omit=dev --omit=optional if: ${{ matrix.flavor == 'prod'}} working-directory: ${{ matrix.node }}/${{ matrix.flavor }}/frontend - name: Install if: ${{ matrix.flavor == 'dev'}} - run: npm ci + run: bash meta/scripts/check-install-scripts.sh && npm ci working-directory: ${{ matrix.node }}/${{ matrix.flavor }}/frontend - name: Lint @@ -252,7 +264,7 @@ jobs: - name: Restore cached mining pool assets continue-on-error: true id: cache-mining-pool-restore - uses: actions/cache/restore@v4 + uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4 with: path: | mining-pool-assets.zip @@ -261,14 +273,14 @@ jobs: - name: Restore promo video assets continue-on-error: true id: cache-promo-video-restore - uses: actions/cache/restore@v4 + uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4 with: path: | promo-video-assets.zip key: promo-video-assets-cache - name: Download artifact - uses: actions/download-artifact@v4 + uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4 with: name: mining-pool-assets @@ -276,7 +288,7 @@ jobs: run: unzip -o mining-pool-assets.zip -d ${{ matrix.node }}/${{ matrix.flavor }}/frontend/src/resources/mining-pools - name: Download artifact - uses: actions/download-artifact@v4 + uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4 with: name: promo-video-assets @@ -310,19 +322,22 @@ jobs: name: E2E tests for ${{ matrix.module }} steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3 with: path: ${{ matrix.module }} - name: Setup node - uses: actions/setup-node@v3 + uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4 with: node-version: ${{ matrix.node }} cache: "npm" cache-dependency-path: ${{ matrix.module }}/frontend/package-lock.json + - name: Install npm 11.12.0 + run: npm install -g npm@11.12.0 + - name: Cache node modules for e2e - uses: actions/cache@v4 + uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4 with: path: ${{ matrix.module }}/frontend/node_modules key: ${{ runner.os }}-e2e-${{ matrix.module }}-node-${{ matrix.node }}-${{ hashFiles('${{ matrix.module }}/frontend/package-lock.json') }} @@ -333,7 +348,7 @@ jobs: - name: Restore cached mining pool assets continue-on-error: true id: cache-mining-pool-restore - uses: actions/cache/restore@v4 + uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4 with: path: | mining-pool-assets.zip @@ -342,14 +357,14 @@ jobs: - name: Restore cached promo video assets continue-on-error: true id: cache-promo-video-restore - uses: actions/cache/restore@v4 + uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4 with: path: | promo-video-assets.zip key: promo-video-assets-cache - name: Download artifact - uses: actions/download-artifact@v4 + uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4 with: name: mining-pool-assets @@ -357,7 +372,7 @@ jobs: run: unzip -o mining-pool-assets.zip -d ${{ matrix.module }}/frontend/src/resources/mining-pools - name: Download artifact - uses: actions/download-artifact@v4 + uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4 with: name: promo-video-assets @@ -367,7 +382,7 @@ jobs: # mempool - name: Chrome browser tests (${{ matrix.module }}) if: ${{ matrix.module == 'mempool' }} - uses: cypress-io/github-action@v5 + uses: cypress-io/github-action@248bde77443c376edc45906ede03a1aba9da0462 # v5 with: tag: ${{ github.event_name }} working-directory: ${{ matrix.module }}/frontend @@ -392,7 +407,7 @@ jobs: # liquid - name: Chrome browser tests (${{ matrix.module }}) if: ${{ matrix.module == 'liquid' }} - uses: cypress-io/github-action@v5 + uses: cypress-io/github-action@248bde77443c376edc45906ede03a1aba9da0462 # v5 with: tag: ${{ github.event_name }} working-directory: ${{ matrix.module }}/frontend @@ -417,7 +432,7 @@ jobs: # testnet - name: Chrome browser tests (${{ matrix.module }}) if: ${{ matrix.module == 'testnet4' }} - uses: cypress-io/github-action@v5 + uses: cypress-io/github-action@248bde77443c376edc45906ede03a1aba9da0462 # v5 with: tag: ${{ github.event_name }} working-directory: ${{ matrix.module }}/frontend @@ -445,7 +460,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3 with: path: docker diff --git a/.github/workflows/dependabot-provenance-check.yml b/.github/workflows/dependabot-provenance-check.yml new file mode 100644 index 000000000..592f18859 --- /dev/null +++ b/.github/workflows/dependabot-provenance-check.yml @@ -0,0 +1,102 @@ +name: Dependabot Provenance Check + +on: + pull_request: + types: [opened, synchronize, reopened] + +permissions: + contents: read + pull-requests: write + issues: write + +jobs: + check-provenance: + if: >- + github.event.pull_request.user.login == 'dependabot[bot]' && + !contains(github.event.pull_request.labels.*.name, 'provenance-exception') + runs-on: ubuntu-latest + + steps: + - name: Checkout + uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4 + + - name: Fetch Dependabot metadata + id: metadata + uses: dependabot/fetch-metadata@21025c705c08248db411dc16f3619e6b5f9ea21a # v2 + with: + github-token: "${{ secrets.GITHUB_TOKEN }}" + + - name: Setup Node + if: steps.metadata.outputs.package-ecosystem == 'npm_and_yarn' + uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4 + with: + node-version: "24.13.0" + + - name: Check npm provenance attestation + if: steps.metadata.outputs.package-ecosystem == 'npm_and_yarn' + id: npm-provenance + run: | + IFS=',' read -ra DEPS <<< "${{ steps.metadata.outputs.dependency-names }}" + UPDATED_DEPS_JSON='${{ steps.metadata.outputs.updated-dependencies-json }}' + + FAILED_DEPS="" + for DEP in "${DEPS[@]}"; do + DEP=$(echo "$DEP" | xargs) + + NEW_VERSION=$(echo "$UPDATED_DEPS_JSON" | jq -r --arg name "$DEP" ' + .[] | select(.dependencyName == $name) | .newVersion + ' | head -n 1) + + if [ -z "$NEW_VERSION" ] || [ "$NEW_VERSION" = "null" ]; then + echo "::error::Could not determine updated version for dependency $DEP from Dependabot metadata" + FAILED_DEPS="${FAILED_DEPS:+$FAILED_DEPS, }$DEP" + continue + fi + echo "::group::Checking provenance for $DEP@$NEW_VERSION" + + ATTESTATIONS=$(npm view "$DEP@$NEW_VERSION" --json 2>/dev/null | jq -r '.dist.attestations // empty') + + if [ -z "$ATTESTATIONS" ]; then + echo "::error::No provenance attestation found for $DEP@$NEW_VERSION" + FAILED_DEPS="${FAILED_DEPS:+$FAILED_DEPS, }$DEP" + else + echo "Provenance attestation found for $DEP@$NEW_VERSION" + fi + echo "::endgroup::" + done + + if [ -n "$FAILED_DEPS" ]; then + echo "failed=true" >> "$GITHUB_OUTPUT" + echo "failed-deps=$FAILED_DEPS" >> "$GITHUB_OUTPUT" + else + echo "failed=false" >> "$GITHUB_OUTPUT" + fi + + - name: Close PR if provenance check failed + if: steps.npm-provenance.outputs.failed == 'true' + env: + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + FAILED_DEPS: ${{ steps.npm-provenance.outputs.failed-deps }} + PR_NUMBER: ${{ github.event.pull_request.number }} + run: | + COMMENT_BODY_FILE="$(mktemp)" + cat > "$COMMENT_BODY_FILE" <> $GITHUB_ENV - name: Set up QEMU - uses: docker/setup-qemu-action@v3 + uses: docker/setup-qemu-action@c7c53464625b32c7a7e944ae62b3e17d2b600130 # v3 with: platforms: linux/amd64,linux/arm64 - name: Setup Docker buildx action - uses: docker/setup-buildx-action@v3 + uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3 with: platforms: linux/amd64,linux/arm64 driver-opts: | network=host - name: Login to Docker Hub - uses: docker/login-action@v3 + uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3 with: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} diff --git a/.github/workflows/e2e_parameterized.yml b/.github/workflows/e2e_parameterized.yml index ac4bca66d..bf5a09518 100644 --- a/.github/workflows/e2e_parameterized.yml +++ b/.github/workflows/e2e_parameterized.yml @@ -17,7 +17,10 @@ on: description: 'Liquid Hostname' required: true default: 'liquid.network' - type: string + type: string + +permissions: + contents: read jobs: cache: @@ -35,25 +38,25 @@ jobs: fi - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3 with: ref: ${{ steps.determine-ref.outputs.ref }} path: assets - name: Setup Node - uses: actions/setup-node@v3 + uses: actions/setup-node@3235b876344d2a9aa001b8d1453c930bba69e610 # v3 with: node-version: 24.13.0 registry-url: "https://registry.npmjs.org" - name: Install (Prod dependencies only) - run: npm ci --omit=dev --omit=optional + run: bash meta/scripts/check-install-scripts.sh && npm ci --omit=dev --omit=optional working-directory: assets/frontend - name: Restore cached mining pool assets continue-on-error: true id: cache-mining-pool-restore - uses: actions/cache/restore@v4 + uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4 with: path: | mining-pool-assets.zip @@ -62,7 +65,7 @@ jobs: - name: Restore promo video assets continue-on-error: true id: cache-promo-video-restore - uses: actions/cache/restore@v4 + uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4 with: path: | promo-video-assets.zip @@ -95,20 +98,20 @@ jobs: run: zip -jrq promo-video-assets.zip assets/frontend/src/resources/promo-video/* - name: Upload mining pool assets as artifact - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4 with: name: mining-pool-assets path: mining-pool-assets.zip - name: Upload promo video assets as artifact - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4 with: name: promo-video-assets path: promo-video-assets.zip - name: Save mining pool assets cache id: cache-mining-pool-save - uses: actions/cache/save@v4 + uses: actions/cache/save@0057852bfaa89a56745cba8c7296529d2fc39830 # v4 with: path: | mining-pool-assets.zip @@ -116,7 +119,7 @@ jobs: - name: Save promo video assets cache id: cache-promo-video-save - uses: actions/cache/save@v4 + uses: actions/cache/save@0057852bfaa89a56745cba8c7296529d2fc39830 # v4 with: path: | promo-video-assets.zip @@ -143,13 +146,13 @@ jobs: fi - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3 with: ref: ${{ steps.determine-ref.outputs.ref }} path: ${{ matrix.module }} - name: Setup node - uses: actions/setup-node@v3 + uses: actions/setup-node@3235b876344d2a9aa001b8d1453c930bba69e610 # v3 with: node-version: 24.13.0 cache: "npm" @@ -158,7 +161,7 @@ jobs: - name: Restore cached mining pool assets continue-on-error: true id: cache-mining-pool-restore - uses: actions/cache/restore@v4 + uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4 with: path: | mining-pool-assets.zip @@ -167,14 +170,14 @@ jobs: - name: Restore cached promo video assets continue-on-error: true id: cache-promo-video-restore - uses: actions/cache/restore@v4 + uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4 with: path: | promo-video-assets.zip key: promo-video-assets-cache - name: Download artifact - uses: actions/download-artifact@v4 + uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4 with: name: mining-pool-assets @@ -182,7 +185,7 @@ jobs: run: unzip -o mining-pool-assets.zip -d ${{ matrix.module }}/frontend/src/resources/mining-pools - name: Download artifact - uses: actions/download-artifact@v4 + uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4 with: name: promo-video-assets @@ -192,7 +195,7 @@ jobs: # mempool - name: Chrome browser tests (${{ matrix.module }}) if: ${{ matrix.module == 'mempool' }} - uses: cypress-io/github-action@v5 + uses: cypress-io/github-action@248bde77443c376edc45906ede03a1aba9da0462 # v5 with: tag: ${{ github.event_name }} working-directory: ${{ matrix.module }}/frontend @@ -220,7 +223,7 @@ jobs: # liquid - name: Chrome browser tests (${{ matrix.module }}) if: ${{ matrix.module == 'liquid' }} - uses: cypress-io/github-action@v5 + uses: cypress-io/github-action@248bde77443c376edc45906ede03a1aba9da0462 # v5 with: tag: ${{ github.event_name }} working-directory: ${{ matrix.module }}/frontend @@ -248,7 +251,7 @@ jobs: # testnet - name: Chrome browser tests (${{ matrix.module }}) if: ${{ matrix.module == 'testnet4' }} - uses: cypress-io/github-action@v5 + uses: cypress-io/github-action@248bde77443c376edc45906ede03a1aba9da0462 # v5 with: tag: ${{ github.event_name }} working-directory: ${{ matrix.module }}/frontend diff --git a/.github/workflows/get_backend_block_height.yml b/.github/workflows/get_backend_block_height.yml index 73db6107e..70d85b20f 100644 --- a/.github/workflows/get_backend_block_height.yml +++ b/.github/workflows/get_backend_block_height.yml @@ -2,13 +2,16 @@ name: 'Check if servers are in sync' on: [workflow_dispatch] +permissions: + contents: read + jobs: print-backend-sha: runs-on: mempool-ci name: Get block height steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3 with: path: repo diff --git a/.github/workflows/get_backend_hash.yml b/.github/workflows/get_backend_hash.yml index d63860c5e..ee0bc6696 100644 --- a/.github/workflows/get_backend_hash.yml +++ b/.github/workflows/get_backend_hash.yml @@ -2,13 +2,16 @@ name: 'Print backend hashes' on: [workflow_dispatch] +permissions: + contents: read + jobs: print-backend-sha: runs-on: mempool-ci name: Print backend hashes steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3 with: path: repo diff --git a/.github/workflows/get_image_digest.yml b/.github/workflows/get_image_digest.yml index 3d86c860c..5c03c8d78 100644 --- a/.github/workflows/get_image_digest.yml +++ b/.github/workflows/get_image_digest.yml @@ -7,14 +7,18 @@ on: description: 'Image Version' required: false default: 'latest' - type: string + type: string + +permissions: + contents: read + jobs: print-images-sha: runs-on: mempool-ci name: Print digest for images steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3 with: path: digest diff --git a/.github/workflows/project-review-status.yml b/.github/workflows/project-review-status.yml index 7e85b8eb3..83be4de23 100644 --- a/.github/workflows/project-review-status.yml +++ b/.github/workflows/project-review-status.yml @@ -1,131 +1,21 @@ -# Workflow: Automate project board management -# - Add newly created issues to project #8 -# - Set status to "Review Needed" when a reviewer is requested on a non-draft PR name: Project Board Automation -# Triggers: Review requested on PRs, or new issues opened on: pull_request: types: [review_requested] issues: types: [opened] +permissions: + contents: read + jobs: - manage-project-board: - runs-on: mempool-ci - steps: - - name: Update Project Board - uses: actions/github-script@v7 - with: - # Use the PAT stored in repository secrets (has project write access) - github-token: ${{ secrets.PROJECT_TOKEN }} - script: | - // Skip draft PRs - if (context.eventName === 'pull_request' && context.payload.pull_request.draft) { - console.log('PR is a draft, skipping Review Needed status...'); - return; - } - - // Handle new issues - add to project - if (context.eventName === 'issues') { - const addMutation = ` - mutation($projectId: ID!, $contentId: ID!) { - addProjectV2ItemById(input: {projectId: $projectId, contentId: $contentId}) { - item { id } - } - } - `; - - try { - await github.graphql(addMutation, { - projectId: "${{ secrets.PROJECT_ID }}", - contentId: context.payload.issue.node_id - }); - - console.log('Successfully added issue to project #8'); - } catch (error) { - // Handle case where the issue is already in the project, or log other failures - const errors = error && error.errors ? error.errors : []; - const alreadyInProject = errors.some(e => - typeof e.message === 'string' && - e.message.toLowerCase().includes('already') && - e.message.toLowerCase().includes('project') - ); - - if (alreadyInProject) { - console.log('Issue is already in project #8, skipping add.'); - } else { - console.error('Failed to add issue to project #8:', error); - throw error; - } - } - return; - } - - // Handle PR review_requested - update status to "Review Needed" - // GraphQL query to find the PR's project items - // This fetches all projects the PR is linked to - const query = ` - query($owner: String!, $repo: String!, $pr: Int!) { - repository(owner: $owner, name: $repo) { - pullRequest(number: $pr) { - projectItems(first: 10) { - nodes { - id - project { - number - } - } - } - } - } - } - `; - - // Execute the query with current repo/PR context - const result = await github.graphql(query, { - owner: context.repo.owner, - repo: context.repo.repo, - pr: context.payload.pull_request.number - }); - - // Find the project item that belongs to project #8 - const projectItems = result.repository.pullRequest.projectItems.nodes; - const projectItem = projectItems.find(item => item.project.number === 8); - - // Exit early if PR isn't in project #8 - if (!projectItem) { - console.log('PR is not in project #8, skipping...'); - return; - } - - // GraphQL mutation to update the Status field - const mutation = ` - mutation($projectId: ID!, $itemId: ID!, $fieldId: ID!, $optionId: String!) { - updateProjectV2ItemFieldValue( - input: { - projectId: $projectId - itemId: $itemId - fieldId: $fieldId - value: { singleSelectOptionId: $optionId } - } - ) { - projectV2Item { - id - } - } - } - `; - - // Execute the mutation using IDs stored in repository variables - // PROJECT_ID: The project's unique identifier - // STATUS_FIELD_ID: The "Status" field's unique identifier - // REVIEW_NEEDED_OPTION_ID: The "Review Needed" option's unique identifier - await github.graphql(mutation, { - projectId: "${{ secrets.PROJECT_ID }}", - itemId: projectItem.id, - fieldId: "${{ secrets.STATUS_FIELD_ID }}", - optionId: "${{ secrets.REVIEW_NEEDED_OPTION_ID }}" - }); - - console.log('Successfully updated project status to Review Needed'); + project-automation: + uses: mempool/.github/.github/workflows/project-board-automation.yml@267e0f38846bfb8cf1b118798dfb12def19ccb35 # master + with: + project-number: 8 + secrets: + PROJECT_TOKEN: ${{ secrets.PROJECT_TOKEN }} + PROJECT_ID: ${{ secrets.PROJECT_ID }} + STATUS_FIELD_ID: ${{ secrets.STATUS_FIELD_ID }} + REVIEW_NEEDED_OPTION_ID: ${{ secrets.REVIEW_NEEDED_OPTION_ID }} \ No newline at end of file diff --git a/.github/workflows/server-config.yml b/.github/workflows/server-config.yml new file mode 100644 index 000000000..d1a89173c --- /dev/null +++ b/.github/workflows/server-config.yml @@ -0,0 +1,32 @@ +name: Validate server config + +on: + pull_request: + types: [opened, synchronize] + paths: + - "nginx.conf" + - "http-basic.conf" + - "nginx-mempool.conf" + - "production/nginx/**" + - ".github/nginx-check/**" + - ".github/workflows/server-config.yml" + +permissions: + contents: read + +jobs: + check_config: + runs-on: "ubuntu-latest" + + name: Validate nginx config + steps: + - name: Checkout + uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3 + + - name: Validate the production nginx config + run: | + docker run --rm $(docker build -q -f .github/nginx-check/Dockerfile.production production) + + - name: Validate the docker frontend nginx config + run: | + docker run --rm $(docker build -q -f .github/nginx-check/Dockerfile.docker .) diff --git a/.github/workflows/supply-chain-audit.yml b/.github/workflows/supply-chain-audit.yml new file mode 100644 index 000000000..763e7d468 --- /dev/null +++ b/.github/workflows/supply-chain-audit.yml @@ -0,0 +1,58 @@ +name: Supply Chain Audit + +on: + pull_request: + types: [opened, synchronize] + push: + branches: + - master + +permissions: + contents: read + +jobs: + backend: + if: "(github.event_name == 'pull_request' && !contains(github.event.pull_request.labels.*.name, 'ops') && !contains(github.head_ref, 'ops/')) || github.event_name == 'push'" + runs-on: mempool-ci + name: Backend install-script audit + steps: + - name: Checkout + uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3 + + - name: Setup Node + uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4 + with: + node-version: "24.13.0" + registry-url: "https://registry.npmjs.org" + + - name: Install npm 11.12.0 + run: npm install -g npm@11.12.0 + + - name: Audit backend install scripts + run: bash backend/meta/scripts/check-install-scripts.sh + + - name: Run backend safe install + run: bash backend/meta/scripts/safe-install.sh + + frontend: + if: "(github.event_name == 'pull_request' && !contains(github.event.pull_request.labels.*.name, 'ops') && !contains(github.head_ref, 'ops/')) || github.event_name == 'push'" + runs-on: mempool-ci + name: Frontend install-script audit + steps: + - name: Checkout + uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3 + + - name: Setup Node + uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4 + with: + node-version: "24.13.0" + registry-url: "https://registry.npmjs.org" + + - name: Install npm 11.12.0 + run: npm install -g npm@11.12.0 + + - name: Audit frontend install scripts + run: bash frontend/meta/scripts/check-install-scripts.sh + + - name: Run frontend safe install + run: bash frontend/meta/scripts/safe-install.sh diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 0e43bda94..0ea569131 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,6 +1,6 @@ # Contributing to The Mempool Open Source Project -Thank you for contributing to The Mempool Open Source Project managed by Mempool Space K.K. (“Mempool”). +Thank you for contributing to The Mempool Open Source Project managed by Mempool Holdings S.A. de C.V. in El Salvador (“Mempool”). In order to clarify the intellectual property license granted with Contributions from any person or entity, Mempool must have a statement on file from each Contributor indicating their agreement to the Contributor License Agreement (“Agreement”). This license is for your protection as a Contributor as well as the protection of Mempool and its other contributors and users; it does not change your rights to use your own Contributions for any other purpose. diff --git a/LICENSE b/LICENSE index cdffcd79b..283935f8c 100644 --- a/LICENSE +++ b/LICENSE @@ -1,5 +1,5 @@ The Mempool Open Source Project® -Copyright (c) 2019-2025 Mempool Space K.K. and other shadowy super-coders +Copyright (c) 2019-2026 Mempool Holdings S.A. de C.V. and other shadowy super-coders This program is free software; you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free @@ -7,17 +7,17 @@ Software Foundation, either version 3 of the License or any later version approved by a proxy statement published on . However, this copyright license does not include an implied right or license -to use any trademarks, service marks, logos, or trade names of Mempool Space K.K. +to use any trademarks, service marks, logos, or trade names of Mempool Holdings or any other contributor to The Mempool Open Source Project. The Mempool Open Source Project®, Mempool Accelerator®, Mempool Enterprise®, Mempool Wallet™, mempool.space®, Be your own explorer™, Explore the full -Bitcoin ecosystem™, Mempool Goggles™, the mempool Logo, the mempool Square Logo, +Bitcoin ecosystem™, Mempool Goggles®, the mempool Logo, the mempool Square Logo, the mempool block visualization Logo, the mempool Blocks Logo, the mempool transaction Logo, the mempool Blocks 3 | 2 Logo, the mempool research Logo, the mempool.space Vertical Logo, and the mempool.space Horizontal Logo are -registered trademarks or trademarks of Mempool Space K.K in Japan, -the United States, and/or other countries. +registered trademarks or trademarks of Mempool Holdings S.A. de C.V. in El +Salvador, Japan, the United States, and/or other countries. See our full Trademark Policy and Guidelines for more details, published on . diff --git a/backend/.eslintrc.js b/backend/.eslintrc.js index 15bc17cd9..b53232ee0 100644 --- a/backend/.eslintrc.js +++ b/backend/.eslintrc.js @@ -15,7 +15,7 @@ module.exports = { "plugin:@typescript-eslint/recommended", "prettier" ], - "ignorePatterns": ["dist", "eslint-local-rules", ".eslintrc.js", "testSetup*.ts", "jest.integration.*.ts", "__tests__", "*.config.ts"], + "ignorePatterns": ["dist", "eslint-local-rules", ".eslintrc.js", "testSetup*.ts", "jest.integration.*.ts", "__tests__", "__e2e__", "*.config.ts"], "overrides": [ { "files": ["src/__integration_tests__/**/*"], diff --git a/backend/.npmrc b/backend/.npmrc new file mode 100644 index 000000000..7253a5cee --- /dev/null +++ b/backend/.npmrc @@ -0,0 +1 @@ +min-release-age=7 diff --git a/backend/jest.config.ts b/backend/jest.config.ts index 7989fca81..78c4ca054 100644 --- a/backend/jest.config.ts +++ b/backend/jest.config.ts @@ -17,8 +17,10 @@ const config: Config.InitialOptions = { './testSetup.ts', ], testPathIgnorePatterns: [ + '/dist/', '/node_modules/', '/__integration_tests__/', + 'test-utils\\.ts$', ], }; export default config; diff --git a/backend/mempool-config.sample.json b/backend/mempool-config.sample.json index c2715153b..b11616b2a 100644 --- a/backend/mempool-config.sample.json +++ b/backend/mempool-config.sample.json @@ -31,6 +31,8 @@ "AUDIT": false, "RUST_GBT": true, "LIMIT_GBT": false, + "CLUSTER_MEMPOOL": false, + "CLUSTER_MEMPOOL_INDEXING": false, "CPFP_INDEXING": false, "DISK_CACHE_BLOCK_INTERVAL": 6, "MAX_PUSH_TX_SIZE_WEIGHT": 4000000, diff --git a/backend/mempool-config.test.json b/backend/mempool-config.test.json index 2522ca90f..c309099b9 100644 --- a/backend/mempool-config.test.json +++ b/backend/mempool-config.test.json @@ -31,6 +31,8 @@ "AUDIT": false, "RUST_GBT": true, "LIMIT_GBT": false, + "CLUSTER_MEMPOOL": false, + "CLUSTER_MEMPOOL_INDEXING": false, "CPFP_INDEXING": false, "DISK_CACHE_BLOCK_INTERVAL": 6, "MAX_PUSH_TX_SIZE_WEIGHT": 4000000, diff --git a/backend/meta/scripts/check-install-scripts.sh b/backend/meta/scripts/check-install-scripts.sh new file mode 100755 index 000000000..1c7f9baa6 --- /dev/null +++ b/backend/meta/scripts/check-install-scripts.sh @@ -0,0 +1,153 @@ +#!/usr/bin/env bash +# +# Audit backend install-script sources before running a full npm install. +# Exits non-zero if any package not on the whitelist has hasInstallScript: true. +# +# Usage (from repo root): +# backend/meta/scripts/check-install-scripts.sh +# + +set -euo pipefail + +BACKEND_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)" +LOCKFILE="${BACKEND_DIR}/package-lock.json" +RUST_GBT_DIR="${BACKEND_DIR}/../rust/gbt" +TMP_AUDIT_DIR="" + +BACKEND_ALLOWED=( + "mempool-backend" + "fsevents" + "unrs-resolver" +) + +RUST_GBT_ALLOWED=() + +is_allowed() { + local pkg="$1" + shift + local allowed + for allowed in "$@"; do + if [[ "$pkg" == "$allowed" ]]; then + return 0 + fi + done + return 1 +} + +cleanup() { + if [[ -n "${TMP_AUDIT_DIR}" && -d "${TMP_AUDIT_DIR}" ]]; then + rm -rf "${TMP_AUDIT_DIR}" + fi +} + +trap cleanup EXIT + +collect_has_install_script_packages() { + local lockfile="$1" + if [[ ! -f "$lockfile" ]]; then + echo "No package-lock.json found at ${lockfile}" + return 1 + fi + + LOCKFILE_PATH="$lockfile" node - <<'NODE' +const fs = require('fs'); + +const lock = JSON.parse(fs.readFileSync(process.env.LOCKFILE_PATH, 'utf8')); +const pkgs = lock.packages || {}; + +for (const [path, meta] of Object.entries(pkgs)) { + if (meta && meta.hasInstallScript) { + const name = path === '' ? (lock.name || '(root)') : path.replace(/^.*node_modules\//, ''); + console.log(name); + } +} +NODE +} + +audit_lockfile() { + local lockfile="$1" + local label="$2" + shift 2 + local allowed=("$@") + local found_violations=0 + local pkg + + while IFS= read -r pkg; do + [[ -z "$pkg" ]] && continue + if ! is_allowed "$pkg" "${allowed[@]}"; then + echo "VIOLATION: unauthorized install script in '${pkg}' (${label}: ${lockfile})" + found_violations=1 + fi + done < <(collect_has_install_script_packages "$lockfile") + + if [[ "$found_violations" -eq 1 ]]; then + echo "" + echo "FAILED: Found packages with install scripts not on the whitelist." + return 1 + fi + + echo "OK: All ${label} install scripts are from whitelisted packages." +} + +get_rust_gbt_napi_cli_version() { + local rust_gbt_package_json="${RUST_GBT_DIR}/package.json" + if [[ ! -f "$rust_gbt_package_json" ]]; then + echo "No rust/gbt package.json found at ${rust_gbt_package_json}" + return 1 + fi + + RUST_GBT_PACKAGE_JSON="$rust_gbt_package_json" node - <<'NODE' +const fs = require('fs'); + +const pkg = JSON.parse(fs.readFileSync(process.env.RUST_GBT_PACKAGE_JSON, 'utf8')); +const buildScript = (pkg.scripts && pkg.scripts.build) || ''; +const match = buildScript.match(/npm install --no-save @napi-rs\/cli@([^\s]+)/); + +if (!match) { + console.error('Could not determine the @napi-rs/cli version from rust/gbt/package.json.'); + process.exit(1); +} + +process.stdout.write(match[1]); +NODE +} + +generate_rust_gbt_audit_lockfile() { + local napi_cli_version="$1" + + TMP_AUDIT_DIR="$(mktemp -d "${TMPDIR:-/tmp}/backend-rust-gbt-audit.XXXXXX")" + cat > "${TMP_AUDIT_DIR}/package.json" </dev/null + ) + + printf '%s\n' "${TMP_AUDIT_DIR}/package-lock.json" +} + +audit_rust_gbt_preinstall_chain() { + local napi_cli_version + local rust_gbt_lockfile + + napi_cli_version="$(get_rust_gbt_napi_cli_version)" + rust_gbt_lockfile="$(generate_rust_gbt_audit_lockfile "${napi_cli_version}")" + if [[ "${#RUST_GBT_ALLOWED[@]}" -gt 0 ]]; then + audit_lockfile "${rust_gbt_lockfile}" "backend preinstall toolchain" "${RUST_GBT_ALLOWED[@]}" + else + audit_lockfile "${rust_gbt_lockfile}" "backend preinstall toolchain" + fi +} + +audit_lockfile "${LOCKFILE}" "backend lockfile" "${BACKEND_ALLOWED[@]}" +audit_rust_gbt_preinstall_chain + +echo "OK: Backend install-script audit passed." diff --git a/backend/meta/scripts/safe-install.sh b/backend/meta/scripts/safe-install.sh new file mode 100755 index 000000000..ac5ed7d39 --- /dev/null +++ b/backend/meta/scripts/safe-install.sh @@ -0,0 +1,55 @@ +#!/usr/bin/env bash +# +# Safely install backend npm dependencies by refreshing the lockfile without +# running install scripts, auditing it, then doing the real install. +# +# Usage (from repo root): +# backend/meta/scripts/safe-install.sh +# + +set -euo pipefail + +SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" +BACKEND_DIR="$(cd "${SCRIPT_DIR}/../.." && pwd)" +LOCKFILE="${BACKEND_DIR}/package-lock.json" +RESTORE_LOCKFILE_DONE=0 + +# Back up the lockfile so we can restore on failure +if [[ -f "$LOCKFILE" ]]; then + cp "$LOCKFILE" "${LOCKFILE}.bak" +fi + +restore_lockfile() { + trap - ERR INT TERM + if [[ "${RESTORE_LOCKFILE_DONE}" -eq 1 ]]; then + return + fi + RESTORE_LOCKFILE_DONE=1 + + if [[ -f "${LOCKFILE}.bak" ]]; then + mv "${LOCKFILE}.bak" "$LOCKFILE" + echo "Restored original package-lock.json." + elif [[ -f "$LOCKFILE" ]]; then + rm "$LOCKFILE" + echo "Removed generated package-lock.json." + fi +} + +trap restore_lockfile ERR INT TERM + +echo "==> Refreshing backend lockfile (--ignore-scripts --package-lock-only)..." +(cd "$BACKEND_DIR" && npm install --ignore-scripts --package-lock-only --no-audit --no-fund) + +echo "" +echo "==> Auditing lockfile for install scripts..." +bash "${SCRIPT_DIR}/check-install-scripts.sh" + +trap - ERR INT TERM +rm -f "${LOCKFILE}.bak" + +echo "" +echo "==> Installing backend (npm ci)..." +(cd "$BACKEND_DIR" && npm ci) + +echo "" +echo "Done." diff --git a/backend/package-lock.json b/backend/package-lock.json index b9b37f733..532b22092 100644 --- a/backend/package-lock.json +++ b/backend/package-lock.json @@ -1,28 +1,28 @@ { "name": "mempool-backend", - "version": "3.3-dev", + "version": "3.4-dev", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "mempool-backend", - "version": "3.3-dev", + "version": "3.4-dev", "hasInstallScript": true, "license": "GNU Affero General Public License v3.0", "dependencies": { "@mempool/electrum-client": "1.1.9", "@types/node": "^18.15.3", - "axios": "1.13.5", + "axios": "1.16.1", "bitcoinjs-lib": "~6.1.3", "crypto-js": "~4.2.0", "express": "~4.22.1", "maxmind": "~4.3.11", - "mysql2": "~3.17.1", + "mysql2": "~3.22.4", "redis": "^4.7.0", "rust-gbt": "file:./rust-gbt", "socks-proxy-agent": "~7.0.0", "typescript": "~4.9.3", - "ws": "~8.19.0" + "ws": "~8.21.0" }, "devDependencies": { "@types/compression": "^1.7.2", @@ -749,29 +749,6 @@ "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==", "dev": true }, - "node_modules/@isaacs/balanced-match": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/@isaacs/balanced-match/-/balanced-match-4.0.1.tgz", - "integrity": "sha512-yzMTt9lEb8Gv7zRioUilSglI0c0smZ9k5D65677DLWLtWJaXIS3CqcGyUFByYKlnUj6TkjLVs54fBl6+TiGQDQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": "20 || >=22" - } - }, - "node_modules/@isaacs/brace-expansion": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/@isaacs/brace-expansion/-/brace-expansion-5.0.0.tgz", - "integrity": "sha512-ZT55BDLV0yv0RBm2czMiZ+SqCGO7AvmOM3G/w2xhVPH+te0aKgFjmBvGlL1dH+ql2tgGO3MVrbb3jCKyvpgnxA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@isaacs/balanced-match": "^4.0.1" - }, - "engines": { - "node": "20 || >=22" - } - }, "node_modules/@isaacs/cliui": { "version": "8.0.2", "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz", @@ -2401,10 +2378,11 @@ } }, "node_modules/ajv": { - "version": "6.12.6", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", - "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", + "version": "6.14.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.14.0.tgz", + "integrity": "sha512-IWrosm/yrn43eiKqkfkHis7QioDleaXQHdDVPKg0FSwwd/DuvyX79TZnFOnYpB7dcsFAMmtFztZuXPDvSePkFw==", "dev": true, + "license": "MIT", "dependencies": { "fast-deep-equal": "^3.1.1", "fast-json-stable-stringify": "^2.0.0", @@ -2511,13 +2489,14 @@ } }, "node_modules/axios": { - "version": "1.13.5", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.13.5.tgz", - "integrity": "sha512-cz4ur7Vb0xS4/KUN0tPWe44eqxrIu31me+fbang3ijiNscE129POzipJJA6zniq2C/Z6sJCjMimjS8Lc/GAs8Q==", + "version": "1.16.1", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.16.1.tgz", + "integrity": "sha512-caYkukvroVPO8KrzuJEb50Hm07KwfBZPEC3VeFHTsqWHvKTsy54hjJz9BS/cdaypROE2rH6xvm9mHX4fgWkr3A==", "dependencies": { - "follow-redirects": "^1.15.11", + "follow-redirects": "^1.16.0", "form-data": "^4.0.5", - "proxy-from-env": "^1.1.0" + "https-proxy-agent": "^5.0.1", + "proxy-from-env": "^2.1.0" } }, "node_modules/babel-jest": { @@ -3199,10 +3178,11 @@ } }, "node_modules/diff": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz", - "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==", + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.4.tgz", + "integrity": "sha512-X07nttJQkwkfKfvTPG/KSnE2OMdcUCao6+eXF3wmnIQRn2aPAHH3VxDbDOdegkd6JbPsXqShpvEOHfAT+nCNwQ==", "dev": true, + "license": "BSD-3-Clause", "engines": { "node": ">=0.3.1" } @@ -3874,15 +3854,16 @@ } }, "node_modules/flatted": { - "version": "3.2.7", - "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz", - "integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==", - "dev": true + "version": "3.4.2", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.4.2.tgz", + "integrity": "sha512-PjDse7RzhcPkIJwy5t7KPWQSZ9cAbzQXcafsetQoD7sOJRQlGikNbx7yZp2OotDnJyrDcbyRq3Ttb18iYOqkxA==", + "dev": true, + "license": "ISC" }, "node_modules/follow-redirects": { - "version": "1.15.11", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.11.tgz", - "integrity": "sha512-deG2P0JfjrTxl50XGCDyfI97ZGVCxIpfKYmfyrQ54n5FO/0gfIES8C/Psl6kWVDolizcaaxZJnTS0QSMxvnsBQ==", + "version": "1.16.0", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.16.0.tgz", + "integrity": "sha512-y5rN/uOsadFT/JfYwhxRS5R7Qce+g3zG97+JrtFZlC9klX/W5hD7iiLzScI4nZqUS7DNUdhPgw4xI8W2LuXlUw==", "funding": [ { "type": "individual", @@ -4111,17 +4092,40 @@ "node": ">=10.13.0" } }, + "node_modules/glob/node_modules/balanced-match": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-4.0.4.tgz", + "integrity": "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==", + "dev": true, + "license": "MIT", + "engines": { + "node": "18 || 20 || >=22" + } + }, + "node_modules/glob/node_modules/brace-expansion": { + "version": "5.0.4", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.4.tgz", + "integrity": "sha512-h+DEnpVvxmfVefa4jFbCf5HdH5YMDXRsmKflpf1pILZWRFlTbJpxeU55nJl4Smt5HQaGzg1o6RHFPJaOqnmBDg==", + "dev": true, + "license": "MIT", + "dependencies": { + "balanced-match": "^4.0.2" + }, + "engines": { + "node": "18 || 20 || >=22" + } + }, "node_modules/glob/node_modules/minimatch": { - "version": "10.1.1", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.1.1.tgz", - "integrity": "sha512-enIvLvRAFZYXJzkCYG5RKmPfrFArdLv+R+lbQ53BmIMLIry74bjKzX6iHAm8WYamJkhSSEabrWN5D97XnKObjQ==", + "version": "10.2.4", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.4.tgz", + "integrity": "sha512-oRjTw/97aTBN0RHbYCdtF1MQfvusSIBQM0IZEgzl6426+8jSC0nF1a/GmnVLpfB9yyr6g6FTqWqiZVbxrtaCIg==", "dev": true, "license": "BlueOak-1.0.0", "dependencies": { - "@isaacs/brace-expansion": "^5.0.0" + "brace-expansion": "^5.0.2" }, "engines": { - "node": "20 || >=22" + "node": "18 || 20 || >=22" }, "funding": { "url": "https://github.com/sponsors/isaacs" @@ -4260,6 +4264,18 @@ "node": ">= 0.8" } }, + "node_modules/https-proxy-agent": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz", + "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==", + "dependencies": { + "agent-base": "6", + "debug": "4" + }, + "engines": { + "node": ">= 6" + } + }, "node_modules/human-signals": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz", @@ -5475,10 +5491,11 @@ } }, "node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "version": "3.1.5", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz", + "integrity": "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==", "dev": true, + "license": "ISC", "dependencies": { "brace-expansion": "^1.1.7" }, @@ -5521,22 +5538,24 @@ "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" }, "node_modules/mysql2": { - "version": "3.17.1", - "resolved": "https://registry.npmjs.org/mysql2/-/mysql2-3.17.1.tgz", - "integrity": "sha512-UzIzdVwPXPoZm+FaJ4lNsRt28HtUwt68gpLH7NP1oSjd91M5Qn1XJzbIsSRMRc5CV3pvktLNshmbaFfMYqPBhQ==", + "version": "3.22.4", + "resolved": "https://registry.npmjs.org/mysql2/-/mysql2-3.22.4.tgz", + "integrity": "sha512-CtXYlmL7ZamiYKbmqkamQHWJROUHSfm+f3kByzGfknw7kW51mcB2ouMUqYq1XfYxbXmnWo6RhPydx6OCqdgcmQ==", "dependencies": { "aws-ssl-profiles": "^1.1.2", "denque": "^2.1.0", "generate-function": "^2.3.1", "iconv-lite": "^0.7.2", "long": "^5.3.2", - "lru.min": "^1.1.3", + "lru.min": "^1.1.4", "named-placeholders": "^1.1.6", - "seq-queue": "^0.0.5", - "sql-escaper": "^1.3.2" + "sql-escaper": "^1.3.3" }, "engines": { "node": ">= 8.0" + }, + "peerDependencies": { + "@types/node": ">= 8" } }, "node_modules/mysql2/node_modules/iconv-lite": { @@ -6009,9 +6028,12 @@ } }, "node_modules/proxy-from-env": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", - "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==" + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-2.1.0.tgz", + "integrity": "sha512-cJ+oHTW1VAEa8cJslgmUZrc+sjRKgAKl3Zyse6+PV38hZe/V6Z14TbCuXcan9F9ghlz4QrFr2c92TNF82UkYHA==", + "engines": { + "node": ">=10" + } }, "node_modules/punycode": { "version": "2.3.0", @@ -6321,11 +6343,6 @@ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" }, - "node_modules/seq-queue": { - "version": "0.0.5", - "resolved": "https://registry.npmjs.org/seq-queue/-/seq-queue-0.0.5.tgz", - "integrity": "sha512-hr3Wtp/GZIc/6DAGPDcV4/9WoZhjrkXsi5B/07QgX8tsdc6ilr7BFM6PM6rbdAX1kFSDYeZGLipIZZKyQP0O5Q==" - }, "node_modules/serve-static": { "version": "1.16.2", "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.2.tgz", @@ -6507,9 +6524,9 @@ } }, "node_modules/sql-escaper": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/sql-escaper/-/sql-escaper-1.3.2.tgz", - "integrity": "sha512-lp+ZDVfSjHt+qAK1jXBTIXBNYnbo7gnaAGwoYTH9bE89kNkXwcu6g0WjJGRsdTKVpY1z70u3Y0IgmnBOoRybHw==", + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/sql-escaper/-/sql-escaper-1.3.3.tgz", + "integrity": "sha512-BsTCV265VpTp8tm1wyIm1xqQCS+Q9NHx2Sr+WcnUrgLrQ6yiDIvHYJV5gHxsj1lMBy2zm5twLaZao8Jd+S8JJw==", "engines": { "bun": ">=1.0.0", "deno": ">=2.0.0", @@ -7176,9 +7193,9 @@ } }, "node_modules/ws": { - "version": "8.19.0", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.19.0.tgz", - "integrity": "sha512-blAT2mjOEIi0ZzruJfIhb3nps74PRWTCz1IjglWEEpQl5XS/UNama6u2/rjFkDDouqr4L67ry+1aGIALViWjDg==", + "version": "8.21.0", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.21.0.tgz", + "integrity": "sha512-Vsp28b7DRcimFQvrqu2Wek3z1iYxDCWqHYB8Qsnk/S4RfaCQzPGPyBNuVjJV3cd6UiKtUtp6sNM77gWvzcCH+g==", "engines": { "node": ">=10.0.0" }, @@ -7764,21 +7781,6 @@ "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==", "dev": true }, - "@isaacs/balanced-match": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/@isaacs/balanced-match/-/balanced-match-4.0.1.tgz", - "integrity": "sha512-yzMTt9lEb8Gv7zRioUilSglI0c0smZ9k5D65677DLWLtWJaXIS3CqcGyUFByYKlnUj6TkjLVs54fBl6+TiGQDQ==", - "dev": true - }, - "@isaacs/brace-expansion": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/@isaacs/brace-expansion/-/brace-expansion-5.0.0.tgz", - "integrity": "sha512-ZT55BDLV0yv0RBm2czMiZ+SqCGO7AvmOM3G/w2xhVPH+te0aKgFjmBvGlL1dH+ql2tgGO3MVrbb3jCKyvpgnxA==", - "dev": true, - "requires": { - "@isaacs/balanced-match": "^4.0.1" - } - }, "@isaacs/cliui": { "version": "8.0.2", "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz", @@ -8935,9 +8937,9 @@ } }, "ajv": { - "version": "6.12.6", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", - "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", + "version": "6.14.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.14.0.tgz", + "integrity": "sha512-IWrosm/yrn43eiKqkfkHis7QioDleaXQHdDVPKg0FSwwd/DuvyX79TZnFOnYpB7dcsFAMmtFztZuXPDvSePkFw==", "dev": true, "requires": { "fast-deep-equal": "^3.1.1", @@ -9014,13 +9016,14 @@ "integrity": "sha512-NZKeq9AfyQvEeNlN0zSYAaWrmBffJh3IELMZfRpJVWgrpEbtEpnjvzqBPf+mxoI287JohRDoa+/nsfqqiZmF6g==" }, "axios": { - "version": "1.13.5", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.13.5.tgz", - "integrity": "sha512-cz4ur7Vb0xS4/KUN0tPWe44eqxrIu31me+fbang3ijiNscE129POzipJJA6zniq2C/Z6sJCjMimjS8Lc/GAs8Q==", + "version": "1.16.1", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.16.1.tgz", + "integrity": "sha512-caYkukvroVPO8KrzuJEb50Hm07KwfBZPEC3VeFHTsqWHvKTsy54hjJz9BS/cdaypROE2rH6xvm9mHX4fgWkr3A==", "requires": { - "follow-redirects": "^1.15.11", + "follow-redirects": "^1.16.0", "form-data": "^4.0.5", - "proxy-from-env": "^1.1.0" + "https-proxy-agent": "^5.0.1", + "proxy-from-env": "^2.1.0" } }, "babel-jest": { @@ -9488,9 +9491,9 @@ "dev": true }, "diff": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz", - "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==", + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.4.tgz", + "integrity": "sha512-X07nttJQkwkfKfvTPG/KSnE2OMdcUCao6+eXF3wmnIQRn2aPAHH3VxDbDOdegkd6JbPsXqShpvEOHfAT+nCNwQ==", "dev": true }, "dir-glob": { @@ -10006,15 +10009,15 @@ } }, "flatted": { - "version": "3.2.7", - "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz", - "integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==", + "version": "3.4.2", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.4.2.tgz", + "integrity": "sha512-PjDse7RzhcPkIJwy5t7KPWQSZ9cAbzQXcafsetQoD7sOJRQlGikNbx7yZp2OotDnJyrDcbyRq3Ttb18iYOqkxA==", "dev": true }, "follow-redirects": { - "version": "1.15.11", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.11.tgz", - "integrity": "sha512-deG2P0JfjrTxl50XGCDyfI97ZGVCxIpfKYmfyrQ54n5FO/0gfIES8C/Psl6kWVDolizcaaxZJnTS0QSMxvnsBQ==" + "version": "1.16.0", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.16.0.tgz", + "integrity": "sha512-y5rN/uOsadFT/JfYwhxRS5R7Qce+g3zG97+JrtFZlC9klX/W5hD7iiLzScI4nZqUS7DNUdhPgw4xI8W2LuXlUw==" }, "foreground-child": { "version": "3.3.1", @@ -10145,13 +10148,28 @@ "path-scurry": "^2.0.0" }, "dependencies": { - "minimatch": { - "version": "10.1.1", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.1.1.tgz", - "integrity": "sha512-enIvLvRAFZYXJzkCYG5RKmPfrFArdLv+R+lbQ53BmIMLIry74bjKzX6iHAm8WYamJkhSSEabrWN5D97XnKObjQ==", + "balanced-match": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-4.0.4.tgz", + "integrity": "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==", + "dev": true + }, + "brace-expansion": { + "version": "5.0.4", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.4.tgz", + "integrity": "sha512-h+DEnpVvxmfVefa4jFbCf5HdH5YMDXRsmKflpf1pILZWRFlTbJpxeU55nJl4Smt5HQaGzg1o6RHFPJaOqnmBDg==", "dev": true, "requires": { - "@isaacs/brace-expansion": "^5.0.0" + "balanced-match": "^4.0.2" + } + }, + "minimatch": { + "version": "10.2.4", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.4.tgz", + "integrity": "sha512-oRjTw/97aTBN0RHbYCdtF1MQfvusSIBQM0IZEgzl6426+8jSC0nF1a/GmnVLpfB9yyr6g6FTqWqiZVbxrtaCIg==", + "dev": true, + "requires": { + "brace-expansion": "^5.0.2" } } } @@ -10254,6 +10272,15 @@ "toidentifier": "1.0.1" } }, + "https-proxy-agent": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz", + "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==", + "requires": { + "agent-base": "6", + "debug": "4" + } + }, "human-signals": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz", @@ -11105,9 +11132,9 @@ "dev": true }, "minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "version": "3.1.5", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz", + "integrity": "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==", "dev": true, "requires": { "brace-expansion": "^1.1.7" @@ -11136,19 +11163,18 @@ "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" }, "mysql2": { - "version": "3.17.1", - "resolved": "https://registry.npmjs.org/mysql2/-/mysql2-3.17.1.tgz", - "integrity": "sha512-UzIzdVwPXPoZm+FaJ4lNsRt28HtUwt68gpLH7NP1oSjd91M5Qn1XJzbIsSRMRc5CV3pvktLNshmbaFfMYqPBhQ==", + "version": "3.22.4", + "resolved": "https://registry.npmjs.org/mysql2/-/mysql2-3.22.4.tgz", + "integrity": "sha512-CtXYlmL7ZamiYKbmqkamQHWJROUHSfm+f3kByzGfknw7kW51mcB2ouMUqYq1XfYxbXmnWo6RhPydx6OCqdgcmQ==", "requires": { "aws-ssl-profiles": "^1.1.2", "denque": "^2.1.0", "generate-function": "^2.3.1", "iconv-lite": "^0.7.2", "long": "^5.3.2", - "lru.min": "^1.1.3", + "lru.min": "^1.1.4", "named-placeholders": "^1.1.6", - "seq-queue": "^0.0.5", - "sql-escaper": "^1.3.2" + "sql-escaper": "^1.3.3" }, "dependencies": { "iconv-lite": { @@ -11465,9 +11491,9 @@ } }, "proxy-from-env": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", - "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==" + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-2.1.0.tgz", + "integrity": "sha512-cJ+oHTW1VAEa8cJslgmUZrc+sjRKgAKl3Zyse6+PV38hZe/V6Z14TbCuXcan9F9ghlz4QrFr2c92TNF82UkYHA==" }, "punycode": { "version": "2.3.0", @@ -11668,11 +11694,6 @@ } } }, - "seq-queue": { - "version": "0.0.5", - "resolved": "https://registry.npmjs.org/seq-queue/-/seq-queue-0.0.5.tgz", - "integrity": "sha512-hr3Wtp/GZIc/6DAGPDcV4/9WoZhjrkXsi5B/07QgX8tsdc6ilr7BFM6PM6rbdAX1kFSDYeZGLipIZZKyQP0O5Q==" - }, "serve-static": { "version": "1.16.2", "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.2.tgz", @@ -11801,9 +11822,9 @@ } }, "sql-escaper": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/sql-escaper/-/sql-escaper-1.3.2.tgz", - "integrity": "sha512-lp+ZDVfSjHt+qAK1jXBTIXBNYnbo7gnaAGwoYTH9bE89kNkXwcu6g0WjJGRsdTKVpY1z70u3Y0IgmnBOoRybHw==" + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/sql-escaper/-/sql-escaper-1.3.3.tgz", + "integrity": "sha512-BsTCV265VpTp8tm1wyIm1xqQCS+Q9NHx2Sr+WcnUrgLrQ6yiDIvHYJV5gHxsj1lMBy2zm5twLaZao8Jd+S8JJw==" }, "stack-utils": { "version": "2.0.6", @@ -12213,9 +12234,9 @@ } }, "ws": { - "version": "8.19.0", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.19.0.tgz", - "integrity": "sha512-blAT2mjOEIi0ZzruJfIhb3nps74PRWTCz1IjglWEEpQl5XS/UNama6u2/rjFkDDouqr4L67ry+1aGIALViWjDg==", + "version": "8.21.0", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.21.0.tgz", + "integrity": "sha512-Vsp28b7DRcimFQvrqu2Wek3z1iYxDCWqHYB8Qsnk/S4RfaCQzPGPyBNuVjJV3cd6UiKtUtp6sNM77gWvzcCH+g==", "requires": {} }, "y18n": { diff --git a/backend/package.json b/backend/package.json index d81dbe9cf..fb9c335e3 100644 --- a/backend/package.json +++ b/backend/package.json @@ -1,6 +1,6 @@ { "name": "mempool-backend", - "version": "3.3-dev", + "version": "3.4-dev", "description": "Bitcoin mempool visualizer and blockchain explorer backend", "license": "GNU Affero General Public License v3.0", "homepage": "https://mempool.space", @@ -43,17 +43,17 @@ "dependencies": { "@mempool/electrum-client": "1.1.9", "@types/node": "^18.15.3", - "axios": "1.13.5", + "axios": "1.16.1", "bitcoinjs-lib": "~6.1.3", "crypto-js": "~4.2.0", "express": "~4.22.1", "maxmind": "~4.3.11", - "mysql2": "~3.17.1", + "mysql2": "~3.22.4", "rust-gbt": "file:./rust-gbt", "redis": "^4.7.0", "socks-proxy-agent": "~7.0.0", "typescript": "~4.9.3", - "ws": "~8.19.0" + "ws": "~8.21.0" }, "devDependencies": { "@types/compression": "^1.7.2", diff --git a/backend/src/__e2e__/cluster-mempool/harness/rpc-client.ts b/backend/src/__e2e__/cluster-mempool/harness/rpc-client.ts new file mode 100644 index 000000000..6ef621028 --- /dev/null +++ b/backend/src/__e2e__/cluster-mempool/harness/rpc-client.ts @@ -0,0 +1,137 @@ +import http from 'http'; + +export interface RpcConfig { + host: string; + port: number; + user: string; + pass: string; +} + +interface RpcResponse { + result: any; + error: { code: number; message: string } | null; + id: string; +} + +export class RpcClient { + private config: RpcConfig; + private idCounter = 0; + + constructor(config: RpcConfig) { + this.config = config; + } + + private async call(method: string, params: any[] = []): Promise { + const id = String(++this.idCounter); + const body = JSON.stringify({ jsonrpc: '2.0', id, method, params }); + const auth = Buffer.from(`${this.config.user}:${this.config.pass}`).toString('base64'); + + return new Promise((resolve, reject) => { + const req = http.request( + { + hostname: this.config.host, + port: this.config.port, + method: 'POST', + headers: { + 'Content-Type': 'application/json', + 'Authorization': `Basic ${auth}`, + 'Content-Length': Buffer.byteLength(body), + }, + }, + (res) => { + let data = ''; + res.on('data', (chunk) => (data += chunk)); + res.on('end', () => { + try { + const parsed: RpcResponse = JSON.parse(data); + if (parsed.error) { + reject(new Error(`RPC error ${parsed.error.code}: ${parsed.error.message}`)); + } else { + resolve(parsed.result); + } + } catch (e) { + reject(new Error(`Failed to parse RPC response: ${data.slice(0, 500)}`)); + } + }); + }, + ); + req.on('error', reject); + req.write(body); + req.end(); + }); + } + + async getRawMempool(): Promise { + return this.call('getrawmempool'); + } + + async getRawTransaction(txid: string, verbose = true): Promise { + return this.call('getrawtransaction', [txid, verbose]); + } + + async getBlockTemplate(rules: string[] = ['segwit']): Promise { + return this.call('getblocktemplate', [{ rules }]); + } + + async getMempoolEntry(txid: string): Promise { + return this.call('getmempoolentry', [txid]); + } + + async getMempoolCluster(txid: string): Promise { + return this.call('getmempoolcluster', [txid]); + } + + async getBlockCount(): Promise { + return this.call('getblockcount'); + } + + async batch(calls: { method: string; params: any[] }[]): Promise { + if (calls.length === 0) { + return []; + } + const bodies = calls.map((c) => ({ + jsonrpc: '2.0', + id: String(++this.idCounter), + method: c.method, + params: c.params, + })); + const body = JSON.stringify(bodies); + const auth = Buffer.from(`${this.config.user}:${this.config.pass}`).toString('base64'); + + return new Promise((resolve, reject) => { + const req = http.request( + { + hostname: this.config.host, + port: this.config.port, + method: 'POST', + headers: { + 'Content-Type': 'application/json', + 'Authorization': `Basic ${auth}`, + 'Content-Length': Buffer.byteLength(body), + }, + }, + (res) => { + let data = ''; + res.on('data', (chunk) => (data += chunk)); + res.on('end', () => { + try { + const parsed: RpcResponse[] = JSON.parse(data); + const results = parsed.map((r) => { + if (r.error) { + return { error: r.error }; + } + return r.result; + }); + resolve(results); + } catch (e) { + reject(new Error(`Failed to parse batch RPC response: ${data.slice(0, 500)}`)); + } + }); + }, + ); + req.on('error', reject); + req.write(body); + req.end(); + }); + } +} diff --git a/backend/src/__e2e__/cluster-mempool/harness/run-harness.ts b/backend/src/__e2e__/cluster-mempool/harness/run-harness.ts new file mode 100644 index 000000000..78c19844c --- /dev/null +++ b/backend/src/__e2e__/cluster-mempool/harness/run-harness.ts @@ -0,0 +1,463 @@ +/** + * Cluster Mempool Test Harness + * + * Standalone script that compares our ClusterMempool block template ordering + * against Bitcoin Core's getblocktemplate output. + * + * Uses the backend's own transactionUtils to fetch and convert transactions, + * ensuring fields (sigops, adjustedVsize, etc.) match exactly. + * + * Usage: + * npx ts-node src/__tests__/cluster-mempool/harness/run-harness.ts [options] + * + * Options: + * --host Override CORE_RPC host + * --port Override CORE_RPC port + * --user Override CORE_RPC username + * --pass Override CORE_RPC password + * --interval Comparison interval in ms (default: 30000) + * --poll Mempool poll interval in ms (default: 1000) + * --max Max comparisons before exit (0 = unlimited, default: 0) + */ + +import { RpcClient, RpcConfig } from './rpc-client'; + +// ─── CLI Parsing (must happen before backend imports) ─────────────────────── + +interface CliOptions { + rpcOverrides: Partial; + comparisonInterval: number; + pollInterval: number; + maxComparisons: number; +} + +function parseArgs(): CliOptions { + const args = process.argv.slice(2); + const overrides: Partial = {}; + let comparisonInterval = 30_000; + let pollInterval = 1000; + let maxComparisons = 0; + + for (let i = 0; i < args.length; i++) { + switch (args[i]) { + case '--host': + overrides.host = args[++i]; + break; + case '--port': + overrides.port = parseInt(args[++i], 10); + break; + case '--user': + overrides.user = args[++i]; + break; + case '--pass': + overrides.pass = args[++i]; + break; + case '--interval': + comparisonInterval = parseInt(args[++i], 10); + break; + case '--poll': + pollInterval = parseInt(args[++i], 10); + break; + case '--max': + maxComparisons = parseInt(args[++i], 10); + break; + } + } + + return { rpcOverrides: overrides, comparisonInterval, pollInterval, maxComparisons }; +} + +const cliOptions = parseArgs(); + +// ─── Backend Module Loading ───────────────────────────────────────────────── +// Import config first, apply CLI overrides, then import modules that depend on it. +// This works because Node's require() caches modules — when transactionUtils +// (via bitcoinClient) reads config, it sees our modified values. + +const config = require('../../../config').default; + +if (cliOptions.rpcOverrides.host) { config.CORE_RPC.HOST = cliOptions.rpcOverrides.host; } +if (cliOptions.rpcOverrides.port) { config.CORE_RPC.PORT = cliOptions.rpcOverrides.port; } +if (cliOptions.rpcOverrides.user) { config.CORE_RPC.USERNAME = cliOptions.rpcOverrides.user; } +if (cliOptions.rpcOverrides.pass) { config.CORE_RPC.PASSWORD = cliOptions.rpcOverrides.pass; } + +// Now load modules that depend on config +const bitcoinApi = require('../../../api/bitcoin/bitcoin-api-factory').default; +const transactionUtils = require('../../../api/transaction-utils').default; +const { ClusterMempool } = require('../../../cluster-mempool/cluster-mempool'); + +import { MempoolTransactionExtended } from '../../../mempool.interfaces'; +import { MempoolDiff } from '../../../cluster-mempool/cluster-mempool'; + +// ─── Main Harness ─────────────────────────────────────────────────────────── + +const TX_FETCH_BATCH_SIZE = 1000; + +class Harness { + private rpc: RpcClient; + private clusterMempool: InstanceType | null = null; + private mempool: { [txid: string]: MempoolTransactionExtended } = {}; + private knownTxids = new Set(); + private lastBlockHeight = -1; + private comparisonInterval: number; + private pollInterval: number; + private maxComparisons: number; + private pollTimer: ReturnType | null = null; + private polling = false; + private nextComparisonTime = 0; + private stats = { + templateMatches: 0, + templateMismatches: 0, + comparisons: 0, + }; + + constructor(rpcConfig: RpcConfig, opts: CliOptions) { + this.rpc = new RpcClient(rpcConfig); + this.comparisonInterval = opts.comparisonInterval; + this.pollInterval = opts.pollInterval; + this.maxComparisons = opts.maxComparisons; + } + + async run(): Promise { + console.log('=== Cluster Mempool Test Harness ==='); + console.log(`RPC: ${config.CORE_RPC.HOST}:${config.CORE_RPC.PORT}`); + console.log(`Backend: ${config.MEMPOOL.BACKEND}`); + console.log(`Poll interval: ${this.pollInterval}ms`); + console.log(`Comparison interval: ${this.comparisonInterval}ms`); + console.log(); + + // Step 1: Fetch full mempool + console.log('Fetching full mempool...'); + const txids: string[] = await bitcoinApi.$getRawMempool(); + console.log(`Got ${txids.length} txids from getrawmempool`); + + const fetchStart = Date.now(); + await this.fetchTransactions(txids); + const fetchTime = Date.now() - fetchStart; + console.log(`Fetched ${Object.keys(this.mempool).length} transactions in ${fetchTime}ms`); + + // Step 2: Initialize ClusterMempool + console.log('Building cluster mempool...'); + const buildStart = Date.now(); + this.clusterMempool = new ClusterMempool(this.mempool); + const buildTime = Date.now() - buildStart; + console.log(`Cluster mempool built in ${buildTime}ms`); + console.log(` Clusters: ${this.clusterMempool.getClusterCount()}`); + console.log(` Transactions: ${this.clusterMempool.getTxCount()}`); + console.log(); + + // Record initial block height + this.lastBlockHeight = await this.rpc.getBlockCount(); + + // Run initial comparison, then start polling + await this.runComparison(); + this.nextComparisonTime = Date.now() + this.comparisonInterval; + this.pollTimer = setInterval(() => this.pollMempool(), this.pollInterval); + + console.log('\nHarness running. Press Ctrl+C to stop.\n'); + + process.on('SIGINT', () => this.shutdown()); + process.on('SIGTERM', () => this.shutdown()); + } + + private async fetchTransactions(txids: string[]): Promise { + const added: MempoolTransactionExtended[] = []; + + for (let offset = 0; offset < txids.length; offset += TX_FETCH_BATCH_SIZE) { + let batch = txids.slice(offset, offset + TX_FETCH_BATCH_SIZE); + let txs: MempoolTransactionExtended[] = []; + let tries = 0; + while (batch.length && tries < 20) { + try { + tries++; + txs = txs.concat(await transactionUtils.$getMempoolTransactionsExtended(batch, false, false, false)); + let missing: string[] = []; + console.log(`txs: ${txs.length} of ${batch.length} fetched`); + for (const txid of batch) { + if (!txs.some(tx => tx.txid === txid)) { + console.log(`missing ${txid} at offset ${offset}, retrying`); + missing.push(txid); + } + } + batch = missing; + if (batch.length) { + await new Promise(resolve => setTimeout(resolve, 500)); + } + } catch (err: any) { + console.log(` Fetch batch failed at offset ${offset}: ${err.message}, retrying`); + } + } + + for (const tx of txs) { + this.mempool[tx.txid] = tx; + this.knownTxids.add(tx.txid); + added.push(tx); + } + + if (txids.length > TX_FETCH_BATCH_SIZE && (offset + batch.length) % 5000 < TX_FETCH_BATCH_SIZE) { + console.log(` ${offset + batch.length} / ${txids.length} fetched...`); + } + } + + return added; + } + + private async pollMempool(): Promise { + if (this.polling || !this.clusterMempool) { + return; + } + this.polling = true; + + try { + // Check for new block + const height = await this.rpc.getBlockCount(); + const newBlock = height > this.lastBlockHeight; + if (newBlock) { + console.log(`\n--- New block detected (height ${height}) ---`); + this.lastBlockHeight = height; + } + + // Get current mempool + const currentTxids = await bitcoinApi.$getRawMempool(); + const currentSet = new Set(currentTxids); + + // Find added and removed + const addedTxids: string[] = []; + for (const txid of currentTxids) { + if (!this.knownTxids.has(txid)) { + addedTxids.push(txid); + } + } + const removedTxids: string[] = []; + for (const txid of this.knownTxids) { + if (!currentSet.has(txid)) { + removedTxids.push(txid); + } + } + + if (addedTxids.length === 0 && removedTxids.length === 0) { + if (newBlock) { + await this.runComparison(); + } + return; + } + + const added = await this.fetchTransactions(addedTxids); + + const removed = removedTxids + .map(txid => this.mempool[txid]) + .filter((tx): tx is MempoolTransactionExtended => !!tx); + const diff: MempoolDiff = { added, removed, accelerations: {} }; + const t0 = Date.now(); + this.clusterMempool.applyMempoolChange(diff); + const dt = Date.now() - t0; + for (const txid of removedTxids) { + delete this.mempool[txid]; + this.knownTxids.delete(txid); + } + console.log( + `Applied${newBlock ? ' block' : ''} diff: +${added.length} -${removedTxids.length} txs in ${dt}ms` + + ` (${this.clusterMempool.getTxCount()} txs, ${this.clusterMempool.getClusterCount()} clusters)` + ); + + if (newBlock) { + await this.runComparison(); + } else if (Date.now() >= this.nextComparisonTime) { + await this.runComparison(); + this.nextComparisonTime = Date.now() + this.comparisonInterval; + } + } catch (err: any) { + console.error(`Poll error: ${err.message}`); + } finally { + this.polling = false; + } + } + + private async runComparison(): Promise { + if (!this.clusterMempool) { + return; + } + this.stats.comparisons++; + console.log(`\n=== Comparison #${this.stats.comparisons} ===`); + + // Step 1: Get Core's block template + let template: any; + try { + template = await this.rpc.getBlockTemplate(['segwit']); + } catch (err: any) { + console.log(`getblocktemplate failed: ${err.message}`); + return; + } + const coreTxids: string[] = template.transactions.map((t: any) => t.txid); + const coreSet = new Set(coreTxids); + + const missingTxids: string[] = []; + for (const txid of coreSet) { + if (!this.mempool[txid]) { + missingTxids.push(txid); + } + } + if (missingTxids.length) { + const added = await this.fetchTransactions(missingTxids); + if (added.length) { + console.log(`Reconciled: +${added.length} missing txs`); + this.clusterMempool.applyMempoolChange({ added, removed: [], accelerations: {} }); + } + } + + const ourBlocks = this.clusterMempool.getBlocks(1, true); + const ourTxids: string[] = ourBlocks[0]?.txids || []; + + await this.compareTemplateOrdering(coreTxids, ourTxids); + + this.printStats(); + + if (this.maxComparisons > 0 && this.stats.comparisons >= this.maxComparisons) { + console.log(`\nReached ${this.maxComparisons} comparisons, stopping.`); + this.shutdown(); + } + } + + private async compareTemplateOrdering(coreTxids: string[], ourTxids: string[]): Promise { + const coreSet = new Set(coreTxids); + const ourSet = new Set(ourTxids); + + let inBoth = 0; + let onlyCore = 0; + let onlyOurs = 0; + for (const txid of coreSet) { + if (ourSet.has(txid)) { + inBoth++; + } else { + onlyCore++; + } + } + for (const txid of ourSet) { + if (!coreSet.has(txid)) { + onlyOurs++; + } + } + + console.log(`Template sets: Core ${coreTxids.length} txs, Ours ${ourTxids.length} txs`); + console.log(` In both: ${inBoth}, Only Core: ${onlyCore}, Only ours: ${onlyOurs}`); + + // Build position maps for the intersection + const corePos = new Map(); + for (let i = 0; i < coreTxids.length; i++) { + if (ourSet.has(coreTxids[i])) { + corePos.set(coreTxids[i], i); + } + } + + // Filter to shared txids in each order + const sharedInCoreOrder = coreTxids.filter(t => ourSet.has(t)); + const sharedInOurOrder = ourTxids.filter(t => coreSet.has(t)); + + let exactMatches = 0; + let firstDivergence = -1; + for (let i = 0; i < sharedInCoreOrder.length; i++) { + if (sharedInCoreOrder[i] === sharedInOurOrder[i]) { + exactMatches++; + } else if (firstDivergence === -1) { + firstDivergence = i; + } + } + + const orderMatchRate = sharedInCoreOrder.length > 0 + ? (exactMatches / sharedInCoreOrder.length * 100).toFixed(1) + : 'N/A'; + console.log(` Ordering: ${orderMatchRate}% exact position match (${exactMatches}/${sharedInCoreOrder.length} shared txs)`); + + if (firstDivergence >= 0) { + const coreTx = sharedInCoreOrder[firstDivergence]; + const ourTx = sharedInOurOrder[firstDivergence]; + console.log(`\n First divergence at position ${firstDivergence}:`); + console.log(` Core wants: ${coreTx}`); + console.log(` We placed: ${ourTx} (Core has this at position ${corePos.get(ourTx)})`); + + for (const [label, txid] of [['Core tx', coreTx], ['Our tx', ourTx]] as const) { + const inOurMempool = !!this.mempool[txid]; + const info = this.clusterMempool?.getClusterInfo(txid); + console.log(`\n --- ${label}: ${txid} ---`); + console.log(` In our mempool: ${inOurMempool}`); + if (inOurMempool) { + const tx = this.mempool[txid]; + console.log(` fee=${tx.fee} weight=${tx.weight} vsize=${tx.vsize} sigops=${tx.sigops} adjustedVsize=${tx.adjustedVsize}`); + } + if (info) { + console.log(` clusterId=${info.clusterId} chunkIndex=${info.chunkIndex} chunkFeerate=${info.chunkFeerate.toFixed(6)}`); + const cluster = this.clusterMempool?.getCluster(info.clusterId); + if (cluster) { + console.log(` Cluster has ${cluster.chunks.length} chunk(s):`); + for (let ci = 0; ci < cluster.chunks.length; ci++) { + const c = cluster.chunks[ci]; + console.log(` chunk[${ci}]: ${c.txs.length} txs, feerate=${c.feerate.toFixed(6)}`); + if (ci === info.chunkIndex) { + const chunkTxids = c.txs.map((idx: number) => cluster.txs[idx]?.txid).filter(Boolean); + for (const tid of chunkTxids) { + const t = this.mempool[tid]; + const parents = t?.vin + ?.filter(v => !v.is_coinbase && this.mempool[v.txid] && chunkTxids.includes(v.txid)) + .map(v => v.txid.substring(0, 12)) || []; + console.log(` ${tid.substring(0, 12)} fee=${t?.fee} size=${(t?.weight || 0) / 4} sigops=${t?.sigops} parents=[${parents.join(', ')}]`); + } + } + } + } + } else { + console.log(` NOT in our cluster mempool`); + } + } + + for (const [label, txid] of [['Core', coreTx], ['Our', ourTx]] as const) { + try { + const coreCluster = await this.rpc.getMempoolCluster(txid); + console.log(`\n --- Core cluster for ${label} tx ${txid.substring(0, 12)} ---`); + console.log(` Raw response: ${JSON.stringify(coreCluster).substring(0, 2000)}`); + } catch (e: any) { + console.log(` Failed to get Core cluster for ${label} tx: ${e.message}`); + } + } + + this.stats.templateMismatches++; + } else if (sharedInCoreOrder.length === coreTxids.length && sharedInCoreOrder.length === ourTxids.length) { + console.log(` PERFECT MATCH`); + this.stats.templateMatches++; + } else { + console.log(` Ordering matches for shared txs, but sets differ`); + this.stats.templateMatches++; + } + } + + private printStats(): void { + console.log('\n--- Cumulative Stats ---'); + const total = this.stats.templateMatches + this.stats.templateMismatches; + console.log(`Template comparisons: ${total} (${this.stats.templateMatches} perfect, ${this.stats.templateMismatches} divergent)`); + } + + private shutdown(): void { + console.log('\nShutting down...'); + if (this.pollTimer) { + clearInterval(this.pollTimer); + } + this.printStats(); + process.exit(0); + } +} + +// ─── Entry Point ──────────────────────────────────────────────────────────── + +const rpcConfig: RpcConfig = { + host: config.CORE_RPC.HOST, + port: config.CORE_RPC.PORT, + user: config.CORE_RPC.USERNAME, + pass: config.CORE_RPC.PASSWORD, +}; + +console.log(`Connecting to Bitcoin Core at ${rpcConfig.host}:${rpcConfig.port}`); + +const harness = new Harness(rpcConfig, cliOptions); +harness.run().catch((err) => { + console.error('Harness failed:', err); + process.exit(1); +}); diff --git a/backend/src/__fixtures__/mempool-config.template.json b/backend/src/__fixtures__/mempool-config.template.json index 0ca5654a5..688a9ba37 100644 --- a/backend/src/__fixtures__/mempool-config.template.json +++ b/backend/src/__fixtures__/mempool-config.template.json @@ -32,6 +32,8 @@ "AUDIT": true, "RUST_GBT": false, "LIMIT_GBT": false, + "CLUSTER_MEMPOOL": false, + "CLUSTER_MEMPOOL_INDEXING": false, "CPFP_INDEXING": true, "MAX_BLOCKS_BULK_QUERY": 999, "DISK_CACHE_BLOCK_INTERVAL": 999, diff --git a/backend/src/__tests__/cluster-mempool/cluster-mempool.test.ts b/backend/src/__tests__/cluster-mempool/cluster-mempool.test.ts new file mode 100644 index 000000000..0e857bd33 --- /dev/null +++ b/backend/src/__tests__/cluster-mempool/cluster-mempool.test.ts @@ -0,0 +1,544 @@ +import { ClusterMempool } from '../../cluster-mempool/cluster-mempool'; +import { makeTx, txid } from './test-utils'; +import { MempoolTransactionExtended } from '../../mempool.interfaces'; + +function buildMempool(txs: MempoolTransactionExtended[]): { [txid: string]: MempoolTransactionExtended } { + const mempool: { [txid: string]: MempoolTransactionExtended } = {}; + for (const tx of txs) { + mempool[tx.txid] = tx; + } + return mempool; +} + +describe('ClusterMempool', () => { + describe('constructor', () => { + it('should build clusters from mempool', () => { + const parentId = txid('a1'); + const childId = txid('a2'); + const mempool = buildMempool([ + makeTx(parentId, 100, 100), + makeTx(childId, 5000, 100, [parentId]), + ]); + const cm = new ClusterMempool(mempool); + expect(cm.getClusterCount()).toBe(1); + expect(cm.getTxCount()).toBe(2); + }); + + it('should create separate clusters for unrelated txs', () => { + const mempool = buildMempool([ + makeTx(txid('a1'), 100, 100), + makeTx(txid('b1'), 200, 100), + ]); + const cm = new ClusterMempool(mempool); + expect(cm.getClusterCount()).toBe(2); + }); + }); + + describe('getClusterInfo', () => { + it('should return cluster info for a known tx', () => { + const parentId = txid('a1'); + const childId = txid('a2'); + const mempool = buildMempool([ + makeTx(parentId, 100, 100), + makeTx(childId, 5000, 100, [parentId]), + ]); + const cm = new ClusterMempool(mempool); + const info = cm.getClusterInfo(parentId); + expect(info).not.toBeNull(); + expect(info?.chunkFeerate).toBeGreaterThan(0); + }); + + it('should return null for unknown tx', () => { + const mempool = buildMempool([makeTx(txid('a1'), 100, 100)]); + const cm = new ClusterMempool(mempool); + expect(cm.getClusterInfo(txid('zz'))).toBeNull(); + }); + }); + + describe('getCluster', () => { + it('should return cluster data with correct topology', () => { + const parentId = txid('a1'); + const childId = txid('a2'); + const mempool = buildMempool([ + makeTx(parentId, 100, 100), + makeTx(childId, 5000, 100, [parentId]), + ]); + const cm = new ClusterMempool(mempool); + const info = cm.getClusterInfo(parentId); + expect(info).not.toBeNull(); + const data = cm.getCluster(info!.clusterId); + expect(data).not.toBeNull(); + expect(data!.txs.length).toBe(2); + expect(data!.chunks.length).toBeGreaterThan(0); + }); + + it('should return null for unknown cluster id', () => { + const mempool = buildMempool([makeTx(txid('a1'), 100, 100)]); + const cm = new ClusterMempool(mempool); + expect(cm.getCluster(9999)).toBeNull(); + }); + }); + + describe('applyMempoolChange', () => { + it('should handle adding a new singleton tx', () => { + const mempool = buildMempool([makeTx(txid('a1'), 100, 100)]); + const cm = new ClusterMempool(mempool); + const initialCount = cm.getClusterCount(); + + cm.applyMempoolChange({ + added: [makeTx(txid('b1'), 200, 100)], + removed: [], + accelerations: {}, + }); + + expect(cm.getClusterCount()).toBe(initialCount + 1); + expect(cm.getTxCount()).toBe(2); + }); + + it('should skip duplicate tx additions', () => { + const mempool = buildMempool([]); + const cm = new ClusterMempool(mempool); + const tx = makeTx(txid('a1'), 100, 100); + mempool[tx.txid] = tx; + + cm.applyMempoolChange({ + added: [tx, tx], + removed: [], + accelerations: {}, + }); + + expect(cm.getClusterCount()).toBe(1); + expect(cm.getTxCount()).toBe(1); + expect(cm.getBlocks(1)[0].txids).toEqual([tx.txid]); + }); + + it('should handle removing a tx', () => { + const parentId = txid('a1'); + const childId = txid('a2'); + const childTx = makeTx(childId, 5000, 100, [parentId]); + const mempool = buildMempool([ + makeTx(parentId, 100, 100), + childTx, + ]); + const cm = new ClusterMempool(mempool); + + cm.applyMempoolChange({ + added: [], + removed: [childTx], + accelerations: {}, + }); + + expect(cm.getTxCount()).toBe(1); + expect(cm.getClusterInfo(childId)).toBeNull(); + expect(cm.getClusterInfo(parentId)).not.toBeNull(); + }); + + it('should clean spentBy when removed tx is already missing from mempool', () => { + const parentId = txid('a1'); + const childId = txid('a2'); + const childTx = makeTx(childId, 5000, 100, [parentId]); + const mempool = buildMempool([ + makeTx(parentId, 100, 100), + childTx, + ]); + const cm = new ClusterMempool(mempool); + const spentBy = (cm as unknown as { spentBy: Map }).spentBy; + + expect(spentBy.get(`${parentId}:0`)).toBe(childId); + + delete mempool[childId]; + cm.applyMempoolChange({ + added: [], + removed: [childTx], + accelerations: {}, + }); + + expect(spentBy.has(`${parentId}:0`)).toBe(false); + }); + + it('should not delete spentBy for a replacement transaction', () => { + const parentId = txid('a1'); + const replacedId = txid('a2'); + const replacementId = txid('a3'); + const replacedTx = makeTx(replacedId, 5000, 100, [parentId]); + const replacementTx = makeTx(replacementId, 6000, 100, [parentId]); + const mempool = buildMempool([ + makeTx(parentId, 100, 100), + replacementTx, + ]); + const cm = new ClusterMempool(mempool); + const spentBy = (cm as unknown as { spentBy: Map }).spentBy; + + expect(spentBy.get(`${parentId}:0`)).toBe(replacementId); + + cm.applyMempoolChange({ + added: [], + removed: [replacedTx], + accelerations: {}, + }); + + expect(spentBy.get(`${parentId}:0`)).toBe(replacementId); + }); + + it('should split cluster when middle tx is removed', () => { + const a = txid('a1'); + const b = txid('b1'); + const c = txid('c1'); + const bTx = makeTx(b, 200, 100, [a]); + const mempool = buildMempool([ + makeTx(a, 100, 100), + bTx, + makeTx(c, 300, 100, [b]), + ]); + const cm = new ClusterMempool(mempool); + expect(cm.getClusterCount()).toBe(1); + + cm.applyMempoolChange({ + added: [], + removed: [bTx], + accelerations: {}, + }); + + expect(cm.getTxCount()).toBe(2); + const infoA = cm.getClusterInfo(a); + const infoC = cm.getClusterInfo(c); + expect(infoA).not.toBeNull(); + expect(infoC).not.toBeNull(); + expect(infoA!.clusterId).not.toBe(infoC!.clusterId); + }); + + it('should handle fee changes via acceleration', () => { + const parentId = txid('a1'); + const childId = txid('a2'); + const mempool = buildMempool([ + makeTx(parentId, 100, 100), + makeTx(childId, 100, 100, [parentId]), + ]); + const cm = new ClusterMempool(mempool); + const infoBefore = cm.getClusterInfo(childId); + + cm.applyMempoolChange({ + added: [], + removed: [], + accelerations: { [childId]: { feeDelta: 49900 } }, + }); + + const infoAfter = cm.getClusterInfo(childId); + expect(infoAfter).not.toBeNull(); + expect(infoAfter!.clusterId).not.toBe(infoBefore!.clusterId); + }); + + it('should merge clusters when new tx connects them', () => { + const a = txid('a1'); + const b = txid('b1'); + const mempool = buildMempool([ + makeTx(a, 100, 100), + makeTx(b, 200, 100), + ]); + const cm = new ClusterMempool(mempool); + expect(cm.getClusterCount()).toBe(2); + + const bridgeTx = makeTx(txid('c1'), 300, 100, [a, b]); + cm.applyMempoolChange({ + added: [bridgeTx], + removed: [], + accelerations: {}, + }); + + expect(cm.getClusterCount()).toBe(1); + expect(cm.getTxCount()).toBe(3); + }); + }); + + describe('cluster merging', () => { + it('should merge 3 separate clusters when new tx bridges them', () => { + const a = txid('a1'); + const b = txid('b1'); + const c = txid('c1'); + const mempool = buildMempool([ + makeTx(a, 100, 100), + makeTx(b, 200, 100), + makeTx(c, 300, 100), + ]); + const cm = new ClusterMempool(mempool); + expect(cm.getClusterCount()).toBe(3); + + const bridge = makeTx(txid('d1'), 400, 100, [a, b, c]); + mempool[bridge.txid] = bridge; + cm.applyMempoolChange({ added: [bridge], removed: [], accelerations: {} }); + + expect(cm.getClusterCount()).toBe(1); + expect(cm.getTxCount()).toBe(4); + }); + + it('should grow cluster by 1 when new tx has parents in same cluster', () => { + const a = txid('a1'); + const b = txid('b1'); + const mempool = buildMempool([ + makeTx(a, 100, 100), + makeTx(b, 200, 100, [a]), + ]); + const cm = new ClusterMempool(mempool); + expect(cm.getClusterCount()).toBe(1); + + const c = makeTx(txid('c1'), 300, 100, [a]); + mempool[c.txid] = c; + cm.applyMempoolChange({ added: [c], removed: [], accelerations: {} }); + + expect(cm.getClusterCount()).toBe(1); + expect(cm.getTxCount()).toBe(3); + }); + + it('should grow chain incrementally', () => { + const a = txid('a1'); + const mempool = buildMempool([makeTx(a, 100, 100)]); + const cm = new ClusterMempool(mempool); + + const b = makeTx(txid('b1'), 200, 100, [a]); + mempool[b.txid] = b; + cm.applyMempoolChange({ added: [b], removed: [], accelerations: {} }); + + const c = makeTx(txid('c1'), 300, 100, [txid('b1')]); + mempool[c.txid] = c; + cm.applyMempoolChange({ added: [c], removed: [], accelerations: {} }); + + expect(cm.getClusterCount()).toBe(1); + expect(cm.getTxCount()).toBe(3); + }); + }); + + describe('cluster splitting', () => { + it('should split star into singletons when center is removed', () => { + const center = txid('center'); + const leaves = Array.from({ length: 5 }, (_, i) => txid(`leaf${i}`)); + const centerTx = makeTx(center, 100, 100); + for (let i = 1; i < 5; i++) { + centerTx.vout.push({ + scriptpubkey: '', scriptpubkey_asm: '', scriptpubkey_type: 'v0_p2wpkh', value: 50000, + }); + } + const leafTxs = leaves.map((l, i) => { + const tx = makeTx(l, 200, 100, [center]); + tx.vin[0].vout = i; + return tx; + }); + const mempool = buildMempool([centerTx, ...leafTxs]); + const cm = new ClusterMempool(mempool); + expect(cm.getClusterCount()).toBe(1); + + cm.applyMempoolChange({ added: [], removed: [centerTx], accelerations: {} }); + + expect(cm.getTxCount()).toBe(5); + expect(cm.getClusterCount()).toBe(5); + }); + + it('should shrink cluster without splitting when leaf is removed', () => { + const a = txid('a1'); + const b = txid('b1'); + const c = txid('c1'); + const aTx = makeTx(a, 100, 100); + aTx.vout.push({ scriptpubkey: '', scriptpubkey_asm: '', scriptpubkey_type: 'v0_p2wpkh', value: 50000 }); + const bTx = makeTx(b, 200, 100, [a]); + bTx.vin[0].vout = 0; + const cTx = makeTx(c, 300, 100, [a]); + cTx.vin[0].vout = 1; + const mempool = buildMempool([aTx, bTx, cTx]); + const cm = new ClusterMempool(mempool); + expect(cm.getClusterCount()).toBe(1); + + cm.applyMempoolChange({ added: [], removed: [cTx], accelerations: {} }); + + expect(cm.getClusterCount()).toBe(1); + expect(cm.getTxCount()).toBe(2); + }); + + it('should produce singleton when tx is removed from 2-tx cluster', () => { + const a = txid('a1'); + const b = txid('b1'); + const bTx = makeTx(b, 200, 100, [a]); + const mempool = buildMempool([ + makeTx(a, 100, 100), + bTx, + ]); + const cm = new ClusterMempool(mempool); + + cm.applyMempoolChange({ added: [], removed: [bTx], accelerations: {} }); + + expect(cm.getClusterCount()).toBe(1); + expect(cm.getTxCount()).toBe(1); + expect(cm.getClusterInfo(a)).not.toBeNull(); + }); + + it('should create 3+ components when removing a tx that bridges multiple subgraphs', () => { + const hub = txid('hub'); + const a = txid('a1'); + const b = txid('b1'); + const c = txid('c1'); + const hubTx = makeTx(hub, 100, 100); + hubTx.vout.push( + { scriptpubkey: '', scriptpubkey_asm: '', scriptpubkey_type: 'v0_p2wpkh', value: 50000 }, + { scriptpubkey: '', scriptpubkey_asm: '', scriptpubkey_type: 'v0_p2wpkh', value: 50000 }, + ); + const txA = makeTx(a, 200, 100, [hub]); + txA.vin[0].vout = 0; + const txB = makeTx(b, 300, 100, [hub]); + txB.vin[0].vout = 1; + const txC = makeTx(c, 400, 100, [hub]); + txC.vin[0].vout = 2; + const mempool = buildMempool([hubTx, txA, txB, txC]); + const cm = new ClusterMempool(mempool); + expect(cm.getClusterCount()).toBe(1); + + cm.applyMempoolChange({ added: [], removed: [hubTx], accelerations: {} }); + + expect(cm.getClusterCount()).toBe(3); + expect(cm.getTxCount()).toBe(3); + }); + }); + + describe('fee changes via accelerations', () => { + it('should increase chunk feerate when acceleration added', () => { + const a = txid('a1'); + const mempool = buildMempool([makeTx(a, 100, 100)]); + const cm = new ClusterMempool(mempool); + const infoBefore = cm.getClusterInfo(a); + expect(infoBefore).not.toBeNull(); + + cm.applyMempoolChange({ + added: [], + removed: [], + accelerations: { [a]: { feeDelta: 9900 } }, + }); + + const infoAfter = cm.getClusterInfo(a); + expect(infoAfter).not.toBeNull(); + expect(infoAfter!.chunkFeerate).toBeGreaterThan(infoBefore!.chunkFeerate); + }); + + it('should decrease chunk feerate when acceleration removed', () => { + const a = txid('a1'); + const mempool = buildMempool([makeTx(a, 100, 100)]); + const cm = new ClusterMempool(mempool, { [a]: { feeDelta: 9900 } }); + const infoBefore = cm.getClusterInfo(a); + expect(infoBefore).not.toBeNull(); + + cm.applyMempoolChange({ + added: [], + removed: [], + accelerations: {}, + }); + + const infoAfter = cm.getClusterInfo(a); + expect(infoAfter).not.toBeNull(); + expect(infoAfter!.chunkFeerate).toBeLessThan(infoBefore!.chunkFeerate); + }); + + it('should reorder chunks when acceleration shifts priorities', () => { + const a = txid('a1'); + const b = txid('b1'); + const mempool = buildMempool([ + makeTx(a, 100, 100), + makeTx(b, 200, 100, [a]), + ]); + const cm = new ClusterMempool(mempool); + const infoBBefore = cm.getClusterInfo(b); + expect(infoBBefore).not.toBeNull(); + + cm.applyMempoolChange({ + added: [], + removed: [], + accelerations: { [b]: { feeDelta: 49800 } }, + }); + + const infoBAfter = cm.getClusterInfo(b); + expect(infoBAfter).not.toBeNull(); + expect(infoBAfter!.chunkFeerate).toBeGreaterThan(infoBBefore!.chunkFeerate); + }); + }); + + describe('getBlocks', () => { + it('should return projected blocks', () => { + const txs: MempoolTransactionExtended[] = []; + for (let i = 0; i < 10; i++) { + txs.push(makeTx(txid(`t${i}`), 1000 * (i + 1), 100)); + } + const mempool = buildMempool(txs); + const cm = new ClusterMempool(mempool); + const blocks = cm.getBlocks(3); + expect(blocks.length).toBeGreaterThan(0); + expect(blocks[0].txids.length).toBeGreaterThan(0); + }); + + it('should return empty array for empty mempool', () => { + const cm = new ClusterMempool({}); + const blocks = cm.getBlocks(3); + expect(blocks.length).toBe(0); + }); + + it('should respect chunk ordering for single-cluster mempool', () => { + const a = txid('a1'); + const b = txid('b1'); + const c = txid('c1'); + const mempool = buildMempool([ + makeTx(a, 3000, 100), + makeTx(b, 200, 100, [a]), + makeTx(c, 100, 100, [b]), + ]); + const cm = new ClusterMempool(mempool); + const blocks = cm.getBlocks(1); + expect(blocks.length).toBe(1); + const txids = blocks[0].txids; + expect(txids.indexOf(a)).toBeLessThan(txids.indexOf(b)); + expect(txids.indexOf(b)).toBeLessThan(txids.indexOf(c)); + }); + + it('should maintain topological validity within blocks', () => { + const a = txid('a1'); + const b = txid('b1'); + const c = txid('c1'); + const d = txid('d1'); + const aTx = makeTx(a, 1000, 100); + aTx.vout.push({ scriptpubkey: '', scriptpubkey_asm: '', scriptpubkey_type: 'v0_p2wpkh', value: 50000 }); + const bTx = makeTx(b, 500, 100, [a]); + bTx.vin[0].vout = 0; + const cTx = makeTx(c, 500, 100, [a]); + cTx.vin[0].vout = 1; + const mempool = buildMempool([aTx, bTx, cTx, makeTx(d, 200, 100, [b, c])]); + const cm = new ClusterMempool(mempool); + const blocks = cm.getBlocks(1); + const txids = blocks[0].txids; + + expect(txids.indexOf(a)).toBeLessThan(txids.indexOf(b)); + expect(txids.indexOf(a)).toBeLessThan(txids.indexOf(c)); + expect(txids.indexOf(b)).toBeLessThan(txids.indexOf(d)); + expect(txids.indexOf(c)).toBeLessThan(txids.indexOf(d)); + }); + }); + + describe('empty and degenerate cases', () => { + it('should handle empty diff with no changes', () => { + const mempool = buildMempool([makeTx(txid('a1'), 100, 100)]); + const cm = new ClusterMempool(mempool); + const countBefore = cm.getClusterCount(); + const txCountBefore = cm.getTxCount(); + + cm.applyMempoolChange({ added: [], removed: [], accelerations: {} }); + + expect(cm.getClusterCount()).toBe(countBefore); + expect(cm.getTxCount()).toBe(txCountBefore); + }); + + it('should not crash when removing nonexistent tx', () => { + const mempool = buildMempool([makeTx(txid('a1'), 100, 100)]); + const cm = new ClusterMempool(mempool); + + cm.applyMempoolChange({ + added: [], + removed: [makeTx(txid('nonexistent'), 100, 100)], + accelerations: {}, + }); + + expect(cm.getTxCount()).toBe(1); + }); + }); +}); diff --git a/backend/src/__tests__/cluster-mempool/depgraph.test.ts b/backend/src/__tests__/cluster-mempool/depgraph.test.ts new file mode 100644 index 000000000..8fd9c48f1 --- /dev/null +++ b/backend/src/__tests__/cluster-mempool/depgraph.test.ts @@ -0,0 +1,494 @@ +import { DepGraph, sortTopological, subgraph } from '../../cluster-mempool/depgraph'; +import { buildChain, buildFanOut, buildDiamond, buildStar } from './test-utils'; + +describe('DepGraph', () => { + describe('addTransaction', () => { + it('should add a transaction and return a ClusterTx', () => { + const dg = new DepGraph(); + const tx = dg.addTransaction('tx0', 1000, 100); + expect(dg.size).toBe(1); + expect(tx.effectiveFee).toBe(1000); + expect(tx.weight).toBe(100); + expect(tx.txid).toBe('tx0'); + }); + + it('should assign distinct ClusterTx objects', () => { + const dg = new DepGraph(); + const a = dg.addTransaction('a', 100, 10); + const b = dg.addTransaction('b', 200, 20); + const c = dg.addTransaction('c', 300, 30); + expect(a).not.toBe(b); + expect(b).not.toBe(c); + expect(dg.size).toBe(3); + }); + + it('should include self in ancestors and descendants', () => { + const dg = new DepGraph(); + const tx = dg.addTransaction('tx0', 100, 10); + expect(tx.ancestors.has(tx)).toBe(true); + expect(tx.descendants.has(tx)).toBe(true); + }); + + it('should handle large clusters', () => { + const dg = new DepGraph(); + for (let i = 0; i < 100; i++) { + dg.addTransaction(`tx${i}`, 100, 10); + } + expect(dg.size).toBe(100); + }); + }); + + describe('addDependency', () => { + it('should establish parent-child relationship', () => { + const dg = new DepGraph(); + const parent = dg.addTransaction('parent', 100, 10); + const child = dg.addTransaction('child', 200, 20); + dg.addDependency(parent, child); + + expect(child.ancestors.has(parent)).toBe(true); + expect(parent.descendants.has(child)).toBe(true); + expect(child.parents.has(parent)).toBe(true); + expect(parent.children.has(child)).toBe(true); + }); + + it('should propagate ancestors transitively', () => { + const dg = new DepGraph(); + const a = dg.addTransaction('a', 100, 10); + const b = dg.addTransaction('b', 200, 20); + const c = dg.addTransaction('c', 300, 30); + dg.addDependency(a, b); + dg.addDependency(b, c); + + expect(c.ancestors.has(a)).toBe(true); + expect(c.ancestors.has(b)).toBe(true); + expect(c.ancestors.has(c)).toBe(true); + + expect(a.descendants.has(a)).toBe(true); + expect(a.descendants.has(b)).toBe(true); + expect(a.descendants.has(c)).toBe(true); + }); + + it('should handle diamond dependencies', () => { + const dg = new DepGraph(); + const a = dg.addTransaction('a', 100, 10); + const b = dg.addTransaction('b', 200, 20); + const c = dg.addTransaction('c', 300, 30); + const d = dg.addTransaction('d', 400, 40); + dg.addDependency(a, b); + dg.addDependency(a, c); + dg.addDependency(b, d); + dg.addDependency(c, d); + + expect(d.ancestors.size).toBe(4); + expect(a.descendants.size).toBe(4); + }); + }); + + describe('removeTransactions', () => { + it('should remove transactions and update sets', () => { + const dg = new DepGraph(); + const a = dg.addTransaction('a', 100, 10); + const b = dg.addTransaction('b', 200, 20); + const c = dg.addTransaction('c', 300, 30); + dg.addDependency(a, b); + dg.addDependency(b, c); + + dg.removeTransactions(new Set([b])); + expect(dg.size).toBe(2); + expect(dg.hasTx(b)).toBe(false); + expect(c.ancestors.has(b)).toBe(false); + expect(a.descendants.has(b)).toBe(false); + }); + + it('should handle slot reuse after removal', () => { + const dg = new DepGraph(); + const a = dg.addTransaction('a', 100, 10); + dg.addTransaction('b', 200, 20); + dg.removeTransactions(new Set([a])); + const c = dg.addTransaction('c', 300, 30); + expect(dg.size).toBe(2); + expect(c.txid).toBe('c'); + }); + }); + + describe('dependsOn (via ancestors)', () => { + it('should correctly identify dependencies', () => { + const dg = new DepGraph(); + const a = dg.addTransaction('a', 100, 10); + const b = dg.addTransaction('b', 200, 20); + const c = dg.addTransaction('c', 300, 30); + dg.addDependency(a, b); + + expect(b.ancestors.has(a)).toBe(true); + expect(a.ancestors.has(b)).toBe(false); + expect(c.ancestors.has(a)).toBe(false); + }); + }); + + describe('findConnectedComponents', () => { + it('should find a single component', () => { + const dg = new DepGraph(); + const a = dg.addTransaction('a', 100, 10); + const b = dg.addTransaction('b', 200, 20); + dg.addDependency(a, b); + + const components = dg.findConnectedComponents(); + expect(components.length).toBe(1); + expect(components[0].size).toBe(2); + }); + + it('should find multiple disconnected components', () => { + const dg = new DepGraph(); + const a = dg.addTransaction('a', 100, 10); + const b = dg.addTransaction('b', 200, 20); + const c = dg.addTransaction('c', 300, 30); + const d = dg.addTransaction('d', 400, 40); + dg.addDependency(a, b); + dg.addDependency(c, d); + + const components = dg.findConnectedComponents(); + expect(components.length).toBe(2); + }); + + it('should handle isolated transactions', () => { + const dg = new DepGraph(); + dg.addTransaction('a', 100, 10); + dg.addTransaction('b', 200, 20); + dg.addTransaction('c', 300, 30); + + const components = dg.findConnectedComponents(); + expect(components.length).toBe(3); + }); + }); + + describe('parents / children (direct)', () => { + it('should return only direct parents, not transitive', () => { + const dg = new DepGraph(); + const a = dg.addTransaction('a', 100, 10); + const b = dg.addTransaction('b', 200, 20); + const c = dg.addTransaction('c', 300, 30); + dg.addDependency(a, b); + dg.addDependency(b, c); + + expect(c.parents.has(b)).toBe(true); + expect(c.parents.has(a)).toBe(false); + }); + + it('should return only direct children', () => { + const dg = new DepGraph(); + const a = dg.addTransaction('a', 100, 10); + const b = dg.addTransaction('b', 200, 20); + const c = dg.addTransaction('c', 300, 30); + dg.addDependency(a, b); + dg.addDependency(b, c); + + expect(a.children.has(b)).toBe(true); + expect(a.children.has(c)).toBe(false); + }); + }); + + describe('appendTopo', () => { + it('should output in topological order', () => { + const dg = new DepGraph(); + const a = dg.addTransaction('a', 100, 10); + const b = dg.addTransaction('b', 200, 20); + const c = dg.addTransaction('c', 300, 30); + dg.addDependency(a, b); + dg.addDependency(b, c); + + const output = sortTopological(new Set([c, a, b])); + expect(output.indexOf(a)).toBeLessThan(output.indexOf(b)); + expect(output.indexOf(b)).toBeLessThan(output.indexOf(c)); + }); + }); + + describe('restrict', () => { + it('should create a subgraph with correct deps', () => { + const dg = new DepGraph(); + const a = dg.addTransaction('a', 100, 10); + const b = dg.addTransaction('b', 200, 20); + dg.addTransaction('c', 300, 30); + dg.addDependency(a, b); + + const { depgraph: sub, txMap } = subgraph(new Set([a, b])); + expect(sub.size).toBe(2); + const newA = txMap.get(a)!; + const newB = txMap.get(b)!; + expect(newB.ancestors.has(newA)).toBe(true); + }); + }); + + describe('graceful error handling', () => { + it('should no-op addDependency with non-member txs', () => { + const dg = new DepGraph(); + const a = dg.addTransaction('a', 100, 10); + const dg2 = new DepGraph(); + const foreign = dg2.addTransaction('foreign', 200, 20); + dg.addDependency(a, foreign); + dg.addDependency(foreign, a); + expect(a.ancestors.size).toBe(1); + }); + }); + + describe('deep chain topology', () => { + it('should track ancestors and descendants at each depth', () => { + const { depgraph, txs } = buildChain(20, 100, 10); + expect(depgraph.size).toBe(20); + + expect(txs[19].ancestors.size).toBe(20); + expect(txs[0].descendants.size).toBe(20); + + expect(txs[10].ancestors.size).toBe(11); + expect(txs[10].descendants.size).toBe(10); + + expect(txs[10].parents.size).toBe(1); + expect(txs[10].parents.has(txs[9])).toBe(true); + expect(txs[10].children.size).toBe(1); + expect(txs[10].children.has(txs[11])).toBe(true); + }); + }); + + describe('wide fan-out topology', () => { + it('should track parent-children relationships for 1 parent with 10 children', () => { + const { depgraph, parent, children } = buildFanOut(10, 100, 10, 50, 10); + expect(depgraph.size).toBe(11); + expect(parent.children.size).toBe(10); + expect(parent.descendants.size).toBe(11); + + for (const child of children) { + expect(child.ancestors.size).toBe(2); + expect(child.ancestors.has(parent)).toBe(true); + expect(child.parents.size).toBe(1); + expect(child.parents.has(parent)).toBe(true); + } + }); + }); + + describe('wide fan-in topology', () => { + it('should track many parents converging to one child', () => { + const dg = new DepGraph(); + const parents: any[] = []; + for (let i = 0; i < 10; i++) { + parents.push(dg.addTransaction(`p${i}`, 100, 10)); + } + const child = dg.addTransaction('child', 500, 50); + for (const p of parents) { + dg.addDependency(p, child); + } + + expect(child.parents.size).toBe(10); + expect(child.ancestors.size).toBe(11); + for (const p of parents) { + expect(p.descendants.has(child)).toBe(true); + } + }); + }); + + describe('multiple diamonds in sequence', () => { + it('should handle A→B,C→D→E,F→G topology', () => { + const dg = new DepGraph(); + const a = dg.addTransaction('a', 100, 10); + const b = dg.addTransaction('b', 100, 10); + const c = dg.addTransaction('c', 100, 10); + const d = dg.addTransaction('d', 100, 10); + const e = dg.addTransaction('e', 100, 10); + const f = dg.addTransaction('f', 100, 10); + const g = dg.addTransaction('g', 100, 10); + dg.addDependency(a, b); + dg.addDependency(a, c); + dg.addDependency(b, d); + dg.addDependency(c, d); + dg.addDependency(d, e); + dg.addDependency(d, f); + dg.addDependency(e, g); + dg.addDependency(f, g); + + expect(g.ancestors.size).toBe(7); + expect(a.descendants.size).toBe(7); + expect(d.parents.size).toBe(2); + expect(d.children.size).toBe(2); + }); + }); + + describe('disconnected subgraphs', () => { + it('should coexist in one DepGraph', () => { + const dg = new DepGraph(); + const a = dg.addTransaction('a', 100, 10); + const b = dg.addTransaction('b', 200, 20); + dg.addDependency(a, b); + + const c = dg.addTransaction('c', 300, 30); + const d = dg.addTransaction('d', 400, 40); + dg.addDependency(c, d); + + const e = dg.addTransaction('e', 500, 50); + + expect(dg.size).toBe(5); + expect(b.ancestors.has(c)).toBe(false); + expect(a.descendants.has(d)).toBe(false); + expect(e.ancestors.size).toBe(1); + expect(dg.findConnectedComponents().length).toBe(3); + }); + }); + + describe('removeTransactions edge cases', () => { + it('should remove a leaf without affecting siblings', () => { + const { depgraph, parent, children } = buildFanOut(3, 100, 10, 50, 10); + depgraph.removeTransactions(new Set([children[2]])); + expect(depgraph.size).toBe(3); + expect(parent.children.size).toBe(2); + expect(depgraph.hasTx(children[0])).toBe(true); + expect(depgraph.hasTx(children[1])).toBe(true); + }); + + it('should remove a root without affecting unrelated txs', () => { + const dg = new DepGraph(); + const a = dg.addTransaction('a', 100, 10); + const b = dg.addTransaction('b', 200, 20); + dg.addDependency(a, b); + dg.removeTransactions(new Set([a])); + expect(dg.size).toBe(1); + expect(dg.hasTx(a)).toBe(false); + expect(b.ancestors.size).toBe(1); + expect(b.ancestors.has(b)).toBe(true); + }); + + it('should break transitive edges when middle of chain is removed', () => { + const { depgraph, txs } = buildChain(5, 100, 10); + depgraph.removeTransactions(new Set([txs[2]])); + expect(depgraph.size).toBe(4); + expect(txs[0].descendants.has(txs[3])).toBe(false); + expect(txs[0].descendants.has(txs[1])).toBe(true); + expect(txs[3].ancestors.has(txs[0])).toBe(false); + expect(txs[3].descendants.has(txs[4])).toBe(true); + }); + + it('should handle batch removal of multiple txs', () => { + const { depgraph, txs } = buildChain(5, 100, 10); + depgraph.removeTransactions(new Set([txs[1], txs[3]])); + expect(depgraph.size).toBe(3); + expect(depgraph.hasTx(txs[0])).toBe(true); + expect(depgraph.hasTx(txs[2])).toBe(true); + expect(depgraph.hasTx(txs[4])).toBe(true); + }); + + it('should result in empty graph when all txs removed', () => { + const { depgraph, txs } = buildChain(3, 100, 10); + depgraph.removeTransactions(new Set(txs)); + expect(depgraph.size).toBe(0); + expect(depgraph.getTxs().size).toBe(0); + }); + + it('should produce clean state when new tx is added after removal', () => { + const dg = new DepGraph(); + const a = dg.addTransaction('a', 100, 10); + const b = dg.addTransaction('b', 200, 20); + dg.addDependency(a, b); + dg.removeTransactions(new Set([a])); + + const c = dg.addTransaction('c', 300, 30); + expect(c.ancestors.size).toBe(1); + expect(c.descendants.size).toBe(1); + expect(c.ancestors.has(c)).toBe(true); + expect(b.ancestors.has(c)).toBe(false); + }); + }); + + describe('findConnectedComponents after removal', () => { + it('should split into 2 components when bridge tx is removed', () => { + const dg = new DepGraph(); + const a = dg.addTransaction('a', 100, 10); + const b = dg.addTransaction('b', 200, 20); + const c = dg.addTransaction('c', 300, 30); + const d = dg.addTransaction('d', 400, 40); + dg.addDependency(a, b); + dg.addDependency(b, c); + dg.addDependency(d, c); + + dg.removeTransactions(new Set([b])); + const components = dg.findConnectedComponents(); + expect(components.length).toBe(2); + const sizes = components.map(comp => comp.size).sort((x, y) => x - y); + expect(sizes).toEqual([1, 2]); + }); + + it('should produce N singletons when center of star is removed', () => { + const { depgraph, center, leaves } = buildStar(5, 100, 10, 50, 10); + depgraph.removeTransactions(new Set([center])); + const components = depgraph.findConnectedComponents(); + expect(components.length).toBe(5); + for (const comp of components) { + expect(comp.size).toBe(1); + } + }); + + it('should remain 1 component when non-bridge tx is removed', () => { + const { depgraph, txs } = buildDiamond([100, 200, 300, 400], [10, 20, 30, 40]); + depgraph.removeTransactions(new Set([txs[1]])); + const components = depgraph.findConnectedComponents(); + expect(components.length).toBe(1); + }); + }); + + describe('restrict edge cases', () => { + it('should restrict to a single tx', () => { + const { depgraph, txs } = buildChain(3, 100, 10); + const { depgraph: sub } = subgraph(new Set([txs[1]])); + expect(sub.size).toBe(1); + }); + + it('should preserve edges within partial chain subset', () => { + const { depgraph, txs } = buildChain(5, 100, 10); + const subset = new Set([txs[0], txs[1], txs[2]]); + const { depgraph: sub, txMap } = subgraph(subset); + expect(sub.size).toBe(3); + + const newA = txMap.get(txs[0]); + const newB = txMap.get(txs[1]); + const newC = txMap.get(txs[2]); + if (!newA || !newB || !newC) { + throw new Error('txMap missing entries'); + } + expect(newB.ancestors.has(newA)).toBe(true); + expect(newC.ancestors.has(newB)).toBe(true); + }); + }); + + describe('sortTopological edge cases', () => { + it('should handle subset with no internal dependencies', () => { + const dg = new DepGraph(); + const a = dg.addTransaction('a', 100, 10); + const b = dg.addTransaction('b', 200, 20); + const c = dg.addTransaction('c', 300, 30); + + const output = sortTopological(new Set([a, b, c])); + expect(output.length).toBe(3); + expect(new Set(output).size).toBe(3); + }); + + it('should handle single-tx subset', () => { + const { txs } = buildChain(3, 100, 10); + const output = sortTopological(new Set([txs[1]])); + expect(output).toEqual([txs[1]]); + }); + }); + + describe('addDependency edge cases', () => { + it('should be idempotent when adding the same dependency twice', () => { + const dg = new DepGraph(); + const a = dg.addTransaction('a', 100, 10); + const b = dg.addTransaction('b', 200, 20); + dg.addDependency(a, b); + dg.addDependency(a, b); + expect(b.ancestors.size).toBe(2); + expect(a.descendants.size).toBe(2); + }); + + it('should handle redundant edge when parent is already transitive ancestor', () => { + const { depgraph, txs } = buildChain(3, 100, 10); + depgraph.addDependency(txs[0], txs[2]); + expect(txs[2].ancestors.size).toBe(3); + expect(txs[2].parents.size).toBe(2); + }); + }); +}); diff --git a/backend/src/__tests__/cluster-mempool/linearize.test.ts b/backend/src/__tests__/cluster-mempool/linearize.test.ts new file mode 100644 index 000000000..1371c59c2 --- /dev/null +++ b/backend/src/__tests__/cluster-mempool/linearize.test.ts @@ -0,0 +1,485 @@ +import { DepGraph } from '../../cluster-mempool/depgraph'; +import { chunkify, postLinearize, spanningForestLinearize, linearizeCluster } from '../../cluster-mempool/linearize'; +import { buildChain, buildFanOut, buildStar, verifyLinearization, verifyTopologicalOrder } from './test-utils'; + +describe('chunkify', () => { + it('should create one chunk per tx when feerates are decreasing', () => { + const dg = new DepGraph(); + const a = dg.addTransaction('a', 300, 10); + const b = dg.addTransaction('b', 200, 10); + const c = dg.addTransaction('c', 100, 10); + + const chunks = chunkify([a, b, c]); + expect(chunks.length).toBe(3); + expect(chunks[0].txs).toEqual([a]); + expect(chunks[1].txs).toEqual([b]); + expect(chunks[2].txs).toEqual([c]); + }); + + it('should merge all into one chunk when feerates are increasing', () => { + const dg = new DepGraph(); + const a = dg.addTransaction('a', 100, 10); + const b = dg.addTransaction('b', 200, 10); + const c = dg.addTransaction('c', 300, 10); + + const chunks = chunkify([a, b, c]); + expect(chunks.length).toBe(1); + expect(chunks[0].txs).toEqual([a, b, c]); + expect(chunks[0].fee).toBe(600); + expect(chunks[0].weight).toBe(30); + }); + + it('should NOT merge equal feerates (matching Core behavior)', () => { + const dg = new DepGraph(); + const a = dg.addTransaction('a', 100, 10); + const b = dg.addTransaction('b', 100, 10); + + const chunks = chunkify([a, b]); + expect(chunks.length).toBe(2); + }); + + it('should handle single transaction', () => { + const dg = new DepGraph(); + const a = dg.addTransaction('a', 500, 50); + + const chunks = chunkify([a]); + expect(chunks.length).toBe(1); + expect(chunks[0].fee).toBe(500); + expect(chunks[0].weight).toBe(50); + }); + + it('should handle empty linearization', () => { + const chunks = chunkify([]); + expect(chunks.length).toBe(0); + }); + + it('should produce decreasing chunk feerates', () => { + const dg = new DepGraph(); + const a = dg.addTransaction('a', 100, 10); + const b = dg.addTransaction('b', 50, 10); + const c = dg.addTransaction('c', 200, 10); + const d = dg.addTransaction('d', 30, 10); + + const chunks = chunkify([a, c, b, d]); + for (let i = 1; i < chunks.length; i++) { + const prevRate = chunks[i - 1].fee / chunks[i - 1].weight; + const curRate = chunks[i].fee / chunks[i].weight; + expect(prevRate).toBeGreaterThanOrEqual(curRate); + } + }); +}); + +describe('postLinearize', () => { + it('should improve a bad linearization', () => { + const dg = new DepGraph(); + const a = dg.addTransaction('a', 100, 100); + const b = dg.addTransaction('b', 500, 100); + + const result = postLinearize([a, b]); + expect(result[0]).toBe(b); + expect(result[1]).toBe(a); + }); + + it('should not violate dependencies', () => { + const dg = new DepGraph(); + const parent = dg.addTransaction('parent', 100, 100); + const child = dg.addTransaction('child', 500, 100); + dg.addDependency(parent, child); + + const result = postLinearize([parent, child]); + expect(result.indexOf(parent)).toBeLessThan(result.indexOf(child)); + }); + + it('should handle already-optimal ordering', () => { + const dg = new DepGraph(); + const a = dg.addTransaction('a', 500, 100); + const b = dg.addTransaction('b', 100, 100); + + const result = postLinearize([a, b]); + expect(result).toEqual([a, b]); + }); +}); + +describe('spanningForestLinearize', () => { + it('should sort independent transactions by feerate', () => { + const dg = new DepGraph(); + const a = dg.addTransaction('a', 100, 100); + const b = dg.addTransaction('b', 500, 100); + const c = dg.addTransaction('c', 300, 100); + + const result = spanningForestLinearize(dg.getTxs(), 75000); + expect(result[0]).toBe(b); + expect(result[1]).toBe(c); + expect(result[2]).toBe(a); + }); + + it('should respect dependencies', () => { + const dg = new DepGraph(); + const parent = dg.addTransaction('parent', 100, 100); + const child = dg.addTransaction('child', 500, 100); + dg.addDependency(parent, child); + + const result = spanningForestLinearize(dg.getTxs(), 75000); + expect(result.indexOf(parent)).toBeLessThan(result.indexOf(child)); + }); + + it('should handle CPFP pattern', () => { + const dg = new DepGraph(); + const a = dg.addTransaction('a', 100, 100); + const b = dg.addTransaction('b', 10000, 100); + dg.addDependency(a, b); + + const { chunks } = linearizeCluster(dg.getTxs(), 75000); + expect(chunks.length).toBe(1); + expect(chunks[0].txs.length).toBe(2); + }); + + it('should separate high and low feerate independent txs', () => { + const dg = new DepGraph(); + const a = dg.addTransaction('a', 1000, 100); + const b = dg.addTransaction('b', 100, 100); + + const { chunks } = linearizeCluster(dg.getTxs(), 75000); + expect(chunks.length).toBe(2); + expect(chunks[0].txs).toContain(a); + expect(chunks[1].txs).toContain(b); + }); + + it('should handle single transaction', () => { + const dg = new DepGraph(); + const a = dg.addTransaction('a', 1000, 100); + + const result = spanningForestLinearize(dg.getTxs(), 75000); + expect(result).toEqual([a]); + }); + + it('should handle empty graph', () => { + const dg = new DepGraph(); + const result = spanningForestLinearize(dg.getTxs(), 75000); + expect(result).toEqual([]); + }); +}); + +describe('minimize', () => { + it('should keep equal-feerate chain as individual chunks', () => { + const dg = new DepGraph(); + const txs: any[] = []; + for (let i = 0; i < 5; i++) { + txs.push(dg.addTransaction(`tx${i}`, 19, 140)); + } + for (let i = 1; i < 5; i++) { + dg.addDependency(txs[i - 1], txs[i]); + } + + const { chunks } = linearizeCluster(dg.getTxs(), 75000); + expect(chunks.length).toBe(5); + for (const chunk of chunks) { + expect(chunk.txs.length).toBe(1); + } + }); + + it('should merge chain where child has strictly higher feerate', () => { + const dg = new DepGraph(); + const parent = dg.addTransaction('parent', 100, 200); + const child = dg.addTransaction('child', 900, 100); + dg.addDependency(parent, child); + + const { chunks } = linearizeCluster(dg.getTxs(), 75000); + expect(chunks.length).toBe(1); + expect(chunks[0].txs.length).toBe(2); + }); + + it('should split parent-child with equal feerate', () => { + const dg = new DepGraph(); + const parent = dg.addTransaction('parent', 1720, 344); + const child = dg.addTransaction('child', 1240, 248); + dg.addDependency(parent, child); + + const { chunks } = linearizeCluster(dg.getTxs(), 75000); + expect(chunks.length).toBe(2); + }); + + it('should split disconnected equal-feerate components', () => { + const dg = new DepGraph(); + dg.addTransaction('a', 100, 100); + dg.addTransaction('b', 100, 100); + + const { chunks } = linearizeCluster(dg.getTxs(), 75000); + expect(chunks.length).toBe(2); + expect(chunks[0].txs.length).toBe(1); + expect(chunks[1].txs.length).toBe(1); + }); +}); + +describe('chunkify edge cases', () => { + it('should produce N separate chunks when all feerates are equal', () => { + const dg = new DepGraph(); + const txs: any[] = []; + for (let i = 0; i < 5; i++) { + txs.push(dg.addTransaction(`tx${i}`, 100, 10)); + } + const chunks = chunkify(txs); + expect(chunks.length).toBe(5); + }); + + it('should handle alternating high/low feerates', () => { + const dg = new DepGraph(); + const a = dg.addTransaction('a', 1000, 10); + const b = dg.addTransaction('b', 100, 10); + const c = dg.addTransaction('c', 1000, 10); + const d = dg.addTransaction('d', 100, 10); + + const chunks = chunkify([a, b, c, d]); + for (let i = 1; i < chunks.length; i++) { + const prevRate = chunks[i - 1].fee * chunks[i].weight; + const curRate = chunks[i].fee * chunks[i - 1].weight; + expect(prevRate).toBeGreaterThanOrEqual(curRate); + } + }); + + it('should merge all when single very high feerate tx is at the end', () => { + const dg = new DepGraph(); + const a = dg.addTransaction('a', 10, 10); + const b = dg.addTransaction('b', 10, 10); + const c = dg.addTransaction('c', 10, 10); + const d = dg.addTransaction('d', 10000, 10); + + const chunks = chunkify([a, b, c, d]); + expect(chunks.length).toBe(1); + expect(chunks[0].txs.length).toBe(4); + }); + + it('should maintain non-increasing feerates for 50+ tx linearization', () => { + const dg = new DepGraph(); + const txs: any[] = []; + for (let i = 0; i < 50; i++) { + txs.push(dg.addTransaction(`tx${i}`, 5000 - i * 100, 100)); + } + const chunks = chunkify(txs); + for (let i = 1; i < chunks.length; i++) { + const prevRate = chunks[i - 1].fee * chunks[i].weight; + const curRate = chunks[i].fee * chunks[i - 1].weight; + expect(prevRate).toBeGreaterThanOrEqual(curRate); + } + }); + + it('should handle zero-fee transaction', () => { + const dg = new DepGraph(); + const a = dg.addTransaction('a', 1000, 100); + const b = dg.addTransaction('b', 0, 100); + + const chunks = chunkify([a, b]); + expect(chunks.length).toBe(2); + expect(chunks[1].fee).toBe(0); + }); +}); + +describe('postLinearize edge cases', () => { + it('should sort three independent txs by feerate', () => { + const dg = new DepGraph(); + const a = dg.addTransaction('a', 100, 100); + const b = dg.addTransaction('b', 500, 100); + const c = dg.addTransaction('c', 300, 100); + + const result = postLinearize([a, c, b]); + expect(result[0]).toBe(b); + expect(result[2]).toBe(a); + }); + + it('should respect parent-child dependency even when child has higher feerate', () => { + const dg = new DepGraph(); + const parent = dg.addTransaction('parent', 100, 100); + const child = dg.addTransaction('child', 1000, 100); + dg.addDependency(parent, child); + + const result = postLinearize([parent, child]); + expect(result[0]).toBe(parent); + expect(result[1]).toBe(child); + }); + + it('should handle chain A→B→C with CPFP-like feerates', () => { + const dg = new DepGraph(); + const a = dg.addTransaction('a', 100, 100); + const b = dg.addTransaction('b', 200, 100); + const c = dg.addTransaction('c', 10000, 100); + dg.addDependency(a, b); + dg.addDependency(b, c); + + const result = postLinearize([a, b, c]); + verifyTopologicalOrder(result); + }); +}); + +describe('SFL adversarial topologies', () => { + it('should handle comb pattern: one root with many children at different feerates', () => { + const dg = new DepGraph(); + const root = dg.addTransaction('root', 100, 100); + for (let i = 0; i < 8; i++) { + const child = dg.addTransaction(`child${i}`, (i + 1) * 500, 100); + dg.addDependency(root, child); + } + + const { linearization, chunks } = linearizeCluster(dg.getTxs(), 75000); + verifyLinearization(dg.getTxs(), linearization, chunks); + }); + + it('should handle inverted tree: many leaves → intermediates → root', () => { + const dg = new DepGraph(); + const root = dg.addTransaction('root', 100, 100); + const mid1 = dg.addTransaction('mid1', 200, 100); + const mid2 = dg.addTransaction('mid2', 300, 100); + dg.addDependency(root, mid1); + dg.addDependency(root, mid2); + + for (let i = 0; i < 4; i++) { + const leaf = dg.addTransaction(`leaf${i}`, 5000, 100); + dg.addDependency(i < 2 ? mid1 : mid2, leaf); + } + + const { linearization, chunks } = linearizeCluster(dg.getTxs(), 75000); + verifyLinearization(dg.getTxs(), linearization, chunks); + }); + + it('should handle two parallel chains with shared root', () => { + const dg = new DepGraph(); + const root = dg.addTransaction('root', 100, 100); + + let prev1: any = root; + for (let i = 0; i < 5; i++) { + const tx = dg.addTransaction(`chain1_${i}`, 200, 100); + dg.addDependency(prev1, tx); + prev1 = tx; + } + + let prev2: any = root; + for (let i = 0; i < 3; i++) { + const tx = dg.addTransaction(`chain2_${i}`, 300, 100); + dg.addDependency(prev2, tx); + prev2 = tx; + } + + const { linearization, chunks } = linearizeCluster(dg.getTxs(), 75000); + verifyLinearization(dg.getTxs(), linearization, chunks); + }); + + it('should handle deep CPFP: low-fee chain with high-fee tip', () => { + const { depgraph, txs } = buildChain(6, 10, 100); + txs[5].effectiveFee = 50000; + + const { linearization, chunks } = linearizeCluster(depgraph.getTxs(), 75000); + verifyLinearization(depgraph.getTxs(), linearization, chunks); + expect(chunks[0].txs.length).toBeGreaterThan(1); + }); + + it('should find better result than ancestor-feerate for overlapping high-feerate subsets', () => { + const dg = new DepGraph(); + const a = dg.addTransaction('a', 100, 100); + const b = dg.addTransaction('b', 100, 100); + const c = dg.addTransaction('c', 10000, 100); + dg.addDependency(a, c); + dg.addDependency(b, c); + + const { linearization, chunks } = linearizeCluster(dg.getTxs(), 75000 ); + verifyLinearization(dg.getTxs(), linearization, chunks); + const firstChunkFee = chunks[0].fee; + const firstChunkSize = chunks[0].weight; + expect(firstChunkFee / firstChunkSize).toBeGreaterThan(100 / 100); + }); +}); + +describe('linearizeCluster', () => { + it('should produce valid topological linearization', () => { + const dg = new DepGraph(); + const a = dg.addTransaction('a', 100, 10); + const b = dg.addTransaction('b', 200, 20); + const c = dg.addTransaction('c', 300, 30); + dg.addDependency(a, b); + dg.addDependency(b, c); + + const { linearization } = linearizeCluster(dg.getTxs(), 75000); + expect(linearization.indexOf(a)).toBeLessThan(linearization.indexOf(b)); + expect(linearization.indexOf(b)).toBeLessThan(linearization.indexOf(c)); + }); + + it('should produce monotonically decreasing chunk feerates', () => { + const dg = new DepGraph(); + for (let i = 0; i < 10; i++) { + dg.addTransaction(`tx${i}`, Math.floor(Math.random() * 10000) + 100, Math.floor(Math.random() * 500) + 50); + } + + const { chunks } = linearizeCluster(dg.getTxs(), 75000); + for (let i = 1; i < chunks.length; i++) { + const prevRate = chunks[i - 1].fee * chunks[i].weight; + const curRate = chunks[i].fee * chunks[i - 1].weight; + expect(prevRate).toBeGreaterThanOrEqual(curRate); + } + }); + + it('should handle complex diamond dependency graph', () => { + const dg = new DepGraph(); + const a = dg.addTransaction('a', 1000, 100); + const b = dg.addTransaction('b', 500, 100); + const c = dg.addTransaction('c', 100, 100); + const d = dg.addTransaction('d', 300, 100); + + dg.addDependency(a, b); + dg.addDependency(a, c); + dg.addDependency(b, d); + dg.addDependency(c, d); + + const { linearization, chunks } = linearizeCluster(dg.getTxs(), 75000); + verifyLinearization(dg.getTxs(), linearization, chunks); + }); + + it('should produce at-least-as-good result when given suboptimal hint', () => { + const dg = new DepGraph(); + const a = dg.addTransaction('a', 500, 100); + const b = dg.addTransaction('b', 100, 100); + const c = dg.addTransaction('c', 1000, 100); + + const suboptimal = [b, a, c]; + const { chunks: hintChunks } = linearizeCluster(dg.getTxs(), 75000, suboptimal); + const { chunks: freshChunks } = linearizeCluster(dg.getTxs(), 75000); + + const hintFirstFeerate = hintChunks[0].fee * freshChunks[0].weight; + const freshFirstFeerate = freshChunks[0].fee * hintChunks[0].weight; + expect(hintFirstFeerate).toBeGreaterThanOrEqual(freshFirstFeerate - 1); + }); + + it('should preserve an already-optimal linearization', () => { + const dg = new DepGraph(); + const a = dg.addTransaction('a', 1000, 100); + const b = dg.addTransaction('b', 500, 100); + const c = dg.addTransaction('c', 100, 100); + + const optimal = [a, b, c]; + const { linearization } = linearizeCluster(dg.getTxs(), 75000, optimal); + expect(linearization).toEqual(optimal); + }); + + it('should produce valid linearizations on repeated calls', () => { + const dg = new DepGraph(); + const a = dg.addTransaction('a', 100, 100); + const b = dg.addTransaction('b', 100, 100); + const c = dg.addTransaction('c', 100, 100); + dg.addDependency(a, c); + dg.addDependency(b, c); + + const result1 = linearizeCluster(dg.getTxs(), 75000); + const result2 = linearizeCluster(dg.getTxs(), 75000); + verifyLinearization(dg.getTxs(), result1.linearization, result1.chunks); + verifyLinearization(dg.getTxs(), result2.linearization, result2.chunks); + }); + + it('should pass invariant checks for fan-out topology', () => { + const { depgraph } = buildFanOut(6, 100, 100, 500, 100); + const { linearization, chunks } = linearizeCluster(depgraph.getTxs(), 75000); + verifyLinearization(depgraph.getTxs(), linearization, chunks); + }); + + it('should pass invariant checks for star topology', () => { + const { depgraph } = buildStar(5, 100, 100, 300, 100); + const { linearization, chunks } = linearizeCluster(depgraph.getTxs(), 75000); + verifyLinearization(depgraph.getTxs(), linearization, chunks); + }); +}); diff --git a/backend/src/__tests__/cluster-mempool/test-utils.ts b/backend/src/__tests__/cluster-mempool/test-utils.ts new file mode 100644 index 000000000..c2cf18ba8 --- /dev/null +++ b/backend/src/__tests__/cluster-mempool/test-utils.ts @@ -0,0 +1,175 @@ +import { MempoolTransactionExtended } from '../../mempool.interfaces'; +import { ClusterTx, DepGraph } from '../../cluster-mempool/depgraph'; +import { LinearizationChunk } from '../../cluster-mempool/linearize'; + +export function makeTx( + txid: string, + fee: number, + vsize: number, + parentTxids: string[] = [], +): MempoolTransactionExtended { + const vin = parentTxids.length > 0 + ? parentTxids.map(ptxid => ({ + txid: ptxid, + vout: 0, + is_coinbase: false, + scriptsig: '', + scriptsig_asm: '', + inner_redeemscript_asm: '', + inner_witnessscript_asm: '', + sequence: 0, + witness: [] as string[], + prevout: null, + })) + : [{ + txid: '0000000000000000000000000000000000000000000000000000000000000000', + vout: 0, + is_coinbase: false, + scriptsig: '', + scriptsig_asm: '', + inner_redeemscript_asm: '', + inner_witnessscript_asm: '', + sequence: 0, + witness: [] as string[], + prevout: null, + }]; + + return { + txid, + version: 2, + locktime: 0, + size: vsize, + weight: vsize * 4, + fee, + vin, + vout: [{ + scriptpubkey: '', + scriptpubkey_asm: '', + scriptpubkey_type: 'v0_p2wpkh', + value: 50000, + }], + status: { confirmed: false }, + vsize, + feePerVsize: fee / vsize, + effectiveFeePerVsize: fee / vsize, + order: 0, + sigops: 0, + adjustedVsize: vsize, + adjustedFeePerVsize: fee / vsize, + } as MempoolTransactionExtended; +} + +export function txid(short: string): string { + return short.padStart(64, '0'); +} + +export function buildChain( + n: number, + baseFee: number, + baseSize: number, +): { depgraph: DepGraph; txs: ClusterTx[] } { + const depgraph = new DepGraph(); + const txs: ClusterTx[] = []; + for (let i = 0; i < n; i++) { + txs.push(depgraph.addTransaction(`chain_${i}`, baseFee, baseSize)); + } + for (let i = 1; i < n; i++) { + depgraph.addDependency(txs[i - 1], txs[i]); + } + return { depgraph, txs }; +} + +export function buildFanOut( + nChildren: number, + parentFee: number, + parentSize: number, + childFee: number, + childSize: number, +): { depgraph: DepGraph; parent: ClusterTx; children: ClusterTx[] } { + const depgraph = new DepGraph(); + const parent = depgraph.addTransaction('fanout_parent', parentFee, parentSize); + const children: ClusterTx[] = []; + for (let i = 0; i < nChildren; i++) { + const child = depgraph.addTransaction(`fanout_child_${i}`, childFee, childSize); + depgraph.addDependency(parent, child); + children.push(child); + } + return { depgraph, parent, children }; +} + +export function buildDiamond( + fees: [number, number, number, number], + sizes: [number, number, number, number], +): { depgraph: DepGraph; txs: [ClusterTx, ClusterTx, ClusterTx, ClusterTx] } { + const depgraph = new DepGraph(); + const a = depgraph.addTransaction('diamond_a', fees[0], sizes[0]); + const b = depgraph.addTransaction('diamond_b', fees[1], sizes[1]); + const c = depgraph.addTransaction('diamond_c', fees[2], sizes[2]); + const d = depgraph.addTransaction('diamond_d', fees[3], sizes[3]); + depgraph.addDependency(a, b); + depgraph.addDependency(a, c); + depgraph.addDependency(b, d); + depgraph.addDependency(c, d); + return { depgraph, txs: [a, b, c, d] }; +} + +export function buildStar( + nLeaves: number, + centerFee: number, + centerSize: number, + leafFee: number, + leafSize: number, +): { depgraph: DepGraph; center: ClusterTx; leaves: ClusterTx[] } { + const depgraph = new DepGraph(); + const center = depgraph.addTransaction('star_center', centerFee, centerSize); + const leaves: ClusterTx[] = []; + for (let i = 0; i < nLeaves; i++) { + const leaf = depgraph.addTransaction(`star_leaf_${i}`, leafFee, leafSize); + depgraph.addDependency(center, leaf); + leaves.push(leaf); + } + return { depgraph, center, leaves }; +} + +export function verifyTopologicalOrder(ordering: ClusterTx[]): void { + const positionMap = new Map(); + for (let i = 0; i < ordering.length; i++) { + positionMap.set(ordering[i], i); + } + for (const tx of ordering) { + for (const parent of tx.parents) { + const parentPos = positionMap.get(parent); + const childPos = positionMap.get(tx); + if (parentPos !== undefined && childPos !== undefined) { + expect(parentPos).toBeLessThan(childPos); + } + } + } +} + +export function verifyLinearization( + txs: Set, + linearization: ClusterTx[], + chunks: LinearizationChunk[], +): void { + expect(linearization.length).toBe(txs.size); + const linSet = new Set(linearization); + expect(linSet.size).toBe(linearization.length); + for (const tx of txs) { + expect(linSet.has(tx)).toBe(true); + } + + verifyTopologicalOrder(linearization); + + for (let i = 1; i < chunks.length; i++) { + const prevRate = chunks[i - 1].fee * chunks[i].weight; + const curRate = chunks[i].fee * chunks[i - 1].weight; + expect(prevRate).toBeGreaterThanOrEqual(curRate); + } + + const chunkTxs = chunks.flatMap(c => c.txs); + expect(chunkTxs.length).toBe(linearization.length); + for (let i = 0; i < chunkTxs.length; i++) { + expect(chunkTxs[i]).toBe(linearization[i]); + } +} diff --git a/backend/src/__tests__/config.test.ts b/backend/src/__tests__/config.test.ts index cf81a5f7f..42a0b3fc8 100644 --- a/backend/src/__tests__/config.test.ts +++ b/backend/src/__tests__/config.test.ts @@ -45,6 +45,8 @@ describe('Mempool Backend Config', () => { AUDIT: false, RUST_GBT: true, LIMIT_GBT: false, + CLUSTER_MEMPOOL: false, + CLUSTER_MEMPOOL_INDEXING: false, CPFP_INDEXING: false, MAX_BLOCKS_BULK_QUERY: 0, DISK_CACHE_BLOCK_INTERVAL: 6, diff --git a/backend/src/api/about.routes.ts b/backend/src/api/about.routes.ts index 8ea052d12..f8bd0f2bc 100644 --- a/backend/src/api/about.routes.ts +++ b/backend/src/api/about.routes.ts @@ -3,6 +3,8 @@ import config from '../config'; import axios from 'axios'; import logger from '../logger'; +const PROXY_PATH_SEGMENT_REGEX = /^(?!\.{1,2}$)[^\p{Cc}/?#\\]{1,256}$/u; + class AboutRoutes { public initRoutes(app: Application) { app @@ -15,8 +17,13 @@ class AboutRoutes { } }) .get(config.MEMPOOL.API_URL_PREFIX + 'donations/images/:id', async (req, res) => { + if (!PROXY_PATH_SEGMENT_REGEX.test(req.params.id)) { + res.status(400).end(); + return; + } + try { - const response = await axios.get(`${config.EXTERNAL_DATA_SERVER.MEMPOOL_API}/donations/images/${req.params.id}`, { + const response = await axios.get(`${config.EXTERNAL_DATA_SERVER.MEMPOOL_API}/donations/images/${encodeURIComponent(req.params.id)}`, { responseType: 'stream', timeout: 10000 }); response.data.pipe(res); @@ -33,8 +40,13 @@ class AboutRoutes { } }) .get(config.MEMPOOL.API_URL_PREFIX + 'contributors/images/:id', async (req, res) => { + if (!PROXY_PATH_SEGMENT_REGEX.test(req.params.id)) { + res.status(400).end(); + return; + } + try { - const response = await axios.get(`${config.EXTERNAL_DATA_SERVER.MEMPOOL_API}/contributors/images/${req.params.id}`, { + const response = await axios.get(`${config.EXTERNAL_DATA_SERVER.MEMPOOL_API}/contributors/images/${encodeURIComponent(req.params.id)}`, { responseType: 'stream', timeout: 10000 }); response.data.pipe(res); @@ -51,8 +63,13 @@ class AboutRoutes { } }) .get(config.MEMPOOL.API_URL_PREFIX + 'translators/images/:id', async (req, res) => { + if (!PROXY_PATH_SEGMENT_REGEX.test(req.params.id)) { + res.status(400).end(); + return; + } + try { - const response = await axios.get(`${config.EXTERNAL_DATA_SERVER.MEMPOOL_API}/translators/images/${req.params.id}`, { + const response = await axios.get(`${config.EXTERNAL_DATA_SERVER.MEMPOOL_API}/translators/images/${encodeURIComponent(req.params.id)}`, { responseType: 'stream', timeout: 10000 }); response.data.pipe(res); @@ -61,7 +78,7 @@ class AboutRoutes { } }) .get(config.MEMPOOL.API_URL_PREFIX + 'services/sponsors', async (req, res) => { - const url = `${config.MEMPOOL_SERVICES.API}/${req.originalUrl.replace('/api/v1/services/', '')}`; + const url = `${config.MEMPOOL_SERVICES.API}/sponsors`; try { const response = await axios.get(url, { responseType: 'stream', timeout: 10000 }); response.data.pipe(res); @@ -71,7 +88,12 @@ class AboutRoutes { } }) .get(config.MEMPOOL.API_URL_PREFIX + 'services/account/images/:username/:md5', async (req, res) => { - const url = `${config.MEMPOOL_SERVICES.API}/${req.originalUrl.replace('/api/v1/services/', '')}`; + if (!PROXY_PATH_SEGMENT_REGEX.test(req.params.username) || !PROXY_PATH_SEGMENT_REGEX.test(req.params.md5)) { + res.status(400).end(); + return; + } + + const url = `${config.MEMPOOL_SERVICES.API}/account/images/${encodeURIComponent(req.params.username)}/${encodeURIComponent(req.params.md5)}`; try { const response = await axios.get(url, { responseType: 'stream', timeout: 10000 }); response.data.pipe(res); @@ -84,4 +106,4 @@ class AboutRoutes { } } -export default new AboutRoutes(); \ No newline at end of file +export default new AboutRoutes(); diff --git a/backend/src/api/acceleration/acceleration.routes.ts b/backend/src/api/acceleration/acceleration.routes.ts index 8be767287..372d1292c 100644 --- a/backend/src/api/acceleration/acceleration.routes.ts +++ b/backend/src/api/acceleration/acceleration.routes.ts @@ -5,16 +5,18 @@ import logger from '../../logger'; import mempool from '../mempool'; import AccelerationRepository from '../../repositories/AccelerationRepository'; +const TXID_REGEX = /^[a-f0-9]{64}$/i; + class AccelerationRoutes { private tag = 'Accelerator'; public initRoutes(app: Application): void { app .get(config.MEMPOOL.API_URL_PREFIX + 'services/accelerator/accelerations', this.$getAcceleratorAccelerations.bind(this)) - .get(config.MEMPOOL.API_URL_PREFIX + 'services/accelerator/accelerations/:txid', this.$getAcceleratorAcceleration.bind(this)) .get(config.MEMPOOL.API_URL_PREFIX + 'services/accelerator/accelerations/history', this.$getAcceleratorAccelerationsHistory.bind(this)) .get(config.MEMPOOL.API_URL_PREFIX + 'services/accelerator/accelerations/history/aggregated', this.$getAcceleratorAccelerationsHistoryAggregated.bind(this)) .get(config.MEMPOOL.API_URL_PREFIX + 'services/accelerator/accelerations/stats', this.$getAcceleratorAccelerationsStats.bind(this)) + .get(config.MEMPOOL.API_URL_PREFIX + 'services/accelerator/accelerations/:txid', this.$getAcceleratorAcceleration.bind(this)) .post(config.MEMPOOL.API_URL_PREFIX + 'services/accelerator/estimate', this.$getAcceleratorEstimate.bind(this)) ; } @@ -26,7 +28,7 @@ class AccelerationRoutes { /** @asyncUnsafe */ private async $getAcceleratorAcceleration(req: Request, res: Response): Promise { - if (req.params.txid) { + if (req.params.txid && TXID_REGEX.test(req.params.txid)) { const acceleration = await AccelerationRepository.$getAccelerationInfoForTxid(req.params.txid); if (acceleration) { res.status(200).send(acceleration); @@ -34,7 +36,7 @@ class AccelerationRoutes { res.status(404).send('Acceleration not found'); } } else { - res.status(400).send('txid is required'); + res.status(400).send('invalid txid'); } } @@ -55,9 +57,9 @@ class AccelerationRoutes { } private async $getAcceleratorAccelerationsHistoryAggregated(req: Request, res: Response): Promise { - const url = `${config.MEMPOOL_SERVICES.API}/${req.originalUrl.replace('/api/v1/services/', '')}`; + const url = `${config.MEMPOOL_SERVICES.API}/accelerator/accelerations/history/aggregated`; try { - const response = await axios.get(url, { responseType: 'stream', timeout: 10000 }); + const response = await axios.get(url, { params: req.query, responseType: 'stream', timeout: 10000 }); for (const key in response.headers) { res.setHeader(key, response.headers[key]); } @@ -69,9 +71,9 @@ class AccelerationRoutes { } private async $getAcceleratorAccelerationsStats(req: Request, res: Response): Promise { - const url = `${config.MEMPOOL_SERVICES.API}/${req.originalUrl.replace('/api/v1/services/', '')}`; + const url = `${config.MEMPOOL_SERVICES.API}/accelerator/accelerations/stats`; try { - const response = await axios.get(url, { responseType: 'stream', timeout: 10000 }); + const response = await axios.get(url, { params: req.query, responseType: 'stream', timeout: 10000 }); for (const key in response.headers) { res.setHeader(key, response.headers[key]); } @@ -83,7 +85,7 @@ class AccelerationRoutes { } private async $getAcceleratorEstimate(req: Request, res: Response): Promise { - const url = `${config.MEMPOOL_SERVICES.API}/${req.originalUrl.replace('/api/v1/services/', '')}`; + const url = `${config.MEMPOOL_SERVICES.API}/accelerator/estimate`; try { const response = await axios.post(url, req.body, { responseType: 'stream', timeout: 10000 }); for (const key in response.headers) { @@ -97,4 +99,4 @@ class AccelerationRoutes { } } -export default new AccelerationRoutes(); \ No newline at end of file +export default new AccelerationRoutes(); diff --git a/backend/src/api/audit.ts b/backend/src/api/audit.ts index 7b90c516e..cc1201919 100644 --- a/backend/src/api/audit.ts +++ b/backend/src/api/audit.ts @@ -6,11 +6,28 @@ import transactionUtils from './transaction-utils'; const PROPAGATION_MARGIN = 180; // in seconds, time since a transaction is first seen after which it is assumed to have propagated to all miners +export interface AuditResult { + unseen: string[]; + censored: string[]; + added: string[]; + prioritized: string[]; + fresh: string[]; + sigop: string[]; + fullrbf: string[]; + accelerated: string[]; + matchRate: number; + similarity: number; +} + class Audit { - auditBlock(height: number, transactions: MempoolTransactionExtended[], projectedBlocks: MempoolBlockWithTransactions[], mempool: { [txId: string]: MempoolTransactionExtended }) - : { unseen: string[], censored: string[], added: string[], prioritized: string[], fresh: string[], sigop: string[], fullrbf: string[], accelerated: string[], score: number, similarity: number } { + auditBlock( + height: number, + transactions: MempoolTransactionExtended[], + projectedBlocks: MempoolBlockWithTransactions[], + mempool: { [txId: string]: MempoolTransactionExtended } + ): AuditResult { if (!projectedBlocks?.[0]?.transactionIds || !mempool) { - return { unseen: [], censored: [], added: [], prioritized: [], fresh: [], sigop: [], fullrbf: [], accelerated: [], score: 1, similarity: 1 }; + return { unseen: [], censored: [], added: [], prioritized: [], fresh: [], sigop: [], fullrbf: [], accelerated: [], matchRate: 100, similarity: 1 }; } const matches: string[] = []; // present in both mined block and template @@ -176,6 +193,8 @@ class Audit { } const similarity = projectedWeight ? matchedWeight / projectedWeight : 1; + const matchRate = Math.round(score * 100 * 100) / 100; + return { unseen, censored: Object.keys(isCensored), @@ -185,7 +204,7 @@ class Audit { sigop: [], fullrbf: rbf, accelerated, - score, + matchRate, similarity, }; } diff --git a/backend/src/api/bitcoin/bitcoin-api-abstract-factory.ts b/backend/src/api/bitcoin/bitcoin-api-abstract-factory.ts index eaa079eb6..36fb0d7b0 100644 --- a/backend/src/api/bitcoin/bitcoin-api-abstract-factory.ts +++ b/backend/src/api/bitcoin/bitcoin-api-abstract-factory.ts @@ -57,4 +57,19 @@ export interface HealthCheckHost { unreachable: boolean; checked: boolean; lastChecked: number; + hashes?: { + frontend?: string; + hybrid?: string; + backend?: string; + electrs?: string; + ssr?: string; + core?: string; + os?: string; + lastUpdated?: number; + }; + liquidAudit?: { + pegRatio: number; + bitcoinLastBlockUpdate: number; + liquidLastBlockUpdate: number; + }; } diff --git a/backend/src/api/bitcoin/bitcoin-api.interface.ts b/backend/src/api/bitcoin/bitcoin-api.interface.ts index 22f800af7..e79b43cc6 100644 --- a/backend/src/api/bitcoin/bitcoin-api.interface.ts +++ b/backend/src/api/bitcoin/bitcoin-api.interface.ts @@ -53,6 +53,7 @@ export namespace IBitcoinApi { nTx: number; // (numeric) The number of transactions in the block previousblockhash: string; // (string) The hash of the previous block nextblockhash: string; // (string) The hash of the next block + dynamic_parameters?: any; // (object) Elements only: dynamic parameters at this block } export interface Transaction { @@ -90,6 +91,7 @@ export namespace IBitcoinApi { }; sequence: number; // (numeric) The script sequence number txinwitness?: string[]; // (string) hex-encoded witness data + pegin_witness?: string[]; // (string) Elements peg-in witness coinbase?: string; is_pegin?: boolean; // (boolean) Elements peg-in } diff --git a/backend/src/api/bitcoin/bitcoin.routes.ts b/backend/src/api/bitcoin/bitcoin.routes.ts index fafcfdbcd..2388a5618 100644 --- a/backend/src/api/bitcoin/bitcoin.routes.ts +++ b/backend/src/api/bitcoin/bitcoin.routes.ts @@ -12,7 +12,7 @@ import backendInfo from '../backend-info'; import transactionUtils from '../transaction-utils'; import { IEsploraApi } from './esplora-api.interface'; import loadingIndicators from '../loading-indicators'; -import { TransactionExtended } from '../../mempool.interfaces'; +import { CpfpInfo, TransactionExtended } from '../../mempool.interfaces'; import logger from '../../logger'; import blocks from '../blocks'; import bitcoinClient from './bitcoin-client'; @@ -23,11 +23,14 @@ import { calculateMempoolTxCpfp } from '../cpfp'; import { handleError } from '../../utils/api'; import poolsUpdater from '../../tasks/pools-updater'; import chainTips from '../chain-tips'; +import FlagValueRepository, { INTERVAL_PRESETS } from '../../repositories/FlagValueRepository'; const TXID_REGEX = /^[a-f0-9]{64}$/i; const BLOCK_HASH_REGEX = /^[a-f0-9]{64}$/i; const ADDRESS_REGEX = /^[a-z0-9]{2,120}$/i; const SCRIPT_HASH_REGEX = /^([a-f0-9]{2})+$/i; +const MAX_TRANSACTION_TIMES = 100; +const JUST_NUMBERS_REGEX = /^[1-9]\d*$/; class BitcoinRoutes { public initRoutes(app: Application) { @@ -37,6 +40,7 @@ class BitcoinRoutes { .get(config.MEMPOOL.API_URL_PREFIX + 'difficulty-adjustment', this.getDifficultyChange) .get(config.MEMPOOL.API_URL_PREFIX + 'fees/recommended', this.getRecommendedFees) .get(config.MEMPOOL.API_URL_PREFIX + 'fees/precise', this.getPreciseRecommendedFees) + .get(config.MEMPOOL.API_URL_PREFIX + 'fee-estimates', this.getPreciseRecommendedFeesEsploraTransformed) .get(config.MEMPOOL.API_URL_PREFIX + 'fees/mempool-blocks', this.getMempoolBlocks) .get(config.MEMPOOL.API_URL_PREFIX + 'backend-info', this.getBackendInfo) .get(config.MEMPOOL.API_URL_PREFIX + 'init-data', this.getInitData) @@ -59,6 +63,7 @@ class BitcoinRoutes { .get(config.MEMPOOL.API_URL_PREFIX + 'blocks-bulk/:from/:to', this.getBlocksByBulk.bind(this)) .get(config.MEMPOOL.API_URL_PREFIX + 'chain-tips', this.getChainTips.bind(this)) .get(config.MEMPOOL.API_URL_PREFIX + 'stale-tips', this.getStaleTips.bind(this)) + .get(config.MEMPOOL.API_URL_PREFIX + 'stale-tips/:height', this.getStaleTips.bind(this)) .post(config.MEMPOOL.API_URL_PREFIX + 'prevouts', this.$getPrevouts) .post(config.MEMPOOL.API_URL_PREFIX + 'cpfp', this.getCpfpLocalTxs) // Temporarily add txs/package endpoint for all backends until esplora supports it @@ -67,6 +72,10 @@ class BitcoinRoutes { .get(config.MEMPOOL.API_URL_PREFIX + 'internal/blocks/definition/list', this.getBlockDefinitionHashes) .get(config.MEMPOOL.API_URL_PREFIX + 'internal/blocks/definition/current', this.getCurrentBlockDefinitionHash) .get(config.MEMPOOL.API_URL_PREFIX + 'internal/blocks/:definitionHash', this.getBlocksByDefinitionHash) + + .get(config.MEMPOOL.API_URL_PREFIX + 'goggles/:interval/', this.getTxCountPerFlagValue) + .get(config.MEMPOOL.API_URL_PREFIX + 'goggles/:interval/:bucketSize', this.getTxCountPerFlagValue) + .get(config.MEMPOOL.API_URL_PREFIX + 'goggles/:interval/:bucketSize/:op/:mask', this.getTxCountPerFlagValue) ; if (config.MEMPOOL.BACKEND !== 'esplora') { @@ -133,6 +142,58 @@ class BitcoinRoutes { res.json(result); } + private getPreciseRecommendedFeesEsploraTransformed(req: Request, res: Response) { + if (!mempool.isInSync()) { + res.statusCode = 503; + res.send('Service Unavailable'); + return; + } + const result = feeApi.getPreciseRecommendedFee(); + + // Note: Manually tested against rust-esplora-client 0.12.3 + // to make sure the status code and extra header didn't blow everything up. + // 3xx redirects with a Location header were silently followed and caused the client to + // blow up, 4xx and 5xx caused errors in the client as well, so only 2xx was acceptable for this endpoint. + + // HTTP 203 Non-Authoritative Information is used to indicate + // that the response is not the original from the server, but a transformed version of it. + res.statusCode = 203; + res.setHeader( + 'x-warning-from-mempool', + `This endpoint is deprecated and will be removed in a future release. Please use /api/v1/fees/precise instead.`, + ); + res.json({ + '1': result.fastestFee, + '2': result.fastestFee, + '3': result.halfHourFee, + '4': result.halfHourFee, + '5': result.halfHourFee, + '6': result.hourFee, + '7': result.hourFee, + '8': result.hourFee, + '9': result.hourFee, + '10': result.hourFee, + '11': result.hourFee, + '12': result.hourFee, + '13': result.hourFee, + '14': result.hourFee, + '15': result.hourFee, + '16': result.hourFee, + '17': result.hourFee, + '18': result.hourFee, + '19': result.hourFee, + '20': result.hourFee, + '21': result.hourFee, + '22': result.hourFee, + '23': result.hourFee, + '24': result.hourFee, + '25': result.hourFee, + '144': result.economyFee, + '504': result.economyFee, + '1008': result.minimumFee, + }); + } + private getMempoolBlocks(req: Request, res: Response) { try { const result = mempoolBlocks.getMempoolBlocks(); @@ -144,11 +205,18 @@ class BitcoinRoutes { private getTransactionTimes(req: Request, res: Response) { if (!req.query.txId || typeof req.query.txId !== 'object') { - handleError(req, res, 500, 'invalid txId format'); + handleError(req, res, 400, 'invalid txId format'); return; } + + const requestedTxIds = Object.values(req.query.txId); + if (requestedTxIds.length > MAX_TRANSACTION_TIMES) { + handleError(req, res, 400, 'Too many txids requested'); + return; + } + const txIds: string[] = []; - for (const txid of Object.values(req.query.txId)) { + for (const txid of requestedTxIds) { if (typeof txid === 'string' && TXID_REGEX.test(txid)) { txIds.push(txid); } @@ -161,7 +229,7 @@ class BitcoinRoutes { private async $getBatchedOutspends(req: Request, res: Response): Promise { const txids_csv = req.query.txids; if (!txids_csv || typeof txids_csv !== 'string') { - handleError(req, res, 500, 'Invalid txids format'); + handleError(req, res, 400, 'Invalid txids format'); return; } const txids = txids_csv.split(','); @@ -184,18 +252,18 @@ class BitcoinRoutes { private async $getCpfpInfo(req: Request, res: Response) { if (!TXID_REGEX.test(req.params.txId)) { - handleError(req, res, 501, `Invalid transaction ID`); + handleError(req, res, 400, `Invalid transaction ID`); return; } const tx = mempool.getMempool()[req.params.txId]; if (tx) { if (tx?.cpfpChecked) { - res.json({ - ancestors: tx.ancestors, + const response: CpfpInfo & { acceleratedBy?: number[], acceleratedAt?: number, feeDelta?: number } = { + ancestors: tx.ancestors || [], bestDescendant: tx.bestDescendant || null, - descendants: tx.descendants || null, - effectiveFeePerVsize: tx.effectiveFeePerVsize || null, + descendants: tx.descendants, + effectiveFeePerVsize: tx.effectiveFeePerVsize, sigops: tx.sigops, fee: tx.fee, adjustedVsize: tx.adjustedVsize, @@ -203,7 +271,14 @@ class BitcoinRoutes { acceleratedBy: tx.acceleratedBy || undefined, acceleratedAt: tx.acceleratedAt || undefined, feeDelta: tx.feeDelta || undefined, - }); + }; + if (config.MEMPOOL.CLUSTER_MEMPOOL && tx.clusterId != null) { + const cluster = mempool.clusterMempool?.getClusterForApi(req.params.txId); + if (cluster) { + response.cluster = cluster; + } + } + res.json(response); return; } @@ -239,7 +314,7 @@ class BitcoinRoutes { private async getTransaction(req: Request, res: Response) { if (!TXID_REGEX.test(req.params.txId)) { - handleError(req, res, 501, `Invalid transaction ID`); + handleError(req, res, 400, `Invalid transaction ID`); return; } try { @@ -258,7 +333,7 @@ class BitcoinRoutes { private async getRawTransaction(req: Request, res: Response) { if (!TXID_REGEX.test(req.params.txId)) { - handleError(req, res, 501, `Invalid transaction ID`); + handleError(req, res, 400, `Invalid transaction ID`); return; } try { @@ -346,7 +421,7 @@ class BitcoinRoutes { private async getTransactionStatus(req: Request, res: Response) { if (!TXID_REGEX.test(req.params.txId)) { - handleError(req, res, 501, `Invalid transaction ID`); + handleError(req, res, 400, `Invalid transaction ID`); return; } try { @@ -365,7 +440,7 @@ class BitcoinRoutes { private async getStrippedBlockTransactions(req: Request, res: Response) { if (!BLOCK_HASH_REGEX.test(req.params.hash)) { - handleError(req, res, 501, `Invalid block hash`); + handleError(req, res, 400, `Invalid block hash`); return; } try { @@ -379,11 +454,11 @@ class BitcoinRoutes { private async getStrippedBlockTransaction(req: Request, res: Response) { if (!BLOCK_HASH_REGEX.test(req.params.hash)) { - handleError(req, res, 501, `Invalid block hash`); + handleError(req, res, 400, `Invalid block hash`); return; } if (!TXID_REGEX.test(req.params.txid)) { - handleError(req, res, 501, `Invalid transaction ID`); + handleError(req, res, 400, `Invalid transaction ID`); return; } try { @@ -401,7 +476,7 @@ class BitcoinRoutes { private async getBlock(req: Request, res: Response) { if (!BLOCK_HASH_REGEX.test(req.params.hash)) { - handleError(req, res, 501, `Invalid block hash`); + handleError(req, res, 400, `Invalid block hash`); return; } try { @@ -427,7 +502,7 @@ class BitcoinRoutes { private async getBlockHeader(req: Request, res: Response) { if (!BLOCK_HASH_REGEX.test(req.params.hash)) { - handleError(req, res, 501, `Invalid block hash`); + handleError(req, res, 400, `Invalid block hash`); return; } try { @@ -441,7 +516,7 @@ class BitcoinRoutes { private async getBlockAuditSummary(req: Request, res: Response) { if (!BLOCK_HASH_REGEX.test(req.params.hash)) { - handleError(req, res, 501, `Invalid block hash`); + handleError(req, res, 400, `Invalid block hash`); return; } try { @@ -460,11 +535,11 @@ class BitcoinRoutes { private async $getBlockTxAuditSummary(req: Request, res: Response) { if (!BLOCK_HASH_REGEX.test(req.params.hash)) { - handleError(req, res, 501, `Invalid block hash`); + handleError(req, res, 400, `Invalid block hash`); return; } if (!TXID_REGEX.test(req.params.txid)) { - handleError(req, res, 501, `Invalid transaction ID`); + handleError(req, res, 400, `Invalid transaction ID`); return; } try { @@ -560,14 +635,18 @@ class BitcoinRoutes { private async getStaleTips(req: Request, res: Response) { try { if (['mainnet', 'testnet', 'signet', 'testnet4', 'regtest'].includes(config.MEMPOOL.NETWORK)) { // Bitcoin - res.setHeader('Expires', new Date(Date.now() + 1000 * 60).toUTCString()); - const tips = await chainTips.getStaleTips(); - if (tips.length > 0) { - res.json(tips); - } else { - handleError(req, res, 503, `Temporarily unavailable`); - return; + let fromHeight: number | undefined; + if (req.params.height !== undefined) { + fromHeight = parseInt(req.params.height, 10); + if (isNaN(fromHeight) || fromHeight < 0) { + handleError(req, res, 400, `Parameter 'height' must be a block height (integer)`); + return; + } } + + res.setHeader('Expires', new Date(Date.now() + 1000 * 60).toUTCString()); + const tips = await chainTips.$getStaleTipsPage(fromHeight, 25); + res.json(tips); } else { // Liquid handleError(req, res, 404, `This API is only available for Bitcoin networks`); return; @@ -614,7 +693,7 @@ class BitcoinRoutes { private async getBlockTransactions(req: Request, res: Response) { if (!BLOCK_HASH_REGEX.test(req.params.hash)) { - handleError(req, res, 501, `Invalid block hash`); + handleError(req, res, 400, `Invalid block hash`); return; } try { @@ -656,7 +735,7 @@ class BitcoinRoutes { return; } if (!ADDRESS_REGEX.test(req.params.address)) { - handleError(req, res, 501, `Invalid address`); + handleError(req, res, 400, `Invalid address`); return; } @@ -664,6 +743,10 @@ class BitcoinRoutes { const addressData = await bitcoinApi.$getAddress(req.params.address); res.json(addressData); } catch (e) { + if (e instanceof Error && e.message === 'Invalid Bitcoin address') { + res.status(400).send(e.message); + return; + } if (e instanceof Error && e.message && (e.message.indexOf('too long') > 0 || e.message.indexOf('confirmed status') > 0)) { handleError(req, res, 413, e.message); return; @@ -678,7 +761,7 @@ class BitcoinRoutes { return; } if (!ADDRESS_REGEX.test(req.params.address)) { - handleError(req, res, 501, `Invalid address`); + handleError(req, res, 400, `Invalid address`); return; } @@ -690,6 +773,10 @@ class BitcoinRoutes { const transactions = await bitcoinApi.$getAddressTransactions(req.params.address, lastTxId); res.json(transactions); } catch (e) { + if (e instanceof Error && e.message === 'Invalid Bitcoin address') { + res.status(400).send(e.message); + return; + } if (e instanceof Error && e.message && (e.message.indexOf('too long') > 0 || e.message.indexOf('confirmed status') > 0)) { handleError(req, res, 413, e.message); return; @@ -704,7 +791,7 @@ class BitcoinRoutes { return; } if (!ADDRESS_REGEX.test(req.params.address)) { - handleError(req, res, 501, `Invalid address`); + handleError(req, res, 400, `Invalid address`); return; } @@ -712,6 +799,10 @@ class BitcoinRoutes { const addressData = await bitcoinApi.$getAddressUtxos(req.params.address); res.json(addressData); } catch (e) { + if (e instanceof Error && e.message === 'Invalid Bitcoin address') { + res.status(400).send(e.message); + return; + } if (e instanceof Error && e.message && (e.message.indexOf('too long') > 0 || e.message.indexOf('confirmed status') > 0)) { handleError(req, res, 413, e.message); return; @@ -733,7 +824,7 @@ class BitcoinRoutes { return; } if (!SCRIPT_HASH_REGEX.test(req.params.scripthash)) { - handleError(req, res, 501, `Invalid scripthash`); + handleError(req, res, 400, `Invalid scripthash`); return; } @@ -757,7 +848,7 @@ class BitcoinRoutes { return; } if (!SCRIPT_HASH_REGEX.test(req.params.scripthash)) { - handleError(req, res, 501, `Invalid scripthash`); + handleError(req, res, 400, `Invalid scripthash`); return; } @@ -785,7 +876,7 @@ class BitcoinRoutes { return; } if (!SCRIPT_HASH_REGEX.test(req.params.scripthash)) { - handleError(req, res, 501, `Invalid scripthash`); + handleError(req, res, 400, `Invalid scripthash`); return; } @@ -918,7 +1009,7 @@ class BitcoinRoutes { private async getRawBlock(req: Request, res: Response) { if (!BLOCK_HASH_REGEX.test(req.params.hash)) { - handleError(req, res, 501, `Invalid block hash`); + handleError(req, res, 400, `Invalid block hash`); return; } try { @@ -932,7 +1023,7 @@ class BitcoinRoutes { private async getTxIdsForBlock(req: Request, res: Response) { if (!BLOCK_HASH_REGEX.test(req.params.hash)) { - handleError(req, res, 501, `Invalid block hash`); + handleError(req, res, 400, `Invalid block hash`); return; } try { @@ -945,7 +1036,7 @@ class BitcoinRoutes { private async validateAddress(req: Request, res: Response) { if (!ADDRESS_REGEX.test(req.params.address)) { - handleError(req, res, 501, `Invalid address`); + handleError(req, res, 400, `Invalid address`); return; } try { @@ -958,7 +1049,7 @@ class BitcoinRoutes { private async getRbfHistory(req: Request, res: Response) { if (!TXID_REGEX.test(req.params.txId)) { - handleError(req, res, 501, `Invalid transaction ID`); + handleError(req, res, 400, `Invalid transaction ID`); return; } try { @@ -993,7 +1084,7 @@ class BitcoinRoutes { private async getCachedTx(req: Request, res: Response) { if (!TXID_REGEX.test(req.params.txId)) { - handleError(req, res, 501, `Invalid transaction ID`); + handleError(req, res, 400, `Invalid transaction ID`); return; } try { @@ -1010,7 +1101,7 @@ class BitcoinRoutes { private async getTransactionOutspends(req: Request, res: Response) { if (!TXID_REGEX.test(req.params.txId)) { - handleError(req, res, 501, `Invalid transaction ID`); + handleError(req, res, 400, `Invalid transaction ID`); return; } try { @@ -1023,7 +1114,7 @@ class BitcoinRoutes { private async getTransactionMerkleProof(req: Request, res: Response): Promise { if (!TXID_REGEX.test(req.params.txId)) { - handleError(req, res, 501, `Invalid transaction ID`); + handleError(req, res, 400, `Invalid transaction ID`); return; } try { @@ -1047,6 +1138,63 @@ class BitcoinRoutes { } } + private async getTxCountPerFlagValue(req: Request, res: Response) { + try { + if (!Common.blocksSummariesIndexingEnabled()) { + handleError(req, res, 404, `Block summaries indexing is required for this API`); + return; + } + + const presets = INTERVAL_PRESETS; + const operations = ['and', 'or', 'nor', undefined]; + const intervals = Object.keys(presets); + const interval = req.params.interval; + + if (!intervals.includes(interval)) { + handleError(req, res, 400, `Invalid interval, must be one of ${intervals.toString()}`); + return; + } + + const validBucketSizes = presets[interval].bucketSizes; + const rawBucketSize = req.params.bucketSize; + const bucketSize: number = rawBucketSize === undefined ? validBucketSizes[0] : Number(rawBucketSize); + if (!Number.isInteger(bucketSize) || !validBucketSizes.includes(bucketSize)) { + handleError(req, res, 400, `Invalid bucket size, must be ${validBucketSizes.toString()}`); + return; + } + + if (!operations.includes(req.params.op)) { + handleError(req, res, 400, `Invalid operation, must be 'and', 'or', 'nor' or undefined.`); + return; + } + + if (req.params.mask && !JUST_NUMBERS_REGEX.test(req.params.mask)) { + handleError(req, res, 400, `Invalid mask value, must be a positive integer`); + return; + } + + const op = (req.params.op) as 'and' | 'or' | 'nor' | undefined; + const mask = BigInt(req.params.mask ?? 0n); + + const { tip, tail } = await FlagValueRepository.$getTipAndTailIndexedByBucketSize(bucketSize) || { tip: undefined, tail: undefined }; + + if (tip === undefined || tail === undefined) { + handleError(req, res, 400, `Failed to get latest indexed flag values for ${interval}`); + return; + } + + const totalCount = await FlagValueRepository.$getTotalBlocksIndexedByBucketSize(bucketSize === 1 ? 1008 : bucketSize) ?? tip - tail; + + const startHeight = presets[interval].retentionSpan !== -1 ? (tip - presets[interval].retentionSpan) : -1; + const txsCount = await FlagValueRepository.$queryTxCountBasedOnMask(mask, bucketSize, op, startHeight); + res.header('X-total-count', totalCount.toString()); + res.header('Expires', new Date(Date.now() + 1000 * 3600 * 24 * (presets[interval].bucketSizes[0] / 144)).toUTCString()); + res.send(txsCount); + } catch (e: any) { + handleError(req, res, 400, e instanceof Error ? e.message : 'Failed to get flag values'); + } + } + private async $postTransaction(req: Request, res: Response) { res.setHeader('content-type', 'text/plain'); try { diff --git a/backend/src/api/bitcoin/electrum-api.ts b/backend/src/api/bitcoin/electrum-api.ts index aa9765420..bf9a28c5d 100644 --- a/backend/src/api/bitcoin/electrum-api.ts +++ b/backend/src/api/bitcoin/electrum-api.ts @@ -44,23 +44,7 @@ class BitcoindElectrsApi extends BitcoinApi implements AbstractBitcoinApi { async $getAddress(address: string): Promise { const addressInfo = await this.bitcoindClient.validateAddress(address); if (!addressInfo || !addressInfo.isvalid) { - return ({ - 'address': address, - 'chain_stats': { - 'funded_txo_count': 0, - 'funded_txo_sum': 0, - 'spent_txo_count': 0, - 'spent_txo_sum': 0, - 'tx_count': 0 - }, - 'mempool_stats': { - 'funded_txo_count': 0, - 'funded_txo_sum': 0, - 'spent_txo_count': 0, - 'spent_txo_sum': 0, - 'tx_count': 0 - } - }); + throw new Error('Invalid Bitcoin address'); } try { @@ -96,7 +80,7 @@ class BitcoindElectrsApi extends BitcoinApi implements AbstractBitcoinApi { async $getAddressTransactions(address: string, lastSeenTxId: string): Promise { const addressInfo = await this.bitcoindClient.validateAddress(address); if (!addressInfo || !addressInfo.isvalid) { - return []; + throw new Error('Invalid Bitcoin address'); } try { @@ -166,7 +150,7 @@ class BitcoindElectrsApi extends BitcoinApi implements AbstractBitcoinApi { async $getAddressUtxos(address: string): Promise { const addressInfo = await this.bitcoindClient.validateAddress(address); if (!addressInfo || !addressInfo.isvalid) { - return []; + throw new Error('Invalid Bitcoin address'); } const scripthash = this.encodeScriptHash(addressInfo.scriptPubKey); return this.$getScriptHashUtxos(scripthash); diff --git a/backend/src/api/bitcoin/esplora-api.ts b/backend/src/api/bitcoin/esplora-api.ts index f4b0b400c..e15a703a2 100644 --- a/backend/src/api/bitcoin/esplora-api.ts +++ b/backend/src/api/bitcoin/esplora-api.ts @@ -32,6 +32,11 @@ interface FailoverHost { core?: string, os?: string, lastUpdated: number, + }, + liquidAudit?: { + pegRatio: number, + bitcoinLastBlockUpdate: number, + liquidLastBlockUpdate: number, } } @@ -145,6 +150,8 @@ class FailoverRouter { } } + await this.$updateLiquidAudit(host); + // Check front and backend git hashes less often if (Date.now() - host.hashes.lastUpdated > this.gitHashInterval) { await Promise.all([ @@ -351,6 +358,43 @@ class FailoverRouter { } } + private async $updateLiquidAudit(host: FailoverHost): Promise { + if (config.MEMPOOL.NETWORK !== 'liquid') { + return; + } + try { + const [reservesResponse, pegsResponse] = await Promise.all([ + this.pollConnection.get( + `${host.publicDomain}/api/v1/liquid/reserves`, { + timeout: config.ESPLORA.FALLBACK_TIMEOUT, + headers: { 'Host': 'liquid.network' } + } + ), + this.pollConnection.get( + `${host.publicDomain}/api/v1/liquid/pegs`, { + timeout: config.ESPLORA.FALLBACK_TIMEOUT, + headers: { 'Host': 'liquid.network' } + } + ), + ]); + + const reservesAmount = Number(reservesResponse.data?.amount); + const pegsAmount = Number(pegsResponse.data?.amount); + const bitcoinLastBlockUpdate = Number(reservesResponse.data?.lastBlockUpdate); + const liquidLastBlockUpdate = Number(pegsResponse.data?.lastBlockUpdate); + + if (Number.isFinite(reservesAmount) && Number.isFinite(pegsAmount) && Number.isFinite(bitcoinLastBlockUpdate) && Number.isFinite(liquidLastBlockUpdate) && pegsAmount > 0) { + host.liquidAudit = { + pegRatio: (reservesAmount / pegsAmount) * 100, + bitcoinLastBlockUpdate, + liquidLastBlockUpdate, + }; + } + } catch (e) { + // failed to get liquid audit values - do nothing + } + } + // returns the public mempool domain corresponding to an esplora server url // (a bit of a hack to avoid manually specifying frontend & backend URLs for each esplora server) private extractPublicDomain(url: string): string { @@ -585,6 +629,7 @@ class ElectrsApi implements AbstractBitcoinApi { checked: !!host.checked, lastChecked: host.lastChecked || 0, hashes: host.hashes, + ...(config.MEMPOOL.NETWORK === 'liquid' ? { liquidAudit: host.liquidAudit } : {}), })); } else { return []; diff --git a/backend/src/api/block-processor.ts b/backend/src/api/block-processor.ts new file mode 100644 index 000000000..6556e907e --- /dev/null +++ b/backend/src/api/block-processor.ts @@ -0,0 +1,262 @@ +import config from '../config'; +import logger from '../logger'; +import { + BlockExtended, + BlockSummary, + PoolTag, + MempoolTransactionExtended, + CpfpSummary, + TemplateAlgorithm, + MempoolBlockWithTransactions, +} from '../mempool.interfaces'; +import { IEsploraApi } from './bitcoin/esplora-api.interface'; +import { Acceleration } from './services/acceleration'; +import { calculateGoodBlockCpfp, calculateClusterMempoolBlockCpfp, calculateFastBlockCpfp, BlockCpfpData } from './cpfp'; +import mempoolBlocks from './mempool-blocks'; +import memPool from './mempool'; +import Audit, { AuditResult } from './audit'; +import blocks from './blocks'; +import transactionUtils from './transaction-utils'; +import { ClusterMempool } from '../cluster-mempool/cluster-mempool'; +import { Common } from './common'; +import accelerationApi from './services/acceleration'; + +interface ProcessedAudit extends AuditResult { + expectedFees: number; + expectedWeight: number; + projectedBlocks: MempoolBlockWithTransactions[]; +} + +export interface BlockProcessingResult { + templateAlgorithm: TemplateAlgorithm; + cpfpSummary: CpfpSummary; + blockExtended: BlockExtended; + blockSummary: BlockSummary; + auditResult?: ProcessedAudit; +} + +const CM_ACTIVATION_HEIGHT: { [network: string]: number } = { + 'mainnet': 940000, + 'testnet': 4860000, + 'testnet4': 125000, + 'signet': 294000, + 'regtest': 0, +}; + +class BlockProcessor { + + /** @asyncUnsafe */ + public async $processNewBlock( + block: IEsploraApi.Block, + transactions: MempoolTransactionExtended[], + pool: PoolTag, + accelerations: Record + ): Promise { + const poolAccelerations = Object.values(accelerations) + .filter(a => a.pools.includes(pool.uniqueId)) + .map(a => ({ txid: a.txid, max_bid: a.feeDelta })); + + const { templateAlgorithm, cpfpSummary } = detectTemplateAlgorithm( + block.height, + transactions, + poolAccelerations + ); + + + const blockExtended = await blocks.$getBlockExtended(block, cpfpSummary.transactions, pool); + const blockSummary = blocks.summarizeBlockTransactions(block.id, block.height, cpfpSummary.transactions); + + let auditResult: ProcessedAudit | undefined; + if (config.MEMPOOL.AUDIT && memPool.isInSync()) { + auditResult = await this.$runAudit( + blockExtended, + transactions, + templateAlgorithm, + pool, + accelerations + ); + + if (blockExtended.extras) { + blockExtended.extras.matchRate = auditResult.matchRate; + blockExtended.extras.expectedFees = auditResult.expectedFees; + blockExtended.extras.expectedWeight = auditResult.expectedWeight; + blockExtended.extras.similarity = auditResult.similarity; + } + } else if (blockExtended.extras) { + const mBlocks = mempoolBlocks.getMempoolBlocksWithTransactions(); + if (mBlocks?.length && mBlocks[0].transactions) { + blockExtended.extras.similarity = Common.getSimilarity(mBlocks[0], transactions); + } + } + + return { + templateAlgorithm, + cpfpSummary, + blockExtended, + blockSummary, + auditResult, + }; + } + + private async $runAudit( + block: BlockExtended, + transactions: MempoolTransactionExtended[], + templateAlgorithm: TemplateAlgorithm, + pool: PoolTag, + accelerations: Record + ): Promise { + const auditMempool = memPool.getMempool(); + const isAccelerated = accelerationApi.isAcceleratedBlock(block, Object.values(accelerations)); + + const candidateTxs = memPool.getMempoolCandidates(); + const candidates = (memPool.limitGBT && candidateTxs) + ? { txs: candidateTxs, added: [], removed: [] } + : undefined; + const transactionIds = (memPool.limitGBT) + ? Object.keys(candidates?.txs || {}) + : Object.keys(auditMempool); + + let projectedBlocks: MempoolBlockWithTransactions[]; + + if (templateAlgorithm === TemplateAlgorithm.clusterMempool) { + const clusterMempool = memPool.clusterMempool ?? new ClusterMempool(auditMempool, accelerations, true, 75000); + const cmBlocks = clusterMempool.getBlocks(config.MEMPOOL.MEMPOOL_BLOCKS_AMOUNT) ?? []; + projectedBlocks = mempoolBlocks.processClusterMempoolBlocks( + cmBlocks, + auditMempool, + accelerations, + false, + pool.uniqueId + ); + } else if (config.MEMPOOL.RUST_GBT) { + const added = memPool.limitGBT ? (candidates?.added || []) : []; + const removed = memPool.limitGBT ? (candidates?.removed || []) : []; + projectedBlocks = await mempoolBlocks.$rustUpdateBlockTemplates( + transactionIds, + auditMempool, + added, + removed, + candidates, + isAccelerated, + pool.uniqueId, + true + ); + } else { + projectedBlocks = await mempoolBlocks.$makeBlockTemplates( + transactionIds, + auditMempool, + candidates, + false, + isAccelerated, + pool.uniqueId + ); + } + + const auditResult = Audit.auditBlock(block.height, transactions, projectedBlocks, auditMempool); + + const stripped = projectedBlocks[0]?.transactions ? projectedBlocks[0].transactions : []; + + let totalFees = 0; + let totalWeight = 0; + for (const tx of stripped) { + totalFees += tx.fee; + totalWeight += (tx.vsize * 4); + } + + return { + ...auditResult, + expectedFees: totalFees, + expectedWeight: totalWeight, + projectedBlocks, + }; + } +} + +function saveCpfpDataToTransactions(transactions: MempoolTransactionExtended[], cpfpData: BlockCpfpData): void { + for (const tx of transactions) { + if (cpfpData.txs[tx.txid]) { + Object.assign(tx, cpfpData.txs[tx.txid]); + } + } +} + +export function saveCpfpDataToCpfpSummary(transactions: MempoolTransactionExtended[], cpfpData: BlockCpfpData): CpfpSummary { + saveCpfpDataToTransactions(transactions, cpfpData); + return { + transactions, + clusters: cpfpData.clusters, + version: cpfpData.version, + }; +} + +/** + * + * @param height + * @param blockTransactions + * @param poolAccelerations + * @param fast + * + * saves effective fee rates from detected algorithm to blockTransactions + */ +export function detectTemplateAlgorithm( + height: number, + blockTransactions: MempoolTransactionExtended[], + poolAccelerations: { txid: string; max_bid: number }[], + fast: boolean = false +): { templateAlgorithm: TemplateAlgorithm; cpfpSummary: CpfpSummary } { + + const legacyCpfpData = fast ? calculateFastBlockCpfp( + height, + blockTransactions, + ) : calculateGoodBlockCpfp( + height, + blockTransactions, + poolAccelerations + ); + + if (!config.MEMPOOL.CLUSTER_MEMPOOL_INDEXING) { + return { + templateAlgorithm: TemplateAlgorithm.legacy, + cpfpSummary: saveCpfpDataToCpfpSummary(blockTransactions, legacyCpfpData), + }; + } + + const network = config.MEMPOOL.NETWORK || 'mainnet'; + const activationHeight = CM_ACTIVATION_HEIGHT[network] ?? Infinity; + + if (height < activationHeight) { + return { + templateAlgorithm: TemplateAlgorithm.legacy, + cpfpSummary: saveCpfpDataToCpfpSummary(blockTransactions, legacyCpfpData), + }; + } + + const clusterCpfpData = calculateClusterMempoolBlockCpfp( + height, + blockTransactions, + poolAccelerations + ); + + const clusterTxs = blockTransactions.map(tx => ({ txid: tx.txid, rate: clusterCpfpData.txs[tx.txid].effectiveFeePerVsize ?? tx.effectiveFeePerVsize })); + const legacyTxs = blockTransactions.map(tx => ({ txid: tx.txid, rate: legacyCpfpData.txs[tx.txid].effectiveFeePerVsize ?? tx.effectiveFeePerVsize })); + const clusterPrioritization = transactionUtils.identifyPrioritizedTransactions(clusterTxs, 'rate'); + const legacyPrioritization = transactionUtils.identifyPrioritizedTransactions(legacyTxs, 'rate'); + + const clusterCount = clusterPrioritization.prioritized.length + clusterPrioritization.deprioritized.length; + const legacyCount = legacyPrioritization.prioritized.length + legacyPrioritization.deprioritized.length; + + if (clusterCount < legacyCount) { + saveCpfpDataToTransactions(blockTransactions, clusterCpfpData); + return { + templateAlgorithm: TemplateAlgorithm.clusterMempool, + cpfpSummary: saveCpfpDataToCpfpSummary(blockTransactions, clusterCpfpData), + }; + } else { + return { + templateAlgorithm: TemplateAlgorithm.legacy, + cpfpSummary: saveCpfpDataToCpfpSummary(blockTransactions, legacyCpfpData), + }; + } +} + +export default new BlockProcessor(); diff --git a/backend/src/api/blocks.ts b/backend/src/api/blocks.ts index c861f1a2d..97276a922 100644 --- a/backend/src/api/blocks.ts +++ b/backend/src/api/blocks.ts @@ -2,7 +2,7 @@ import config from '../config'; import bitcoinApi, { bitcoinCoreApi } from './bitcoin/bitcoin-api-factory'; import logger from '../logger'; import memPool from './mempool'; -import { BlockExtended, BlockExtension, BlockSummary, PoolTag, TransactionExtended, TransactionMinerInfo, CpfpSummary, MempoolTransactionExtended, TransactionClassified, BlockAudit, TransactionAudit } from '../mempool.interfaces'; +import { BlockExtended, BlockExtension, BlockSummary, PoolTag, TransactionExtended, TransactionMinerInfo, CpfpSummary, MempoolTransactionExtended, TransactionClassified, BlockAudit, TransactionAudit, TemplateAlgorithm } from '../mempool.interfaces'; import { Common } from './common'; import diskCache from './disk-cache'; import transactionUtils from './transaction-utils'; @@ -28,14 +28,19 @@ import chainTips from './chain-tips'; import websocketHandler from './websocket-handler'; import redisCache from './redis-cache'; import rbfCache from './rbf-cache'; +import bitcoinSecondClient from './bitcoin/bitcoin-second-client'; +import mempoolBlocks from './mempool-blocks'; +import statistics from './statistics/statistics'; import { calcBitsDifference } from './difficulty-adjustment'; import AccelerationRepository from '../repositories/AccelerationRepository'; -import { calculateFastBlockCpfp, calculateGoodBlockCpfp } from './cpfp'; +import { calculateGoodBlockCpfp } from './cpfp'; +import blockProcessor, { BlockProcessingResult, detectTemplateAlgorithm, saveCpfpDataToCpfpSummary } from './block-processor'; import mempool from './mempool'; import CpfpRepository from '../repositories/CpfpRepository'; -import { parseDATUMTemplateCreator } from '../utils/bitcoin-script'; +import { parseDATUMTemplateCreator, parseDMNDTemplateCreator } from '../utils/bitcoin-script'; import database from '../database'; import { getBlockFirstSeenFromLogs, getOldestLogTimestampFromLogs, scanLogsForBlocksFirstSeen } from '../utils/file-read'; +import FlagValueRepository, { INDEXING_PRESETS } from '../repositories/FlagValueRepository'; class Blocks { private blocks: BlockExtended[] = []; @@ -46,11 +51,12 @@ class Blocks { private previousDifficultyRetarget = 0; private quarterEpochBlockTime: number | null = null; private newBlockCallbacks: ((block: BlockExtended, txIds: string[], transactions: TransactionExtended[]) => void)[] = []; - private newAsyncBlockCallbacks: ((block: BlockExtended, txIds: string[], transactions: MempoolTransactionExtended[]) => Promise)[] = []; private classifyingBlocks: boolean = false; private oldestCoreLogTimestamp: number | undefined | null = undefined; private mainLoopTimeout: number = 120000; + private indexingFlagValues: boolean = false; + private flagValuesDeleteQueue: number[]= []; constructor() { } @@ -74,10 +80,6 @@ class Blocks { this.newBlockCallbacks.push(fn); } - public setNewAsyncBlockCallback(fn: (block: BlockExtended, txIds: string[], transactions: MempoolTransactionExtended[]) => Promise) { - this.newAsyncBlockCallbacks.push(fn); - } - /** * Return the list of transaction for a block * @param blockHash @@ -252,7 +254,7 @@ class Blocks { * * @asyncUnsafe */ - private async $getBlockExtended(block: IEsploraApi.Block, transactions: TransactionExtended[]): Promise { + public async $getBlockExtended(block: IEsploraApi.Block, transactions: TransactionExtended[], providedPool?: PoolTag): Promise { const coinbaseTx = transactionUtils.stripCoinbaseTransaction(transactions[0]); const blk: Partial = Object.assign({}, block); @@ -335,7 +337,9 @@ class Blocks { if (['mainnet', 'testnet', 'signet', 'testnet4', 'regtest'].includes(config.MEMPOOL.NETWORK)) { let pool: PoolTag; - if (coinbaseTx !== undefined) { + if (providedPool) { + pool = providedPool; + } else if (coinbaseTx !== undefined) { pool = await this.$findBlockMiner(coinbaseTx); } else { if (config.DATABASE.ENABLED === true) { @@ -358,6 +362,8 @@ class Blocks { if (extras.pool.name === 'OCEAN') { extras.pool.minerNames = parseDATUMTemplateCreator(extras.coinbaseRaw); + } else if (extras.pool.name === 'DMND') { + extras.pool.minerNames = parseDMNDTemplateCreator(extras.coinbaseRaw); } } @@ -373,6 +379,7 @@ class Blocks { } } + extras.firstSeen = null; if (config.CORE_RPC.DEBUG_LOG_PATH) { const oldestLog = this.getOldestCoreLogTimestamp(); if (oldestLog) { @@ -385,7 +392,7 @@ class Blocks { return blk; } - private async $getBlockStats(block: IEsploraApi.Block, transactions: TransactionExtended[]): Promise { + public async $getBlockStats(block: IEsploraApi.Block, transactions: TransactionExtended[]): Promise { if (!block.stale) { return bitcoinClient.getBlockStats(block.id); } @@ -495,6 +502,129 @@ class Blocks { } } + /** @asyncUnsafe */ + private async $applyBlockTransactionsToMempool( + txIds: string[], + transactions: MempoolTransactionExtended[] + ): Promise<{ rbfTransactions: { [txid: string]: { replaced: MempoolTransactionExtended[], replacedBy: TransactionExtended }}}> { + const _memPool = memPool.getMempool(); + + const rbfTransactions = Common.findMinedRbfTransactions(transactions, memPool.getSpendMap()); + memPool.handleRbfTransactions(rbfTransactions); + memPool.removeFromSpendMap(transactions); + + if (config.MEMPOOL.CLUSTER_MEMPOOL) { + memPool.clusterMempool?.applyMempoolChange({ + added: [], + removed: transactions, + accelerations: mempool.getAccelerations(), + }); + } + + for (const txId of txIds) { + delete _memPool[txId]; + rbfCache.mined(txId); + } + redisCache.queueTransactionsForRemoval(txIds); + + let candidates; + let transactionIds: string[]; + + if (memPool.limitGBT) { + const minFeeMempool = await bitcoinSecondClient.getRawMemPool(); + const minFeeTip = await bitcoinSecondClient.getBlockCount(); + candidates = memPool.getNextCandidates(minFeeMempool, minFeeTip, transactions); + transactionIds = Object.keys(candidates?.txs || {}); + } else { + candidates = undefined; + transactionIds = Object.keys(memPool.getMempool()); + } + + if (config.MEMPOOL.CLUSTER_MEMPOOL) { + const cmBlocks = mempool.clusterMempool?.getBlocks(config.MEMPOOL.MEMPOOL_BLOCKS_AMOUNT) ?? []; + mempoolBlocks.processClusterMempoolBlocks(cmBlocks, _memPool, mempool.getAccelerations()); + } else if (config.MEMPOOL.RUST_GBT) { + const added = memPool.limitGBT ? (candidates?.added || []) : []; + const removed = memPool.limitGBT ? (candidates?.removed || []) : transactions; + await mempoolBlocks.$rustUpdateBlockTemplates(transactionIds, _memPool, added, removed, candidates, true); + } else { + await mempoolBlocks.$makeBlockTemplates(transactionIds, _memPool, candidates, true, true); + } + + return { rbfTransactions }; + } + + /** @asyncUnsafe */ + private async $saveBlockData( + processingResult: BlockProcessingResult, + timer: number + ): Promise { + const blockExtended = processingResult.blockExtended; + const cpfpSummary = processingResult.cpfpSummary; + + let latestPriceId; + try { + latestPriceId = await PricesRepository.$getLatestPriceId(); + this.updateTimerProgress(timer, `got latest price id ${this.currentBlockHeight}`); + } catch (e) { + logger.debug('failed to fetch latest price id from db: ' + (e instanceof Error ? e.message : e)); + } + if (priceUpdater.historyInserted === true && latestPriceId !== null) { + await blocksRepository.$saveBlockPrices([{ + height: blockExtended.height, + priceId: latestPriceId, + }]); + this.updateTimerProgress(timer, `saved prices for ${this.currentBlockHeight}`); + } else { + logger.debug(`Cannot save block price for ${blockExtended.height} because the price updater hasnt completed yet. Trying again in 10 seconds.`, logger.tags.mining); + indexer.scheduleSingleTask('blocksPrices', 10000); + } + + if (Common.blocksSummariesIndexingEnabled() === true) { + // indexes the summary as a side effect + await this.$getStrippedBlockTransactions(blockExtended.id, true, false, cpfpSummary, blockExtended.height); + this.updateTimerProgress(timer, `saved block summary for ${this.currentBlockHeight}`); + } + + if (config.MEMPOOL.CPFP_INDEXING) { + // can be slow, and isn't critical, so don't await + void this.$saveCpfp(blockExtended.id, this.currentBlockHeight, cpfpSummary); + this.updateTimerProgress(timer, `saved cpfp for ${this.currentBlockHeight}`); + } + + if (processingResult.auditResult) { + void BlocksSummariesRepository.$saveTemplate({ + height: blockExtended.height, + template: { + id: blockExtended.id, + transactions: processingResult.auditResult.projectedBlocks[0].transactions, + }, + version: 1, + }); + this.updateTimerProgress(timer, `saved audit template for ${this.currentBlockHeight}`); + + void BlocksAuditsRepository.$saveAudit({ + version: 1, + templateAlgorithm: processingResult.templateAlgorithm, + time: blockExtended.timestamp, + height: blockExtended.height, + hash: blockExtended.id, + unseenTxs: processingResult.auditResult.unseen, + addedTxs: processingResult.auditResult.added, + prioritizedTxs: processingResult.auditResult.prioritized, + missingTxs: processingResult.auditResult.censored, + freshTxs: processingResult.auditResult.fresh, + sigopTxs: processingResult.auditResult.sigop, + fullrbfTxs: processingResult.auditResult.fullrbf, + acceleratedTxs: processingResult.auditResult.accelerated, + matchRate: processingResult.auditResult.matchRate, + expectedFees: processingResult.auditResult.expectedFees, + expectedWeight: processingResult.auditResult.expectedWeight, + }); + this.updateTimerProgress(timer, `saved audit results for ${this.currentBlockHeight}`); + } + } + /** * [INDEXING] Index all blocks summaries for the block txs visualization */ @@ -562,6 +692,155 @@ class Blocks { } } + /** + * [INDEXING] Index all blocks flag values for the goggles graph rendering + * + * @asyncSafe + */ + public async $generateFlagValuesDatabase(): Promise { + const MAX_BLOCKS_PERQUERY = 144; + if (this.indexingFlagValues) { + return; + } + + if (Common.blocksSummariesIndexingEnabled() === false || Common.isLiquid()) { + return; + } + + this.indexingFlagValues = true; + + const tipOfSummaries = await BlocksSummariesRepository.$getTipIndexed(); + if (!tipOfSummaries) { + this.indexingFlagValues = false; + return; + } + + let newlyIndexedBuckets = 0; + + while (this.flagValuesDeleteQueue.length > 0) { // Deletion of in-queue heights due to reorg + const deletionHeight = this.flagValuesDeleteQueue.shift(); + if (deletionHeight === undefined) { + continue; + } + await FlagValueRepository.$deleteFlagValuesFromHeight(deletionHeight); + } + + for (const preset of INDEXING_PRESETS) { + let seedHeight = preset.retentionSpan > -1 ? tipOfSummaries - preset.retentionSpan : 0; + if (config.MEMPOOL.INDEXING_BLOCKS_AMOUNT > 0) { + seedHeight = Math.max(seedHeight, tipOfSummaries - config.MEMPOOL.INDEXING_BLOCKS_AMOUNT + 1); + } + const firstBucket = Math.floor((tipOfSummaries + 1) / preset.bucketSize) * preset.bucketSize - preset.bucketSize; + const lastBucket = Math.max(0, Math.floor(seedHeight / preset.bucketSize) * preset.bucketSize); + + // Deletion of flag values out of retention span + const tipAndTailOfFlagValues = await FlagValueRepository.$getTipAndTailIndexedByBucketSize(preset.bucketSize); + if (tipAndTailOfFlagValues && lastBucket > tipAndTailOfFlagValues.tail) { // Drop buckets that fell out of block span + logger.debug(`Deleting all the flag values ${preset.name} below height #${lastBucket}`, logger.tags.goggles); + await FlagValueRepository.$deleteFlagValuesBelowHeight(lastBucket, preset.bucketSize); + } + + if (firstBucket < lastBucket) { + continue; // no complete bucket in range + } + + const indexedBuckets = await FlagValueRepository.$getIndexedStartHeights(preset.bucketSize, firstBucket, lastBucket); + const isBucketIndexed = {}; + // We map the buckets that are already indexed to skip them + for (const startHeight of indexedBuckets) { + isBucketIndexed[startHeight] = true; + } + + logger.debug(`Processing and indexing flag values from #${firstBucket} to #${lastBucket} ${preset.name}`, logger.tags.goggles); + + let timer = Date.now() / 1000; + const startedAt = Date.now() / 1000; + let blocksComputedInTotal = 0; + let blocksComputedThisRun = 0; + const blocksToCompute = firstBucket + preset.bucketSize - lastBucket - (indexedBuckets.length * preset.bucketSize); + for (let bucketStart = firstBucket; bucketStart >= lastBucket; bucketStart -= preset.bucketSize) { + if (isBucketIndexed[bucketStart]) { + continue; // already indexed + } + try { + const bucketFirstHeight = bucketStart + preset.bucketSize - 1; + const bucketLastHeight = bucketStart - 1; + + let step = bucketFirstHeight; + + const dataPerFlag: Record> = {}; + let sumTimestamps = 0; + let nBlocks = 0; + let incomplete = false; + + // Incrementalized logic capped by max blocks per query, not bucket size + while (step > bucketLastHeight) { + const blocksPerQuery = Math.min(step - bucketLastHeight, MAX_BLOCKS_PERQUERY); + const cappedLastHeight = step - blocksPerQuery; + + const blocks = await BlocksSummariesRepository.$getSummariesBetweenHeights(step, cappedLastHeight); + await Common.sleep$(250); // Don't query/index flag values too fast + + if (!blocks || blocks.length < blocksPerQuery) { + incomplete = true; + break; // Incomplete bucket + } + + // Flag values processing + for (const block of blocks) { + const txData = JSON.parse(block.transactions).map((tx) => ({flags: tx.flags, vsize: tx.vsize})); + for (const data of txData) { + if (dataPerFlag[data.flags] === undefined || Object.keys(dataPerFlag[data.flags]).length === 0) { + dataPerFlag[data.flags] = { + txCount: 0, + vSizeTotal: 0 + }; + } + dataPerFlag[data.flags].txCount = dataPerFlag[data.flags].txCount + 1; + dataPerFlag[data.flags].vSizeTotal = dataPerFlag[data.flags].vSizeTotal + data.vsize; + } + sumTimestamps += block.timestamp; + blocksComputedInTotal++; + blocksComputedThisRun++; + nBlocks++; + } + + // Logging + const elapsedSeconds = (Date.now() / 1000) - timer; + if (elapsedSeconds > 5) { + const runningFor = (Date.now() / 1000) - startedAt; + const blocksPerSecond = blocksComputedThisRun / elapsedSeconds; + const completion = (blocksComputedInTotal / blocksToCompute) * 100; + logger.debug(`Indexing flag values ${preset.name} | ${blocksComputedInTotal}/${blocksToCompute} (${completion.toFixed(2)}%) | ~${blocksPerSecond.toFixed(2)} blocks/sec | elapsed: ${runningFor.toFixed(2)} seconds`,logger.tags.goggles); + timer = Date.now() / 1000; + blocksComputedThisRun = 0; + } + + step -= blocksPerQuery; + } + + if (incomplete) { + continue; + } + + const avgTimestamp = sumTimestamps / nBlocks; + await FlagValueRepository.$saveBatchFlagValues(preset.bucketSize, bucketStart, dataPerFlag, avgTimestamp); + nBlocks = 0; + newlyIndexedBuckets++; + } catch (e) { + logger.err(`Failed to index flag values between #${bucketStart} and #${bucketStart + preset.bucketSize - 1}. Reason: ${(e instanceof Error ? e.message : e)}`, logger.tags.goggles); + } + } + logger.debug(`Successfully indexed #${blocksComputedInTotal} blocks ${preset.name} in ${((Date.now() / 1000) - startedAt).toFixed(2)} seconds`, logger.tags.goggles); + } + if (newlyIndexedBuckets > 0) { + logger.notice(`Flag values indexing completed: indexed ${newlyIndexedBuckets} buckets`, logger.tags.goggles); + } else { + logger.debug(`Flag values indexing completed: indexed ${newlyIndexedBuckets} buckets`, logger.tags.goggles); + } + this.indexingFlagValues = false; + } + /** @asyncUnsafe */ public async $indexBlockSummary(hash: string, height: number, stale?: boolean): Promise { if (config.MEMPOOL.BACKEND === 'esplora') { @@ -727,7 +1006,8 @@ class Blocks { // fetch transactions txs = (await bitcoinApi.$getTxsForBlock(blockHash, true)).map(tx => transactionUtils.extendMempoolTransaction(tx)) || []; // add CPFP - const cpfpSummary = calculateGoodBlockCpfp(height, txs, []); + const blockCpfpData = calculateGoodBlockCpfp(height, txs, []); + const cpfpSummary = saveCpfpDataToCpfpSummary(txs, blockCpfpData); // classify const { transactions: classifiedTxs } = this.summarizeBlockTransactions(blockHash, height, cpfpSummary.transactions); await BlocksSummariesRepository.$saveTransactions(height, blockHash, classifiedTxs, 2); @@ -764,7 +1044,8 @@ class Blocks { } templateTxs.push(tx || templateTx); } - const cpfpSummary = calculateGoodBlockCpfp(height, templateTxs?.filter(tx => tx['effectiveFeePerVsize'] != null) as MempoolTransactionExtended[], []); + const blockCpfpData = calculateGoodBlockCpfp(height, templateTxs?.filter(tx => tx['effectiveFeePerVsize'] != null) as MempoolTransactionExtended[], []); + const cpfpSummary = saveCpfpDataToCpfpSummary(templateTxs as MempoolTransactionExtended[], blockCpfpData); // classify const { transactions: classifiedTxs } = this.summarizeBlockTransactions(blockHash, height, cpfpSummary.transactions); const classifiedTxMap: { [txid: string]: TransactionClassified } = {}; @@ -955,12 +1236,12 @@ class Blocks { logger.debug(`Found first seen times of ${foundCount} / ${results.length} blocks in Core logs, saving to database...`); await BlocksRepository.$saveFirstSeenTimes(results); + const blocksByHash = new Map(this.blocks.map<[string, BlockExtended]>(block => [block.id, block])); + for (const { hash, firstSeen } of results) { - if (firstSeen !== null) { - const cachedBlock = this.blocks.find(blk => blk.id === hash); - if (cachedBlock) { - cachedBlock.extras.firstSeen = firstSeen; - } + const cachedBlock = blocksByHash.get(hash); + if (cachedBlock?.extras) { + cachedBlock.extras.firstSeen = firstSeen; } } @@ -1053,59 +1334,55 @@ class Blocks { } } - let accelerations = Object.values(mempool.getAccelerations()); - if (accelerations?.length > 0) { - const pool = await this.$findBlockMiner(transactionUtils.stripCoinbaseTransaction(transactions[0])); - accelerations = accelerations.filter(a => a.pools.includes(pool.uniqueId)); - } - const cpfpSummary: CpfpSummary = calculateGoodBlockCpfp(block.height, transactions, accelerations.map(a => ({ txid: a.txid, max_bid: a.feeDelta }))); - const blockExtended: BlockExtended = await this.$getBlockExtended(block, cpfpSummary.transactions); - const blockSummary: BlockSummary = this.summarizeBlockTransactions(block.id, block.height, cpfpSummary.transactions); + const pool = await this.$findBlockMiner(transactionUtils.stripCoinbaseTransaction(transactions[0])); + const accelerations = mempool.getAccelerations(); + + const processingResult = await blockProcessor.$processNewBlock( + block, + transactions, + pool, + accelerations + ); + + const blockExtended = processingResult.blockExtended; + const blockSummary = processingResult.blockSummary; + const cpfpSummary = processingResult.cpfpSummary; this.updateTimerProgress(timer, `got block data for ${this.currentBlockHeight}`); - if (Common.indexingEnabled()) { - if (!fastForwarded) { - await this.$handleReorgs(blockExtended, timer); - } + if (config.STATISTICS.ENABLED && config.DATABASE.ENABLED) { + await statistics.runStatistics(); + } + const { rbfTransactions } = await this.$applyBlockTransactionsToMempool(txIds, cpfpSummary.transactions); + this.updateTimerProgress(timer, `applied mempool changes for ${this.currentBlockHeight}`); + + if (config.STATISTICS.ENABLED && config.DATABASE.ENABLED) { + await statistics.runStatistics(); + } + + if (Common.indexingEnabled() && !fastForwarded) { + await this.$handleReorgs(blockExtended, timer); + } + + await websocketHandler.handleNewBlock(blockExtended, txIds, cpfpSummary.transactions, rbfTransactions); + this.updateTimerProgress(timer, `sent websocket updates for ${this.currentBlockHeight}`); + + if (Common.indexingEnabled()) { await blocksRepository.$saveBlockInDatabase(blockExtended); this.updateTimerProgress(timer, `saved ${this.currentBlockHeight} to database`); - if (!fastForwarded) { - let lastestPriceId; - try { - lastestPriceId = await PricesRepository.$getLatestPriceId(); - this.updateTimerProgress(timer, `got latest price id ${this.currentBlockHeight}`); - } catch (e) { - logger.debug('failed to fetch latest price id from db: ' + (e instanceof Error ? e.message : e)); - } - if (priceUpdater.historyInserted === true && lastestPriceId !== null) { - await blocksRepository.$saveBlockPrices([{ - height: blockExtended.height, - priceId: lastestPriceId, - }]); - this.updateTimerProgress(timer, `saved prices for ${this.currentBlockHeight}`); - } else { - logger.debug(`Cannot save block price for ${blockExtended.height} because the price updater hasnt completed yet. Trying again in 10 seconds.`, logger.tags.mining); - indexer.scheduleSingleTask('blocksPrices', 10000); - } + await AccelerationRepository.$indexAccelerationsForBlock( + blockExtended, + Object.values(accelerations), + cpfpSummary.transactions + ); + this.updateTimerProgress(timer, `indexed accelerations for ${this.currentBlockHeight}`); - // Save blocks summary for visualization if it's enabled - if (Common.blocksSummariesIndexingEnabled() === true) { - await this.$getStrippedBlockTransactions(blockExtended.id, true, false, cpfpSummary, blockExtended.height); - this.updateTimerProgress(timer, `saved block summary for ${this.currentBlockHeight}`); - } - if (config.MEMPOOL.CPFP_INDEXING) { - void this.$saveCpfp(blockExtended.id, this.currentBlockHeight, cpfpSummary); - this.updateTimerProgress(timer, `saved cpfp for ${this.currentBlockHeight}`); - } + if (!fastForwarded) { + await this.$saveBlockData(processingResult, timer); } } - // start async callbacks - this.updateTimerProgress(timer, `starting async callbacks for ${this.currentBlockHeight}`); - const callbackPromises = this.newAsyncBlockCallbacks.map((cb) => cb(blockExtended, txIds, cpfpSummary.transactions)); - if (block.height % 2016 === 0) { if (Common.indexingEnabled()) { let adjustment; @@ -1143,11 +1420,6 @@ class Blocks { await chainTips.updateOrphanedBlocks(); } - // wait for pending async callbacks to finish - this.updateTimerProgress(timer, `waiting for async callbacks to complete for ${this.currentBlockHeight}`); - await Promise.all(callbackPromises); - this.updateTimerProgress(timer, `async callbacks completed for ${this.currentBlockHeight}`); - this.blocks.push(blockExtended); if (this.blocks.length > config.MEMPOOL.INITIAL_BLOCKS_AMOUNT * 4) { this.blocks = this.blocks.slice(-config.MEMPOOL.INITIAL_BLOCKS_AMOUNT * 4); @@ -1171,7 +1443,7 @@ class Blocks { if (config.REDIS.ENABLED) { await redisCache.$updateBlocks(this.blocks); await redisCache.$updateBlockSummaries(this.blockSummaries); - await redisCache.$removeTransactions(txIds); + await redisCache.$removeTransactions(); await rbfCache.updateCache(); } @@ -1289,6 +1561,7 @@ class Blocks { await DifficultyAdjustmentsRepository.$deleteAdjustementsFromHeight(forkTail.height); await cpfpRepository.$deleteClustersFrom(forkTail.height); await AccelerationRepository.$deleteAccelerationsFrom(forkTail.height); + this.flagValuesDeleteQueue.push(forkTail.height); chainTips.clearOrphanCacheAboveHeight(forkTail.height); this.updateTimerProgress(timer, `deleted stale block data`); @@ -1647,16 +1920,16 @@ class Blocks { } if (transactions?.length != null) { - const summary = calculateFastBlockCpfp(height, transactions); + const { cpfpSummary } = await detectTemplateAlgorithm(height, transactions, [], true); - if (!stale) { - await this.$saveCpfp(hash, height, summary); + if (!stale && Common.cpfpIndexingEnabled() === true) { + await this.$saveCpfp(hash, height, cpfpSummary); } - const effectiveFeeStats = Common.calcEffectiveFeeStatistics(summary.transactions); + const effectiveFeeStats = Common.calcEffectiveFeeStatistics(cpfpSummary.transactions); await blocksRepository.$saveEffectiveFeeStats(hash, effectiveFeeStats); - return summary; + return cpfpSummary; } else { logger.err(`Cannot index CPFP for block ${height} - missing transaction data`); return null; diff --git a/backend/src/api/chain-tips.ts b/backend/src/api/chain-tips.ts index 5062ca1a0..0d7b8713e 100644 --- a/backend/src/api/chain-tips.ts +++ b/backend/src/api/chain-tips.ts @@ -2,6 +2,7 @@ import config from '../config'; import logger from '../logger'; import { BlockExtended } from '../mempool.interfaces'; import BlocksSummariesRepository from '../repositories/BlocksSummariesRepository'; +import BlocksRepository from '../repositories/BlocksRepository'; import bitcoinApi, { bitcoinCoreApi } from './bitcoin/bitcoin-api-factory'; import bitcoinClient from './bitcoin/bitcoin-client'; import { IEsploraApi } from './bitcoin/esplora-api.interface'; @@ -23,26 +24,29 @@ export interface StaleTip extends ChainTip { export interface OrphanedBlock { height: number; hash: string; + branchlen: number; status: 'valid-fork' | 'valid-headers' | 'headers-only'; prevhash: string; } class ChainTips { private chainTips: ChainTip[] = []; - private staleTips: Record = {}; + private validChainTips: ChainTip[] = []; // 'valid-fork' and 'valid-headers' only, in descending height order + private staleBlocks: Record = {}; private orphanedBlocks: { [hash: string]: OrphanedBlock } = {}; private blockCache: { [hash: string]: OrphanedBlock } = {}; private orphansByHeight: { [height: number]: OrphanedBlock[] } = {}; private indexingOrphanedBlocks = false; private indexingQueue: { blockhash?: string, block?: IEsploraApi.Block, tip: OrphanedBlock }[] = []; - private staleTipsCacheSize = 50; + private staleBlocksCacheSize = 50; private maxIndexingQueueSize = 100; /** @asyncSafe */ public async updateOrphanedBlocks(): Promise { try { this.chainTips = await bitcoinClient.getChainTips(); + this.validChainTips = this.chainTips.filter(tip => tip.status === 'valid-fork' || tip.status === 'valid-headers').sort((a, b) => b.height - a.height); const activeTipHeight = this.chainTips.find(tip => tip.status === 'active')?.height || (await bitcoinApi.$getBlockHeightTip()); let minIndexHeight = 0; @@ -69,6 +73,7 @@ class ChainTips { orphan = { height: block.height, hash: block.id, + branchlen: chain.branchlen, status: chain.status, prevhash: block.previousblockhash, }; @@ -119,13 +124,7 @@ class ChainTips { this.orphansByHeight[orphan.height].push(orphan); } - const heightsToKeep = new Set(this.chainTips.filter(tip => tip.status !== 'active').map(tip => tip.height)); - const heightsToRemove: number[] = Object.keys(this.staleTips).map(Number).filter(height => !heightsToKeep.has(height)); - for (const height of heightsToRemove) { - delete this.staleTips[height]; - } - - this.trimStaleTipsCache(); + this.trimStaleBlocksCache(); // index new orphaned blocks in the background void this.$indexOrphanedBlocks(); @@ -157,7 +156,7 @@ class ChainTips { } let staleBlock: BlockExtended | undefined; const alreadyIndexed = await BlocksSummariesRepository.$isSummaryIndexed(block.id); - const needToCache = Object.keys(this.staleTips).length < this.staleTipsCacheSize || block.height > Object.keys(this.staleTips).map(Number).sort((a, b) => b - a)[this.staleTipsCacheSize - 1]; + const needToCache = this.shouldCacheStaleBlock(block.id, block.height); if (!alreadyIndexed) { staleBlock = await blocks.$indexBlock(block.id, block, true); await blocks.$indexBlockSummary(block.id, block.height, true); @@ -168,16 +167,9 @@ class ChainTips { } if (staleBlock && needToCache) { - const canonicalBlock = await blocks.$indexBlockByHeight(staleBlock.height); - this.staleTips[staleBlock.height] = { - height: staleBlock.height, - hash: staleBlock.id, - branchlen: tip.height - staleBlock.height, - status: tip.status, - stale: staleBlock, - canonical: canonicalBlock, - }; - this.trimStaleTipsCache(); + // ensure the canonical block is correctly indexed + await blocks.$indexBlockByHeight(staleBlock.height); + this.cacheStaleBlock(staleBlock); } } catch (e) { logger.err(`Failed to index orphaned block ${block?.id} at height ${block?.height}. Reason: ${e instanceof Error ? e.message : e}`); @@ -186,12 +178,42 @@ class ChainTips { this.indexingOrphanedBlocks = false; } - private trimStaleTipsCache(): void { - const staleTipHeights = Object.keys(this.staleTips).map(Number).sort((a, b) => b - a); - if (staleTipHeights.length > this.staleTipsCacheSize) { - const heightsToDiscard = staleTipHeights.slice(this.staleTipsCacheSize); - for (const height of heightsToDiscard) { - delete this.staleTips[height]; + private shouldCacheStaleBlock(hash: string, height: number): boolean { + // already cached + if (this.staleBlocks[hash]) { + return false; + } + + // cache is not full + const cachedBlocks = Object.values(this.staleBlocks); + if (cachedBlocks.length < this.staleBlocksCacheSize) { + return true; + } + + // otherwise cache if this block is newer than the oldest in the cache + const oldestCachedHeight = cachedBlocks.reduce((min, block) => Math.min(min, block.height), Infinity); + return height >= oldestCachedHeight; + } + + private cacheStaleBlock(block: BlockExtended): void { + this.staleBlocks[block.id] = block; + this.trimStaleBlocksCache(); + } + + // evict the oldest stale blocks until the cache is within the size limit + private trimStaleBlocksCache(): void { + // sort by height + const cachedBlocks = Object.values(this.staleBlocks).sort((a, b) => { + if (b.height !== a.height) { + return b.height - a.height; + } + // tie-break by hash + return a.id.localeCompare(b.id); + }); + // delete everything beyond the size limit + if (cachedBlocks.length > this.staleBlocksCacheSize) { + for (const block of cachedBlocks.slice(this.staleBlocksCacheSize)) { + delete this.staleBlocks[block.id]; } } } @@ -208,8 +230,51 @@ class ChainTips { return this.chainTips; } - public getStaleTips(): StaleTip[] { - return Object.values(this.staleTips).sort((a, b) => b.height - a.height); + /** + * get paginated stale chain tips + * @param fromHeight - start height (exclusive) + * @param count - requested page size (target, but not strictly enforced) + * + * @asyncSafe + */ + public async $getStaleTipsPage(fromHeight: number | undefined, count: number): Promise { + const start = fromHeight === undefined ? 0 : this.validChainTips.findIndex(tip => tip.height < fromHeight); + // no tips beyond the requested height, we can return early + if (start === -1) { + return []; + } + + // fill the response array with hydrated tip data + const tips: StaleTip[] = []; + let lastHeight; + for (let index = start; index < this.validChainTips.length; index++) { + const staleTip = this.validChainTips[index]; + // stretch the page to include any remaining blocks at the last included height to avoid pagination gaps with a height-based cursor + if (tips.length >= count) { + if (staleTip.height !== lastHeight) { + break; + } + } + // fetch blocks from caches if available, or DB otherwise + const canonical = blocks.getBlocks().find(block => block.height === staleTip.height) || await BlocksRepository.$getBlockByHeight(staleTip.height); + let stale: BlockExtended | null | undefined = this.staleBlocks[staleTip.hash]; + if (!stale) { + stale = await BlocksRepository.$getBlockByHash(staleTip.hash); + } + // skip tips with missing block data + if (!canonical || !stale) { + continue; + } + + tips.push({ + ...staleTip, + stale, + canonical, + }); + lastHeight = staleTip.height; + } + + return tips; } clearOrphanCacheAboveHeight(height: number): void { @@ -234,4 +299,4 @@ class ChainTips { } } -export default new ChainTips(); \ No newline at end of file +export default new ChainTips(); diff --git a/backend/src/api/common.ts b/backend/src/api/common.ts index 8fcd2b27b..6786bf1c8 100644 --- a/backend/src/api/common.ts +++ b/backend/src/api/common.ts @@ -749,7 +749,15 @@ export class Common { // fast but bad heuristic to detect possible coinjoins // (at least 5 inputs and 5 outputs, less than half of which are unique amounts, with no address reuse) const addressReuse = Object.keys(reusedOutputAddresses).reduce((acc, key) => Math.max(acc, (reusedInputAddresses[key] || 0) + (reusedOutputAddresses[key] || 0)), 0) > 1; - if (!addressReuse && tx.vin.length >= 5 && tx.vout.length >= 5 && (Object.keys(inValues).length + Object.keys(outValues).length) <= (tx.vin.length + tx.vout.length) / 2 ) { + const tokenRelated = (flags & (TransactionFlags.inscription | TransactionFlags.op_return)) !== 0n; + if (!addressReuse && + tx.vin.length >= 5 && + tx.vout.length >= 5 && + (Object.keys(inValues).length + Object.keys(outValues).length) <= (tx.vin.length + tx.vout.length) / 2 && + !tokenRelated && + tx.vin.length / tx.vout.length < 5 && + tx.vin.length / tx.vout.length > 0.2 + ) { flags |= TransactionFlags.coinjoin; } // more than 5:1 input:output ratio diff --git a/backend/src/api/cpfp.ts b/backend/src/api/cpfp.ts index ad601361c..30232c90b 100644 --- a/backend/src/api/cpfp.ts +++ b/backend/src/api/cpfp.ts @@ -1,20 +1,30 @@ -import { Ancestor, CpfpCluster, CpfpInfo, CpfpSummary, MempoolTransactionExtended, TransactionExtended } from '../mempool.interfaces'; +import { Ancestor, CpfpCluster, CpfpInfo, MempoolTransactionExtended, TemplateAlgorithm, TransactionExtended } from '../mempool.interfaces'; import { GraphTx, convertToGraphTx, expandRelativesGraph, initializeRelatives, makeBlockTemplate, mempoolComparator, removeAncestors, setAncestorScores } from './mini-miner'; import memPool from './mempool'; import { Acceleration } from './acceleration/acceleration'; +import { ClusterMempool } from '../cluster-mempool/cluster-mempool'; const CPFP_UPDATE_INTERVAL = 60_000; // update CPFP info at most once per 60s per transaction const MAX_CLUSTER_ITERATIONS = 100; -export function calculateFastBlockCpfp(height: number, transactions: MempoolTransactionExtended[], saveRelatives: boolean = false): CpfpSummary { +type TransactionCpfpData = Partial; +export interface BlockCpfpData { + txs: Record, + clusters: CpfpCluster[]; + version: number; +} + +export function calculateFastBlockCpfp(height: number, transactions: MempoolTransactionExtended[], saveRelatives: boolean = false): BlockCpfpData { const clusters: CpfpCluster[] = []; // list of all cpfp clusters in this block const clusterMap: { [txid: string]: CpfpCluster } = {}; // map transactions to their cpfp cluster let clusterTxs: TransactionExtended[] = []; // working list of elements of the current cluster let ancestors: { [txid: string]: boolean } = {}; // working set of ancestors of the current cluster root const txMap: { [txid: string]: TransactionExtended } = {}; + const cpfpData: Record = {}; // initialize the txMap for (const tx of transactions) { txMap[tx.txid] = tx; + cpfpData[tx.txid] = {}; } // reverse pass to identify CPFP clusters for (let i = transactions.length - 1; i >= 0; i--) { @@ -38,7 +48,9 @@ export function calculateFastBlockCpfp(height: number, transactions: MempoolTran clusters.push(cluster); } clusterTxs.forEach(tx => { - txMap[tx.txid].effectiveFeePerVsize = effectiveFeePerVsize; + cpfpData[tx.txid] = { + effectiveFeePerVsize + }; if (cluster) { clusterMap[tx.txid] = cluster; } @@ -54,17 +66,19 @@ export function calculateFastBlockCpfp(height: number, transactions: MempoolTran } // forward pass to enforce ancestor rate caps for (const tx of transactions) { - let minAncestorRate = tx.effectiveFeePerVsize; + const txRate = cpfpData[tx.txid]?.effectiveFeePerVsize ?? tx.effectiveFeePerVsize; + let minAncestorRate = txRate; for (const vin of tx.vin) { - if (txMap[vin.txid]?.effectiveFeePerVsize) { - minAncestorRate = Math.min(minAncestorRate, txMap[vin.txid].effectiveFeePerVsize); + const vinRate = cpfpData[vin.txid]?.effectiveFeePerVsize ?? txMap[vin.txid]?.effectiveFeePerVsize; + if (vinRate) { + minAncestorRate = Math.min(minAncestorRate, vinRate); } } // check rounded values to skip cases with almost identical fees const roundedMinAncestorRate = Math.ceil(minAncestorRate); - const roundedEffectiveFeeRate = Math.floor(tx.effectiveFeePerVsize); + const roundedEffectiveFeeRate = Math.floor(txRate); if (roundedMinAncestorRate < roundedEffectiveFeeRate) { - tx.effectiveFeePerVsize = minAncestorRate; + cpfpData[tx.txid].effectiveFeePerVsize = minAncestorRate; if (!clusterMap[tx.txid]) { // add a single-tx cluster to record the dependent rate const cluster = { @@ -84,23 +98,25 @@ export function calculateFastBlockCpfp(height: number, transactions: MempoolTran if (saveRelatives) { for (const cluster of clusters) { cluster.txs.forEach((member, index) => { - txMap[member.txid].descendants = cluster.txs.slice(0, index).reverse(); - txMap[member.txid].ancestors = cluster.txs.slice(index + 1).reverse(); - txMap[member.txid].effectiveFeePerVsize = cluster.effectiveFeePerVsize; + cpfpData[member.txid].descendants = cluster.txs.slice(0, index).reverse(); + cpfpData[member.txid].ancestors = cluster.txs.slice(index + 1).reverse(); + cpfpData[member.txid].effectiveFeePerVsize = cluster.effectiveFeePerVsize; }); } } return { - transactions, + txs: cpfpData, clusters, version: 1, }; } -export function calculateGoodBlockCpfp(height: number, transactions: MempoolTransactionExtended[], accelerations: Acceleration[]): CpfpSummary { +export function calculateGoodBlockCpfp(height: number, transactions: MempoolTransactionExtended[], accelerations: Acceleration[]): BlockCpfpData { const txMap: { [txid: string]: MempoolTransactionExtended } = {}; + const cpfpData: Record = {}; for (const tx of transactions) { txMap[tx.txid] = tx; + cpfpData[tx.txid] = {}; } const template = makeBlockTemplate(transactions, accelerations, 1, Infinity, Infinity); const clusters = new Map(); @@ -110,15 +126,15 @@ export function calculateGoodBlockCpfp(height: number, transactions: MempoolTran if (cluster.length > 1 && root && !clusters.has(root)) { clusters.set(root, cluster); } - txMap[tx.txid].effectiveFeePerVsize = tx.effectiveFeePerVsize; + cpfpData[tx.txid].effectiveFeePerVsize = tx.effectiveFeePerVsize; } const clusterArray: CpfpCluster[] = []; for (const cluster of clusters.values()) { for (const txid of cluster) { - const mempoolTx = txMap[txid]; - if (mempoolTx) { + const mempoolTxCpfpData = cpfpData[txid]; + if (mempoolTxCpfpData) { const ancestors: Ancestor[] = []; const descendants: Ancestor[] = []; let matched = false; @@ -138,10 +154,10 @@ export function calculateGoodBlockCpfp(height: number, transactions: MempoolTran } } }); - if (mempoolTx.ancestors?.length !== ancestors.length || mempoolTx.descendants?.length !== descendants.length) { - mempoolTx.cpfpDirty = true; + if (mempoolTxCpfpData.ancestors?.length !== ancestors.length || mempoolTxCpfpData.descendants?.length !== descendants.length) { + mempoolTxCpfpData.cpfpDirty = true; } - Object.assign(mempoolTx, { ancestors, descendants, bestDescendant: null, cpfpChecked: true }); + Object.assign(mempoolTxCpfpData, { ancestors, descendants, bestDescendant: null, cpfpChecked: true }); } } const root = cluster[cluster.length - 1]; @@ -153,17 +169,75 @@ export function calculateGoodBlockCpfp(height: number, transactions: MempoolTran fee: txMap[txid].fee, weight: (txMap[txid].adjustedVsize * 4) || txMap[txid].weight, })), - effectiveFeePerVsize: txMap[root].effectiveFeePerVsize, + effectiveFeePerVsize: cpfpData[root].effectiveFeePerVsize ?? txMap[root].effectiveFeePerVsize, }); } return { - transactions: transactions.map(tx => txMap[tx.txid]), + txs: cpfpData, clusters: clusterArray, version: 2, }; } +export function calculateClusterMempoolBlockCpfp(height: number, transactions: MempoolTransactionExtended[], accelerations: Acceleration[]): BlockCpfpData { + const txMap: { [txid: string]: MempoolTransactionExtended } = {}; + const cpfpData: Record = {}; + for (const tx of transactions) { + txMap[tx.txid] = tx; + cpfpData[tx.txid] = {}; + } + + const accelMap: { [txid: string]: { feeDelta: number } } = {}; + for (const acc of accelerations) { + accelMap[acc.txid] = { feeDelta: acc.max_bid }; + } + + const cm = new ClusterMempool(txMap, accelMap, false, 25000); + + const seenClusters = new Set(); + const clusters: CpfpCluster[] = []; + + for (const txid in cpfpData) { + const txCpfpData = cm.getCpfpDataForTx(txid); + if (!txCpfpData) { + continue; + } + cpfpData[txid].effectiveFeePerVsize = txCpfpData.effectiveFeePerVsize; + cpfpData[txid].clusterId = txCpfpData.clusterId; + cpfpData[txid].chunkIndex = txCpfpData.chunkIndex; + cpfpData[txid].ancestors = txCpfpData.ancestors; + cpfpData[txid].descendants = txCpfpData.descendants; + if (txCpfpData.clusterId !== undefined && !seenClusters.has(txCpfpData.clusterId)) { + seenClusters.add(txCpfpData.clusterId); + + const clusterData = cm.getCluster(txCpfpData.clusterId); + if (clusterData && clusterData.txs.length > 1) { + let totalFee = 0; + let totalWeight = 0; + for (const t of clusterData.txs) { + totalFee += t.fee; + totalWeight += t.weight; + } + clusters.push({ + root: clusterData.txs[0].txid, + height, + txs: clusterData.txs.map(t => ({ txid: t.txid, weight: t.weight, fee: t.fee })), + effectiveFeePerVsize: totalFee / (totalWeight / 4), + templateAlgorithm: TemplateAlgorithm.clusterMempool, + clusterData, + }); + } + } + } + + return { + txs: cpfpData, + clusters, + version: 3, + }; +} + /** * Takes a mempool transaction and a copy of the current mempool, and calculates the CPFP data for * that transaction (and all others in the same cluster) diff --git a/backend/src/api/database-migration.ts b/backend/src/api/database-migration.ts index 2e7bffcab..39bd7787f 100644 --- a/backend/src/api/database-migration.ts +++ b/backend/src/api/database-migration.ts @@ -7,7 +7,7 @@ import cpfpRepository from '../repositories/CpfpRepository'; import { RowDataPacket } from 'mysql2'; class DatabaseMigration { - private static currentVersion = 106; + private static currentVersion = 112; private queryTimeout = 3600_000; private statisticsAddedIndexed = false; private uniqueLogs: string[] = []; @@ -1222,6 +1222,44 @@ class DatabaseMigration { } await this.updateToSchemaVersion(106); } + + if (databaseSchemaVersion < 107) { + await this.$executeQuery('ALTER TABLE `federation_txos` DROP FOREIGN KEY IF EXISTS `federation_txos_ibfk_1`'); + await this.$executeQuery('DROP TABLE IF EXISTS `federation_addresses`'); + await this.updateToSchemaVersion(107); + } + + if (databaseSchemaVersion < 108) { + await this.$executeQuery(this.getCreateFederationPegScriptsTableQuery(), await this.$checkIfTableExists('federation_peg_scripts'),); + await this.updateToSchemaVersion(108); + } + + // safe to make this conditional on the network since it doesn't change the database schema + if (databaseSchemaVersion < 109 && config.MEMPOOL.NETWORK === 'liquid') { + // hardcode current and past federation peg scripts to avoid reindexing existing instances + await this.$executeQuery(` + INSERT IGNORE INTO federation_peg_scripts (address, fedpegscript, timelock, blocknumber) VALUES + ('3G6neksSBMp51kHJ2if8SeDUrzT8iVETWT', '745c87635b21020e0338c96a8870479f2396c373cc7696ba124e8635d41b0ea581112b678172612102675333a4e4b8fb51d9d4e22fa5a8eaced3fdac8a8cbf9be8c030f75712e6af992102896807d54bc55c24981f24a453c60ad3e8993d693732288068a23df3d9f50d4821029e51a5ef5db3137051de8323b001749932f2ff0d34c82e96a2c2461de96ae56c2102a4e1a9638d46923272c266631d94d36bdb03a64ee0e14c7518e49d2f29bc40102102f8a00b269f8c5e59c67d36db3cdc11b11b21f64b4bffb2815e9100d9aa8daf072103079e252e85abffd3c401a69b087e590a9b86f33f574f08129ccbd3521ecf516b2103111cf405b627e22135b3b3733a4a34aa5723fb0f58379a16d32861bf576b0ec2210318f331b3e5d38156da6633b31929c5b220349859cc9ca3d33fb4e68aa08401742103230dae6b4ac93480aeab26d000841298e3b8f6157028e47b0897c1e025165de121035abff4281ff00660f99ab27bb53e6b33689c2cd8dcd364bc3c90ca5aea0d71a62103bd45cddfacf2083b14310ae4a84e25de61e451637346325222747b157446614c2103cc297026b06c71cbfa52089149157b5ff23de027ac5ab781800a578192d175462103d3bde5d63bdb3a6379b461be64dad45eabff42f758543a9645afd42f6d4248282103ed1e8d5109c9ed66f7941bc53cc71137baa76d50d274bda8d5e8ffbd6e61fe9a5f6702c00fb275522103aab896d53a8e7d6433137bbba940f9c521e085dd07e60994579b64a6d992cf79210291b7d0b1b692f8f524516ed950872e5da10fb1b808b5a526dedc6fed1cf29807210386aa9372fbab374593466bc5451dc59954e90787f08060964d95c87ef34ca5bb5368ae', 4032, 0), + ('3EiAcrzq1cELXScc98KeCswGWZaPGceT1d', '745c87635b21020e0338c96a8870479f2396c373cc7696ba124e8635d41b0ea581112b678172612102675333a4e4b8fb51d9d4e22fa5a8eaced3fdac8a8cbf9be8c030f75712e6af992102896807d54bc55c24981f24a453c60ad3e8993d693732288068a23df3d9f50d4821029e51a5ef5db3137051de8323b001749932f2ff0d34c82e96a2c2461de96ae56c2102a4e1a9638d46923272c266631d94d36bdb03a64ee0e14c7518e49d2f29bc40102102f8a00b269f8c5e59c67d36db3cdc11b11b21f64b4bffb2815e9100d9aa8daf072103079e252e85abffd3c401a69b087e590a9b86f33f574f08129ccbd3521ecf516b2103111cf405b627e22135b3b3733a4a34aa5723fb0f58379a16d32861bf576b0ec2210318f331b3e5d38156da6633b31929c5b220349859cc9ca3d33fb4e68aa08401742103230dae6b4ac93480aeab26d000841298e3b8f6157028e47b0897c1e025165de121035abff4281ff00660f99ab27bb53e6b33689c2cd8dcd364bc3c90ca5aea0d71a62103bd45cddfacf2083b14310ae4a84e25de61e451637346325222747b157446614c2103cc297026b06c71cbfa52089149157b5ff23de027ac5ab781800a578192d175462103d3bde5d63bdb3a6379b461be64dad45eabff42f758543a9645afd42f6d4248282103ed1e8d5109c9ed66f7941bc53cc71137baa76d50d274bda8d5e8ffbd6e61fe9a5f6702e007b275522103aab896d53a8e7d6433137bbba940f9c521e085dd07e60994579b64a6d992cf79210291b7d0b1b692f8f524516ed950872e5da10fb1b808b5a526dedc6fed1cf29807210386aa9372fbab374593466bc5451dc59954e90787f08060964d95c87ef34ca5bb5368ae', 2016, 0), + ('bc1qxvay4an52gcghxq5lavact7r6qe9l4laedsazz8fj2ee2cy47tlqff4aj4', '5b21020e0338c96a8870479f2396c373cc7696ba124e8635d41b0ea581112b678172612102675333a4e4b8fb51d9d4e22fa5a8eaced3fdac8a8cbf9be8c030f75712e6af992102896807d54bc55c24981f24a453c60ad3e8993d693732288068a23df3d9f50d4821029e51a5ef5db3137051de8323b001749932f2ff0d34c82e96a2c2461de96ae56c2102a4e1a9638d46923272c266631d94d36bdb03a64ee0e14c7518e49d2f29bc401021031c41fdbcebe17bec8d49816e00ca1b5ac34766b91c9f2ac37d39c63e5e008afb2103079e252e85abffd3c401a69b087e590a9b86f33f574f08129ccbd3521ecf516b2103111cf405b627e22135b3b3733a4a34aa5723fb0f58379a16d32861bf576b0ec2210318f331b3e5d38156da6633b31929c5b220349859cc9ca3d33fb4e68aa08401742103230dae6b4ac93480aeab26d000841298e3b8f6157028e47b0897c1e025165de121035abff4281ff00660f99ab27bb53e6b33689c2cd8dcd364bc3c90ca5aea0d71a62103bd45cddfacf2083b14310ae4a84e25de61e451637346325222747b157446614c2103cc297026b06c71cbfa52089149157b5ff23de027ac5ab781800a578192d175462103d3bde5d63bdb3a6379b461be64dad45eabff42f758543a9645afd42f6d4248282103ed1e8d5109c9ed66f7941bc53cc71137baa76d50d274bda8d5e8ffbd6e61fe9a5fae736402c00fb269522103aab896d53a8e7d6433137bbba940f9c521e085dd07e60994579b64a6d992cf79210291b7d0b1b692f8f524516ed950872e5da10fb1b808b5a526dedc6fed1cf29807210386aa9372fbab374593466bc5451dc59954e90787f08060964d95c87ef34ca5bb53ae68', 4032, 2197440), + ('bc1qwnevjp8nsq7adu3hxlvdvslrf242q4vuavfg0y929jp2zntp3vgq7cq6z2', '5b21020e0338c96a8870479f2396c373cc7696ba124e8635d41b0ea581112b678172612102675333a4e4b8fb51d9d4e22fa5a8eaced3fdac8a8cbf9be8c030f75712e6af9921021fad939f956beae2e6765b450552f1a75236c8b7314ec30474d8f4978b252ab221029e51a5ef5db3137051de8323b001749932f2ff0d34c82e96a2c2461de96ae56c2102a4e1a9638d46923272c266631d94d36bdb03a64ee0e14c7518e49d2f29bc401021031c41fdbcebe17bec8d49816e00ca1b5ac34766b91c9f2ac37d39c63e5e008afb2102e323a079079582cf6bb68583df94bd68c9590e5904062b503ef5476109ad739e2103111cf405b627e22135b3b3733a4a34aa5723fb0f58379a16d32861bf576b0ec2210318f331b3e5d38156da6633b31929c5b220349859cc9ca3d33fb4e68aa08401742103230dae6b4ac93480aeab26d000841298e3b8f6157028e47b0897c1e025165de121035abff4281ff00660f99ab27bb53e6b33689c2cd8dcd364bc3c90ca5aea0d71a62103bd45cddfacf2083b14310ae4a84e25de61e451637346325222747b157446614c2103cc297026b06c71cbfa52089149157b5ff23de027ac5ab781800a578192d175462103d3bde5d63bdb3a6379b461be64dad45eabff42f758543a9645afd42f6d4248282103ed1e8d5109c9ed66f7941bc53cc71137baa76d50d274bda8d5e8ffbd6e61fe9a5fae736402c00fb269522103aab896d53a8e7d6433137bbba940f9c521e085dd07e60994579b64a6d992cf79210291b7d0b1b692f8f524516ed950872e5da10fb1b808b5a526dedc6fed1cf29807210386aa9372fbab374593466bc5451dc59954e90787f08060964d95c87ef34ca5bb53ae68', 4032, 3729600); + `); + await this.updateToSchemaVersion(109); + } + if (databaseSchemaVersion < 110 && isBitcoin === true) { + await this.$executeQuery('ALTER TABLE `blocks_audits` ADD template_algo TINYINT UNSIGNED NOT NULL DEFAULT 0'); + await this.updateToSchemaVersion(110); + } + + if (databaseSchemaVersion < 111 && isBitcoin === true) { + await this.$executeQuery('ALTER TABLE `compact_cpfp_clusters` ADD template_algo TINYINT UNSIGNED NOT NULL DEFAULT 0'); + await this.updateToSchemaVersion(111); + } + + if (databaseSchemaVersion < 112) { + await this.$executeQuery(this.getCreateFlagsValuesTableQuery(), await this.$checkIfTableExists('flag_values')); + await this.updateToSchemaVersion(112); + } } /** @@ -1511,6 +1549,16 @@ class DatabaseMigration { ) ENGINE=InnoDB DEFAULT CHARSET=utf8;`; } + private getCreateFederationPegScriptsTableQuery(): string { + return `CREATE TABLE IF NOT EXISTS federation_peg_scripts ( + address varchar(100) NOT NULL, + fedpegscript text NOT NULL, + timelock int(11) unsigned NOT NULL, + blocknumber int(11) unsigned NOT NULL, + PRIMARY KEY (address) + ) ENGINE=InnoDB DEFAULT CHARSET=utf8;`; + } + private getCreatePoolsTableQuery(): string { return `CREATE TABLE IF NOT EXISTS pools ( id int(11) NOT NULL AUTO_INCREMENT, @@ -1798,6 +1846,18 @@ class DatabaseMigration { ) ENGINE=InnoDB DEFAULT CHARSET=utf8;`; } + private getCreateFlagsValuesTableQuery(): string { + return `CREATE TABLE IF NOT EXISTS flag_values ( + bucket_size enum('1', '1008', '4032') NOT NULL, + start_height int unsigned NOT NULL, + avg_timestamp timestamp NOT NULL, + flag_value bigint unsigned NOT NULL, + tx_count int unsigned NOT NULL, + vsize_total int unsigned NOT NULL, + PRIMARY KEY (bucket_size, start_height, flag_value) + ) ENGINE=InnoDB DEFAULT CHARSET=utf8`; + } + /** @asyncUnsafe */ public async $blocksReindexingTruncate(): Promise { logger.warn(`Truncating pools, blocks, hashrates and difficulty_adjustments tables for re-indexing (using '--reindex-blocks'). You can cancel this command within 5 seconds`); diff --git a/backend/src/api/liquid/elements-parser.ts b/backend/src/api/liquid/elements-parser.ts index 090df023c..083ff6c68 100644 --- a/backend/src/api/liquid/elements-parser.ts +++ b/backend/src/api/liquid/elements-parser.ts @@ -4,13 +4,23 @@ import bitcoinSecondClient from '../bitcoin/bitcoin-second-client'; import { Common } from '../common'; import DB from '../../database'; import logger from '../../logger'; +import * as bitcoinjs from 'bitcoinjs-lib'; -const federationChangeAddresses = ['bc1qxvay4an52gcghxq5lavact7r6qe9l4laedsazz8fj2ee2cy47tlqff4aj4', '3EiAcrzq1cELXScc98KeCswGWZaPGceT1d', '3G6neksSBMp51kHJ2if8SeDUrzT8iVETWT', 'bc1qwnevjp8nsq7adu3hxlvdvslrf242q4vuavfg0y929jp2zntp3vgq7cq6z2']; const auditBlockOffsetWithTip = 1; // Wait for 1 block confirmation before processing the block in the audit process to reduce the risk of reorgs +const auditSyncToleranceBlocks = 105; // Audit lag from bitcoin tip to avoid potential unsynced state on peg-ins, which require 102 confirmations +const DYNAFED_ACTIVATION_HEIGHT = 1517040; +const DYNAFED_CHECK_INTERVAL = 20160; +const FEDERATION_TIMELOCK_FALLBACK = 0x0000ffff; // Preventive timelock in case an error occurs while extracting it from the fedpegscript +interface FederationAddress { + fedpegscript: string; + address: string; + timelock: number; + blocknumber: number; +} class ElementsParser { private isRunning = false; - private isUtxosUpdatingRunning = false; + private federationPegScripts: FederationAddress[] = []; constructor() { } @@ -20,15 +30,23 @@ class ElementsParser { } try { this.isRunning = true; + const startedAt = Date.now() / 1000; + const stopAt = startedAt + 3600; // Limit one parse run to 1 hour to keep the tip sufficiently up to date const result = await bitcoinClient.getChainTips(); const tip = result[0].height; const latestBlockHeight = await this.$getLatestBlockHeightFromDatabase(); for (let height = latestBlockHeight + 1; height <= tip; height++) { - const blockHash: IBitcoinApi.ChainTips = await bitcoinClient.getBlockHash(height); + if ((Date.now() / 1000) >= stopAt) { + logger.debug(`Reached max Elements parsing runtime of one hour, pausing parse to resume later`); + break; + } + const blockHash: string = await bitcoinClient.getBlockHash(height); const block: IBitcoinApi.Block = await bitcoinClient.getBlock(blockHash, 2); + await this.$updateFederationPegScripts(block); await this.$parseBlock(block); await this.$saveLatestBlockToDatabase(block.height); } + await this.$updateFederationUtxos(stopAt); this.isRunning = false; } catch (e) { this.isRunning = false; @@ -59,8 +77,9 @@ class ElementsParser { const bitcoinBlock: IBitcoinApi.Block = await bitcoinSecondClient.getBlock(bitcoinTx.blockhash); const prevout = bitcoinTx.vout[input.vout || 0]; const outputAddress = prevout.scriptPubKey.address || (prevout.scriptPubKey.addresses && prevout.scriptPubKey.addresses[0]) || ''; + const timelock = await this.$resolvePegInTimelock(input, outputAddress); await this.$savePegToDatabase(block.height, block.time, prevout.value * 100000000, txid, vindex, - outputAddress, bitcoinTx.txid, prevout.n, bitcoinBlock.height, bitcoinBlock.time, 1); + outputAddress, bitcoinTx.txid, prevout.n, bitcoinBlock.height, bitcoinBlock.time, 1, timelock); } /** @asyncUnsafe */ @@ -80,7 +99,7 @@ class ElementsParser { /** @asyncUnsafe */ protected async $savePegToDatabase(height: number, blockTime: number, amount: number, txid: string, - txindex: number, bitcoinaddress: string, bitcointxid: string, bitcoinindex: number, bitcoinblock: number, bitcoinBlockTime: number, final_tx: number): Promise { + txindex: number, bitcoinaddress: string, bitcointxid: string, bitcoinindex: number, bitcoinblock: number, bitcoinBlockTime: number, final_tx: number, pegInTimelock: number = FEDERATION_TIMELOCK_FALLBACK): Promise { const query = `INSERT IGNORE INTO elements_pegs( block, datetime, amount, txid, txindex, bitcoinaddress, bitcointxid, bitcoinindex, final_tx ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)`; @@ -92,13 +111,9 @@ class ElementsParser { logger.debug(`Saved L-BTC peg from Liquid block height #${height} with TXID ${txid}.`); if (amount > 0) { // Peg-in - - // Add the address to the federation addresses table - await DB.query(`INSERT IGNORE INTO federation_addresses (bitcoinaddress) VALUES (?)`, [bitcoinaddress]); - // Add the UTXO to the federation txos table const query_utxos = `INSERT IGNORE INTO federation_txos (txid, txindex, bitcoinaddress, amount, blocknumber, blocktime, unspent, lastblockupdate, lasttimeupdate, timelock, expiredAt, emergencyKey, pegtxid, pegindex, pegblocktime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`; - const params_utxos: (string | number)[] = [bitcointxid, bitcoinindex, bitcoinaddress, amount, bitcoinblock, bitcoinBlockTime, 1, bitcoinblock - 1, 0, 4032, 0, 0, txid, txindex, blockTime]; + const params_utxos: (string | number)[] = [bitcointxid, bitcoinindex, bitcoinaddress, amount, bitcoinblock, bitcoinBlockTime, 1, bitcoinblock - 1, 0, pegInTimelock, 0, 0, txid, txindex, blockTime]; await DB.query(query_utxos, params_utxos); const [minBlockUpdate] = await DB.query(`SELECT MIN(lastblockupdate) AS lastblockupdate FROM federation_txos WHERE unspent = 1`); await this.$saveLastBlockAuditToDatabase(minBlockUpdate[0]['lastblockupdate']); @@ -107,6 +122,127 @@ class ElementsParser { } } + /** @asyncUnsafe */ + private async $getFederationPegScripts(): Promise { + if (this.federationPegScripts.length === 0) { + const [rows] = await DB.query(`SELECT fedpegscript, address, timelock, blocknumber FROM federation_peg_scripts ORDER BY blocknumber DESC`); + this.federationPegScripts = rows as FederationAddress[]; + } + return this.federationPegScripts; + } + + /** @asyncUnsafe */ + private async $updateFederationPegScripts(block: IBitcoinApi.Block): Promise { + const height = block.height; + if (height < DYNAFED_ACTIVATION_HEIGHT || height % DYNAFED_CHECK_INTERVAL !== 0) { + return; + } + + const fedpegscript = block.dynamic_parameters?.current?.fedpegscript as string | undefined; + const fedpegProgram = block.dynamic_parameters?.current?.fedpeg_program as string | undefined; + if (!fedpegscript || !fedpegProgram) { + logger.err(`Missing fedpeg fields at height ${height}, skipping dynamic federation address update.`); + return; + } + + if ((await this.$getFederationPegScripts()).some(entry => entry.fedpegscript === fedpegscript)) { + logger.debug(`Fedpegscript at height ${height} is already known, skipping.`); + return; + } + + logger.debug(`New fedpegscript found at height ${height}, deriving federation address.`); + let address: string; + try { + address = bitcoinjs.address.fromOutputScript(Buffer.from(fedpegProgram, 'hex'), bitcoinjs.networks.bitcoin); + } catch (e) { + logger.err(`Unable to derive federation address from fedpeg program at height ${height}: ${e instanceof Error ? e.message : 'Error'}`); + return; + } + + let timelock = this.extractTimelockFromFedpegscript(fedpegscript); + if (timelock === null) { + timelock = FEDERATION_TIMELOCK_FALLBACK; + logger.err(`Unable to extract federation address timelock from fedpegscript at height ${height}, using fallback timelock ${FEDERATION_TIMELOCK_FALLBACK}.`); + } + + this.federationPegScripts.unshift({ fedpegscript, address, timelock, blocknumber: height }); + logger.debug(`Derived new federation address ${address} with timelock ${timelock} from fedpegscript at height ${height}. Adding to database.`); + try { + await DB.query( + `INSERT INTO federation_peg_scripts (fedpegscript, address, timelock, blocknumber) VALUES (?, ?, ?, ?)`, + [fedpegscript, address, timelock, height] + ); + logger.debug(`Added new federation address ${address} to the database.`); + } catch (e) { + logger.err(`Error while inserting new federation address ${address} into the database: ${e instanceof Error ? e.message : 'Error'}`); + } + } + + private extractTimelockFromFedpegscript(fedpegscript: string): number | null { + const chunks = bitcoinjs.script.decompile(Buffer.from(fedpegscript, 'hex')); + if (!chunks) { + return null; + } + + for (let i = 0; i < chunks.length; i++) { + if (chunks[i] !== bitcoinjs.opcodes.OP_CHECKSEQUENCEVERIFY) { + continue; + } + + const previous = chunks[i - 1]; + if (previous === undefined) { + return null; + } + + if (Buffer.isBuffer(previous)) { + try { + return bitcoinjs.script.number.decode(previous, 5, true); + } catch (e) { + return null; + } + } + + if (typeof previous === 'number') { + if (previous === bitcoinjs.opcodes.OP_0) { + return 0; + } + if (previous >= bitcoinjs.opcodes.OP_1 && previous <= bitcoinjs.opcodes.OP_16) { + return previous - bitcoinjs.opcodes.OP_1 + 1; + } + } + + return null; + } + + return null; + } + + /** @asyncUnsafe */ + private async $resolvePegInTimelock(input: IBitcoinApi.Vin, bitcoinaddress: string): Promise { + const claimScript = input.pegin_witness?.[3]; + if (!claimScript) { + logger.err(`Missing claim_script for peg-in input to address ${bitcoinaddress}, using fallback timelock ${FEDERATION_TIMELOCK_FALLBACK}.`); + return FEDERATION_TIMELOCK_FALLBACK; + } + + // Check claim script against each fedpegscript most recent first + for (const pegScript of (await this.$getFederationPegScripts())) { + try { + const tweakResult = await bitcoinClient.tweakFedPegScript(claimScript, pegScript.fedpegscript); + const matches = tweakResult?.p2wsh === bitcoinaddress || tweakResult?.p2shwsh === bitcoinaddress; + if (matches) { + return pegScript.timelock; + } + } catch (e) { + const message = e instanceof Error ? e.message : String(e); + logger.err(`tweakfedpegscript failed for address ${bitcoinaddress}: ${message}`); + } + } + + logger.err(`No matching fedpegscript found for address ${bitcoinaddress}, using fallback timelock ${FEDERATION_TIMELOCK_FALLBACK}.`); + return FEDERATION_TIMELOCK_FALLBACK; + } + /** @asyncUnsafe */ protected async $getLatestBlockHeightFromDatabase(): Promise { const query = `SELECT number FROM state WHERE name = 'last_elements_block'`; @@ -122,19 +258,12 @@ class ElementsParser { ///////////// FEDERATION AUDIT ////////////// - public async $updateFederationUtxos() { - if (this.isUtxosUpdatingRunning) { - return; - } - - this.isUtxosUpdatingRunning = true; - + public async $updateFederationUtxos(stopAt: number) { try { let auditProgress = await this.$getAuditProgress(); // If no peg in transaction was found in the database, return if (!auditProgress.lastBlockAudit) { logger.debug(`No Federation UTXOs found in the database. Waiting for some to be confirmed before starting the Federation UTXOs audit`); - this.isUtxosUpdatingRunning = false; return; } @@ -142,7 +271,6 @@ class ElementsParser { // If the bitcoin blockchain is not synced yet, return if (bitcoinBlocksToSync.bitcoinHeaders > bitcoinBlocksToSync.bitcoinBlocks + 1) { logger.debug(`Bitcoin client is not synced yet. ${bitcoinBlocksToSync.bitcoinHeaders - bitcoinBlocksToSync.bitcoinBlocks} blocks remaining to sync before the Federation audit process can start`); - this.isUtxosUpdatingRunning = false; return; } @@ -161,19 +289,28 @@ class ElementsParser { // Get the peg-out addresses that need to be scanned const redeemAddresses = await this.$getRedeemAddressesToScan(); + const redeemAddressesByAddress = new Map(); + for (const redeemAddress of redeemAddresses) { + const entries = redeemAddressesByAddress.get(redeemAddress.bitcoinaddress); + if (entries) { + entries.push(redeemAddress); + } else { + redeemAddressesByAddress.set(redeemAddress.bitcoinaddress, [redeemAddress]); + } + } // The fast way: check if these UTXOs are still unspent as of the current block with gettxout - let spentAsTip: any[]; - let unspentAsTip: any[]; + let spentAsTip: Map; + let unspentAsTip: Map; if (auditProgress.confirmedTip - auditProgress.lastBlockAudit <= 150) { // If the audit status is not too far in the past, we can use gettxout (fast way) const utxosToParse = await this.$getFederationUtxosToParse(utxos); spentAsTip = utxosToParse.spentAsTip; unspentAsTip = utxosToParse.unspentAsTip; logger.debug(`Found ${utxos.length} Federation UTXOs and ${redeemAddresses.length} Peg-Out Addresses to scan in Bitcoin block height #${auditProgress.lastBlockAudit} / #${auditProgress.confirmedTip}`); - logger.debug(`${unspentAsTip.length} / ${utxos.length} Federation UTXOs are unspent as of tip`); + logger.debug(`${unspentAsTip.size} / ${utxos.length} Federation UTXOs are unspent as of tip`); } else { // If the audit status is too far in the past, it is useless and wasteful to look for still unspent txos since they will all be spent as of the tip - spentAsTip = utxos; - unspentAsTip = []; + spentAsTip = new Map(utxos.map(utxo => [`${utxo.txid}:${utxo.txindex}`, utxo])); + unspentAsTip = new Map(); // Logging const elapsedSeconds = (Date.now() / 1000) - timer; @@ -193,7 +330,7 @@ class ElementsParser { // The slow way: parse the block to look for the spending tx const blockHash: IBitcoinApi.ChainTips = await bitcoinSecondClient.getBlockHash(auditProgress.lastBlockAudit); const block: IBitcoinApi.Block = await bitcoinSecondClient.getBlock(blockHash, 2); - await this.$parseBitcoinBlock(block, spentAsTip, unspentAsTip, auditProgress.confirmedTip, redeemAddresses); + await this.$parseBitcoinBlock(block, spentAsTip, unspentAsTip, auditProgress.confirmedTip, redeemAddressesByAddress); // Finally, update the lastblockupdate of the remaining UTXOs and save to the database const [minBlockUpdate] = await DB.query(`SELECT MIN(lastblockupdate) AS lastblockupdate FROM federation_txos WHERE unspent = 1`); @@ -202,11 +339,14 @@ class ElementsParser { auditProgress = await this.$getAuditProgress(); auditProgress.lastBlockAudit++; indexedThisRun++; + + if ((Date.now() / 1000) >= stopAt) { + logger.debug(`Reached max federation audit runtime, pausing audit to let Liquid parsing run and resuming later`); + break; + } } - this.isUtxosUpdatingRunning = false; } catch (e) { - this.isUtxosUpdatingRunning = false; throw new Error(e instanceof Error ? e.message : 'Error'); } } @@ -221,28 +361,29 @@ class ElementsParser { // Returns the UTXOs that are spent as of tip and need to be scanned /** @asyncUnsafe */ - protected async $getFederationUtxosToParse(utxos: any[]): Promise { - const spentAsTip: any[] = []; - const unspentAsTip: any[] = []; + protected async $getFederationUtxosToParse(utxos: any[]): Promise<{ spentAsTip: Map; unspentAsTip: Map }> { + const spentAsTip = new Map(); + const unspentAsTip = new Map(); for (const utxo of utxos) { const result = await bitcoinSecondClient.getTxOut(utxo.txid, utxo.txindex, false); - result ? unspentAsTip.push(utxo) : spentAsTip.push(utxo); + const key = `${utxo.txid}:${utxo.txindex}`; + result ? unspentAsTip.set(key, utxo) : spentAsTip.set(key, utxo); } return {spentAsTip, unspentAsTip}; } /** @asyncUnsafe */ - protected async $parseBitcoinBlock(block: IBitcoinApi.Block, spentAsTip: any[], unspentAsTip: any[], confirmedTip: number, redeemAddressesData: any[] = []) { - const redeemAddresses: string[] = redeemAddressesData.map(redeemAddress => redeemAddress.bitcoinaddress); + protected async $parseBitcoinBlock(block: IBitcoinApi.Block, spentAsTip: Map, unspentAsTip: Map, confirmedTip: number, redeemAddressesByAddress: Map) { + const federationTimelockByAddress = new Map((await this.$getFederationPegScripts()).map(fedAddress => [fedAddress.address, fedAddress.timelock])); for (const tx of block.tx) { let mightRedeemInThisTx = false; // Check if the Federation UTXOs that was spent as of tip are spent in this block for (const input of tx.vin) { - const txo = spentAsTip.find(txo => txo.txid === input.txid && txo.txindex === input.vout); + const txo = spentAsTip.get(`${input.txid!}:${input.vout!}`); if (txo) { - mightRedeemInThisTx = true; // A Federation UTXO is spent in this block: we might find a peg-out address in the outputs + mightRedeemInThisTx = true; // A Federation UTXO is spent in this tx: a peg-out redeem output may be present if (txo.expiredAt > 0 ) { if (input.txinwitness?.length !== 13) { // Check if the witness data of the input contains the 11 signatures: if it doesn't, emergency keys are being used await DB.query(`UPDATE federation_txos SET unspent = 0, lastblockupdate = ?, lasttimeupdate = ?, emergencyKey = 1 WHERE txid = ? AND txindex = ?`, [block.height, block.time, txo.txid, txo.txindex]); @@ -255,36 +396,44 @@ class ElementsParser { await DB.query(`UPDATE federation_txos SET unspent = 0, lastblockupdate = ?, lasttimeupdate = ? WHERE txid = ? AND txindex = ?`, [block.height, block.time, txo.txid, txo.txindex]); logger.debug(`Federation UTXO ${txo.txid}:${txo.txindex} (${txo.amount} sats) was spent in block ${block.height}`); } - // Remove the TXO from the utxo array - spentAsTip.splice(spentAsTip.indexOf(txo), 1); + // Remove the TXO from the map + spentAsTip.delete(`${txo.txid}:${txo.txindex}`); } } // Check if an output is sent to a change address of the federation for (const output of tx.vout) { - if (output.scriptPubKey.address && federationChangeAddresses.includes(output.scriptPubKey.address)) { - // Check that the UTXO was not already added in the DB by previous scans - const [rows_check] = await DB.query(`SELECT txid FROM federation_txos WHERE txid = ? AND txindex = ?`, [tx.txid, output.n]) as any[]; - if (rows_check.length === 0) { - const timelock = output.scriptPubKey.address === federationChangeAddresses[1] ? 2016 : 4032; // hardcode timelock for 3EiAcrzq... This will be addressed better in the future - const query_utxos = `INSERT INTO federation_txos (txid, txindex, bitcoinaddress, amount, blocknumber, blocktime, unspent, lastblockupdate, lasttimeupdate, timelock, expiredAt, emergencyKey, pegtxid, pegindex, pegblocktime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`; - const params_utxos: (string | number)[] = [tx.txid, output.n, output.scriptPubKey.address, output.value * 100000000, block.height, block.time, 1, block.height, 0, timelock, 0, 0, '', 0, 0]; - await DB.query(query_utxos, params_utxos); - // Add the UTXO to the utxo array - spentAsTip.push({ - txid: tx.txid, - txindex: output.n, - bitcoinaddress: output.scriptPubKey.address, - amount: output.value * 100000000, - blocknumber: block.height, - timelock: timelock, - expiredAt: 0, - }); - logger.debug(`Added new Federation UTXO ${tx.txid}:${output.n} (${Math.round(output.value * 100000000)} sats), change address: ${output.scriptPubKey.address}`); + if (output.scriptPubKey.address) { + const timelock = federationTimelockByAddress.get(output.scriptPubKey.address); + if (timelock !== undefined) { + // Check that the UTXO was not already added in the DB by previous scans + const [rows_check] = await DB.query(`SELECT txid FROM federation_txos WHERE txid = ? AND txindex = ?`, [tx.txid, output.n]) as any[]; + if (rows_check.length === 0) { + const query_utxos = `INSERT INTO federation_txos (txid, txindex, bitcoinaddress, amount, blocknumber, blocktime, unspent, lastblockupdate, lasttimeupdate, timelock, expiredAt, emergencyKey, pegtxid, pegindex, pegblocktime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`; + const params_utxos: (string | number)[] = [tx.txid, output.n, output.scriptPubKey.address, output.value * 100000000, block.height, block.time, 1, block.height, 0, timelock, 0, 0, '', 0, 0]; + await DB.query(query_utxos, params_utxos); + // Add the UTXO to the map + spentAsTip.set(`${tx.txid}:${output.n}`, { + txid: tx.txid, + txindex: output.n, + bitcoinaddress: output.scriptPubKey.address, + amount: output.value * 100000000, + blocknumber: block.height, + timelock: timelock, + expiredAt: 0, + }); + logger.debug(`Added new Federation UTXO ${tx.txid}:${output.n} (${Math.round(output.value * 100000000)} sats), change address: ${output.scriptPubKey.address}`); + } } - } - if (mightRedeemInThisTx && output.scriptPubKey.address && redeemAddresses.includes(output.scriptPubKey.address)) { - // Find the number of times output.scriptPubKey.address appears in redeemAddresses. There can be address reuse for peg-outs... - const matchingAddress: any[] = redeemAddressesData.filter(redeemAddress => redeemAddress.bitcoinaddress === output.scriptPubKey.address && -redeemAddress.amount === Math.round(output.value * 100000000)); + + if (!mightRedeemInThisTx) { + continue; + } + const redeemCandidates = redeemAddressesByAddress.get(output.scriptPubKey.address); + if (!redeemCandidates) { + continue; + } + // Find the number of times output.scriptPubKey.address appears in the candidates. There can be address reuse for peg-outs... + const matchingAddress: any[] = redeemCandidates.filter(redeemAddress => -redeemAddress.amount === Math.round(output.value * 100000000)); if (matchingAddress.length > 0) { if (matchingAddress.length > 1) { // If there are more than one peg out address with the same amount, we can't know which one redeemed the UTXO: we take the oldest one @@ -296,9 +445,13 @@ class ElementsParser { const query_add_redeem = `UPDATE elements_pegs SET bitcointxid = ?, bitcoinindex = ? WHERE bitcoinaddress = ? AND amount = ? AND datetime = ?`; const params_add_redeem: (string | number)[] = [tx.txid, output.n, matchingAddress[0].bitcoinaddress, matchingAddress[0].amount, matchingAddress[0].datetime]; await DB.query(query_add_redeem, params_add_redeem); - const index = redeemAddressesData.indexOf(matchingAddress[0]); - redeemAddressesData.splice(index, 1); - redeemAddresses.splice(index, 1); + const index = redeemCandidates.indexOf(matchingAddress[0]); + if (index !== -1) { + redeemCandidates.splice(index, 1); + if (redeemCandidates.length === 0) { + redeemAddressesByAddress.delete(output.scriptPubKey.address); + } + } } else { // The output amount does not match the peg-out amount... log it logger.debug(`Found redeem txid ${tx.txid}:${output.n} to peg-out address ${output.scriptPubKey.address} but output amount ${Math.round(output.value * 100000000)} does not match the peg-out amount!`); } @@ -306,7 +459,7 @@ class ElementsParser { } } - for (const utxo of spentAsTip) { + for (const utxo of spentAsTip.values()) { if (utxo.expiredAt === 0 && block.height >= utxo.blocknumber + utxo.timelock) { // The UTXO is expiring in this block await DB.query(`UPDATE federation_txos SET lastblockupdate = ?, expiredAt = ? WHERE txid = ? AND txindex = ?`, [block.height, block.time, utxo.txid, utxo.txindex]); } else { @@ -314,7 +467,7 @@ class ElementsParser { } } - for (const utxo of unspentAsTip) { + for (const utxo of unspentAsTip.values()) { if (utxo.expiredAt === 0 && block.height >= utxo.blocknumber + utxo.timelock) { // The UTXO is expiring in this block await DB.query(`UPDATE federation_txos SET lastblockupdate = ?, expiredAt = ? WHERE txid = ? AND txindex = ?`, [confirmedTip, block.time, utxo.txid, utxo.txindex]); } else if (utxo.expiredAt === 0 && confirmedTip >= utxo.blocknumber + utxo.timelock) { // The UTXO is expiring before the tip: we need to keep track of it @@ -380,7 +533,7 @@ class ElementsParser { bitcoinBlocks: bitcoinBlocksToSync.bitcoinBlocks, bitcoinHeaders: bitcoinBlocksToSync.bitcoinHeaders, lastBlockAudit: lastBlockAudit, - isAuditSynced: bitcoinBlocksToSync.bitcoinHeaders - bitcoinBlocksToSync.bitcoinBlocks <= 2 && bitcoinBlocksToSync.bitcoinBlocks - lastBlockAudit <= 3, + isAuditSynced: bitcoinBlocksToSync.bitcoinHeaders - bitcoinBlocksToSync.bitcoinBlocks <= 3 && bitcoinBlocksToSync.bitcoinBlocks - lastBlockAudit <= auditSyncToleranceBlocks, }; } diff --git a/backend/src/api/liquid/liquid.routes.ts b/backend/src/api/liquid/liquid.routes.ts index 5353510f0..de728da6a 100644 --- a/backend/src/api/liquid/liquid.routes.ts +++ b/backend/src/api/liquid/liquid.routes.ts @@ -6,6 +6,8 @@ import icons from './icons'; import { handleError } from '../../utils/api'; import PricesRepository from '../../repositories/PricesRepository'; +const PROXY_PATH_SEGMENT_REGEX = /^(?!\.{1,2}$)[^\p{Cc}/?#\\]{1,256}$/u; + class LiquidRoutes { public initRoutes(app: Application) { app @@ -68,8 +70,13 @@ class LiquidRoutes { } private async $getAssetGroup(req: Request, res: Response) { + if (!PROXY_PATH_SEGMENT_REGEX.test(req.params.id)) { + handleError(req, res, 400, 'Invalid asset group id'); + return; + } + try { - const response = await axios.get(`${config.EXTERNAL_DATA_SERVER.LIQUID_API}/assets/group/${parseInt(req.params.id, 10)}`, + const response = await axios.get(`${config.EXTERNAL_DATA_SERVER.LIQUID_API}/assets/group/${encodeURIComponent(req.params.id)}`, { responseType: 'stream', timeout: 10000 }); response.data.pipe(res); } catch (e) { diff --git a/backend/src/api/mempool-blocks.ts b/backend/src/api/mempool-blocks.ts index 43bf05eec..17ccf84e6 100644 --- a/backend/src/api/mempool-blocks.ts +++ b/backend/src/api/mempool-blocks.ts @@ -8,6 +8,7 @@ import path from 'path'; import mempool from './mempool'; import { Acceleration } from './services/acceleration'; import PoolsRepository from '../repositories/PoolsRepository'; +import { ProjectedBlock } from '../cluster-mempool/cluster-mempool'; const MAX_UINT32 = Math.pow(2, 32) - 1; @@ -238,7 +239,7 @@ class MempoolBlocks { } /** @asyncSafe */ - public async $rustMakeBlockTemplates(txids: string[], newMempool: { [txid: string]: MempoolTransactionExtended }, candidates: GbtCandidates | undefined, saveResults: boolean = false, useAccelerations: boolean = false, accelerationPool?: number): Promise { + public async $rustMakeBlockTemplates(txids: string[], newMempool: { [txid: string]: MempoolTransactionExtended }, candidates: GbtCandidates | undefined, saveResults: boolean = false, useAccelerations: boolean = false, accelerationPool?: number, dryRun = false): Promise { const start = Date.now(); // reset mempool short ids @@ -278,7 +279,7 @@ class MempoolBlocks { const expectedSize = transactions.length; const resultMempoolSize = blocks.reduce((total, block) => total + block.length, 0) + overflow.length; logger.debug(`RUST updateBlockTemplates returned ${resultMempoolSize} txs out of ${expectedSize} in the mempool, ${overflow.length} were unmineable`); - const processed = this.processBlockTemplates(newMempool, blocks, blockWeights, rates, clusters, candidates, accelerations, accelerationPool, saveResults); + const processed = this.processBlockTemplates(newMempool, blocks, blockWeights, rates, clusters, candidates, accelerations, accelerationPool, saveResults, dryRun); logger.debug(`RUST makeBlockTemplates completed in ${(Date.now() - start)/1000} seconds`); return processed; } catch (e) { @@ -296,16 +297,15 @@ class MempoolBlocks { } /** @asyncSafe */ - public async $rustUpdateBlockTemplates(transactions: string[], newMempool: { [txid: string]: MempoolTransactionExtended }, added: MempoolTransactionExtended[], removed: MempoolTransactionExtended[], candidates: GbtCandidates | undefined, useAccelerations: boolean, accelerationPool?: number): Promise { + public async $rustUpdateBlockTemplates(transactions: string[], newMempool: { [txid: string]: MempoolTransactionExtended }, added: MempoolTransactionExtended[], removed: MempoolTransactionExtended[], candidates: GbtCandidates | undefined, useAccelerations: boolean, accelerationPool?: number, dryRun = false): Promise { // GBT optimization requires that uids never get too sparse // as a sanity check, we should also explicitly prevent uint32 uid overflow if (this.nextUid + added.length >= Math.min(Math.max(262144, 2 * transactions.length), MAX_UINT32)) { this.resetRustGbt(); } - if (!this.rustInitialized) { - // need to reset the worker - return this.$rustMakeBlockTemplates(transactions, newMempool, candidates, true, useAccelerations, accelerationPool); + if (!this.rustInitialized || dryRun) { + return this.$rustMakeBlockTemplates(transactions, newMempool, candidates, !dryRun, useAccelerations, accelerationPool, dryRun); } const start = Date.now(); @@ -344,7 +344,7 @@ class MempoolBlocks { if (transactions.length !== resultMempoolSize) { throw new Error(`GBT returned wrong number of transactions ${transactions.length} vs ${resultMempoolSize}, cache is probably out of sync`); } else { - const processed = this.processBlockTemplates(newMempool, blocks, blockWeights, rates, clusters, candidates, accelerations, accelerationPool, true); + const processed = this.processBlockTemplates(newMempool, blocks, blockWeights, rates, clusters, candidates, accelerations, accelerationPool, !dryRun, dryRun); this.removeUids(removedTxs); logger.debug(`RUST updateBlockTemplates completed in ${(Date.now() - start)/1000} seconds`); return processed; @@ -356,20 +356,22 @@ class MempoolBlocks { } } - private processBlockTemplates(mempool: { [txid: string]: MempoolTransactionExtended }, blocks: string[][], blockWeights: number[] | null, rates: [string, number][], clusters: string[][], candidates: GbtCandidates | undefined, accelerations: { [txid: string]: Acceleration }, accelerationPool, saveResults): MempoolBlockWithTransactions[] { - for (const txid of Object.keys(candidates?.txs ?? mempool)) { - if (txid in mempool) { - mempool[txid].cpfpDirty = false; - mempool[txid].ancestors = []; - mempool[txid].descendants = []; - mempool[txid].bestDescendant = null; + private processBlockTemplates(mempool: { [txid: string]: MempoolTransactionExtended }, blocks: string[][], blockWeights: number[] | null, rates: [string, number][], clusters: string[][], candidates: GbtCandidates | undefined, accelerations: { [txid: string]: Acceleration }, accelerationPool, saveResults, dryRun = false): MempoolBlockWithTransactions[] { + if (!dryRun) { + for (const txid of Object.keys(candidates?.txs ?? mempool)) { + if (txid in mempool) { + mempool[txid].cpfpDirty = false; + mempool[txid].ancestors = []; + mempool[txid].descendants = []; + mempool[txid].bestDescendant = null; + } } - } - for (const [txid, rate] of rates) { - if (txid in mempool) { - mempool[txid].cpfpDirty = (rate !== mempool[txid].effectiveFeePerVsize); - mempool[txid].effectiveFeePerVsize = rate; - mempool[txid].cpfpChecked = true; + for (const [txid, rate] of rates) { + if (txid in mempool) { + mempool[txid].cpfpDirty = (rate !== mempool[txid].effectiveFeePerVsize); + mempool[txid].effectiveFeePerVsize = rate; + mempool[txid].cpfpChecked = true; + } } } @@ -387,58 +389,60 @@ class MempoolBlocks { feeStatsCalculator = new OnlineFeeStatsCalculator(stackWeight, 0.5, [10, 20, 30, 40, 50, 60, 70, 80, 90]); } - const ancestors: Ancestor[] = []; - const descendants: Ancestor[] = []; - let ancestor: MempoolTransactionExtended; - for (const cluster of clusters) { - for (const memberTxid of cluster) { - const mempoolTx = mempool[memberTxid]; - if (mempoolTx) { - // ugly micro-optimization to avoid allocating new arrays - ancestors.length = 0; - descendants.length = 0; - let matched = false; - cluster.forEach(txid => { - ancestor = mempool[txid]; - if (txid === memberTxid) { - matched = true; - } else { - if (!ancestor) { - console.log('txid missing from mempool! ', txid, candidates?.txs[txid]); - return; - } - const relative = { - txid: txid, - fee: ancestor.fee, - weight: (ancestor.adjustedVsize * 4), - }; - if (matched) { - descendants.push(relative); - if (!mempoolTx.lastBoosted || (ancestor.firstSeen && ancestor.firstSeen > mempoolTx.lastBoosted)) { - mempoolTx.lastBoosted = ancestor.firstSeen; - } + if (!dryRun) { + const ancestors: Ancestor[] = []; + const descendants: Ancestor[] = []; + let ancestor: MempoolTransactionExtended; + for (const cluster of clusters) { + for (const memberTxid of cluster) { + const mempoolTx = mempool[memberTxid]; + if (mempoolTx) { + // ugly micro-optimization to avoid allocating new arrays + ancestors.length = 0; + descendants.length = 0; + let matched = false; + cluster.forEach(txid => { + ancestor = mempool[txid]; + if (txid === memberTxid) { + matched = true; } else { - ancestors.push(relative); + if (!ancestor) { + console.log('txid missing from mempool! ', txid, candidates?.txs[txid]); + return; + } + const relative = { + txid: txid, + fee: ancestor.fee, + weight: (ancestor.adjustedVsize * 4), + }; + if (matched) { + descendants.push(relative); + if (!mempoolTx.lastBoosted || (ancestor.firstSeen && ancestor.firstSeen > mempoolTx.lastBoosted)) { + mempoolTx.lastBoosted = ancestor.firstSeen; + } + } else { + ancestors.push(relative); + } } + }); + if (mempoolTx.ancestors?.length !== ancestors.length || mempoolTx.descendants?.length !== descendants.length) { + mempoolTx.cpfpDirty = true; } - }); - if (mempoolTx.ancestors?.length !== ancestors.length || mempoolTx.descendants?.length !== descendants.length) { - mempoolTx.cpfpDirty = true; + // ugly micro-optimization to avoid allocating new arrays or objects + if (mempoolTx.ancestors) { + mempoolTx.ancestors.length = 0; + } else { + mempoolTx.ancestors = []; + } + if (mempoolTx.descendants) { + mempoolTx.descendants.length = 0; + } else { + mempoolTx.descendants = []; + } + mempoolTx.ancestors.push(...ancestors); + mempoolTx.descendants.push(...descendants); + mempoolTx.cpfpChecked = true; } - // ugly micro-optimization to avoid allocating new arrays or objects - if (mempoolTx.ancestors) { - mempoolTx.ancestors.length = 0; - } else { - mempoolTx.ancestors = []; - } - if (mempoolTx.descendants) { - mempoolTx.descendants.length = 0; - } else { - mempoolTx.descendants = []; - } - mempoolTx.ancestors.push(...ancestors); - mempoolTx.descendants.push(...descendants); - mempoolTx.cpfpChecked = true; } } } @@ -471,34 +475,42 @@ class MempoolBlocks { const txid = block[i]; if (txid in mempool) { mempoolTx = mempool[txid]; - // save position in projected blocks - mempoolTx.position = { - block: blockIndex, - vsize: totalVsize + (mempoolTx.vsize / 2), - }; - if (txid in accelerations) { - acceleration = accelerations[txid]; - if (isAcceleratedBy[txid] || (acceleration && (!accelerationPool || acceleration.pools.includes(accelerationPool)))) { - if (!mempoolTx.acceleration) { - mempoolTx.cpfpDirty = true; - } - mempoolTx.acceleration = true; - mempoolTx.acceleratedBy = isAcceleratedBy[txid] || acceleration?.pools; - mempoolTx.acceleratedAt = acceleration?.added; - mempoolTx.feeDelta = acceleration?.feeDelta; - for (const ancestor of mempoolTx.ancestors || []) { - if (!(ancestor.txid in mempool)) { - continue; + if (!dryRun) { + // save position in projected blocks + mempoolTx.position = { + block: blockIndex, + vsize: totalVsize + (mempoolTx.vsize / 2), + }; + + if (txid in accelerations) { + acceleration = accelerations[txid]; + if (isAcceleratedBy[txid] || (acceleration && (!accelerationPool || acceleration.pools.includes(accelerationPool)))) { + if (!mempoolTx.acceleration) { + mempoolTx.cpfpDirty = true; } - if (!mempool[ancestor.txid].acceleration) { - mempool[ancestor.txid].cpfpDirty = true; + mempoolTx.acceleration = true; + mempoolTx.acceleratedBy = isAcceleratedBy[txid] || acceleration?.pools; + mempoolTx.acceleratedAt = acceleration?.added; + mempoolTx.feeDelta = acceleration?.feeDelta; + for (const ancestor of mempoolTx.ancestors || []) { + if (!(ancestor.txid in mempool)) { + continue; + } + if (!mempool[ancestor.txid].acceleration) { + mempool[ancestor.txid].cpfpDirty = true; + } + mempool[ancestor.txid].acceleration = true; + mempool[ancestor.txid].acceleratedBy = mempoolTx.acceleratedBy; + mempool[ancestor.txid].acceleratedAt = mempoolTx.acceleratedAt; + mempool[ancestor.txid].feeDelta = mempoolTx.feeDelta; + isAcceleratedBy[ancestor.txid] = mempoolTx.acceleratedBy; + } + } else { + if (mempoolTx.acceleration) { + mempoolTx.cpfpDirty = true; + delete mempoolTx.acceleration; } - mempool[ancestor.txid].acceleration = true; - mempool[ancestor.txid].acceleratedBy = mempoolTx.acceleratedBy; - mempool[ancestor.txid].acceleratedAt = mempoolTx.acceleratedAt; - mempool[ancestor.txid].feeDelta = mempoolTx.feeDelta; - isAcceleratedBy[ancestor.txid] = mempoolTx.acceleratedBy; } } else { if (mempoolTx.acceleration) { @@ -506,11 +518,6 @@ class MempoolBlocks { delete mempoolTx.acceleration; } } - } else { - if (mempoolTx.acceleration) { - mempoolTx.cpfpDirty = true; - delete mempoolTx.acceleration; - } } // online calculation of stack-of-blocks fee stats @@ -548,6 +555,115 @@ class MempoolBlocks { return mempoolBlocks; } + public processClusterMempoolBlocks(projectedBlocks: ProjectedBlock[], newMempool: { [txid: string]: MempoolTransactionExtended }, accelerations: { [txid: string]: Acceleration }, saveResults = true, accelerationPool?: number): MempoolBlockWithTransactions[] { + const lastBlockIndex = projectedBlocks.length - 1; + let hasBlockStack = projectedBlocks.length >= 8; + let stackWeight = 0; + let feeStatsCalculator: OnlineFeeStatsCalculator | null = null; + if (hasBlockStack) { + stackWeight = projectedBlocks[lastBlockIndex].weight; + hasBlockStack = stackWeight > config.MEMPOOL.BLOCK_WEIGHT_UNITS; + feeStatsCalculator = new OnlineFeeStatsCalculator(stackWeight, 0.5, [10, 20, 30, 40, 50, 60, 70, 80, 90]); + } + + const isAcceleratedBy: { [txid: string]: number[] | false } = {}; + + const sizeLimit = (config.MEMPOOL.BLOCK_WEIGHT_UNITS / 4) * 1.2; + let mempoolTx: MempoolTransactionExtended; + let acceleration: Acceleration; + const mempoolBlocks: MempoolBlockWithTransactions[] = []; + + for (let blockIndex = 0; blockIndex < projectedBlocks.length; blockIndex++) { + const projected = projectedBlocks[blockIndex]; + let totalSize = 0; + let totalVsize = 0; + let totalWeight = 0; + let totalFees = 0; + const transactions: MempoolTransactionExtended[] = []; + const validTxids: string[] = []; + + for (const txid of projected.txids) { + if (txid in newMempool) { + mempoolTx = newMempool[txid]; + validTxids.push(txid); + + // save position in projected blocks + mempoolTx.position = { + block: blockIndex, + vsize: totalVsize + (mempoolTx.vsize / 2), + }; + + if (txid in accelerations) { + acceleration = accelerations[txid]; + if (isAcceleratedBy[txid] || (acceleration && (!accelerationPool || acceleration.pools.includes(accelerationPool)))) { + if (!mempoolTx.acceleration) { + mempoolTx.cpfpDirty = true; + } + mempoolTx.acceleration = true; + mempoolTx.acceleratedBy = isAcceleratedBy[txid] || acceleration?.pools; + mempoolTx.acceleratedAt = acceleration?.added; + mempoolTx.feeDelta = acceleration?.feeDelta; + for (const ancestor of mempoolTx.ancestors || []) { + if (!(ancestor.txid in newMempool)) { + continue; + } + if (!newMempool[ancestor.txid].acceleration) { + newMempool[ancestor.txid].cpfpDirty = true; + } + newMempool[ancestor.txid].acceleration = true; + newMempool[ancestor.txid].acceleratedBy = mempoolTx.acceleratedBy; + newMempool[ancestor.txid].acceleratedAt = mempoolTx.acceleratedAt; + newMempool[ancestor.txid].feeDelta = mempoolTx.feeDelta; + isAcceleratedBy[ancestor.txid] = mempoolTx.acceleratedBy; + } + } else { + if (mempoolTx.acceleration) { + mempoolTx.cpfpDirty = true; + delete mempoolTx.acceleration; + } + } + } else { + if (mempoolTx.acceleration) { + mempoolTx.cpfpDirty = true; + delete mempoolTx.acceleration; + } + } + + if (hasBlockStack && blockIndex === lastBlockIndex && feeStatsCalculator) { + feeStatsCalculator.processNext(mempoolTx); + } + + totalSize += mempoolTx.size; + totalVsize += mempoolTx.vsize; + totalWeight += mempoolTx.weight; + totalFees += mempoolTx.fee; + + if (totalVsize <= sizeLimit) { + transactions.push(mempoolTx); + } + } + } + + mempoolBlocks[blockIndex] = this.dataToMempoolBlocks( + validTxids, + transactions, + totalSize, + totalWeight, + totalFees, + (hasBlockStack && blockIndex === lastBlockIndex && feeStatsCalculator) ? feeStatsCalculator.getRawFeeStats() : undefined, + ); + } + + if (saveResults) { + const deltas = this.calculateMempoolDeltas(this.mempoolBlocks, mempoolBlocks); + this.mempoolBlocks = mempoolBlocks; + this.mempoolBlockDeltas = deltas; + this.updateAccelerationPositions(newMempool, accelerations, mempoolBlocks); + } + + return mempoolBlocks; + } + private dataToMempoolBlocks(transactionIds: string[], transactions: MempoolTransactionExtended[], totalSize: number, totalWeight: number, totalFees: number, feeStats?: EffectiveFeeStats ): MempoolBlockWithTransactions { if (!feeStats) { feeStats = Common.calcEffectiveFeeStatistics(transactions); diff --git a/backend/src/api/mempool.ts b/backend/src/api/mempool.ts index d83347fd6..bee3e10db 100644 --- a/backend/src/api/mempool.ts +++ b/backend/src/api/mempool.ts @@ -13,6 +13,7 @@ import { Acceleration } from './services/acceleration'; import accelerationApi from './services/acceleration'; import redisCache from './redis-cache'; import blocks from './blocks'; +import { ClusterMempool } from '../cluster-mempool/cluster-mempool'; class Mempool { private inSync: boolean = false; @@ -22,6 +23,7 @@ class Mempool { private spendMap = new Map(); private recentlyDeleted: MempoolTransactionExtended[][] = []; // buffer of transactions deleted in recent mempool updates private mempoolInfo: IBitcoinApi.MempoolInfo; + public clusterMempool: ClusterMempool | null = null; private mempoolChangedCallback: ((newMempool: {[txId: string]: MempoolTransactionExtended; }, newTransactions: MempoolTransactionExtended[], deletedTransactions: MempoolTransactionExtended[][], accelerationDelta: string[]) => void) | undefined; private $asyncMempoolChangedCallback: ((newMempool: {[txId: string]: MempoolTransactionExtended; }, mempoolSize: number, newTransactions: MempoolTransactionExtended[], @@ -62,6 +64,9 @@ class Mempool { minrelaytxfee: isLiquid ? 0.00000100 : 0.00001000 }; this.txPerSecondInterval = setInterval(this.updateTxPerSecond.bind(this), 1000); + if (config.MEMPOOL.CLUSTER_MEMPOOL) { + this.clusterMempool = new ClusterMempool(this.mempoolCache, this.accelerations); + } } /** @@ -153,6 +158,9 @@ class Mempool { await redisCache.$flushTransactions(); logger.debug(`Finished migrating cache transactions in ${((Date.now() - redisTimer) / 1000).toFixed(2)} seconds`); } + if (config.MEMPOOL.CLUSTER_MEMPOOL) { + this.clusterMempool = new ClusterMempool(this.mempoolCache, this.accelerations); + } if (this.mempoolChangedCallback) { this.mempoolChangedCallback(this.mempoolCache, [], [], []); } @@ -374,6 +382,7 @@ class Mempool { for (const tx of deletedTransactions) { delete this.mempoolCache[tx.txid]; } + redisCache.queueTransactionsForRemoval(deletedTransactions.map(tx => tx.txid)); } const candidates = await this.getNextCandidates(minFeeMempool, minFeeTip, deletedTransactions); @@ -387,6 +396,14 @@ class Mempool { hasChange = true; } + if (config.MEMPOOL.CLUSTER_MEMPOOL && (newTransactions.length || deletedTransactions.length || accelerationDelta.length)) { + this.clusterMempool?.applyMempoolChange({ + added: newTransactions, + removed: deletedTransactions, + accelerations: this.getAccelerations(), + }); + } + this.mempoolCacheDelta = Math.abs(transactions.length - newMempoolSize); const candidatesChanged = candidates?.added?.length || candidates?.removed?.length; @@ -412,7 +429,7 @@ class Mempool { // Update Redis cache if (config.REDIS.ENABLED) { await redisCache.$flushTransactions(); - await redisCache.$removeTransactions(deletedTransactions.map(tx => tx.txid)); + await redisCache.$removeTransactions(); await rbfCache.updateCache(); } diff --git a/backend/src/api/mining/mining.ts b/backend/src/api/mining/mining.ts index d3fadbcce..ebf8fd40d 100644 --- a/backend/src/api/mining/mining.ts +++ b/backend/src/api/mining/mining.ts @@ -114,31 +114,29 @@ class Mining { const poolsStatistics = {}; const poolsInfo: PoolInfo[] = await PoolsRepository.$getPoolsInfo(interval); - const emptyBlocks: any[] = await BlocksRepository.$countEmptyBlocks(null, interval); const poolsStats: PoolStats[] = []; let rank = 1; + let blockCount = 0; poolsInfo.forEach((poolInfo: PoolInfo) => { - const emptyBlocksCount = emptyBlocks.filter((emptyCount) => emptyCount.poolId === poolInfo.poolId); const poolStat: PoolStats = { poolId: poolInfo.poolId, // mysql row id name: poolInfo.name, link: poolInfo.link, blockCount: poolInfo.blockCount, rank: rank++, - emptyBlocks: emptyBlocksCount.length > 0 ? emptyBlocksCount[0]['count'] : 0, + emptyBlocks: poolInfo.emptyBlocks, slug: poolInfo.slug, avgMatchRate: poolInfo.avgMatchRate !== null ? Math.round(100 * poolInfo.avgMatchRate) / 100 : null, avgFeeDelta: poolInfo.avgFeeDelta, poolUniqueId: poolInfo.poolUniqueId }; poolsStats.push(poolStat); + blockCount += poolInfo.blockCount; }); poolsStatistics['pools'] = poolsStats; - - const blockCount: number = await BlocksRepository.$blockCount(null, interval); poolsStatistics['blockCount'] = blockCount; const totalBlock24h: number = await BlocksRepository.$blockCount(null, '24h'); @@ -151,6 +149,8 @@ class Mining { poolsStatistics['lastEstimatedHashrate1w'] = await bitcoinClient.getNetworkHashPs(totalBlock1w); } catch (e) { poolsStatistics['lastEstimatedHashrate'] = 0; + poolsStatistics['lastEstimatedHashrate3d'] = 0; + poolsStatistics['lastEstimatedHashrate1w'] = 0; logger.debug('Bitcoin Core is not available, using zeroed value for current hashrate', logger.tags.mining); } diff --git a/backend/src/api/redis-cache.ts b/backend/src/api/redis-cache.ts index 80a947c12..5858603c7 100644 --- a/backend/src/api/redis-cache.ts +++ b/backend/src/api/redis-cache.ts @@ -23,11 +23,14 @@ class RedisCache { private pauseFlush: boolean = false; private cacheQueue: MempoolTransactionExtended[] = []; - private removeQueue: string[] = []; + private removeQueue = new Set(); + private removeQueueFlushInProgress: boolean = false; private rbfCacheQueue: { type: string, txid: string, value: any }[] = []; private rbfRemoveQueue: { type: string, txid: string }[] = []; private txFlushLimit: number = 10000; private ignoreBlocksCache = false; + private reconciliationInProgress: boolean = false; + private reconciliationCursor: string = '0'; constructor() { if (config.REDIS.ENABLED) { @@ -39,6 +42,7 @@ class RedisCache { }; void this.$ensureConnected(); setInterval(() => { void this.$ensureConnected(); }, 10000); + setInterval(() => { void this.$reconcileMempoolTransactions(); }, 30000); } } @@ -92,7 +96,7 @@ class RedisCache { private async $onConnected(): Promise { await this.$flushTransactions(); - await this.$removeTransactions([]); + await this.$removeTransactions(); await this.$flushRbfQueues(); } @@ -134,6 +138,7 @@ class RedisCache { if (!config.REDIS.ENABLED) { return; } + this.removeQueue.delete(tx.txid); this.cacheQueue.push(tx); if (this.cacheQueue.length >= this.txFlushLimit) { if (!this.pauseFlush) { @@ -182,32 +187,88 @@ class RedisCache { } } - /** @asyncSafe */ - async $removeTransactions(transactions: string[]): Promise { + queueTransactionsForRemoval(transactions: string[]): void { if (!config.REDIS.ENABLED) { return; } - const toRemove = this.removeQueue.concat(transactions); - this.removeQueue = []; - let failed: string[] = []; - let numRemoved = 0; - if (this.connected) { + + for (const txid of transactions) { + this.removeQueue.add(txid); + } + } + + /** @asyncSafe */ + async $removeTransactions(transactions: string[] = []): Promise { + if (!config.REDIS.ENABLED) { + return; + } + for (const txid of transactions) { + this.removeQueue.add(txid); + } + await this.$flushQueuedMempoolTxRemovals(); + } + + // incrementally reconcile the redis cache with the in-memory mempool + // by scanning for cached txs no longer in the mempool and marking for deletion + // each invocation scans 1000 keys, cursor loops back to the start after completing a full scan + /** @asyncSafe */ + private async $reconcileMempoolTransactions(): Promise { + if (!config.REDIS.ENABLED || !this.connected || this.reconciliationInProgress || !memPool.isInSync()) { + return; + } + + this.reconciliationInProgress = true; + try { + const result = await this.client.scan(this.reconciliationCursor, { + MATCH: 'mempool:tx:*', + COUNT: 1000 + }); + const mempool = memPool.getMempool(); + let staleCount = 0; + this.reconciliationCursor = result.cursor.toString(); + + for (const key of result.keys) { + const txid = key.slice('mempool:tx:'.length); + if (!mempool[txid]) { + this.removeQueue.add(txid); + staleCount++; + } + } + + if (staleCount) { + logger.debug(`Removing ${staleCount} stale transactions from the redis cache`); + void this.$removeTransactions(); + } + } catch (e) { + logger.warn(`Failed to reconcile Redis mempool cache: ${e instanceof Error ? e.message : e}`); + } finally { + this.reconciliationInProgress = false; + } + } + + /** @asyncSafe */ + private async $flushQueuedMempoolTxRemovals(): Promise { + if (!this.connected || !this.removeQueue.size || this.removeQueueFlushInProgress) { + return; + } + + this.removeQueueFlushInProgress = true; + const toRemove = Array.from(this.removeQueue); + this.removeQueue.clear(); + try { const sliceLength = config.REDIS.BATCH_QUERY_BASE_SIZE; for (let i = 0; i < Math.ceil(toRemove.length / sliceLength); i++) { const slice = toRemove.slice(i * sliceLength, (i + 1) * sliceLength); try { await this.client.unlink(slice.map(txid => `mempool:tx:${txid}`)); - numRemoved+= sliceLength; logger.debug(`Deleted ${slice.length} transactions from the Redis cache`); } catch (e) { logger.warn(`Failed to remove ${slice.length} transactions from Redis cache: ${e instanceof Error ? e.message : e}`); - failed = failed.concat(slice); + this.queueTransactionsForRemoval(slice); } } - // concat instead of replace, in case more txs have been added in the meantime - this.removeQueue = this.removeQueue.concat(failed); - } else { - this.removeQueue = this.removeQueue.concat(toRemove); + } finally { + this.removeQueueFlushInProgress = false; } } @@ -308,7 +369,7 @@ class RedisCache { } /** @asyncSafe */ - async $getMempool(): Promise<{ [txid: string]: MempoolTransactionExtended }> { + async $getMempool(validTxids?: Set): Promise<{ [txid: string]: MempoolTransactionExtended }> { if (!config.REDIS.ENABLED) { return {}; } @@ -319,7 +380,9 @@ class RedisCache { const start = Date.now(); const mempool = {}; try { - const mempoolList = await this.scanKeys('mempool:tx:*'); + const mempoolList = validTxids?.size + ? await this.loadKeys('mempool:tx:*', Array.from(validTxids)) + : await this.scanKeys('mempool:tx:*'); for (const tx of mempoolList) { mempool[tx.key] = tx.value; } @@ -350,14 +413,14 @@ class RedisCache { } /** @asyncUnsafe */ - async $loadCache(): Promise { + async $loadCache(validTxids?: Set): Promise { if (!config.REDIS.ENABLED) { return; } logger.info('Restoring mempool and blocks data from Redis cache'); // Load mempool - const loadedMempool = await this.$getMempool(); + const loadedMempool = await this.$getMempool(validTxids); this.inflateLoadedTxs(loadedMempool); // Load rbf data const rbfTxs = await this.$getRbfEntries('tx'); @@ -432,6 +495,29 @@ class RedisCache { return result; } + /** @asyncUnsafe */ + private async loadKeys(pattern, keys: string[]): Promise<{ key: string, value: T }[]> { + const prefix = pattern.slice(0, -1); + const result: { key: string, value: T }[] = []; + let count = 0; + /** @asyncUnsafe */ + const processValues = async (slice: string[]): Promise => { + const values = await this.client.MGET(slice.map(key => `${prefix}${key}`)); + for (let i = 0; i < values.length; i++) { + if (values[i]) { + result.push({ key: slice[i], value: JSON.parse(values[i]) }); + count++; + } + } + logger.info(`loaded ${count} entries from Redis cache`); + }; + for (let i = 0; i < Math.ceil(keys.length / 10000); i++) { + const slice = keys.slice(i * 10000, (i + 1) * 10000); + await processValues(slice); + } + return result; + } + public setIgnoreBlocksCache(): void { this.ignoreBlocksCache = true; } diff --git a/backend/src/api/services/wallets.ts b/backend/src/api/services/wallets.ts index d1ffa1f27..fb28e18d8 100644 --- a/backend/src/api/services/wallets.ts +++ b/backend/src/api/services/wallets.ts @@ -8,7 +8,6 @@ import { promises as fsPromises } from 'fs'; interface WalletAddress { address: string; - active: boolean; stats: { funded_txo_count: number; funded_txo_sum: number; @@ -244,15 +243,18 @@ class WalletApi { // resync address transactions from esplora async $syncWalletAddress(wallet: Wallet, address: WalletAddress): Promise { - // fetch full transaction data if the address is new or still active and hasn't been synced in the last hour - const refreshTransactions = !wallet.addresses[address.address] || (address.active && (Date.now() - wallet.addresses[address.address].lastSync) > 60 * 60 * 1000); + if (address.address === 'private') { + // skip pseudo-address for private balances + return; + } + // fetch full transaction data if the address is new or hasn't been synced in the last hour + const refreshTransactions = !wallet.addresses[address.address] || (Date.now() - wallet.addresses[address.address].lastSync) > 60 * 60 * 1000; if (refreshTransactions) { try { const summary = await bitcoinApi.$getAddressTransactionSummary(address.address); const addressInfo = await bitcoinApi.$getAddress(address.address); const walletAddress: WalletAddress = { address: address.address, - active: address.active, transactions: summary, stats: addressInfo.chain_stats, lastSync: Date.now(), @@ -322,7 +324,6 @@ function convertBalancesToWalletAddress(wallet: string, balances: { balance: num const sortedBalances = balances.sort((a, b) => a.time - b.time); const walletAddress: WalletAddress = { address: 'private', - active: false, stats: { funded_txo_count: 0, funded_txo_sum: sortedBalances[sortedBalances.length - 1].balance, diff --git a/backend/src/api/transaction-utils.ts b/backend/src/api/transaction-utils.ts index 0345282b0..caf589708 100644 --- a/backend/src/api/transaction-utils.ts +++ b/backend/src/api/transaction-utils.ts @@ -256,13 +256,14 @@ class TransactionUtils { // returns the most significant 4 bytes of the txid as an integer public txidToOrdering(txid: string): number { - return parseInt( - txid.substr(62, 2) + - txid.substr(60, 2) + - txid.substr(58, 2) + - txid.substr(56, 2), - 16 - ); + // Parse last 4 bytes of txid as little-endian uint32, without string allocation + let result = 0; + for (let i = 62; i >= 56; i -= 2) { + const hi = txid.charCodeAt(i); + const lo = txid.charCodeAt(i + 1); + result = result * 256 + (hi < 58 ? hi - 48 : hi - 87) * 16 + (lo < 58 ? lo - 48 : lo - 87); + } + return result; } public addInnerScriptsToVin(vin: IEsploraApi.Vin): void { diff --git a/backend/src/api/websocket-handler.ts b/backend/src/api/websocket-handler.ts index 595e46d24..17bc72890 100644 --- a/backend/src/api/websocket-handler.ts +++ b/backend/src/api/websocket-handler.ts @@ -3,7 +3,7 @@ import * as WebSocket from 'ws'; import { BlockExtended, TransactionExtended, MempoolTransactionExtended, WebsocketResponse, OptimizedStatistic, ILoadingIndicators, GbtCandidates, TxTrackingInfo, - MempoolDelta, MempoolDeltaTxids + MempoolDelta, MempoolDeltaTxids, CpfpInfo } from '../mempool.interfaces'; import blocks from './blocks'; import memPool from './mempool'; @@ -16,16 +16,12 @@ import transactionUtils from './transaction-utils'; import rbfCache, { ReplacementInfo } from './rbf-cache'; import difficultyAdjustment from './difficulty-adjustment'; import feeApi from './fee-api'; -import BlocksAuditsRepository from '../repositories/BlocksAuditsRepository'; -import BlocksSummariesRepository from '../repositories/BlocksSummariesRepository'; -import Audit from './audit'; import priceUpdater from '../tasks/price-updater'; import { ApiPrice } from '../repositories/PricesRepository'; import { Acceleration } from './services/acceleration'; import accelerationApi from './services/acceleration'; import mempool from './mempool'; import statistics from './statistics/statistics'; -import accelerationRepository from '../repositories/AccelerationRepository'; import bitcoinApi from './bitcoin/bitcoin-api-factory'; import walletApi from './services/wallets'; @@ -62,6 +58,12 @@ class WebsocketHandler { private accelerations: Record = {}; + private MAX_BUFFERED_AMOUNT = 10_000_000; + public MAX_MESSAGE_SIZE = 50_000; + private MAX_TRACKED_TXS = 100; + private MSG_RATE_LIMIT = 100; + private MSG_RATE_WINDOW = 10_000; + constructor() { } addWebsocketServer(wss: WebSocket.Server) { @@ -118,6 +120,7 @@ class WebsocketHandler { server.on('connection', (client: WebSocket, req) => { this.numConnected++; client['remoteAddress'] = req.headers['x-forwarded-for'] || req.socket?.remoteAddress || 'unknown'; + client['msgTimestamps'] = []; client.on('error', (e) => { logger.info(`websocket client error from ${client['remoteAddress']}: ` + (e instanceof Error ? e.message : e)); client.close(); @@ -125,9 +128,30 @@ class WebsocketHandler { client.on('close', () => { this.numDisconnected++; }); - client.on('message', async (message: string) => { + client.on('message', async (message) => { try { - const parsedMessage: WebsocketResponse = JSON.parse(message); + const msgLength = Buffer.isBuffer(message) ? message.byteLength + : message instanceof ArrayBuffer ? message.byteLength + : message.reduce((sum, buf) => sum + buf.byteLength, 0); + if (msgLength > this.MAX_MESSAGE_SIZE) { + logger.debug(`Dropping oversized websocket message from ${client['remoteAddress']}: ${msgLength} bytes`); + client.terminate(); + return; + } + + const now = Date.now(); + const timestamps: number[] = client['msgTimestamps']; + timestamps.push(now); + while (timestamps.length && timestamps[0] <= now - this.MSG_RATE_WINDOW) { + timestamps.shift(); + } + if (timestamps.length > this.MSG_RATE_LIMIT) { + logger.debug(`Rate limiting websocket client ${client['remoteAddress']}`); + client.close(); + return; + } + + const parsedMessage: WebsocketResponse = JSON.parse(message as any); const response = {}; const wantNow = {}; @@ -223,45 +247,60 @@ class WebsocketHandler { if (parsedMessage && parsedMessage['track-txs']) { const txids: string[] = []; if (Array.isArray(parsedMessage['track-txs'])) { + if (parsedMessage['track-txs'].length > this.MAX_TRACKED_TXS) { + response['track-txs-error'] = `"too many txids requested, this connection supports tracking a maximum of ${this.MAX_TRACKED_TXS} transactions"`; + this.send(client, this.serializeResponse(response)); + client['track-txs'] = null; + client.close(); + return; + } for (const txid of parsedMessage['track-txs']) { if (/^[a-fA-F0-9]{64}$/.test(txid)) { txids.push(txid); } } + } else { + response['track-txs-error'] = `"incorrect track-txs format"`; + this.send(client, this.serializeResponse(response)); + client['track-txs'] = null; + client.close(); + return; } const txs: { [txid: string]: TxTrackingInfo } = {}; for (const txid of txids) { - const txInfo: TxTrackingInfo = { - confirmed: true, - }; + const txInfo: TxTrackingInfo = {}; const rbfCacheTxid = rbfCache.getReplacedBy(txid); if (rbfCacheTxid) { txInfo.replacedBy = rbfCacheTxid; txInfo.confirmed = false; + txs[txid] = txInfo; } const tx = memPool.getMempool()[txid]; - if (tx && tx.position) { - txInfo.position = { - ...tx.position - }; - if (tx.acceleration) { - txInfo.accelerated = tx.acceleration; - } - } if (tx) { + if (tx.position) { + txInfo.position = { + ...tx.position + }; + if (tx.acceleration) { + txInfo.accelerated = tx.acceleration; + } + } txInfo.confirmed = false; + txs[txid] = txInfo; } - txs[txid] = txInfo; } if (txids.length) { client['track-txs'] = txids; + client['track-txs-updates'] = 0; } else { client['track-txs'] = null; + client['track-txs-updates'] = 0; } if (Object.keys(txs).length) { + client['track-txs-updates'] = (client['track-txs-updates'] || 0) + Object.keys(txs).length; response['tracked-txs'] = JSON.stringify(txs); } } @@ -286,10 +325,13 @@ class WebsocketHandler { if (Object.keys(addressMap).length > config.MEMPOOL.MAX_TRACKED_ADDRESSES) { response['track-addresses-error'] = `"too many addresses requested, this connection supports tracking a maximum of ${config.MEMPOOL.MAX_TRACKED_ADDRESSES} addresses"`; client['track-addresses'] = null; + client['track-addresses-updates'] = 0; } else if (Object.keys(addressMap).length > 0) { client['track-addresses'] = addressMap; + client['track-addresses-updates'] = 0; } else { client['track-addresses'] = null; + client['track-addresses-updates'] = 0; } } @@ -313,8 +355,10 @@ class WebsocketHandler { if (parsedMessage && parsedMessage['track-wallet']) { if (parsedMessage['track-wallet'] === 'stop') { client['track-wallet'] = null; - } else { + } else if (typeof parsedMessage['track-wallet'] === 'string' && walletApi.getWallets().includes(parsedMessage['track-wallet'])) { client['track-wallet'] = parsedMessage['track-wallet']; + } else { + client['track-wallet'] = null; } } @@ -327,8 +371,8 @@ class WebsocketHandler { } if (parsedMessage && parsedMessage['track-mempool-block'] !== undefined) { - if (Number.isInteger(parsedMessage['track-mempool-block']) && parsedMessage['track-mempool-block'] >= 0) { - const index = parsedMessage['track-mempool-block']; + const index = parsedMessage['track-mempool-block']; + if (Number.isInteger(index) && index >= 0 && index < config.MEMPOOL.MEMPOOL_BLOCKS_AMOUNT) { client['track-mempool-block'] = index; const mBlocksWithTransactions = mempoolBlocks.getMempoolBlocksWithTransactions(); response['projected-block-transactions'] = JSON.stringify({ @@ -379,14 +423,14 @@ class WebsocketHandler { if (!this.socketData['blocks']?.length) { return; } - client.send(this.serializedInitData); + this.send(client, this.serializedInitData); } if (parsedMessage.action === 'ping') { response['pong'] = JSON.stringify(true); } - if (parsedMessage['track-donation'] && parsedMessage['track-donation'].length === 22) { + if (typeof parsedMessage['track-donation'] === 'string' && parsedMessage['track-donation'].length === 22) { client['track-donation'] = parsedMessage['track-donation']; } @@ -402,18 +446,18 @@ class WebsocketHandler { delete client['track-mempool']; } - if (parsedMessage && parsedMessage['track-stratum'] != null) { - if (parsedMessage['track-stratum']) { + if (parsedMessage && parsedMessage['track-stratum'] !== undefined) { + if (parsedMessage['track-stratum'] === 'all' || typeof parsedMessage['track-stratum'] === 'number') { const sub = parsedMessage['track-stratum']; client['track-stratum'] = sub; - response['stratumJobs'] = this.socketData['stratumJobs']; + response['stratumJobs'] = JSON.stringify(stratumApi.getJobs()); } else { client['track-stratum'] = false; } } if (Object.keys(response).length) { - client.send(this.serializeResponse(response)); + this.send(client, this.serializeResponse(response)); } } catch (e) { logger.debug(`Error parsing websocket message from ${client['remoteAddress']}: ` + (e instanceof Error ? e.message : e)); @@ -436,7 +480,7 @@ class WebsocketHandler { return; } if (client['track-donation'] === id) { - client.send(JSON.stringify({ donationConfirmed: true })); + this.send(client, JSON.stringify({ donationConfirmed: true })); } }); } @@ -456,7 +500,7 @@ class WebsocketHandler { if (client.readyState !== WebSocket.OPEN) { return; } - client.send(response); + this.send(client, response); }); } } @@ -475,7 +519,7 @@ class WebsocketHandler { if (client.readyState !== WebSocket.OPEN) { return; } - client.send(response); + this.send(client, response); }); } } @@ -502,7 +546,7 @@ class WebsocketHandler { return; } - client.send(response); + this.send(client, response); }); } } @@ -535,7 +579,7 @@ class WebsocketHandler { if (client.readyState !== WebSocket.OPEN) { return; } - client.send(response); + this.send(client, response); }); } } catch (e) { @@ -573,7 +617,7 @@ class WebsocketHandler { } if (Object.keys(response).length) { - client.send(this.serializeResponse(response)); + this.send(client, this.serializeResponse(response)); } }); } @@ -607,7 +651,10 @@ class WebsocketHandler { removed = candidates?.removed || []; } - if (config.MEMPOOL.RUST_GBT) { + if (config.MEMPOOL.CLUSTER_MEMPOOL) { + const cmBlocks = mempool.clusterMempool?.getBlocks(config.MEMPOOL.MEMPOOL_BLOCKS_AMOUNT) ?? []; + mempoolBlocks.processClusterMempoolBlocks(cmBlocks, newMempool, mempool.getAccelerations()); + } else if (config.MEMPOOL.RUST_GBT) { await mempoolBlocks.$rustUpdateBlockTemplates(transactionIds, newMempool, added, removed, candidates, true); } else { await mempoolBlocks.$updateBlockTemplates(transactionIds, newMempool, added, removed, candidates, accelerationDelta, true, true); @@ -736,6 +783,8 @@ class WebsocketHandler { removed: websocketAccelerationDelta.filter(txid => !accelerations[txid]), }; + const cpfpUpdatesSent = new Set(); + // TODO - Fix indentation after PR is merged for (const server of this.webSocketServers) { server.clients.forEach(async (client) => { @@ -813,6 +862,8 @@ class WebsocketHandler { } if (Object.keys(addressMap).length > 0) { + client['track-addresses-updates'] = + (client['track-addresses-updates'] || 0) + this.countAddressTransactions(addressMap); response['multi-address-transactions'] = JSON.stringify(addressMap); } } @@ -904,15 +955,23 @@ class WebsocketHandler { calculateMempoolTxCpfp(mempoolTx, newMempool); } if (mempoolTx.cpfpDirty) { - positionData['cpfp'] = { - ancestors: mempoolTx.ancestors, + const cpfp: CpfpInfo = { + ancestors: mempoolTx.ancestors || [], bestDescendant: mempoolTx.bestDescendant || null, - descendants: mempoolTx.descendants || null, - effectiveFeePerVsize: mempoolTx.effectiveFeePerVsize || null, + descendants: mempoolTx.descendants, + effectiveFeePerVsize: mempoolTx.effectiveFeePerVsize, sigops: mempoolTx.sigops, adjustedVsize: mempoolTx.adjustedVsize, acceleration: mempoolTx.acceleration, }; + if (config.MEMPOOL.CLUSTER_MEMPOOL && mempoolTx.clusterId != null) { + const cluster = mempool.clusterMempool?.getClusterForApi(mempoolTx.txid); + if (cluster) { + cpfp.cluster = cluster; + } + } + positionData['cpfp'] = cpfp; + cpfpUpdatesSent.add(trackTxid); } response['txPosition'] = JSON.stringify(positionData); } @@ -923,13 +982,16 @@ class WebsocketHandler { const txs: { [txid: string]: TxTrackingInfo } = {}; for (const txid of txids) { const txInfo: TxTrackingInfo = {}; + let txHasInfo = false; const outspends = outspendCache[txid]; if (outspends && Object.keys(outspends).length) { txInfo.utxoSpent = outspends; + txHasInfo = true; } const replacedBy = rbfChanges.map[txid] ? rbfCache.getReplacedBy(txid) : false; if (replacedBy) { txInfo.replacedBy = replacedBy; + txHasInfo = true; } const mempoolTx = newMempool[txid]; if (mempoolTx && mempoolTx.position) { @@ -947,16 +1009,27 @@ class WebsocketHandler { txInfo.cpfp = { ancestors: mempoolTx.ancestors, bestDescendant: mempoolTx.bestDescendant || null, - descendants: mempoolTx.descendants || null, - effectiveFeePerVsize: mempoolTx.effectiveFeePerVsize || null, + descendants: mempoolTx.descendants, + effectiveFeePerVsize: mempoolTx.effectiveFeePerVsize, sigops: mempoolTx.sigops, adjustedVsize: mempoolTx.adjustedVsize, }; + if (config.MEMPOOL.CLUSTER_MEMPOOL && mempoolTx.clusterId != null) { + const cluster = mempool.clusterMempool?.getClusterForApi(mempoolTx.txid); + if (cluster) { + (txInfo.cpfp as CpfpInfo).cluster = cluster; + } + } + cpfpUpdatesSent.add(txid); } + txHasInfo = true; + } + if (txHasInfo) { + txs[txid] = txInfo; } - txs[txid] = txInfo; } if (Object.keys(txs).length) { + client['track-txs-updates'] = (client['track-txs-updates'] || 0) + Object.keys(txs).length; response['tracked-txs'] = JSON.stringify(txs); } } @@ -995,133 +1068,37 @@ class WebsocketHandler { } if (Object.keys(response).length) { - client.send(this.serializeResponse(response)); + this.send(client, this.serializeResponse(response)); } }); } + + for (const txid of cpfpUpdatesSent) { + if (newMempool[txid]) { + newMempool[txid].cpfpDirty = false; + } + } } - /** @asyncUnsafe */ - async handleNewBlock(block: BlockExtended, txIds: string[], transactions: MempoolTransactionExtended[]): Promise { + /** @asyncSafe */ + async handleNewBlock( + block: BlockExtended, + txIds: string[], + transactions: MempoolTransactionExtended[], + rbfTransactions: { [txid: string]: { replaced: MempoolTransactionExtended[], replacedBy: TransactionExtended }} + ): Promise { if (!this.webSocketServers.length) { throw new Error('No WebSocket.Server have been set'); } - const blockTransactions = structuredClone(transactions); - this.printLogs(); - if (config.STATISTICS.ENABLED && config.DATABASE.ENABLED) { - await statistics.runStatistics(); - } const _memPool = memPool.getMempool(); - const candidateTxs = memPool.getMempoolCandidates(); - let candidates: GbtCandidates | undefined = (memPool.limitGBT && candidateTxs) ? { txs: candidateTxs, added: [], removed: [] } : undefined; - let transactionIds: string[] = (memPool.limitGBT) ? Object.keys(candidates?.txs || {}) : Object.keys(_memPool); - - if (config.DATABASE.ENABLED) { - const accelerations = Object.values(mempool.getAccelerations()); - await accelerationRepository.$indexAccelerationsForBlock(block, accelerations, structuredClone(transactions)); - } - - const rbfTransactions = Common.findMinedRbfTransactions(transactions, memPool.getSpendMap()); - memPool.handleRbfTransactions(rbfTransactions); - memPool.removeFromSpendMap(transactions); - - if (config.MEMPOOL.AUDIT && memPool.isInSync()) { - let projectedBlocks; - const auditMempool = _memPool; - const isAccelerated = accelerationApi.isAcceleratedBlock(block, Object.values(mempool.getAccelerations())); - - if (config.MEMPOOL.RUST_GBT) { - const added = memPool.limitGBT ? (candidates?.added || []) : []; - const removed = memPool.limitGBT ? (candidates?.removed || []) : []; - projectedBlocks = await mempoolBlocks.$rustUpdateBlockTemplates(transactionIds, auditMempool, added, removed, candidates, isAccelerated, block.extras.pool.id); - } else { - projectedBlocks = await mempoolBlocks.$makeBlockTemplates(transactionIds, auditMempool, candidates, false, isAccelerated, block.extras.pool.id); - } - - if (Common.indexingEnabled()) { - const { unseen, censored, added, prioritized, fresh, sigop, fullrbf, accelerated, score, similarity } = Audit.auditBlock(block.height, blockTransactions, projectedBlocks, auditMempool); - const matchRate = Math.round(score * 100 * 100) / 100; - - const stripped = projectedBlocks[0]?.transactions ? projectedBlocks[0].transactions : []; - - let totalFees = 0; - let totalWeight = 0; - for (const tx of stripped) { - totalFees += tx.fee; - totalWeight += (tx.vsize * 4); - } - - void BlocksSummariesRepository.$saveTemplate({ - height: block.height, - template: { - id: block.id, - transactions: stripped, - }, - version: 1, - }); - - void BlocksAuditsRepository.$saveAudit({ - version: 1, - time: block.timestamp, - height: block.height, - hash: block.id, - unseenTxs: unseen, - addedTxs: added, - prioritizedTxs: prioritized, - missingTxs: censored, - freshTxs: fresh, - sigopTxs: sigop, - fullrbfTxs: fullrbf, - acceleratedTxs: accelerated, - matchRate: matchRate, - expectedFees: totalFees, - expectedWeight: totalWeight, - }); - - if (block.extras) { - block.extras.matchRate = matchRate; - block.extras.expectedFees = totalFees; - block.extras.expectedWeight = totalWeight; - block.extras.similarity = similarity; - } - } - } else if (block.extras) { - const mBlocks = mempoolBlocks.getMempoolBlocksWithTransactions(); - if (mBlocks?.length && mBlocks[0].transactions) { - block.extras.similarity = Common.getSimilarity(mBlocks[0], transactions); - } - } - const confirmedTxids: { [txid: string]: boolean } = {}; - - // Update mempool to remove transactions included in the new block for (const txId of txIds) { - delete _memPool[txId]; - rbfCache.mined(txId); confirmedTxids[txId] = true; } - if (memPool.limitGBT) { - const minFeeMempool = memPool.limitGBT ? await bitcoinSecondClient.getRawMemPool() : null; - const minFeeTip = memPool.limitGBT ? await bitcoinSecondClient.getBlockCount() : -1; - candidates = memPool.getNextCandidates(minFeeMempool, minFeeTip, transactions); - transactionIds = Object.keys(candidates?.txs || {}); - } else { - candidates = undefined; - transactionIds = Object.keys(memPool.getMempool()); - } - - - if (config.MEMPOOL.RUST_GBT) { - const added = memPool.limitGBT ? (candidates?.added || []) : []; - const removed = memPool.limitGBT ? (candidates?.removed || []) : transactions; - await mempoolBlocks.$rustUpdateBlockTemplates(transactionIds, _memPool, added, removed, candidates, true); - } else { - await mempoolBlocks.$makeBlockTemplates(transactionIds, _memPool, candidates, true, true); - } const mBlocks = mempoolBlocks.getMempoolBlocks(); const mBlockDeltas = mempoolBlocks.getMempoolBlockDeltas(); @@ -1254,6 +1231,7 @@ class WebsocketHandler { } } if (Object.keys(txs).length) { + client['track-txs-updates'] = (client['track-txs-updates'] || 0) + Object.keys(txs).length; response['tracked-txs'] = JSON.stringify(txs); } } @@ -1289,6 +1267,8 @@ class WebsocketHandler { } if (Object.keys(addressMap).length > 0) { + client['track-addresses-updates'] = + (client['track-addresses-updates'] || 0) + this.countAddressTransactions(addressMap); response['multi-address-transactions'] = JSON.stringify(addressMap); } } @@ -1382,26 +1362,20 @@ class WebsocketHandler { } if (Object.keys(response).length) { - client.send(this.serializeResponse(response)); + this.send(client, this.serializeResponse(response)); } }); } - - if (config.STATISTICS.ENABLED && config.DATABASE.ENABLED) { - await statistics.runStatistics(); - } } public handleNewStratumJob(job: StratumJob): void { - this.updateSocketDataFields({ 'stratumJobs': stratumApi.getJobs() }); - for (const server of this.webSocketServers) { server.clients.forEach((client) => { if (client.readyState !== WebSocket.OPEN) { return; } if (client['track-stratum'] && (client['track-stratum'] === 'all' || client['track-stratum'] === job.pool)) { - client.send(JSON.stringify({ + this.send(client, JSON.stringify({ 'stratumJob': job })); } @@ -1409,6 +1383,14 @@ class WebsocketHandler { } } + private send(client: WebSocket.WebSocket, data: string): void { + if (client.bufferedAmount > this.MAX_BUFFERED_AMOUNT) { + client.terminate(); + return; + } + client.send(data); + } + // takes a dictionary of JSON serialized values // and zips it together into a valid JSON object private serializeResponse(response): string { @@ -1490,25 +1472,72 @@ class WebsocketHandler { if (this.webSocketServers.length) { let numTxSubs = 0; let numTxsSubs = 0; + let numAddressSubs = 0; + let numAddressesSubs = 0; let numProjectedSubs = 0; let numRbfSubs = 0; + let trackedTxsTotal = 0; + let trackedAddressesTotal = 0; + let trackedTxsMax = 0; + let trackedAddressesMax = 0; + let trackTxsTrackedTotal = 0; + let trackTxsTrackedMax = 0; + let trackAddressesTrackedTotal = 0; + let trackAddressesTrackedMax = 0; + let trackTxsUpdatesTotal = 0; + let trackTxsUpdatesMax = 0; + let trackAddressesUpdatesTotal = 0; + let trackAddressesUpdatesMax = 0; - // TODO - Fix indentation after PR is merged for (const server of this.webSocketServers) { - server.clients.forEach((client) => { - if (client['track-tx']) { - numTxSubs++; - } - if (client['track-txs']) { - numTxsSubs++; - } - if (client['track-mempool-block'] != null && client['track-mempool-block'] >= 0) { - numProjectedSubs++; - } - if (client['track-rbf']) { - numRbfSubs++; - } - }); + server.clients.forEach((client) => { + let trackedTxCount = 0; + let trackedAddressCount = 0; + + if (client['track-tx']) { + numTxSubs++; + trackedTxCount += 1; + } + if (client['track-txs']) { + numTxsSubs++; + trackedTxCount += client['track-txs'].length; + } + if (client['track-address']) { + numAddressSubs++; + trackedAddressCount += 1; + } + if (client['track-addresses']) { + numAddressesSubs++; + const addressCount = Object.keys(client['track-addresses']).length; + trackedAddressCount += addressCount; + trackAddressesTrackedTotal += addressCount; + trackAddressesTrackedMax = Math.max(trackAddressesTrackedMax, addressCount); + const updates = client['track-addresses-updates'] || 0; + trackAddressesUpdatesTotal += updates; + trackAddressesUpdatesMax = Math.max(trackAddressesUpdatesMax, updates); + client['track-addresses-updates'] = 0; + } + if (client['track-mempool-block'] != null && client['track-mempool-block'] >= 0) { + numProjectedSubs++; + } + if (client['track-rbf']) { + numRbfSubs++; + } + if (client['track-txs']) { + const txCount = client['track-txs'].length; + trackTxsTrackedTotal += txCount; + trackTxsTrackedMax = Math.max(trackTxsTrackedMax, txCount); + const updates = client['track-txs-updates'] || 0; + trackTxsUpdatesTotal += updates; + trackTxsUpdatesMax = Math.max(trackTxsUpdatesMax, updates); + client['track-txs-updates'] = 0; + } + + trackedTxsTotal += trackedTxCount; + trackedAddressesTotal += trackedAddressCount; + trackedTxsMax = Math.max(trackedTxsMax, trackedTxCount); + trackedAddressesMax = Math.max(trackedAddressesMax, trackedAddressCount); + }); } let count = 0; @@ -1517,12 +1546,33 @@ class WebsocketHandler { } const diff = count - this.numClients; this.numClients = count; - logger.debug(`${count} websocket clients | ${this.numConnected} connected | ${this.numDisconnected} disconnected | (${diff >= 0 ? '+' : ''}${diff})`); - logger.debug(`websocket subscriptions: track-tx: ${numTxSubs}, track-txs: ${numTxsSubs}, track-mempool-block: ${numProjectedSubs} track-rbf: ${numRbfSubs}`); + const trackedTxsAvg = count > 0 ? trackedTxsTotal / count : 0; + const trackedAddressesAvg = count > 0 ? trackedAddressesTotal / count : 0; + const trackTxsTrackedAvg = numTxsSubs > 0 ? trackTxsTrackedTotal / numTxsSubs : 0; + const trackAddressesTrackedAvg = + numAddressesSubs > 0 ? trackAddressesTrackedTotal / numAddressesSubs : 0; + const trackTxsUpdatesAvg = numTxsSubs > 0 ? trackTxsUpdatesTotal / numTxsSubs : 0; + const trackAddressesUpdatesAvg = + numAddressesSubs > 0 ? trackAddressesUpdatesTotal / numAddressesSubs : 0; + logger.debug( + `${count} websocket clients | ${this.numConnected} connected | ${this.numDisconnected} disconnected | (${diff >= 0 ? '+' : ''}${diff}) | tracked txs: total=${trackedTxsTotal}, avg=${trackedTxsAvg.toFixed(2)}, max=${trackedTxsMax} | tracked addresses: total=${trackedAddressesTotal}, avg=${trackedAddressesAvg.toFixed(2)}, max=${trackedAddressesMax} | ws-subscriptions: tx=${numTxSubs},txs=${numTxsSubs},address=${numAddressSubs},addresses=${numAddressesSubs},txs-tracked-avg=${trackTxsTrackedAvg.toFixed(2)},txs-tracked-max=${trackTxsTrackedMax},addresses-tracked-avg=${trackAddressesTrackedAvg.toFixed(2)},addresses-tracked-max=${trackAddressesTrackedMax},txs-updates-avg=${trackTxsUpdatesAvg.toFixed(2)},txs-updates-max=${trackTxsUpdatesMax},addresses-updates-avg=${trackAddressesUpdatesAvg.toFixed(2)},addresses-updates-max=${trackAddressesUpdatesMax}` + ); + logger.debug(`websocket subscriptions: track-tx: ${numTxSubs}, track-txs: ${numTxsSubs}, track-address: ${numAddressSubs}, track-addresses: ${numAddressesSubs}, track-mempool-block: ${numProjectedSubs} track-rbf: ${numRbfSubs}`); this.numConnected = 0; this.numDisconnected = 0; } } + + private countAddressTransactions(addressMap: { [address: string]: AddressTransactions }): number { + return Object.values(addressMap).reduce( + (total, transactions) => + total + + transactions.mempool.length + + transactions.confirmed.length + + transactions.removed.length, + 0, + ); + } } export default new WebsocketHandler(); diff --git a/backend/src/cluster-mempool/block-builder.ts b/backend/src/cluster-mempool/block-builder.ts new file mode 100644 index 000000000..3f6a4b687 --- /dev/null +++ b/backend/src/cluster-mempool/block-builder.ts @@ -0,0 +1,165 @@ +import { PairingHeap } from '../utils/pairing-heap'; +import { LinearizationChunk } from './linearize'; +import { MempoolTransactionExtended } from '../mempool.interfaces'; +import { Cluster } from './cluster-mempool'; + +export interface ProjectedBlock { + txids: string[]; + weight: number; + sigops: number; +} + +interface ChunkHeapEntry { + fee: number; + weight: number; + sigops: number; + equalFeeratePrefixWeight: number; + maxOrder: number; + clusterId: number; + chunkIndex: number; +} + +const BLOCK_WEIGHT_UNITS = 4_000_000; +const MAX_BLOCK_SIGOPS_COST = 80_000; +const COINBASE_RESERVED_WEIGHT = 8000; +const MAX_CONSECUTIVE_FAILURES = 1000; +const MAX_WASTED_WEIGHT = 4000; + +function chunkHeapHigherPriority(a: ChunkHeapEntry, b: ChunkHeapEntry): boolean { + const feerateDiff = a.fee * b.weight - b.fee * a.weight; + if (feerateDiff !== 0) { + return feerateDiff > 0; + } + if (a.equalFeeratePrefixWeight !== b.equalFeeratePrefixWeight) { + return a.equalFeeratePrefixWeight < b.equalFeeratePrefixWeight; + } + return a.maxOrder < b.maxOrder; +} + +function equalFeerate(a: LinearizationChunk, b: LinearizationChunk): boolean { + return a.fee * b.weight === b.fee * a.weight; +} + +function makeChunkHeapEntry(cluster: Cluster, chunkIndex: number, mempool: { [txid: string]: MempoolTransactionExtended }): ChunkHeapEntry { + const chunk = cluster.chunks[chunkIndex]; + let maxOrder = 0; + let sigops = 0; + for (const tx of chunk.txs) { + if (tx.order > maxOrder) { + maxOrder = tx.order; + } + const mempoolTx = mempool[tx.txid]; + if (mempoolTx) { + sigops += mempoolTx.sigops || 0; + } + } + let prefixWeight = chunk.weight; + for (let i = chunkIndex - 1; i >= 0; i--) { + if (equalFeerate(cluster.chunks[i], chunk)) { + prefixWeight += cluster.chunks[i].weight; + } else { + break; + } + } + return { + fee: chunk.fee, + weight: chunk.weight, + sigops, + equalFeeratePrefixWeight: prefixWeight, + maxOrder, + clusterId: cluster.id, + chunkIndex, + }; +} + +function buildChunkHeap(clusters: Map, mempool: { [txid: string]: MempoolTransactionExtended }): PairingHeap { + const heap = new PairingHeap(chunkHeapHigherPriority); + for (const cluster of clusters.values()) { + if (cluster.chunks.length > 0) { + heap.add(makeChunkHeapEntry(cluster, 0, mempool)); + } + } + return heap; +} + +export function assembleBlocks( + n: number, + clusters: Map, + mempool: { [txid: string]: MempoolTransactionExtended }, + enforceLimit: boolean, +): ProjectedBlock[] { + const heap = buildChunkHeap(clusters, mempool); + const blocks: ProjectedBlock[] = []; + for (let blockIdx = 0; blockIdx < n; blockIdx++) { + const limited = enforceLimit || blockIdx < n - 1; + const maxWeight = limited ? BLOCK_WEIGHT_UNITS : Infinity; + const maxSigops = limited ? MAX_BLOCK_SIGOPS_COST : Infinity; + const block = fillBlock(heap, clusters, mempool, maxWeight, maxSigops); + if (block.txids.length === 0) { + break; + } + blocks.push(block); + } + return blocks; +} + +function fillBlock( + heap: PairingHeap, + clusters: Map, + mempool: { [txid: string]: MempoolTransactionExtended }, + maxWeight: number, + maxSigops: number, +): ProjectedBlock { + const block: ProjectedBlock = { txids: [], weight: COINBASE_RESERVED_WEIGHT, sigops: 0 }; + const deferred: ChunkHeapEntry[] = []; + let consecutiveFailed = 0; + let full = false; + + while (!heap.isEmpty() && !full) { + const entry = heap.pop() as ChunkHeapEntry; + const cluster = clusters.get(entry.clusterId); + const chunk = cluster?.chunks[entry.chunkIndex]; + + if (!cluster || !chunk) { + // stale entry + } else if (block.weight + entry.weight < maxWeight + && block.sigops + entry.sigops < maxSigops) { + consecutiveFailed = 0; + block.weight += chunkWeight(chunk, mempool); + block.sigops += entry.sigops; + for (const tx of chunk.txs) { + block.txids.push(tx.txid); + } + if (entry.chunkIndex + 1 < cluster.chunks.length) { + heap.add(makeChunkHeapEntry(cluster, entry.chunkIndex + 1, mempool)); + } + } else { + deferred.push(entry); + consecutiveFailed++; + if (consecutiveFailed > MAX_CONSECUTIVE_FAILURES + && block.weight + MAX_WASTED_WEIGHT > maxWeight) { + full = true; + } + } + } + + for (const entry of deferred) { + heap.add(entry); + } + + return block; +} + +function chunkWeight( + chunk: LinearizationChunk, + mempool: { [txid: string]: MempoolTransactionExtended }, +): number { + let weight = 0; + for (const clusterTx of chunk.txs) { + const mempoolTx = mempool[clusterTx.txid]; + if (mempoolTx) { + weight += mempoolTx.weight; + } + } + return weight; +} diff --git a/backend/src/cluster-mempool/cluster-mempool.ts b/backend/src/cluster-mempool/cluster-mempool.ts new file mode 100644 index 000000000..92e1bd5fa --- /dev/null +++ b/backend/src/cluster-mempool/cluster-mempool.ts @@ -0,0 +1,709 @@ +import { ClusterTx, DepGraph, sortTopological, subgraph } from './depgraph'; +import { linearizeCluster, LinearizationChunk } from './linearize'; +import { ProjectedBlock, assembleBlocks } from './block-builder'; +import { Ancestor, CpfpClusterData, CpfpClusterTx, MempoolTransactionExtended } from '../mempool.interfaces'; +import logger from '../logger'; + +export interface MempoolDiff { + added: MempoolTransactionExtended[]; + removed: MempoolTransactionExtended[]; + accelerations: { [txid: string]: { feeDelta: number } }; +} + +export interface ClusterInfo { + clusterId: number; + chunkIndex: number; + chunkFeerate: number; +} + +export { ProjectedBlock }; + +export interface Cluster { + id: number; + depgraph: DepGraph; + txs: Map; + linearization: ClusterTx[]; + chunks: LinearizationChunk[]; + dirty: boolean; +} + +export interface TxCpfpData { + effectiveFeePerVsize: number; + clusterId: number; + chunkIndex: number; + cpfpDirty: boolean; + cpfpChecked: boolean; + ancestors: Ancestor[]; + descendants: Ancestor[]; +} + +const DEFAULT_COST_BUDGET = 75000; + +export class ClusterMempool { + private clusters = new Map(); + private txToCluster = new Map(); + private spentBy = new Map(); + private mempool: Readonly<{ [txid: string]: MempoolTransactionExtended }>; + private accelerations: { [txid: string]: { feeDelta: number } } = {}; + private nextClusterId = 0; + private modifyTxs: boolean; + private costBudget: number = DEFAULT_COST_BUDGET; + + constructor(mempool: { [txid: string]: MempoolTransactionExtended }, accelerations?: { [txid: string]: { feeDelta: number } }, modifyTxs: boolean = true, costBudget: number = DEFAULT_COST_BUDGET) { + this.mempool = mempool; + if (accelerations) { + this.accelerations = accelerations; + } + this.modifyTxs = modifyTxs; + this.costBudget = costBudget; + this.buildFromMempool(); + } + + applyMempoolChange(diff: MempoolDiff): void { + this.processRemovals(diff.removed); + this.splitDisconnectedClusters(); + this.processAccelerationChanges(diff.accelerations); + this.processAdditions(diff.added); + this.relinearizeDirtyClusters(); + } + + getBlocks(n: number, enforceLimit = false): ProjectedBlock[] { + return assembleBlocks(n, this.clusters, this.mempool, enforceLimit); + } + + getCluster(clusterId: number): CpfpClusterData | null { + const cluster = this.clusters.get(clusterId); + if (!cluster) { + return null; + } + return this.buildClusterData(cluster); + } + + getClusterInfo(txid: string): ClusterInfo | null { + const match = this.getClusterForTx(txid); + if (!match) { + return null; + } + return this.findChunkInfo(match.cluster, match.clusterTx); + } + + getClusterForApi(txid: string): (CpfpClusterData & { chunkIndex: number }) | null { + const info = this.getClusterInfo(txid); + if (!info) { + return null; + } + const cluster = this.getCluster(info.clusterId); + if (!cluster || cluster.txs.length <= 1) { + return null; + } + return { ...cluster, chunkIndex: info.chunkIndex }; + } + + getCpfpDataForTx(txid: string): TxCpfpData | null { + const clusterInfo = this.getClusterForTx(txid); + if (!clusterInfo) { + return null; + } + const chunkInfo = this.findChunkInfo(clusterInfo.cluster, clusterInfo.clusterTx); + if (!chunkInfo) { + return null; + } + const chunk = clusterInfo.cluster.chunks[chunkInfo?.chunkIndex]; + const chunkSet = chunk.txs.length > 1 ? new Set(chunk.txs) : null; + return { + effectiveFeePerVsize: chunkInfo.chunkFeerate, + clusterId: clusterInfo.cluster.id, + chunkIndex: chunkInfo.chunkIndex, + cpfpDirty: true, + cpfpChecked: true, + ancestors: chunkSet ? this.getChunkRelatives(clusterInfo.clusterTx, chunkSet, 'ancestors') : [], + descendants: chunkSet ? this.getChunkRelatives(clusterInfo.clusterTx, chunkSet, 'descendants') : [], + }; + } + + getClusterCount(): number { + return this.clusters.size; + } + + getTxCount(): number { + return this.txToCluster.size; + } + + private getClusterForTx(txid: string): { cluster: Cluster; clusterTx: ClusterTx } | null { + const clusterId = this.txToCluster.get(txid); + if (clusterId === undefined) { + return null; + } + const cluster = this.clusters.get(clusterId); + if (!cluster) { + return null; + } + const clusterTx = cluster.txs.get(txid); + if (!clusterTx) { + return null; + } + return { cluster, clusterTx }; + } + + private buildFromMempool(): void { + const parentMap = this.buildRelativeMaps(); + const components = this.findMempoolComponents(parentMap); + for (const component of components) { + this.createClusterFromTxids(component, parentMap); + } + } + + private buildRelativeMaps(): Map> { + const parentMap = new Map>(); + this.spentBy.clear(); + for (const txid in this.mempool) { + const tx = this.mempool[txid]; + const txParents = new Set(); + for (const vin of tx.vin) { + if (!vin.is_coinbase && this.mempool[vin.txid]) { + txParents.add(vin.txid); + this.spentBy.set(`${vin.txid}:${vin.vout}`, txid); + } + } + if (txParents.size > 0) { + parentMap.set(txid, txParents); + } + } + return parentMap; + } + + private findMempoolComponents(parentMap: Map>): Set[] { + const visited = new Set(); + const components: Set[] = []; + + for (const txid in this.mempool) { + if (!visited.has(txid)) { + const component = this.dfsComponent(txid, visited, parentMap); + components.push(component); + } + } + return components; + } + + private dfsComponent( + startTxid: string, + visited: Set, + parentMap: Map> + ): Set { + const component = new Set(); + const stack = [startTxid]; + while (stack.length > 0) { + const current = stack.pop(); + if (current !== undefined && !visited.has(current)) { + visited.add(current); + component.add(current); + + const txParents = parentMap.get(current); + if (txParents) { + for (const p of txParents) { + if (!visited.has(p)) { + stack.push(p); + } + } + } + + const tx = this.mempool[current]; + if (tx) { + for (let vout = 0; vout < tx.vout.length; vout++) { + const child = this.spentBy.get(`${current}:${vout}`); + if (child && !visited.has(child)) { + stack.push(child); + } + } + } + } + } + return component; + } + + private effectiveFee(txid: string, tx: MempoolTransactionExtended): number { + return tx.fee + (this.accelerations[txid]?.feeDelta || 0); + } + + private adjustedWeight(tx: MempoolTransactionExtended): number { + return Math.max(tx.weight, (tx.sigops || 0) * 20); + } + + private createClusterFromTxids( + txids: Set, + parentMap: Map> + ): Cluster | null { + const clusterId = this.nextClusterId++; + const depgraph = new DepGraph(); + const txMap = new Map(); + + for (const txid of txids) { + const tx = this.mempool[txid]; + if (!tx) { + logger.warn(`Warning: missing mempool tx ${txid} during cluster creation, skipping`); + return null; + } + const clusterTx = depgraph.addTransaction(txid, this.effectiveFee(txid, tx), this.adjustedWeight(tx), tx.order ?? 0); + txMap.set(txid, clusterTx); + } + + for (const txid of txids) { + const txParents = parentMap.get(txid); + if (txParents) { + for (const parentTxid of txParents) { + if (txids.has(parentTxid)) { + const parentTx = txMap.get(parentTxid); + const childTx = txMap.get(txid); + if (parentTx && childTx) { + depgraph.addDependency(parentTx, childTx); + } + } + } + } + } + + const { linearization, chunks } = linearizeCluster(depgraph.getTxs(), this.costBudget); + + const cluster: Cluster = { + id: clusterId, + depgraph, + txs: txMap, + linearization, + chunks, + dirty: false, + }; + + this.clusters.set(clusterId, cluster); + for (const txid of txids) { + this.txToCluster.set(txid, clusterId); + } + + if (this.modifyTxs) { + this.writeBackCluster(cluster); + } + return cluster; + } + + public writeBackClusters(): void { + for (const cluster of this.clusters.values()) { + this.writeBackCluster(cluster); + } + } + + private writeBackCluster(cluster: Cluster): void { + for (let chunkIdx = 0; chunkIdx < cluster.chunks.length; chunkIdx++) { + const chunk = cluster.chunks[chunkIdx]; + const chunkFeerate = chunk.weight > 0 ? (chunk.fee * 4) / chunk.weight : 0; + const chunkSet = chunk.txs.length > 1 ? new Set(chunk.txs) : null; + for (const clusterTx of chunk.txs) { + this.writeBackTx(cluster, clusterTx, chunkIdx, chunkFeerate, chunkSet); + } + } + } + + private writeBackTx( + cluster: Cluster, + clusterTx: ClusterTx, + chunkIdx: number, + chunkFeerate: number, + chunkSet: Set | null + ): void { + const txid = clusterTx.txid; + if (!this.mempool[txid]) { + logger.warn(`ClusterMempool.writeBackTx: ${txid} missing from mempool (cluster ${cluster.id})`); + return; + } + const tx = this.mempool[txid]; + if (tx.effectiveFeePerVsize !== chunkFeerate || tx.clusterId !== cluster.id) { + tx.cpfpDirty = true; + } + tx.effectiveFeePerVsize = chunkFeerate; + tx.clusterId = cluster.id; + tx.chunkIndex = chunkIdx; + tx.cpfpChecked = true; + + if (chunkSet) { + tx.ancestors = this.getChunkRelatives(clusterTx, chunkSet, 'ancestors'); + tx.descendants = this.getChunkRelatives(clusterTx, chunkSet, 'descendants'); + } else { + tx.ancestors = []; + tx.descendants = []; + } + } + + private getChunkRelatives( + clusterTx: ClusterTx, + chunkSet: Set, + direction: 'ancestors' | 'descendants' + ): { txid: string; fee: number; weight: number }[] { + const relatives: { txid: string; fee: number; weight: number }[] = []; + const related = direction === 'ancestors' ? clusterTx.ancestors : clusterTx.descendants; + for (const rel of related) { + if (rel !== clusterTx && chunkSet.has(rel)) { + const mempoolTx = this.mempool[rel.txid]; + if (mempoolTx) { + relatives.push({ txid: rel.txid, fee: mempoolTx.fee, weight: mempoolTx.weight }); + } else { + logger.warn(`ClusterMempool.getChunkRelatives: ${rel.txid} missing from mempool`); + } + } + } + return relatives; + } + + private processRemovals(removed: MempoolTransactionExtended[]): void { + for (const tx of removed) { + for (const vin of tx.vin) { + if (!vin.is_coinbase) { + const spentOutpoint = `${vin.txid}:${vin.vout}`; + if (this.spentBy.get(spentOutpoint) === tx.txid) { + this.spentBy.delete(spentOutpoint); + } + } + } + } + + for (const tx of removed) { + const match = this.getClusterForTx(tx.txid); + if (match) { + match.cluster.depgraph.removeTransactions(new Set([match.clusterTx])); + match.cluster.txs.delete(tx.txid); + match.cluster.linearization = match.cluster.linearization.filter(t => t !== match.clusterTx); + this.txToCluster.delete(tx.txid); + match.cluster.dirty = true; + } + } + } + + private splitDisconnectedClusters(): void { + for (const [clusterId, cluster] of this.clusters.entries()) { + if (cluster.dirty) { + if (cluster.depgraph.size === 0) { + this.clusters.delete(clusterId); + } else { + const components = cluster.depgraph.findConnectedComponents(); + if (components.length > 1) { + this.clusters.delete(clusterId); + for (const component of components) { + this.splitComponentToCluster(cluster, component); + } + } + } + } + } + } + + private splitComponentToCluster(sourceCluster: Cluster, component: Set): void { + const newClusterId = this.nextClusterId++; + const { depgraph: newDepgraph, txMap } = subgraph(component); + + const newTxs = new Map(); + for (const oldTx of component) { + const newTx = txMap.get(oldTx); + if (newTx) { + newTxs.set(oldTx.txid, newTx); + this.txToCluster.set(oldTx.txid, newClusterId); + } + } + + const newLinearization: ClusterTx[] = []; + for (const oldTx of sourceCluster.linearization) { + if (component.has(oldTx)) { + const newTx = txMap.get(oldTx); + if (newTx) { + newLinearization.push(newTx); + } + } + } + + const newCluster: Cluster = { + id: newClusterId, + dirty: true, + depgraph: newDepgraph, + txs: newTxs, + linearization: newLinearization, + chunks: [], + }; + this.clusters.set(newClusterId, newCluster); + } + + private processAdditions(added: MempoolTransactionExtended[]): void { + for (const tx of added) { + const txid = tx.txid; + + // sanity check for duplicate transactions + if (this.getClusterForTx(txid) !== null) { + logger.warn(`ClusterMempool.processAdditions: ${txid} was already added, skipping`); + continue; + } + + for (const vin of tx.vin) { + if (!vin.is_coinbase) { + this.spentBy.set(`${vin.txid}:${vin.vout}`, txid); + } + } + + const { relatedClusterIds, parentTxids, childTxids } = this.findRelatedClusters(tx); + + if (relatedClusterIds.size === 0) { + this.addSingletonCluster(tx); + } else if (relatedClusterIds.size === 1) { + this.addToExistingCluster(tx, relatedClusterIds, parentTxids, childTxids); + } else { + this.mergeAndAddToCluster(tx, relatedClusterIds, parentTxids, childTxids); + } + } + } + + private findRelatedClusters(tx: MempoolTransactionExtended): { + relatedClusterIds: Set; + parentTxids: string[]; + childTxids: string[]; + } { + const relatedClusterIds = new Set(); + const parentTxids: string[] = []; + const childTxids: string[] = []; + + for (const vin of tx.vin) { + if (!vin.is_coinbase && this.mempool[vin.txid]) { + const parentCluster = this.txToCluster.get(vin.txid); + if (parentCluster !== undefined) { + relatedClusterIds.add(parentCluster); + parentTxids.push(vin.txid); + } + } + } + + for (let vout = 0; vout < tx.vout.length; vout++) { + const childTxid = this.spentBy.get(`${tx.txid}:${vout}`); + if (childTxid && this.mempool[childTxid]) { + const childCluster = this.txToCluster.get(childTxid); + if (childCluster !== undefined) { + relatedClusterIds.add(childCluster); + childTxids.push(childTxid); + } + } + } + + return { relatedClusterIds, parentTxids, childTxids }; + } + + private addSingletonCluster(tx: MempoolTransactionExtended): void { + const txid = tx.txid; + const clusterId = this.nextClusterId++; + const depgraph = new DepGraph(); + const clusterTx = depgraph.addTransaction(txid, this.effectiveFee(txid, tx), this.adjustedWeight(tx), tx.order ?? 0); + + const cluster: Cluster = { + id: clusterId, + dirty: true, + depgraph, + txs: new Map([[txid, clusterTx]]), + linearization: [clusterTx], + chunks: [], + }; + this.clusters.set(clusterId, cluster); + this.txToCluster.set(txid, clusterId); + } + + private addToExistingCluster( + tx: MempoolTransactionExtended, + relatedClusterIds: Set, + parentTxids: string[], + childTxids: string[], + ): void { + const txid = tx.txid; + const clusterId = relatedClusterIds.values().next().value; + const cluster = this.clusters.get(clusterId); + if (!cluster) { + return; + } + const clusterTx = cluster.depgraph.addTransaction(txid, this.effectiveFee(txid, tx), this.adjustedWeight(tx), tx.order ?? 0); + cluster.txs.set(txid, clusterTx); + cluster.linearization.push(clusterTx); + this.txToCluster.set(txid, clusterId); + + this.addParentDeps(cluster, clusterTx, parentTxids); + this.addChildDeps(cluster, clusterTx, childTxids); + cluster.dirty = true; + } + + private mergeAndAddToCluster( + tx: MempoolTransactionExtended, + relatedClusterIds: Set, + parentTxids: string[], + childTxids: string[], + ): void { + const clusterIterator = relatedClusterIds.values(); + const primaryId: number = clusterIterator.next().value; + const primary = this.clusters.get(primaryId); + if (!primary) { + return; + } + + for (const clusterId of clusterIterator) { + const other = this.clusters.get(clusterId); + if (other) { + this.mergeClusterInto(primary, other); + this.clusters.delete(clusterId); + } + } + + const clusterTx = primary.depgraph.addTransaction(tx.txid, this.effectiveFee(tx.txid, tx), this.adjustedWeight(tx), tx.order ?? 0); + primary.txs.set(tx.txid, clusterTx); + primary.linearization.push(clusterTx); + this.txToCluster.set(tx.txid, primaryId); + + this.addParentDeps(primary, clusterTx, parentTxids); + this.addChildDeps(primary, clusterTx, childTxids); + primary.dirty = true; + } + + private addParentDeps(cluster: Cluster, childTx: ClusterTx, parentTxids: string[]): void { + for (const parentTxid of parentTxids) { + const parentTx = cluster.txs.get(parentTxid); + if (parentTx) { + cluster.depgraph.addDependency(parentTx, childTx); + } + } + } + + private addChildDeps(cluster: Cluster, parentTx: ClusterTx, childTxids: string[]): void { + for (const childTxid of childTxids) { + const childTx = cluster.txs.get(childTxid); + if (childTx) { + cluster.depgraph.addDependency(parentTx, childTx); + } + } + } + + private mergeClusterInto(primary: Cluster, other: Cluster): void { + for (const [txid, otherTx] of other.txs) { + const newTx = primary.depgraph.addTransaction(txid, otherTx.effectiveFee, otherTx.weight, otherTx.order); + primary.txs.set(txid, newTx); + this.txToCluster.set(txid, primary.id); + } + + for (const otherTx of other.depgraph.getTxs()) { + for (const parent of otherTx.parents) { + const newChild = primary.txs.get(otherTx.txid); + const newParent = primary.txs.get(parent.txid); + if (newChild && newParent) { + primary.depgraph.addDependency(newParent, newChild); + } + } + } + + for (const otherTx of other.linearization) { + const newTx = primary.txs.get(otherTx.txid); + if (newTx) { + primary.linearization.push(newTx); + } + } + } + + private processAccelerationChanges(newAccelerations: { [txid: string]: { feeDelta: number } }): void { + const changed = new Set(); + for (const txid in newAccelerations) { + if ((newAccelerations[txid]?.feeDelta || 0) !== (this.accelerations[txid]?.feeDelta || 0)) { + changed.add(txid); + } + } + for (const txid in this.accelerations) { + if (!newAccelerations[txid]) { + changed.add(txid); + } + } + this.accelerations = newAccelerations; + for (const txid of changed) { + const tx = this.mempool[txid]; + if (!tx) { + continue; + } + const match = this.getClusterForTx(txid); + if (match) { + match.clusterTx.effectiveFee = this.effectiveFee(txid, tx); + match.cluster.dirty = true; + } + } + } + + private relinearizeDirtyClusters(): void { + for (const [clusterId, cluster] of this.clusters.entries()) { + if (cluster.dirty) { + cluster.dirty = false; + const newId = this.nextClusterId++; + this.clusters.delete(clusterId); + cluster.id = newId; + this.clusters.set(newId, cluster); + for (const txid of cluster.txs.keys()) { + this.txToCluster.set(txid, newId); + } + + const { linearization, chunks } = linearizeCluster( + cluster.depgraph.getTxs(), + this.costBudget, + cluster.linearization, + ); + cluster.linearization = linearization; + cluster.chunks = chunks; + + if (this.modifyTxs) { + this.writeBackCluster(cluster); + } + } + } + } + + private buildClusterData(cluster: Cluster): CpfpClusterData { + const txs: CpfpClusterTx[] = []; + const txToFlatIdx = new Map(); + + for (const chunk of cluster.chunks) { + const ordered = sortTopological(new Set(chunk.txs)); + for (const clusterTx of ordered) { + if (this.mempool[clusterTx.txid]) { + txToFlatIdx.set(clusterTx, txs.length); + const parents: number[] = []; + for (const parentTx of clusterTx.parents) { + const flatIdx = txToFlatIdx.get(parentTx); + if (flatIdx !== undefined) { + parents.push(flatIdx); + } + } + const mempoolTx = this.mempool[clusterTx.txid]; + txs.push({ txid: clusterTx.txid, fee: mempoolTx.fee, weight: mempoolTx.weight, parents }); + } else { + logger.warn(`ClusterMempool.buildClusterData: ${clusterTx.txid} missing from mempool (cluster ${cluster.id})`); + } + } + } + + let offset = 0; + const chunks = cluster.chunks.map(chunk => { + const count = chunk.txs.length; + const chunkEntry = { + txs: Array.from({ length: count }, (_, i) => offset + i), + feerate: chunk.weight > 0 ? (chunk.fee * 4) / chunk.weight : 0, + }; + offset += count; + return chunkEntry; + }); + + return { txs, chunks }; + } + + private findChunkInfo(cluster: Cluster, tx: ClusterTx): ClusterInfo | null { + for (let chunkIdx = 0; chunkIdx < cluster.chunks.length; chunkIdx++) { + const chunk = cluster.chunks[chunkIdx]; + if (chunk.txs.includes(tx)) { + return { + clusterId: cluster.id, + chunkIndex: chunkIdx, + chunkFeerate: chunk.weight > 0 ? (chunk.fee * 4) / chunk.weight : 0, + }; + } + } + return null; + } +} diff --git a/backend/src/cluster-mempool/depgraph.ts b/backend/src/cluster-mempool/depgraph.ts new file mode 100644 index 000000000..76e98e3f2 --- /dev/null +++ b/backend/src/cluster-mempool/depgraph.ts @@ -0,0 +1,165 @@ +import logger from '../logger'; + +export class ClusterTx { + txid: string; + effectiveFee: number; + weight: number; + order: number; + ancestors: Set; + descendants: Set; + parents: Set; + children: Set; + + constructor(txid: string, effectiveFee: number, weight: number, order: number) { + this.txid = txid; + this.effectiveFee = effectiveFee; + this.weight = weight; + this.order = order; + this.ancestors = new Set([this]); + this.descendants = new Set([this]); + this.parents = new Set(); + this.children = new Set(); + } +} + +export class DepGraph { + private txs: Set = new Set(); + + get size(): number { + return this.txs.size; + } + + addTransaction(txid: string, fee: number, weight: number, order: number = 0): ClusterTx { + const tx = new ClusterTx(txid, fee, weight, order); + this.txs.add(tx); + return tx; + } + + addDependency(parent: ClusterTx, child: ClusterTx): void { + if (!this.txs.has(parent) || !this.txs.has(child)) { + logger.warn(`Warning: invalid dependency, skipping`); + return; + } + + parent.children.add(child); + child.parents.add(parent); + + if (child.ancestors.has(parent)) { + return; + } + + for (const descendant of child.descendants) { + for (const ancestor of parent.ancestors) { + descendant.ancestors.add(ancestor); + ancestor.descendants.add(descendant); + } + } + } + + removeTransactions(toRemove: Set): void { + for (const tx of toRemove) { + for (const parent of tx.parents) { + parent.children.delete(tx); + } + for (const child of tx.children) { + child.parents.delete(tx); + } + this.txs.delete(tx); + } + + for (const tx of this.txs) { + for (const removed of toRemove) { + tx.ancestors.delete(removed); + tx.descendants.delete(removed); + } + } + + this.rederiveAncestorsDescendants(); + } + + private rederiveAncestorsDescendants(): void { + const ordered = [...this.txs].sort((a, b) => a.ancestors.size - b.ancestors.size); + for (const tx of this.txs) { + tx.ancestors = new Set([tx]); + tx.descendants = new Set([tx]); + } + for (const tx of ordered) { + for (const parent of tx.parents) { + for (const ancestor of parent.ancestors) { + tx.ancestors.add(ancestor); + } + } + for (const ancestor of tx.ancestors) { + ancestor.descendants.add(tx); + } + } + } + + hasTx(tx: ClusterTx): boolean { + return this.txs.has(tx); + } + + getTxs(): Set { + return this.txs; + } + + findConnectedComponents(): Set[] { + const visited = new Set(); + const components: Set[] = []; + + for (const tx of this.txs) { + if (!visited.has(tx)) { + const component = new Set(); + const stack: ClusterTx[] = [tx]; + while (stack.length > 0) { + const node = stack.pop(); + if (node && !visited.has(node)) { + visited.add(node); + component.add(node); + for (const a of node.ancestors) { + if (!visited.has(a) && this.txs.has(a)) { + stack.push(a); + } + } + for (const d of node.descendants) { + if (!visited.has(d) && this.txs.has(d)) { + stack.push(d); + } + } + } + } + components.push(component); + } + } + return components; + } + +} + +export function sortTopological(subset: Set): ClusterTx[] { + return [...subset].sort((a, b) => a.ancestors.size - b.ancestors.size); +} + +export function subgraph(txSubset: Set): { depgraph: DepGraph; txMap: Map } { + const newGraph = new DepGraph(); + const txMap = new Map(); + + for (const oldTx of txSubset) { + const newTx = newGraph.addTransaction(oldTx.txid, oldTx.effectiveFee, oldTx.weight, oldTx.order); + txMap.set(oldTx, newTx); + } + + for (const oldTx of txSubset) { + for (const parent of oldTx.parents) { + if (txSubset.has(parent)) { + const newChild = txMap.get(oldTx); + const newParent = txMap.get(parent); + if (newChild && newParent) { + newGraph.addDependency(newParent, newChild); + } + } + } + } + + return { depgraph: newGraph, txMap }; +} diff --git a/backend/src/cluster-mempool/linearize.ts b/backend/src/cluster-mempool/linearize.ts new file mode 100644 index 000000000..8b1c0465d --- /dev/null +++ b/backend/src/cluster-mempool/linearize.ts @@ -0,0 +1,1314 @@ +import { ClusterTx } from './depgraph'; + +function higherFeerate(aFee: number, aWeight: number, bFee: number, bWeight: number): boolean { + return aFee * bWeight > bFee * aWeight; +} + +export interface LinearizationChunk { + txs: ClusterTx[]; + fee: number; + weight: number; +} + +export function chunkify(linearization: ClusterTx[]): LinearizationChunk[] { + const chunks: LinearizationChunk[] = []; + + for (const tx of linearization) { + chunks.push({ txs: [tx], fee: tx.effectiveFee, weight: tx.weight }); + + while (chunks.length >= 2) { + const last = chunks[chunks.length - 1]; + const prev = chunks[chunks.length - 2]; + if (higherFeerate(last.fee, last.weight, prev.fee, prev.weight)) { + prev.txs.push(...last.txs); + prev.fee += last.fee; + prev.weight += last.weight; + chunks.pop(); + } else { + break; + } + } + } + + return chunks; +} + +export function postLinearize(linearization: ClusterTx[]): ClusterTx[] { + if (linearization.length <= 1) { + return [...linearization]; + } + let result = [...linearization]; + result = postLinearizePass(result, true); + result = postLinearizePass(result, false); + return result; +} + +interface PostLinGroup { + txs: ClusterTx[]; + deps: Set; + fee: number; + weight: number; +} + +function postLinearizePass(lin: ClusterTx[], forward: boolean): ClusterTx[] { + const n = lin.length; + if (n <= 1) { + return [...lin]; + } + + const input = forward ? lin : [...lin].reverse(); + const feeMul = forward ? 1 : -1; + + const groups: PostLinGroup[] = []; + const seen = new Set(); + + for (const tx of input) { + const deps = new Set(); + const related = forward ? tx.parents : tx.children; + for (const r of related) { + if (seen.has(r)) { + deps.add(r); + } + } + seen.add(tx); + + groups.push({ + txs: [tx], + deps, + fee: tx.effectiveFee * feeMul, + weight: tx.weight, + }); + + let pos = groups.length - 1; + while (pos > 0) { + const cur = groups[pos]; + const prev = groups[pos - 1]; + if (groupsDepsOverlap(cur, prev)) { + mergeGroupIntoCurrent(groups, pos); + pos--; + } else if (higherFeerate(cur.fee, cur.weight, prev.fee, prev.weight)) { + swapAdjacentGroups(groups, pos); + pos--; + } else { + break; + } + } + } + + const result: ClusterTx[] = []; + for (const g of groups) { + for (const tx of g.txs) { + result.push(tx); + } + } + + if (!forward) { + result.reverse(); + } + + return result; +} + +function groupsDepsOverlap(cur: PostLinGroup, prev: PostLinGroup): boolean { + for (const tx of prev.txs) { + if (cur.deps.has(tx)) { + return true; + } + } + return false; +} + +function mergeGroupIntoCurrent(groups: PostLinGroup[], pos: number): void { + const cur = groups[pos]; + const prev = groups[pos - 1]; + prev.txs.push(...cur.txs); + for (const d of cur.deps) { + prev.deps.add(d); + } + prev.fee += cur.fee; + prev.weight += cur.weight; + groups.splice(pos, 1); +} + +function swapAdjacentGroups(groups: PostLinGroup[], pos: number): void { + const tmp = groups[pos]; + groups[pos] = groups[pos - 1]; + groups[pos - 1] = tmp; +} + +function pickRandomTx(txs: Set): ClusterTx | null { + const arr = [...txs]; + if (arr.length === 0) { + return null; + } + return arr[Math.floor(Math.random() * arr.length)]; +} + +interface SFLChunk { + id: number; + txs: Set; + fee: number; + weight: number; +} + +interface SFLDependency { + parent: ClusterTx; + child: ClusterTx; + active: boolean; +} + +const enum MergeDir { Up, Down, Both } + +interface SFLCost { cost: number; } + +export function spanningForestLinearize( + txs: Set, + costBudget: number, + existingLinearization?: ClusterTx[], +): ClusterTx[] { + const allTxs = [...txs]; + if (allTxs.length === 0) { + return []; + } + if (allTxs.length === 1) { + return [...allTxs]; + } + + const deps = collectDirectDeps(allTxs); + + if (deps.length === 0) { + return sortByFeerateDesc(allTxs); + } + + const { chunks, txToChunk, nextChunkId: startNextId } = initSFLChunks(allTxs); + + const cost: SFLCost = { cost: 87 * allTxs.length + 4 * deps.length }; + + if (existingLinearization && existingLinearization.length > 0) { + for (const tx of existingLinearization) { + const chunkId = txs.has(tx) ? txToChunk.get(tx) : undefined; + if (chunkId !== undefined) { + mergeUpwards(chunkId, deps, chunks, txToChunk, cost); + } + } + } + + let nextId = makeTopological(deps, chunks, txToChunk, startNextId, cost); + if (cost.cost < costBudget) { + nextId = optimizeSFL(deps, chunks, txToChunk, nextId, costBudget, cost); + } + if (cost.cost < costBudget) { + minimizeSFL(deps, chunks, txToChunk, nextId, costBudget, cost); + } + + return extractLinearization(chunks, txToChunk); +} + +function collectDirectDeps(txs: ClusterTx[]): SFLDependency[] { + const deps: SFLDependency[] = []; + for (const tx of txs) { + for (const parent of tx.parents) { + deps.push({ parent, child: tx, active: false }); + } + } + return deps; +} + +function sortByFeerateDesc(txs: ClusterTx[]): ClusterTx[] { + return [...txs].sort((a, b) => { + if (higherFeerate(a.effectiveFee, a.weight, b.effectiveFee, b.weight)) { + return -1; + } + if (higherFeerate(b.effectiveFee, b.weight, a.effectiveFee, a.weight)) { + return 1; + } + return a.order - b.order; + }); +} + +function initSFLChunks( + txs: ClusterTx[] +): { chunks: Map; txToChunk: Map; nextChunkId: number } { + let nextChunkId = 0; + const txToChunk = new Map(); + const chunks = new Map(); + + for (const tx of txs) { + const chunkId = nextChunkId++; + chunks.set(chunkId, { + id: chunkId, + txs: new Set([tx]), + fee: tx.effectiveFee, + weight: tx.weight, + }); + txToChunk.set(tx, chunkId); + } + + return { chunks, txToChunk, nextChunkId }; +} + +function mergeChunks( + dstId: number, + srcId: number, + chunks: Map, + txToChunk: Map +): void { + const dst = chunks.get(dstId); + const src = chunks.get(srcId); + if (!dst || !src) { + return; + } + for (const tx of src.txs) { + dst.txs.add(tx); + txToChunk.set(tx, dstId); + } + dst.fee += src.fee; + dst.weight += src.weight; + chunks.delete(srcId); +} + +function activateInternalDeps( + chunkId: number, + deps: SFLDependency[], + txToChunk: Map, + cost: SFLCost, + chunks?: Map, +): void { + for (const d of deps) { + if (!d.active) { + const c1 = txToChunk.get(d.parent); + const c2 = txToChunk.get(d.child); + if (c1 === chunkId && c2 === chunkId) { + d.active = true; + } + } + } + const mergedChunkSize = chunks?.get(chunkId)?.txs.size ?? 0; + cost.cost += 10 * mergedChunkSize + 1; +} + +function pickMergeCandidateUp( + chunkId: number, + chunk: SFLChunk, + deps: SFLDependency[], + chunks: Map, + txToChunk: Map, + cost: SFLCost, +): number | null { + let bestChunkId: number | null = null; + let bestFee = 0; + let bestWeight = 0; + let bestTiebreak = 0; + const visited = new Set(); + for (const dep of deps) { + if (!dep.active) { + const childChunk = txToChunk.get(dep.child); + const parentChunkId = txToChunk.get(dep.parent); + if (childChunk === chunkId && parentChunkId !== chunkId && parentChunkId !== undefined) { + visited.add(parentChunkId); + const pChunk = chunks.get(parentChunkId); + if (pChunk && !higherFeerate(pChunk.fee, pChunk.weight, chunk.fee, chunk.weight)) { + const tiebreak = Math.random(); + if (bestChunkId === null + || higherFeerate(bestFee, bestWeight, pChunk.fee, pChunk.weight) + || (!higherFeerate(pChunk.fee, pChunk.weight, bestFee, bestWeight) && tiebreak > bestTiebreak)) { + bestChunkId = parentChunkId; + bestFee = pChunk.fee; + bestWeight = pChunk.weight; + bestTiebreak = tiebreak; + } + } + } + } + } + cost.cost += 8 * visited.size; + return bestChunkId; +} + +function mergeStep( + dir: MergeDir.Up | MergeDir.Down, + chunkId: number, + deps: SFLDependency[], + chunks: Map, + txToChunk: Map, + cost: SFLCost, +): number | null { + if (dir === MergeDir.Up) { + return mergeStepUp(chunkId, deps, chunks, txToChunk, cost); + } + return mergeStepDown(chunkId, deps, chunks, txToChunk, cost); +} + +function mergeStepUp( + chunkId: number, + deps: SFLDependency[], + chunks: Map, + txToChunk: Map, + cost: SFLCost, +): number | null { + const chunk = chunks.get(chunkId); + if (!chunk) { + return null; + } + const parentChunkId = pickMergeCandidateUp(chunkId, chunk, deps, chunks, txToChunk, cost); + if (parentChunkId === null) { + return null; + } + const dep = pickRandomCrossChunkDep(parentChunkId, chunkId, deps, txToChunk, chunks, cost); + if (!dep) { + return null; + } + dep.active = true; + mergeChunks(chunkId, parentChunkId, chunks, txToChunk); + activateInternalDeps(chunkId, deps, txToChunk, cost, chunks); + return chunkId; +} + +function mergeStepDown( + chunkId: number, + deps: SFLDependency[], + chunks: Map, + txToChunk: Map, + cost: SFLCost, +): number | null { + const chunk = chunks.get(chunkId); + if (!chunk) { + return null; + } + const childChunkId = pickMergeCandidateDown(chunkId, chunk, deps, chunks, txToChunk, cost); + if (childChunkId === null) { + return null; + } + const dep = pickRandomCrossChunkDep(chunkId, childChunkId, deps, txToChunk, chunks, cost); + if (!dep) { + return null; + } + dep.active = true; + mergeChunks(chunkId, childChunkId, chunks, txToChunk); + activateInternalDeps(chunkId, deps, txToChunk, cost, chunks); + return chunkId; +} + +function makeTopological( + deps: SFLDependency[], + chunks: Map, + txToChunk: Map, + nextChunkId: number, + cost: SFLCost, +): number { + const queue: number[] = []; + const onQueue = new Set(); + for (const [chunkId] of chunks) { + queue.push(chunkId); + const j = Math.floor(Math.random() * queue.length); + if (j !== queue.length - 1) { + [queue[queue.length - 1], queue[j]] = [queue[j], queue[queue.length - 1]]; + } + onQueue.add(chunkId); + } + + const mergedChunks = new Set(); + const initDir: MergeDir = Math.random() < 0.5 ? MergeDir.Up : MergeDir.Down; + let numSteps = 0; + + while (queue.length > 0) { + const chunkId = queue.shift(); + if (chunkId === undefined) { + break; + } + onQueue.delete(chunkId); + if (!chunks.has(chunkId)) { + continue; + } + numSteps++; + + const dir = mergedChunks.has(chunkId) ? MergeDir.Both : initDir; + const first = Math.random() < 0.5 ? MergeDir.Up : MergeDir.Down; + const second = first === MergeDir.Up ? MergeDir.Down : MergeDir.Up; + + let result: number | null = null; + if (dir === MergeDir.Both || dir === first) { + result = mergeStep(first, chunkId, deps, chunks, txToChunk, cost); + } + if (result === null && (dir === MergeDir.Both || dir === second)) { + result = mergeStep(second, chunkId, deps, chunks, txToChunk, cost); + } + + if (result !== null) { + if (!onQueue.has(result)) { + onQueue.add(result); + queue.push(result); + } + mergedChunks.add(result); + } + } + + cost.cost += 20 * chunks.size + 28 * numSteps; + + return nextChunkId; +} + +function mergeUpwards( + chunkId: number, + deps: SFLDependency[], + chunks: Map, + txToChunk: Map, + cost: SFLCost, +): void { + let done = false; + while (!done) { + done = mergeStepUp(chunkId, deps, chunks, txToChunk, cost) === null; + } +} + +function pickMergeCandidateDown( + chunkId: number, + chunk: SFLChunk, + deps: SFLDependency[], + chunks: Map, + txToChunk: Map, + cost: SFLCost, +): number | null { + let bestChunkId: number | null = null; + let bestFee = 0; + let bestWeight = 0; + let bestTiebreak = 0; + const visited = new Set(); + for (const dep of deps) { + if (!dep.active) { + const parentChunk = txToChunk.get(dep.parent); + const childChunkId = txToChunk.get(dep.child); + if (parentChunk === chunkId && childChunkId !== chunkId && childChunkId !== undefined) { + visited.add(childChunkId); + const cChunk = chunks.get(childChunkId); + if (cChunk && !higherFeerate(chunk.fee, chunk.weight, cChunk.fee, cChunk.weight)) { + const tiebreak = Math.random(); + if (bestChunkId === null + || higherFeerate(cChunk.fee, cChunk.weight, bestFee, bestWeight) + || (!higherFeerate(bestFee, bestWeight, cChunk.fee, cChunk.weight) && tiebreak > bestTiebreak)) { + bestChunkId = childChunkId; + bestFee = cChunk.fee; + bestWeight = cChunk.weight; + bestTiebreak = tiebreak; + } + } + } + } + } + cost.cost += 8 * visited.size; + return bestChunkId; +} + +function pickRandomCrossChunkDep( + topChunkId: number, + bottomChunkId: number, + deps: SFLDependency[], + txToChunk: Map, + chunks: Map, + cost: SFLCost, +): SFLDependency | null { + const topChunk = chunks.get(topChunkId); + const candidates: SFLDependency[] = []; + let scanSteps = 0; + for (const d of deps) { + if (!d.active) { + const pChunk = txToChunk.get(d.parent); + const cChunk = txToChunk.get(d.child); + if (pChunk === topChunkId && cChunk === bottomChunkId) { + candidates.push(d); + } + scanSteps++; + } + } + cost.cost += 2 * (topChunk?.txs.size ?? 0); + cost.cost += 3 * scanSteps + 5; + if (candidates.length === 0) { + return null; + } + return candidates[Math.floor(Math.random() * candidates.length)]; +} + +function mergeDownwards( + chunkId: number, + deps: SFLDependency[], + chunks: Map, + txToChunk: Map, + cost: SFLCost, +): void { + let done = false; + while (!done) { + done = mergeStepDown(chunkId, deps, chunks, txToChunk, cost) === null; + } +} + +function buildChunkAdjacency( + deps: SFLDependency[], + chunkTxs: Set, + excludeDep?: SFLDependency +): Map> { + const adj = new Map>(); + for (const tx of chunkTxs) { + adj.set(tx, new Set()); + } + for (const d of deps) { + if (d !== excludeDep && d.active && chunkTxs.has(d.parent) && chunkTxs.has(d.child)) { + const parentAdj = adj.get(d.parent); + const childAdj = adj.get(d.child); + if (parentAdj) { + parentAdj.add(d.child); + } + if (childAdj) { + childAdj.add(d.parent); + } + } + } + return adj; +} + +function bfsReachable(adj: Map>, start: ClusterTx): Set { + const visited = new Set(); + const queue: ClusterTx[] = [start]; + visited.add(start); + while (queue.length > 0) { + const node = queue.shift(); + if (node) { + const neighbors = adj.get(node); + if (neighbors) { + for (const neighbor of neighbors) { + if (!visited.has(neighbor)) { + visited.add(neighbor); + queue.push(neighbor); + } + } + } + } + } + return visited; +} + +function optimizeSFL( + deps: SFLDependency[], + chunks: Map, + txToChunk: Map, + nextChunkId: number, + maxCost: number, + cost: SFLCost, +): number { + const queue: number[] = []; + const onQueue = new Set(); + for (const [chunkId] of chunks) { + queue.push(chunkId); + const j = Math.floor(Math.random() * queue.length); + if (j !== queue.length - 1) { + [queue[queue.length - 1], queue[j]] = [queue[j], queue[queue.length - 1]]; + } + onQueue.add(chunkId); + } + + cost.cost += 13 * chunks.size; + + while (cost.cost < maxCost) { + let chunkId: number | undefined; + let numPopped = 0; + while (queue.length > 0) { + const candidate = queue.shift(); + if (candidate === undefined) { + break; + } + numPopped++; + onQueue.delete(candidate); + if (chunks.has(candidate)) { + chunkId = candidate; + break; + } + } + cost.cost += 1 * numPopped + 4; + if (chunkId === undefined) { + break; + } + + const chunk = chunks.get(chunkId); + if (!chunk) { + break; + } + + const split = pickDependencyToSplit(deps, chunk, chunkId, txToChunk, cost); + if (split) { + const result = splitAndMerge( + split.dep, split.parentSide, chunkId, chunk, + deps, chunks, txToChunk, nextChunkId, cost, + ); + nextChunkId = result.nextChunkId; + + if (!onQueue.has(chunkId) && chunks.has(chunkId)) { + onQueue.add(chunkId); + queue.push(chunkId); + } + if (!onQueue.has(result.childChunkId) && chunks.has(result.childChunkId)) { + onQueue.add(result.childChunkId); + queue.push(result.childChunkId); + } + } + } + + return nextChunkId; +} + +function computeDepTopSet( + dep: SFLDependency, + chunk: SFLChunk, + chunkId: number, + deps: SFLDependency[], + txToChunk: Map, +): { parentSide: Set; topFee: number; topWeight: number } | null { + if (!dep.active + || txToChunk.get(dep.parent) !== chunkId + || txToChunk.get(dep.child) !== chunkId) { + return null; + } + const adj = buildChunkAdjacency(deps, chunk.txs, dep); + const parentSide = bfsReachable(adj, dep.parent); + if (parentSide.has(dep.child)) { + return null; + } + let topFee = 0; + let topWeight = 0; + for (const tx of parentSide) { + topFee += tx.effectiveFee; + topWeight += tx.weight; + } + return { parentSide, topFee, topWeight }; +} + +function pickDependencyToSplit( + deps: SFLDependency[], + chunk: SFLChunk, + chunkId: number, + txToChunk: Map, + cost: SFLCost, +): { dep: SFLDependency; parentSide: Set } | null { + let best: { dep: SFLDependency; parentSide: Set } | null = null; + let bestTiebreak = 0; + + for (const dep of deps) { + const split = computeDepTopSet(dep, chunk, chunkId, deps, txToChunk); + if (split && split.topFee * chunk.weight > chunk.fee * split.topWeight) { + const tiebreak = Math.random(); + if (tiebreak >= bestTiebreak) { + bestTiebreak = tiebreak; + best = { dep, parentSide: split.parentSide }; + } + } + } + + cost.cost += 8 * chunk.txs.size + 9; + return best; +} + +function splitAndMerge( + dep: SFLDependency, + parentSide: Set, + parentChunkId: number, + parentChunk: SFLChunk, + deps: SFLDependency[], + chunks: Map, + txToChunk: Map, + nextChunkId: number, + cost: SFLCost, +): { nextChunkId: number; childChunkId: number } { + dep.active = false; + + const origChunkSize = parentChunk.txs.size; + + const childSide = new Set(); + for (const tx of parentChunk.txs) { + if (!parentSide.has(tx)) { + childSide.add(tx); + } + } + + let childFee = 0; + let childWeight = 0; + for (const tx of childSide) { + childFee += tx.effectiveFee; + childWeight += tx.weight; + } + + const childChunkId = nextChunkId++; + chunks.set(childChunkId, { + id: childChunkId, + txs: childSide, + fee: childFee, + weight: childWeight, + }); + + let parentFee = 0; + let parentWeight = 0; + for (const tx of parentSide) { + parentFee += tx.effectiveFee; + parentWeight += tx.weight; + } + parentChunk.txs = parentSide; + parentChunk.fee = parentFee; + parentChunk.weight = parentWeight; + + for (const tx of childSide) { + txToChunk.set(tx, childChunkId); + } + + for (const d of deps) { + if (d.active && txToChunk.get(d.parent) !== txToChunk.get(d.child)) { + d.active = false; + } + } + + cost.cost += 11 * (origChunkSize - 1) + 8; + + let needsSelfMerge = false; + for (const d of deps) { + if (!d.active && txToChunk.get(d.parent) === parentChunkId && txToChunk.get(d.child) === childChunkId) { + needsSelfMerge = true; + break; + } + } + + if (needsSelfMerge) { + const selfDep = pickRandomCrossChunkDep(childChunkId, parentChunkId, deps, txToChunk, chunks, cost); + if (selfDep) { + selfDep.active = true; + mergeChunks(childChunkId, parentChunkId, chunks, txToChunk); + activateInternalDeps(childChunkId, deps, txToChunk, cost, chunks); + } + } else { + mergeUpwards(parentChunkId, deps, chunks, txToChunk, cost); + mergeDownwards(childChunkId, deps, chunks, txToChunk, cost); + } + + return { nextChunkId, childChunkId }; +} + +interface MinimizeQueueEntry { + chunkId: number; + pivot: ClusterTx; + movePivotDown: boolean; + secondStage: boolean; +} + +function minimizeSFL( + deps: SFLDependency[], + chunks: Map, + txToChunk: Map, + nextChunkId: number, + maxCost: number, + cost: SFLCost, +): number { + const queue: MinimizeQueueEntry[] = []; + + for (const [chunkId, chunk] of chunks) { + const pivot = pickRandomTx(chunk.txs); + if (pivot) { + queue.push({ chunkId, pivot, movePivotDown: Math.random() < 0.5, secondStage: false }); + const j = Math.floor(Math.random() * queue.length); + if (j !== queue.length - 1) { + [queue[queue.length - 1], queue[j]] = [queue[j], queue[queue.length - 1]]; + } + } + } + + cost.cost += 18 * chunks.size; + + while (queue.length > 0 && cost.cost < maxCost) { + const entry = queue.shift(); + if (!entry) { + break; + } + + const chunk = chunks.get(entry.chunkId); + if (chunk) { + nextChunkId = minimizeChunkStep( + chunk, entry, + deps, chunks, txToChunk, nextChunkId, queue, cost, + ); + } + } + + return nextChunkId; +} + +function minimizeChunkStep( + chunk: SFLChunk, + entry: MinimizeQueueEntry, + deps: SFLDependency[], + chunks: Map, + txToChunk: Map, + nextChunkId: number, + queue: MinimizeQueueEntry[], + cost: SFLCost, +): number { + const { chunkId, pivot, movePivotDown, secondStage } = entry; + + let haveAny = false; + let bestDep: SFLDependency | null = null; + let bestParentSide: Set | null = null; + let bestTiebreak = 0; + + for (const dep of deps) { + const split = computeDepTopSet(dep, chunk, chunkId, deps, txToChunk); + if (split && split.topFee * chunk.weight === chunk.fee * split.topWeight) { + haveAny = true; + if (movePivotDown !== split.parentSide.has(pivot)) { + const tiebreak = Math.random(); + if (tiebreak > bestTiebreak) { + bestTiebreak = tiebreak; + bestDep = dep; + bestParentSide = split.parentSide; + } + } + } + } + + cost.cost += 11 * chunk.txs.size + 11; + + if (!haveAny) { + cost.cost += 7; + return nextChunkId; + } + + if (!bestDep || !bestParentSide) { + if (!secondStage) { + queue.push({ chunkId, pivot, movePivotDown: !movePivotDown, secondStage: true }); + } + cost.cost += 7; + return nextChunkId; + } + + const result = splitAndMerge( + bestDep, bestParentSide, chunkId, chunk, + deps, chunks, txToChunk, nextChunkId, cost, + ); + nextChunkId = result.nextChunkId; + const childChunkId = result.childChunkId; + + cost.cost += 17 + 7; + + if (movePivotDown) { + const parentPivot = pickRandomTx(chunks.get(chunkId)?.txs ?? new Set()); + if (parentPivot) { + queue.push({ chunkId, pivot: parentPivot, movePivotDown: Math.random() < 0.5, secondStage: false }); + } + queue.push({ chunkId: childChunkId, pivot, movePivotDown, secondStage }); + } else { + queue.push({ chunkId, pivot, movePivotDown, secondStage }); + const childPivot = pickRandomTx(chunks.get(childChunkId)?.txs ?? new Set()); + if (childPivot) { + queue.push({ chunkId: childChunkId, pivot: childPivot, movePivotDown: Math.random() < 0.5, secondStage: false }); + } + } + + if (queue.length >= 2 && Math.random() < 0.5) { + const last = queue.length - 1; + [queue[last], queue[last - 1]] = [queue[last - 1], queue[last]]; + } + + return nextChunkId; +} + +function chunkCmp(a: SFLChunk, b: SFLChunk, chunkMaxOrder: Map): number { + if (higherFeerate(a.fee, a.weight, b.fee, b.weight)) { + return -1; + } + if (higherFeerate(b.fee, b.weight, a.fee, a.weight)) { + return 1; + } + if (a.weight !== b.weight) { + return b.weight - a.weight; + } + return (chunkMaxOrder.get(a.id) ?? 0) - (chunkMaxOrder.get(b.id) ?? 0); +} + +function txCmp(a: ClusterTx, b: ClusterTx): number { + if (higherFeerate(a.effectiveFee, a.weight, b.effectiveFee, b.weight)) { + return -1; + } + if (higherFeerate(b.effectiveFee, b.weight, a.effectiveFee, a.weight)) { + return 1; + } + if (a.weight !== b.weight) { + return b.weight - a.weight; + } + return a.order - b.order; +} + +function extractLinearization( + chunks: Map, + txToChunk: Map, +): ClusterTx[] { + const chunkList = [...chunks.values()]; + + const chunkMaxOrder = new Map(); + for (const c of chunkList) { + let max = 0; + for (const tx of c.txs) { + if (tx.order > max) { + max = tx.order; + } + } + chunkMaxOrder.set(c.id, max); + } + + const { chunkDeps, chunkChildren } = buildChunkDependencies(chunkList, txToChunk); + + return emitLinearization(chunkList, chunkDeps, chunkChildren, chunkMaxOrder, chunks); +} + +function buildChunkDependencies( + chunkList: SFLChunk[], + txToChunk: Map +): { chunkDeps: Map; chunkChildren: Map } { + const chunkDeps = new Map(); + const chunkChildren = new Map(); + + for (const c of chunkList) { + chunkChildren.set(c.id, []); + } + + for (const c of chunkList) { + const depChunks = new Set(); + for (const tx of c.txs) { + for (const parent of tx.parents) { + const parentChunk = txToChunk.get(parent); + if (parentChunk !== undefined && parentChunk !== c.id) { + depChunks.add(parentChunk); + } + } + } + chunkDeps.set(c.id, depChunks.size); + for (const d of depChunks) { + const children = chunkChildren.get(d); + if (children) { + children.push(c.id); + } + } + } + + return { chunkDeps, chunkChildren }; +} + +function emitLinearization( + chunkList: SFLChunk[], + chunkDeps: Map, + chunkChildren: Map, + chunkMaxOrder: Map, + chunkMap: Map +): ClusterTx[] { + const result: ClusterTx[] = []; + + const readyChunks: SFLChunk[] = []; + for (const c of chunkList) { + if (chunkDeps.get(c.id) === 0) { + readyChunks.push(c); + } + } + readyChunks.sort((a, b) => chunkCmp(a, b, chunkMaxOrder)); + + while (readyChunks.length > 0) { + const chunk = readyChunks.shift(); + if (!chunk) { + break; + } + + emitChunkTxs(chunk, result); + + const children = chunkChildren.get(chunk.id); + if (children) { + for (const childChunkId of children) { + const prevCount = chunkDeps.get(childChunkId) ?? 0; + const newCount = prevCount - 1; + chunkDeps.set(childChunkId, newCount); + if (newCount === 0) { + const childChunk = chunkMap.get(childChunkId); + if (childChunk) { + insertSortedChunk(readyChunks, childChunk, chunkMaxOrder); + } + } + } + } + } + + return result; +} + +function emitChunkTxs( + chunk: SFLChunk, + result: ClusterTx[] +): void { + const txSet = new Set(chunk.txs); + const txDepCount = new Map(); + for (const tx of txSet) { + let count = 0; + for (const parent of tx.parents) { + if (txSet.has(parent)) { + count++; + } + } + txDepCount.set(tx, count); + } + + const readyTxs: ClusterTx[] = []; + for (const tx of txSet) { + if (txDepCount.get(tx) === 0) { + readyTxs.push(tx); + } + } + readyTxs.sort((a, b) => txCmp(a, b)); + + const emitted = new Set(); + while (readyTxs.length > 0) { + const best = readyTxs.shift(); + if (!best) { + break; + } + result.push(best); + emitted.add(best); + + for (const child of best.children) { + if (txSet.has(child) && !emitted.has(child)) { + const prevCount = txDepCount.get(child) ?? 0; + const newCount = prevCount - 1; + txDepCount.set(child, newCount); + if (newCount === 0) { + insertSortedTx(readyTxs, child); + } + } + } + } +} + +function insertSortedChunk(arr: SFLChunk[], item: SFLChunk, chunkMaxOrder: Map): void { + const idx = arr.findIndex(e => chunkCmp(item, e, chunkMaxOrder) < 0); + if (idx === -1) { + arr.push(item); + } else { + arr.splice(idx, 0, item); + } +} + +function insertSortedTx(arr: ClusterTx[], item: ClusterTx): void { + const idx = arr.findIndex(e => txCmp(item, e) < 0); + if (idx === -1) { + arr.push(item); + } else { + arr.splice(idx, 0, item); + } +} + +function minimizeChunks(chunks: LinearizationChunk[]): LinearizationChunk[] { + const result: LinearizationChunk[] = []; + + for (const chunk of chunks) { + if (chunk.txs.length <= 1) { + result.push(chunk); + } else { + const subChunks = splitChunkByComponents(chunk); + result.push(...subChunks); + } + } + + return result; +} + +function splitChunkByComponents(chunk: LinearizationChunk): LinearizationChunk[] { + const txSet = new Set(chunk.txs); + const visited = new Set(); + const components: ClusterTx[][] = []; + + for (const tx of chunk.txs) { + if (!visited.has(tx)) { + const component = bfsComponentWithinChunk(tx, txSet, visited); + components.push(component); + } + } + + if (components.length <= 1) { + return [chunk]; + } + + const posInLin = new Map(); + for (let i = 0; i < chunk.txs.length; i++) { + posInLin.set(chunk.txs[i], i); + } + + components.sort((a, b) => { + let aFee = 0, aWeight = 0; + for (const t of a) { aFee += t.effectiveFee; aWeight += t.weight; } + let bFee = 0, bWeight = 0; + for (const t of b) { bFee += t.effectiveFee; bWeight += t.weight; } + if (higherFeerate(aFee, aWeight, bFee, bWeight)) { return -1; } + if (higherFeerate(bFee, bWeight, aFee, aWeight)) { return 1; } + const aMin = Math.min(...a.map(t => posInLin.get(t) ?? 0)); + const bMin = Math.min(...b.map(t => posInLin.get(t) ?? 0)); + return aMin - bMin; + }); + + return components.map(comp => { + comp.sort((a, b) => (posInLin.get(a) ?? 0) - (posInLin.get(b) ?? 0)); + + let fee = 0; + let weight = 0; + for (const tx of comp) { + fee += tx.effectiveFee; + weight += tx.weight; + } + return { txs: comp, fee, weight }; + }); +} + +function bfsComponentWithinChunk( + start: ClusterTx, + txSet: Set, + visited: Set +): ClusterTx[] { + const component: ClusterTx[] = []; + const queue: ClusterTx[] = [start]; + visited.add(start); + + while (queue.length > 0) { + const node = queue.shift(); + if (!node) { + break; + } + component.push(node); + for (const parent of node.parents) { + if (txSet.has(parent) && !visited.has(parent)) { + visited.add(parent); + queue.push(parent); + } + } + for (const child of node.children) { + if (txSet.has(child) && !visited.has(child)) { + visited.add(child); + queue.push(child); + } + } + } + + return component; +} + +export function linearizeCluster( + txs: Set, + costBudget: number, + existingLinearization?: ClusterTx[], +): { linearization: ClusterTx[]; chunks: LinearizationChunk[] } { + let linearization = spanningForestLinearize(txs, costBudget, existingLinearization); + linearization = postLinearize(linearization); + let chunks = chunkify(linearization); + chunks = minimizeChunks(chunks); + linearization = chunks.flatMap(c => c.txs); + chunks = chunkify(linearization); + chunks = canonicalizeChunkOrder(chunks); + linearization = chunks.flatMap(c => c.txs); + return { linearization, chunks }; +} + +function canonicalizeChunkOrder(chunks: LinearizationChunk[]): LinearizationChunk[] { + if (chunks.length <= 1) { + return chunks; + } + + const txToChunkIdx = new Map(); + for (let i = 0; i < chunks.length; i++) { + for (const tx of chunks[i].txs) { + txToChunkIdx.set(tx, i); + } + } + + const { depCount, chunkChildren } = buildCanonicalChunkDeps(chunks, txToChunkIdx); + const maxOrder = computeChunkMaxOrder(chunks); + + const ready: number[] = []; + for (let i = 0; i < chunks.length; i++) { + if (depCount[i] === 0) { + ready.push(i); + } + } + ready.sort((a, b) => canonicalChunkCmp(chunks, maxOrder, a, b)); + + const result: LinearizationChunk[] = []; + while (ready.length > 0) { + const idx = ready.shift(); + if (idx === undefined) { + break; + } + result.push(chunks[idx]); + + for (const childIdx of chunkChildren[idx]) { + depCount[childIdx]--; + if (depCount[childIdx] === 0) { + insertSortedCanonicalChunk(ready, childIdx, chunks, maxOrder); + } + } + } + + return result; +} + +function buildCanonicalChunkDeps( + chunks: LinearizationChunk[], + txToChunkIdx: Map, +): { depCount: number[]; chunkChildren: number[][] } { + const depCount = new Array(chunks.length).fill(0); + const chunkChildren: number[][] = chunks.map(() => []); + const seen: Set[] = chunks.map(() => new Set()); + + for (let i = 0; i < chunks.length; i++) { + for (const tx of chunks[i].txs) { + for (const parent of tx.parents) { + const parentIdx = txToChunkIdx.get(parent); + if (parentIdx !== undefined && parentIdx !== i && !seen[i].has(parentIdx)) { + seen[i].add(parentIdx); + depCount[i]++; + chunkChildren[parentIdx].push(i); + } + } + } + } + + return { depCount, chunkChildren }; +} + +function computeChunkMaxOrder(chunks: LinearizationChunk[]): number[] { + return chunks.map(chunk => { + let max = 0; + for (const tx of chunk.txs) { + if (tx.order > max) { + max = tx.order; + } + } + return max; + }); +} + +function canonicalChunkCmp(chunks: LinearizationChunk[], maxOrder: number[], a: number, b: number): number { + const ac = chunks[a]; + const bc = chunks[b]; + if (higherFeerate(ac.fee, ac.weight, bc.fee, bc.weight)) { + return -1; + } + if (higherFeerate(bc.fee, bc.weight, ac.fee, ac.weight)) { + return 1; + } + if (ac.weight !== bc.weight) { + return ac.weight - bc.weight; + } + return maxOrder[a] - maxOrder[b]; +} + +function insertSortedCanonicalChunk(ready: number[], idx: number, chunks: LinearizationChunk[], maxOrder: number[]): void { + const insertPos = ready.findIndex(r => canonicalChunkCmp(chunks, maxOrder, idx, r) < 0); + if (insertPos === -1) { + ready.push(idx); + } else { + ready.splice(insertPos, 0, idx); + } +} diff --git a/backend/src/config.ts b/backend/src/config.ts index 9c1762378..6ac08a2f1 100644 --- a/backend/src/config.ts +++ b/backend/src/config.ts @@ -34,6 +34,8 @@ interface IConfig { POOLS_JSON_TREE_URL: string, POOLS_UPDATE_DELAY: number, AUDIT: boolean; + CLUSTER_MEMPOOL: boolean; + CLUSTER_MEMPOOL_INDEXING: boolean; RUST_GBT: boolean; LIMIT_GBT: boolean; CPFP_INDEXING: boolean; @@ -205,6 +207,8 @@ const defaults: IConfig = { 'POOLS_JSON_TREE_URL': 'https://api.github.com/repos/mempool/mining-pools/git/trees/master', 'POOLS_UPDATE_DELAY': 604800, // in seconds, default is one week 'AUDIT': false, + 'CLUSTER_MEMPOOL': false, + 'CLUSTER_MEMPOOL_INDEXING': false, 'RUST_GBT': true, 'LIMIT_GBT': false, 'CPFP_INDEXING': false, diff --git a/backend/src/index.ts b/backend/src/index.ts index 45dc16fb4..04690c4bc 100644 --- a/backend/src/index.ts +++ b/backend/src/index.ts @@ -1,5 +1,6 @@ import express from 'express'; import { Application, Request, Response, NextFunction } from 'express'; +import * as fs from 'fs'; import * as http from 'http'; import * as WebSocket from 'ws'; import bitcoinApi from './api/bitcoin/bitcoin-api-factory'; @@ -67,6 +68,10 @@ class Server { constructor() { this.app = express(); + if (cluster.isPrimary && config.MEMPOOL.UNIX_SOCKET_PATH) { + this.clearStaleUnixSocket(config.MEMPOOL.UNIX_SOCKET_PATH); + } + if (!config.MEMPOOL.SPAWN_CLUSTER_PROCS) { void this.startServer(); return; @@ -154,17 +159,17 @@ class Server { } this.server = http.createServer(this.app); - this.wss = new WebSocket.Server({ server: this.server }); + this.wss = new WebSocket.Server({ server: this.server, maxPayload: websocketHandler.MAX_MESSAGE_SIZE }); if (config.MEMPOOL.UNIX_SOCKET_PATH) { this.serverUnixSocket = http.createServer(this.app); - this.wssUnixSocket = new WebSocket.Server({ server: this.serverUnixSocket }); + this.wssUnixSocket = new WebSocket.Server({ server: this.serverUnixSocket, maxPayload: websocketHandler.MAX_MESSAGE_SIZE }); } this.setUpWebsocketHandling(); await poolsUpdater.updatePoolsJson(); // Needs to be done before loading the disk cache because we sometimes wipe it if (config.DATABASE.ENABLED === true && config.MEMPOOL.ENABLED && ['mainnet', 'testnet', 'signet', 'testnet4', 'regtest'].includes(config.MEMPOOL.NETWORK) && !poolsUpdater.currentSha) { - logger.err(`Failed to retreive pools-v2.json sha, cannot run block indexing. Please make sure you've set valid urls in your mempool-config.json::MEMPOOL::POOLS_JSON_URL and mempool-config.json::MEMPOOL::POOLS_JSON_TREE_UR, aborting now`); + logger.err(`Failed to retrieve pools-v2.json sha, cannot run block indexing. Please make sure you've set valid urls in your mempool-config.json::MEMPOOL::POOLS_JSON_URL and mempool-config.json::MEMPOOL::POOLS_JSON_TREE_UR, aborting now`); return process.exit(1); } @@ -177,8 +182,14 @@ class Server { if (config.MEMPOOL.CACHE_ENABLED) { await diskCache.$loadMempoolCache(); } else if (config.REDIS.ENABLED) { + let currentMempoolTxids: Set | undefined; + try { + currentMempoolTxids = new Set(await bitcoinApi.$getRawMempool()); + } catch (e) { + logger.warn(`Failed to fetch raw mempool before loading Redis cache. Reason: ${e instanceof Error ? e.message : e}`); + } /** @asyncUnsafe */ - await redisCache.$loadCache(); + await redisCache.$loadCache(currentMempoolTxids); } } @@ -224,6 +235,8 @@ class Server { logger.notice(`Mempool Server is running on port ${config.MEMPOOL.HTTP_PORT}`); } }); + this.server.keepAliveTimeout = 70 * 1000; + this.server.headersTimeout = 71 * 1000; if (this.serverUnixSocket) { this.serverUnixSocket.listen(config.MEMPOOL.UNIX_SOCKET_PATH, () => { @@ -233,11 +246,25 @@ class Server { logger.notice(`Mempool Server is listening on ${config.MEMPOOL.UNIX_SOCKET_PATH}`); } }); + + this.serverUnixSocket.keepAliveTimeout = 70 * 1000; + this.serverUnixSocket.headersTimeout = 71 * 1000; } void poolsUpdater.$startService(); } + clearStaleUnixSocket(path: string): void { + try { + if (fs.existsSync(path)) { + fs.unlinkSync(path); + logger.notice(`Removed stale unix socket ${path}`); + } + } catch (e) { + logger.err(`Failed to remove stale unix socket ${path}. Reason: ${e instanceof Error ? e.message : e}`); + } + } + /** @asyncSafe */ async runMainUpdateLoop(): Promise { const start = Date.now(); @@ -325,7 +352,6 @@ class Server { blocks.setNewBlockCallback(async () => { try { await elementsParser.$parse(); - await elementsParser.$updateFederationUtxos(); } catch (e) { logger.warn('Elements parsing error: ' + (e instanceof Error ? e.message : e)); } @@ -335,7 +361,6 @@ class Server { if (config.MEMPOOL.ENABLED) { statistics.setNewStatisticsEntryCallback(websocketHandler.handleNewStatistic.bind(websocketHandler)); memPool.setAsyncMempoolChangedCallback(websocketHandler.$handleMempoolChange.bind(websocketHandler)); - blocks.setNewAsyncBlockCallback(websocketHandler.handleNewBlock.bind(websocketHandler)); } if (config.FIAT_PRICE.ENABLED) { priceUpdater.setRatesChangedCallback(websocketHandler.handleNewConversionRates.bind(websocketHandler)); @@ -396,6 +421,16 @@ class Server { this.warnedHeapCritical = false; this.maxHeapSize = 0; this.lastHeapLogTime = now; + this.server?.getConnections((error, count) => { + if (!error) { + logger.debug(`${count} open TCP sockets`); + } + }); + this.serverUnixSocket?.getConnections((error, count) => { + if (!error) { + logger.debug(`${count} open unix sockets`); + } + }); } } diff --git a/backend/src/indexer.ts b/backend/src/indexer.ts index 327bbbebf..9d47de2f2 100644 --- a/backend/src/indexer.ts +++ b/backend/src/indexer.ts @@ -113,12 +113,11 @@ class Indexer { } } this.tasksScheduled[task] = setTimeout(async () => { + delete this.tasksScheduled[task]; try { await this.runSingleTask(task); } catch (e) { logger.err(`Unexpected error in scheduled task ${task}: ` + (e instanceof Error ? e.message : e)); - } finally { - clearTimeout(this.tasksScheduled[task]); } }, timeout); } @@ -139,12 +138,13 @@ class Indexer { switch (task) { case 'blocksPrices': { if (!['testnet', 'signet', 'testnet4', 'regtest'].includes(config.MEMPOOL.NETWORK) && config.FIAT_PRICE.ENABLED) { - let lastestPriceId; + let latestPriceId; try { - lastestPriceId = await PricesRepository.$getLatestPriceId(); + latestPriceId = await PricesRepository.$getLatestPriceId(); } catch (e) { logger.debug('failed to fetch latest price id from db: ' + (e instanceof Error ? e.message : e)); - } if (priceUpdater.historyInserted === false || lastestPriceId === null) { + } + if (priceUpdater.historyInserted === false || latestPriceId === null) { logger.debug(`Blocks prices indexer is waiting for the price updater to complete`, logger.tags.mining); this.scheduleSingleTask(task, 10000); } else { @@ -226,6 +226,8 @@ class Indexer { await AccelerationRepository.$indexPastAccelerations(); await BlocksAuditsRepository.$migrateAuditsV0toV1(); await BlocksRepository.$migrateBlocks(); + + void blocks.$generateFlagValuesDatabase(); // do not wait for classify blocks to finish void blocks.$classifyBlocks(); runSuccessful = true; diff --git a/backend/src/mempool.interfaces.ts b/backend/src/mempool.interfaces.ts index a0888bb50..3f1403518 100644 --- a/backend/src/mempool.interfaces.ts +++ b/backend/src/mempool.interfaces.ts @@ -17,6 +17,7 @@ export interface PoolInfo { name: string; link: string; blockCount: number; + emptyBlocks: number; slug: string; avgMatchRate: number | null; avgFeeDelta: number | null; @@ -25,7 +26,11 @@ export interface PoolInfo { export interface PoolStats extends PoolInfo { rank: number; - emptyBlocks: number; +} + +export enum TemplateAlgorithm { + legacy = 0, + clusterMempool = 1, } export interface BlockAudit { @@ -45,6 +50,7 @@ export interface BlockAudit { expectedFees?: number, expectedWeight?: number, template?: any[]; + templateAlgorithm?: TemplateAlgorithm, } export interface TransactionAudit { @@ -132,6 +138,8 @@ export interface TransactionExtended extends IEsploraApi.Transaction { replacement?: boolean; uid?: number; flags?: number; + clusterId?: number; + chunkIndex?: number; } export interface MempoolTransactionExtended extends TransactionExtended { @@ -227,6 +235,7 @@ export interface CpfpInfo { adjustedVsize?: number, acceleration?: boolean, fee?: number; + cluster?: CpfpClusterData & { chunkIndex: number }; } export interface TransactionStripped { @@ -388,6 +397,25 @@ export interface CpfpCluster { height: number, txs: Ancestor[], effectiveFeePerVsize: number, + templateAlgorithm?: TemplateAlgorithm, + clusterData?: CpfpClusterData, +} + +export interface CpfpClusterTx { + txid: string; + fee: number; + weight: number; + parents: number[]; +} + +export interface CpfpClusterChunk { + txs: number[]; + feerate: number; +} + +export interface CpfpClusterData { + txs: CpfpClusterTx[]; + chunks: CpfpClusterChunk[]; } export interface CpfpSummary { diff --git a/backend/src/replication/AuditReplication.ts b/backend/src/replication/AuditReplication.ts index d92614746..562de5e2f 100644 --- a/backend/src/replication/AuditReplication.ts +++ b/backend/src/replication/AuditReplication.ts @@ -114,6 +114,7 @@ class AuditReplication { }); await blocksAuditsRepository.$saveAudit({ version: auditSummary.version || 0, + templateAlgorithm: auditSummary.templateAlgorithm ?? 0, hash: blockHash, height: auditSummary.height, time: auditSummary.timestamp || auditSummary.time, diff --git a/backend/src/repositories/BlocksAuditsRepository.ts b/backend/src/repositories/BlocksAuditsRepository.ts index e682cab59..9d1be0eb6 100644 --- a/backend/src/repositories/BlocksAuditsRepository.ts +++ b/backend/src/repositories/BlocksAuditsRepository.ts @@ -1,7 +1,7 @@ import DB from '../database'; import logger from '../logger'; import bitcoinApi from '../api/bitcoin/bitcoin-api-factory'; -import { BlockAudit, AuditScore, TransactionAudit, TransactionStripped } from '../mempool.interfaces'; +import { BlockAudit, AuditScore, TransactionAudit, TransactionStripped, TemplateAlgorithm } from '../mempool.interfaces'; interface MigrationAudit { version: number, @@ -18,8 +18,8 @@ class BlocksAuditRepositories { /** @asyncSafe */ public async $saveAudit(audit: BlockAudit): Promise { try { - await DB.query(`INSERT INTO blocks_audits(version, time, height, hash, unseen_txs, missing_txs, added_txs, prioritized_txs, fresh_txs, sigop_txs, fullrbf_txs, accelerated_txs, match_rate, expected_fees, expected_weight) - VALUE (?, FROM_UNIXTIME(?), ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`, [audit.version, audit.time, audit.height, audit.hash, JSON.stringify(audit.unseenTxs), JSON.stringify(audit.missingTxs), + await DB.query(`INSERT INTO blocks_audits(version, template_algo, time, height, hash, unseen_txs, missing_txs, added_txs, prioritized_txs, fresh_txs, sigop_txs, fullrbf_txs, accelerated_txs, match_rate, expected_fees, expected_weight) + VALUE (?, ?, FROM_UNIXTIME(?), ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`, [audit.version, audit.templateAlgorithm ?? 0, audit.time, audit.height, audit.hash, JSON.stringify(audit.unseenTxs), JSON.stringify(audit.missingTxs), JSON.stringify(audit.addedTxs), JSON.stringify(audit.prioritizedTxs), JSON.stringify(audit.freshTxs), JSON.stringify(audit.sigopTxs), JSON.stringify(audit.fullrbfTxs), JSON.stringify(audit.acceleratedTxs), audit.matchRate, audit.expectedFees, audit.expectedWeight]); } catch (e: any) { if (e.errno === 1062) { // ER_DUP_ENTRY - This scenario is possible upon node backend restart @@ -80,6 +80,7 @@ class BlocksAuditRepositories { const [rows]: any[] = await DB.query( `SELECT blocks_audits.version, + blocks_audits.template_algo as templateAlgorithm, blocks_audits.height, blocks_audits.hash as id, UNIX_TIMESTAMP(blocks_audits.time) as timestamp, @@ -120,6 +121,23 @@ class BlocksAuditRepositories { } } + /** @asyncSafe */ + public async $getBlockTemplateAlgo(hash: string): Promise { + try { + const [rows]: any[] = await DB.query( + `SELECT template_algo FROM blocks_audits WHERE hash = ?`, + [hash] + ); + if (rows.length) { + return rows[0].template_algo as TemplateAlgorithm; + } + return null; + } catch (e: any) { + logger.err(`Cannot fetch block template algo from db. Reason: ` + (e instanceof Error ? e.message : e)); + return null; + } + } + /** @asyncSafe */ public async $getBlockTxAudit(hash: string, txid: string): Promise { try { diff --git a/backend/src/repositories/BlocksRepository.ts b/backend/src/repositories/BlocksRepository.ts index 9cd4bc0d9..20d0a6e46 100644 --- a/backend/src/repositories/BlocksRepository.ts +++ b/backend/src/repositories/BlocksRepository.ts @@ -14,7 +14,7 @@ import chainTips from '../api/chain-tips'; import blocks from '../api/blocks'; import BlocksAuditsRepository from './BlocksAuditsRepository'; import transactionUtils from '../api/transaction-utils'; -import { parseDATUMTemplateCreator } from '../utils/bitcoin-script'; +import { parseDATUMTemplateCreator, parseDMNDTemplateCreator } from '../utils/bitcoin-script'; import poolsUpdater from '../tasks/pools-updater'; interface DatabaseBlock { @@ -305,39 +305,6 @@ class BlocksRepository { } } - /** - * Get empty blocks for one or all pools - * @asyncSafe - */ - public async $countEmptyBlocks(poolId: number | null, interval: string | null = null): Promise { - interval = Common.getSqlInterval(interval); - - const params: any[] = []; - let query = `SELECT count(height) as count, pools.id as poolId - FROM blocks - JOIN pools on pools.id = blocks.pool_id - WHERE tx_count = 1 AND stale = 0`; - - if (poolId) { - query += ` AND pool_id = ?`; - params.push(poolId); - } - - if (interval) { - query += ` AND blockTimestamp BETWEEN DATE_SUB(NOW(), INTERVAL ${interval}) AND NOW()`; - } - - query += ` GROUP by pools.id`; - - try { - const [rows] = await DB.query(query, params); - return rows; - } catch (e) { - logger.err('Cannot count empty blocks. Reason: ' + (e instanceof Error ? e.message : e)); - throw e; - } - } - /** * Return most recent block height * @asyncSafe @@ -360,17 +327,26 @@ class BlocksRepository { interval = Common.getSqlInterval(interval); const params: any[] = []; - let query = `SELECT count(height) as blockCount - FROM blocks - WHERE stale = 0`; - - if (poolId) { - query += ` AND pool_id = ?`; + let query; + if (!poolId && !interval) { + // optimized query to get full indexed block count + query = `SELECT CAST(COALESCE(MAX(height) - MIN(height) + 1, 0) AS SIGNED) as blockCount FROM blocks`; + } else if (!poolId) { + // optimized query for indexed count within an interval + query = `SELECT GREATEST(0, COALESCE( + CAST((SELECT height FROM blocks WHERE stale = 0 AND blockTimestamp <= NOW() ORDER BY blockTimestamp DESC LIMIT 1) AS SIGNED) - + CAST((SELECT height FROM blocks WHERE stale = 0 AND blockTimestamp >= DATE_SUB(NOW(), INTERVAL ${interval}) ORDER BY blockTimestamp ASC LIMIT 1) AS SIGNED) + 1 + , 0)) as blockCount`; + } else { + // for specific pools, we do still have to actually count the blocks + query = `SELECT count(*) as blockCount + FROM blocks + WHERE stale = 0 AND pool_id = ?`; params.push(poolId); - } - if (interval) { - query += ` AND blockTimestamp BETWEEN DATE_SUB(NOW(), INTERVAL ${interval}) AND NOW()`; + if (interval) { + query += ` AND blockTimestamp BETWEEN DATE_SUB(NOW(), INTERVAL ${interval}) AND NOW()`; + } } try { @@ -575,8 +551,34 @@ class BlocksRepository { } } + /** + * Get the canonical block hash at a given height + * @asyncSafe + */ + public async $getCanonicalBlockHashByHeight(height: number): Promise { + try { + const [rows]: any[] = await DB.query(` + SELECT hash + FROM blocks + WHERE height = ? AND stale = 0 + LIMIT 1`, + [height] + ); + + if (rows.length <= 0) { + return null; + } + + return rows[0].hash; + } catch (e) { + logger.err(`Cannot get canonical block hash at height ${height}. Reason: ` + (e instanceof Error ? e.message : e)); + throw e; + } + } + /** * Get one block by hash + * @asyncSafe */ public async $getBlockByHash(hash: string): Promise { try { @@ -677,6 +679,7 @@ class BlocksRepository { const start = new Date().getTime(); const tip = await bitcoinApi.$getBlockHashTip(); let firstBadBlockHeight: number | null = null; + let firstBadBlockTimestamp: number | null = null; const [blocks]: any[] = await DB.query(` SELECT height, @@ -687,6 +690,9 @@ class BlocksRepository { FROM blocks ORDER BY height DESC `); + if (!blocks || blocks.length === 0) { + throw new Error('Cannot validate chain: no indexed blocks in database'); + } const blocksByHash = {}; const blocksByHeight = {}; let minHeight = Infinity; @@ -703,7 +709,11 @@ class BlocksRepository { // ensure that indexed blocks are correctly classified as stale or canonical // iterate back to genesis, resetting canonical status where necessary let hash = tip; - const tipHeight = blocksByHash[hash].height || (await bitcoinApi.$getBlock(hash))?.height; + const indexedTip = blocksByHash[hash]; + const tipHeight = indexedTip?.height ?? (await bitcoinApi.$getBlock(hash))?.height; + if (typeof tipHeight !== 'number') { + throw new Error(`Cannot validate chain: could not resolve tip block height for ${hash} from index or node`); + } // stop at the last canonical block we're supposed to have indexed already let lastIndexedBlockHeight = minHeight; @@ -725,6 +735,7 @@ class BlocksRepository { // block is marked stale, but shouldn't be await this.$setCanonicalBlockAtHeight(block.hash, height); firstBadBlockHeight = height; + firstBadBlockTimestamp = block.timestamp; } hash = block?.previous_block_hash; if (!hash) { @@ -741,7 +752,9 @@ class BlocksRepository { if (firstBadBlockHeight != null) { logger.warn(`Chain divergence detected at block ${firstBadBlockHeight}`); - await HashratesRepository.$deleteHashratesFromTimestamp(blocksByHash[firstBadBlockHeight].timestamp - 604800); + if (firstBadBlockTimestamp != null) { + await HashratesRepository.$deleteHashratesFromTimestamp(firstBadBlockTimestamp - 604800); + } await DifficultyAdjustmentsRepository.$deleteAdjustementsFromHeight(firstBadBlockHeight); return false; } @@ -1245,6 +1258,10 @@ class BlocksRepository { blk.previousblockhash = dbBlk.previousblockhash; blk.mediantime = dbBlk.mediantime; blk.indexVersion = dbBlk.index_version; + blk.stale = dbBlk.stale; + if (dbBlk.stale) { + blk.canonical = await this.$getCanonicalBlockHashByHeight(dbBlk.height) || undefined; + } // BlockExtension extras.totalFees = dbBlk.totalFees; extras.medianFee = dbBlk.medianFee; @@ -1333,6 +1350,8 @@ class BlocksRepository { if (extras.pool.name === 'OCEAN') { extras.pool.minerNames = parseDATUMTemplateCreator(extras.coinbaseRaw); + } else if (extras.pool.name === 'DMND') { + extras.pool.minerNames = parseDMNDTemplateCreator(extras.coinbaseRaw); } blk.extras = extras; diff --git a/backend/src/repositories/BlocksSummariesRepository.ts b/backend/src/repositories/BlocksSummariesRepository.ts index fc2771ce8..2239fa258 100644 --- a/backend/src/repositories/BlocksSummariesRepository.ts +++ b/backend/src/repositories/BlocksSummariesRepository.ts @@ -216,6 +216,34 @@ class BlocksSummariesRepository { } return false; } + + /** @asyncSafe */ + public async $getTipIndexed(): Promise { + if (!Common.blocksSummariesIndexingEnabled()) { + return null; + } + try { + const [row]: any[] = await DB.query('SELECT MAX(height) as tip FROM blocks_summaries WHERE version >= 1'); + + if (row !== null && row.length > 0) { + return row[0].tip; + } + } catch (e) { + logger.err(`Cannot get latest block summary. Reason: ` + (e instanceof Error ? e.message : e)); + } + return null; + } + + public async $getSummariesBetweenHeights(startHeight: number, latestHeight: number): Promise<{height: number, transactions: string, timestamp: number}[]> { + try { + const [rows]: any[] = await DB.query(`SELECT bs.height, bs.transactions, UNIX_TIMESTAMP(b.blockTimestamp) as timestamp FROM blocks_summaries bs JOIN blocks b ON bs.id = b.hash WHERE bs.height <= ? AND bs.height > ? AND b.stale = 0 AND bs.version >= 1 ORDER BY height DESC`, [startHeight, latestHeight]); + + return rows; + } catch (e) { + logger.err(`Cannot get blocks between ${startHeight} and ${latestHeight}. Reason: ` + (e instanceof Error ? e.message : e)); + throw e; + } + } } export default new BlocksSummariesRepository(); diff --git a/backend/src/repositories/CpfpRepository.ts b/backend/src/repositories/CpfpRepository.ts index 3be43eb64..f3f9dad5c 100644 --- a/backend/src/repositories/CpfpRepository.ts +++ b/backend/src/repositories/CpfpRepository.ts @@ -1,31 +1,47 @@ import { RowDataPacket } from 'mysql2'; import DB from '../database'; import logger from '../logger'; -import { Ancestor, CpfpCluster } from '../mempool.interfaces'; +import { Ancestor, CpfpCluster, CpfpClusterData, CpfpClusterTx, TemplateAlgorithm } from '../mempool.interfaces'; import transactionRepository from '../repositories/TransactionRepository'; class CpfpRepository { - public async $batchSaveClusters(clusters: { root: string, height: number, txs: Ancestor[], effectiveFeePerVsize: number }[]): Promise { + public async $batchSaveClusters(clusters: CpfpCluster[]): Promise { try { - const clusterValues: [string, number, Buffer, number][] = []; + const clusterValues: [string, number, Buffer, number, number][] = []; const txs: { txid: string, cluster: string }[] = []; for (const cluster of clusters) { if (cluster.txs?.length) { - const roundedEffectiveFee = Math.round(cluster.effectiveFeePerVsize * 100) / 100; - const equalFee = cluster.txs.length > 1 && cluster.txs.reduce((acc, tx) => { - return (acc && Math.round(((tx.fee || 0) / (tx.weight / 4)) * 100) / 100 === roundedEffectiveFee); - }, true); - if (!equalFee) { + const isCM = cluster.templateAlgorithm === TemplateAlgorithm.clusterMempool; + + if (isCM && cluster.clusterData) { clusterValues.push([ cluster.root, cluster.height, - Buffer.from(this.pack(cluster.txs)), - cluster.effectiveFeePerVsize + Buffer.from(this.packCM(cluster.clusterData)), + 0, + TemplateAlgorithm.clusterMempool, ]); - for (const tx of cluster.txs) { + for (const tx of cluster.clusterData.txs) { txs.push({ txid: tx.txid, cluster: cluster.root }); } + } else { + const roundedEffectiveFee = Math.round(cluster.effectiveFeePerVsize * 100) / 100; + const equalFee = cluster.txs.length > 1 && cluster.txs.reduce((acc, tx) => { + return (acc && Math.round(((tx.fee || 0) / (tx.weight / 4)) * 100) / 100 === roundedEffectiveFee); + }, true); + if (!equalFee) { + clusterValues.push([ + cluster.root, + cluster.height, + Buffer.from(this.pack(cluster.txs)), + cluster.effectiveFeePerVsize, + TemplateAlgorithm.legacy, + ]); + for (const tx of cluster.txs) { + txs.push({ txid: tx.txid, cluster: cluster.root }); + } + } } } } @@ -42,11 +58,11 @@ class CpfpRepository { while (chunkIndex < clusterValues.length) { const chunk = clusterValues.slice(chunkIndex, chunkIndex + maxChunk); let query = ` - INSERT IGNORE INTO compact_cpfp_clusters(root, height, txs, fee_rate) + INSERT IGNORE INTO compact_cpfp_clusters(root, height, txs, fee_rate, template_algo) VALUES `; query += chunk.map(chunk => { - return (' (UNHEX(?), ?, ?, ?)'); + return (' (UNHEX(?), ?, ?, ?, ?)'); }) + ';'; const values = chunk.flat(); queries.push({ @@ -86,8 +102,16 @@ class CpfpRepository { ); const cluster = clusterRows[0]; if (cluster?.txs) { - cluster.effectiveFeePerVsize = cluster.fee_rate; - cluster.txs = this.unpack(cluster.txs); + if (cluster.template_algo === TemplateAlgorithm.clusterMempool) { + cluster.templateAlgorithm = TemplateAlgorithm.clusterMempool; + cluster.clusterData = this.unpackCM(cluster.txs); + cluster.txs = cluster.clusterData.txs.map(tx => ({ txid: tx.txid, weight: tx.weight, fee: tx.fee })); + cluster.effectiveFeePerVsize = 0; + } else { + cluster.templateAlgorithm = TemplateAlgorithm.legacy; + cluster.effectiveFeePerVsize = cluster.fee_rate; + cluster.txs = this.unpack(cluster.txs); + } return cluster; } return; @@ -105,8 +129,16 @@ class CpfpRepository { ); return clusterRows.map(cluster => { if (cluster?.txs) { - cluster.effectiveFeePerVsize = cluster.fee_rate; - cluster.txs = this.unpack(cluster.txs); + if (cluster.template_algo === TemplateAlgorithm.clusterMempool) { + cluster.templateAlgorithm = TemplateAlgorithm.clusterMempool; + cluster.clusterData = this.unpackCM(cluster.txs); + cluster.txs = cluster.clusterData.txs.map(tx => ({ txid: tx.txid, weight: tx.weight, fee: tx.fee })); + cluster.effectiveFeePerVsize = 0; + } else { + cluster.templateAlgorithm = TemplateAlgorithm.legacy; + cluster.effectiveFeePerVsize = cluster.fee_rate; + cluster.txs = this.unpack(cluster.txs); + } return cluster; } else { return null; @@ -119,16 +151,16 @@ class CpfpRepository { try { const [rows] = await DB.query( ` - SELECT txs, height, root from compact_cpfp_clusters + SELECT txs, height, root, template_algo from compact_cpfp_clusters WHERE height >= ? `, [height] ) as RowDataPacket[][]; if (rows?.length) { for (const clusterToDelete of rows) { - const txs = this.unpack(clusterToDelete?.txs); - for (const tx of txs) { - await transactionRepository.$removeTransaction(tx.txid); + const txids = this.extractTxids(clusterToDelete); + for (const txid of txids) { + await transactionRepository.$removeTransaction(txid); } } } @@ -150,16 +182,16 @@ class CpfpRepository { try { const [rows] = await DB.query( ` - SELECT txs, height, root from compact_cpfp_clusters + SELECT txs, height, root, template_algo from compact_cpfp_clusters WHERE height = ? `, [height] ) as RowDataPacket[][]; if (rows?.length) { for (const clusterToDelete of rows) { - const txs = this.unpack(clusterToDelete?.txs); - for (const tx of txs) { - await transactionRepository.$removeTransaction(tx.txid); + const txids = this.extractTxids(clusterToDelete); + for (const txid of txids) { + await transactionRepository.$removeTransaction(txid); } } } @@ -176,6 +208,13 @@ class CpfpRepository { } } + private extractTxids(row: any): string[] { + if (row.template_algo === TemplateAlgorithm.clusterMempool) { + return this.unpackCM(row.txs).txs.map(tx => tx.txid); + } + return this.unpack(row.txs).map(tx => tx.txid); + } + // insert a dummy row to mark that we've indexed as far as this block public async $insertProgressMarker(height: number): Promise { try { @@ -245,6 +284,117 @@ class CpfpRepository { } } + /** + * Pack cluster mempool data into binary format: + * [num_chunks: uint16] + * Per chunk: [num_txs: uint16] + * Per tx (in linearization order, grouped by chunk): + * [txid: 32 bytes LE] [weight: uint32] [fee: uint64] [num_parents: uint8] [parent_indices: uint8 each] + */ + public packCM(clusterData: CpfpClusterData): ArrayBuffer { + const headerSize = 2; + const chunkHeadersSize = clusterData.chunks.length * 2; + let txDataSize = 0; + for (const tx of clusterData.txs) { + txDataSize += 32 + 4 + 8 + 1 + tx.parents.length; + } + const totalSize = headerSize + chunkHeadersSize + txDataSize; + + const buf = new ArrayBuffer(totalSize); + const view = new DataView(buf); + let offset = 0; + + view.setUint16(offset, clusterData.chunks.length); + offset += 2; + + for (const chunk of clusterData.chunks) { + view.setUint16(offset, chunk.txs.length); + offset += 2; + } + + for (const tx of clusterData.txs) { + for (let x = 0; x < 32; x++) { + view.setUint8(offset + (31 - x), parseInt(tx.txid.slice(x * 2, (x * 2) + 2), 16)); + } + offset += 32; + view.setUint32(offset, tx.weight); + offset += 4; + view.setBigUint64(offset, BigInt(Math.round(tx.fee))); + offset += 8; + view.setUint8(offset, tx.parents.length); + offset += 1; + for (const parentIdx of tx.parents) { + view.setUint8(offset, parentIdx); + offset += 1; + } + } + + return buf; + } + + public unpackCM(buf: Buffer): CpfpClusterData { + if (!buf) { + return { txs: [], chunks: [] }; + } + + try { + const arrayBuffer = buf.buffer.slice(buf.byteOffset, buf.byteOffset + buf.byteLength); + const view = new DataView(arrayBuffer); + let offset = 0; + + const numChunks = view.getUint16(offset); + offset += 2; + + const chunkSizes: number[] = []; + for (let i = 0; i < numChunks; i++) { + chunkSizes.push(view.getUint16(offset)); + offset += 2; + } + + const txs: CpfpClusterTx[] = []; + const chunks: { txs: number[], feerate: number }[] = []; + let txIndex = 0; + + for (let chunkIdx = 0; chunkIdx < numChunks; chunkIdx++) { + const chunkTxIndices: number[] = []; + let chunkFee = 0; + let chunkWeight = 0; + + for (let t = 0; t < chunkSizes[chunkIdx]; t++) { + const txid = Array.from(new Uint8Array(arrayBuffer, offset, 32)).reverse().map(b => b.toString(16).padStart(2, '0')).join(''); + offset += 32; + const weight = view.getUint32(offset); + offset += 4; + const fee = Number(view.getBigUint64(offset)); + offset += 8; + const numParents = view.getUint8(offset); + offset += 1; + const parents: number[] = []; + for (let p = 0; p < numParents; p++) { + parents.push(view.getUint8(offset)); + offset += 1; + } + + txs.push({ txid, fee, weight, parents }); + chunkTxIndices.push(txIndex); + chunkFee += fee; + chunkWeight += weight; + txIndex++; + } + + chunks.push({ + txs: chunkTxIndices, + feerate: chunkWeight > 0 ? (chunkFee * 4) / chunkWeight : 0, + }); + } + + return { txs, chunks }; + } catch (e) { + logger.warn(`Failed to unpack CM CPFP cluster. Reason: ` + (e instanceof Error ? e.message : e)); + return { txs: [], chunks: [] }; + } + } + // returns `true` if two sets of CPFP clusters are deeply identical public compareClusters(clustersA: CpfpCluster[], clustersB: CpfpCluster[]): boolean { if (clustersA.length !== clustersB.length) { diff --git a/backend/src/repositories/FlagValueRepository.ts b/backend/src/repositories/FlagValueRepository.ts new file mode 100644 index 000000000..9bedf7913 --- /dev/null +++ b/backend/src/repositories/FlagValueRepository.ts @@ -0,0 +1,145 @@ +import DB from '../database'; +import logger from '../logger'; + +export const INDEXING_PRESETS = [ + {name: 'per block', bucketSize: 1, retentionSpan: 144}, // block span of ~1 day + {name: 'per week', bucketSize: 1008, retentionSpan: -1}, // all + {name: 'per month', bucketSize: 4032, retentionSpan: -1}, // all +]; + +export const INTERVAL_PRESETS = { + '24h': {retentionSpan: 144, bucketSizes: [1]}, + '6m': {retentionSpan: 24192, bucketSizes: [1008, 4032]}, + '1y': {retentionSpan: 48384, bucketSizes: [1008, 4032]}, + '2y': {retentionSpan: 96768, bucketSizes: [1008, 4032]}, + '3y': {retentionSpan: 145152, bucketSizes: [1008, 4032]}, + 'all': {retentionSpan: -1, bucketSizes: [1008, 4032]}, +}; + +class FlagValuesRepository { + /** + * Get the latest indexed day from the database + * + * @asyncSafe */ + public async $getTipAndTailIndexedByBucketSize(bucketSize: number): Promise<{tip: number, tail: number} | null> { + try { + const [rows]: any[] = await DB.query(`SELECT (MAX(start_height) + ?) as tip, MIN(start_height) as tail FROM flag_values WHERE bucket_size = ?`, [bucketSize, bucketSize.toString()]); + if (rows !== null && rows.length > 0 && rows[0].tip !== null && rows[0].tail !== null) { + return rows[0]; + } + } catch (e) { + logger.err(`Cannot get tip and tail indexed from flag_values. Reason: ` + (e instanceof Error ? e.message : e)); + } + return null; + } + + /** + * Get the set of bucket that area already indexed between heights by bucketSize + * + * @asyncSafe */ + public async $getIndexedStartHeights(bucketSize: number, startHeight: number, latestHeight: number): Promise { + try { + const [rows]: any[] = await DB.query( + `SELECT DISTINCT start_height FROM flag_values WHERE bucket_size = ? AND start_height <= ? AND start_height >= ?`, + [bucketSize.toString(), startHeight, latestHeight] + ); + return rows.map(row => row.start_height); + } catch (e) { + logger.err(`Cannot get indexed start heights from flag_values. Reason: ` + (e instanceof Error ? e.message : e)); + } + return []; + } + + public async $saveBatchFlagValues(bucketSize: number, startHeight: number, dataPerFlag: Record>, avgTimestamp: number): Promise { + const params: any[] = []; + const distinctFlags = Object.keys(dataPerFlag); + const avgDate = new Date(Math.round(avgTimestamp) * 1000); + for (const flag of distinctFlags) { + params.push([bucketSize.toString(), startHeight, avgDate, BigInt(flag), dataPerFlag[flag].txCount, dataPerFlag[flag].vSizeTotal]); + } + try { + await DB.query(` + INSERT INTO flag_values (bucket_size, start_height, avg_timestamp, flag_value, tx_count, vsize_total) VALUES ? + ON DUPLICATE KEY UPDATE + avg_timestamp = VALUES(avg_timestamp), tx_count = VALUES(tx_count), vsize_total = VALUES(vsize_total) + `, [params]); + } catch (e) { + logger.debug(`Cannot save flag batched values. Reason: ${e instanceof Error ? e.message : e}`); + throw e; + } + } + + public async $queryTxCountBasedOnMask(mask: bigint, bucketSize: number, op: 'and' | 'or' | 'nor' | undefined, startHeight: number): Promise<{bucketSize: string, startHeight: number, avgTimestamp: number, txCount: number, vSizeTotal: number}[]> { + let flagPredicate = ''; + let params: any[]= []; + switch (op) { + case 'and': { + flagPredicate = 'AND (flag_value & ?) = ?'; + params = [bucketSize.toString(), startHeight, mask, mask]; + } break; + case 'or': { + flagPredicate = 'AND (flag_value & ?) > 0'; + params = [bucketSize.toString(), startHeight, mask]; + } break; + case 'nor': { + flagPredicate = 'AND (flag_value & ?) = 0'; + params = [bucketSize.toString(), startHeight, mask]; + } break; + case undefined: { // op not passed, no boolean operations + params = [bucketSize.toString(), startHeight]; + break; + } + default: throw new Error(`Invalid op '${op}', expected 'and' | 'or' | 'nor' | undefined`); + } + try { + const [rows]: any[] = await DB.query(` + SELECT bucket_size as bucketSize, start_height as startHeight, UNIX_TIMESTAMP(avg_timestamp) as avgTimestamp, + SUM(tx_count) as txCount, SUM(vsize_total) as vSizeTotal + FROM flag_values + WHERE bucket_size = ? AND start_height >= ? ${flagPredicate} + GROUP BY start_height ORDER BY start_height DESC + `, params); + if (rows !== null && rows.length > 0) { + return rows; + } + } catch (e) { + logger.debug(`Cannot get tx counts. Reason: ${e instanceof Error ? e.message : e}`); + } + return []; + } + + /** @asyncSafe */ + public async $deleteFlagValuesBelowHeight(height: number, bucketSize: number): Promise { + try { + await DB.query(`DELETE FROM flag_values WHERE start_height < ? AND bucket_size = ?`, [height, bucketSize.toString()]); + } catch(e) { + logger.err(`Cannot delete flag values below block #${height}. Reason: ` + (e instanceof Error ? e.message : e)); + } + } + + /** @asyncSafe */ + public async $deleteFlagValuesFromHeight(height: number): Promise { + try { + for (const preset of INDEXING_PRESETS) { + const startHeight = Math.floor(height / preset.bucketSize) * preset.bucketSize; + await DB.query(`DELETE FROM flag_values WHERE start_height >= ? AND bucket_size = ?`, [startHeight, preset.bucketSize.toString()]); + } + } catch (e) { + logger.err(`Cannot delete flag values above ${height}. Reason: ` + (e instanceof Error ? e.message : e)); + } + } + + public async $getTotalBlocksIndexedByBucketSize(bucketSize: number): Promise { + try { + const [rows]: any[] = await DB.query(`SELECT (count(distinct start_height) * ?) as total FROM flag_values WHERE bucket_size = ?`, [bucketSize, bucketSize.toString()]); + if (rows !== null && rows.length > 0) { + return rows[0].total; + } + } catch (e) { + logger.err(`Cannot get total blocks indexed in flag_values. Reason: ` + (e instanceof Error ? e.message : e)); + } + return null; + } +} + +export default new FlagValuesRepository(); diff --git a/backend/src/repositories/NodesSocketsRepository.ts b/backend/src/repositories/NodesSocketsRepository.ts index 8ddfafe68..9e2d28549 100644 --- a/backend/src/repositories/NodesSocketsRepository.ts +++ b/backend/src/repositories/NodesSocketsRepository.ts @@ -30,12 +30,13 @@ class NodesSocketsRepository { return 0; } try { + const placeholders = addresses.map(() => '?').join(','); const query = ` DELETE FROM nodes_sockets WHERE public_key = ? - AND socket NOT IN (${addresses.map(id => `"${id}"`).join(',')}) + AND socket NOT IN (${placeholders}) `; - const [result] = await DB.query(query, [publicKey]); + const [result] = await DB.query(query, [publicKey, ...addresses]); return result.affectedRows; } catch (e) { logger.err(`Cannot delete unused sockets for ${publicKey} from db. Reason: ` + (e instanceof Error ? e.message : e)); diff --git a/backend/src/repositories/PoolsRepository.ts b/backend/src/repositories/PoolsRepository.ts index fcc218f7b..4fc3742fd 100644 --- a/backend/src/repositories/PoolsRepository.ts +++ b/backend/src/repositories/PoolsRepository.ts @@ -38,6 +38,7 @@ class PoolsRepository { let query = ` SELECT COUNT(blocks.height) As blockCount, + COUNT(CASE WHEN blocks.tx_count = 1 THEN 1 END) AS emptyBlocks, pool_id AS poolId, pools.name AS name, pools.link AS link, @@ -47,7 +48,7 @@ class PoolsRepository { unique_id as poolUniqueId FROM blocks JOIN pools on pools.id = pool_id - LEFT JOIN blocks_audits ON blocks_audits.height = blocks.height + LEFT JOIN blocks_audits ON blocks_audits.hash = blocks.hash WHERE blocks.stale = 0 `; diff --git a/backend/src/repositories/PricesRepository.ts b/backend/src/repositories/PricesRepository.ts index ac2558cc8..bbf9d8caf 100644 --- a/backend/src/repositories/PricesRepository.ts +++ b/backend/src/repositories/PricesRepository.ts @@ -330,7 +330,7 @@ class PricesRepository { const [rates] = await DB.query(` SELECT ${ApiPriceFields} FROM prices - WHERE UNIX_TIMESTAMP(time) < ? + WHERE UNIX_TIMESTAMP(time) <= ? AND USD >= 0 ORDER BY time DESC LIMIT 1`, diff --git a/backend/src/repositories/TransactionRepository.ts b/backend/src/repositories/TransactionRepository.ts index b5067f790..772bfd9ae 100644 --- a/backend/src/repositories/TransactionRepository.ts +++ b/backend/src/repositories/TransactionRepository.ts @@ -1,6 +1,6 @@ import DB from '../database'; import logger from '../logger'; -import { Ancestor, CpfpInfo } from '../mempool.interfaces'; +import { Ancestor, CpfpCluster, CpfpInfo, TemplateAlgorithm } from '../mempool.interfaces'; import cpfpRepository from './CpfpRepository'; class TransactionRepository { @@ -72,6 +72,9 @@ class TransactionRepository { const clusterId = txRows[0].root.toLowerCase(); const cluster = await cpfpRepository.$getCluster(clusterId); if (cluster) { + if (cluster.templateAlgorithm === TemplateAlgorithm.clusterMempool && cluster.clusterData) { + return this.convertCpfpCM(txid, cluster); + } return this.convertCpfp(txid, cluster); } } @@ -116,6 +119,95 @@ class TransactionRepository { effectiveFeePerVsize: cluster.effectiveFeePerVsize, }; } + + private convertCpfpCM(txid: string, cluster: CpfpCluster): CpfpInfo { + const clusterData = cluster.clusterData; + if (!clusterData) { + return { ancestors: [], descendants: [], effectiveFeePerVsize: 0 }; + } + + // Find which chunk this tx belongs to + let txFlatIdx = -1; + let txChunkIndex = -1; + for (let i = 0; i < clusterData.txs.length; i++) { + if (clusterData.txs[i].txid === txid) { + txFlatIdx = i; + break; + } + } + + // Find the chunk containing this tx + for (let chunkIdx = 0; chunkIdx < clusterData.chunks.length; chunkIdx++) { + if (clusterData.chunks[chunkIdx].txs.includes(txFlatIdx)) { + txChunkIndex = chunkIdx; + break; + } + } + + // Derive ancestors/descendants from in-chunk depgraph parents + // For CM, ancestors are the tx's depgraph parents within the cluster, + // descendants are txs that depend on this tx + const ancestors: Ancestor[] = []; + const descendants: Ancestor[] = []; + + if (txFlatIdx >= 0) { + // Build child map + const childMap = new Map(); + for (let i = 0; i < clusterData.txs.length; i++) { + for (const parentIdx of clusterData.txs[i].parents) { + let children = childMap.get(parentIdx); + if (!children) { + children = []; + childMap.set(parentIdx, children); + } + children.push(i); + } + } + + const ancestorSet = new Set(); + const stack = [...clusterData.txs[txFlatIdx].parents]; + while (stack.length) { + const idx = stack.pop(); + if (idx === undefined || ancestorSet.has(idx)) { + continue; + } + ancestorSet.add(idx); + stack.push(...clusterData.txs[idx].parents); + } + + const descendantSet = new Set(); + const dStack = [...(childMap.get(txFlatIdx) || [])]; + while (dStack.length) { + const idx = dStack.pop(); + if (idx === undefined || descendantSet.has(idx)) { + continue; + } + descendantSet.add(idx); + dStack.push(...(childMap.get(idx) || [])); + } + + for (const idx of ancestorSet) { + const tx = clusterData.txs[idx]; + ancestors.push({ txid: tx.txid, weight: tx.weight, fee: tx.fee }); + } + for (const idx of descendantSet) { + const tx = clusterData.txs[idx]; + descendants.push({ txid: tx.txid, weight: tx.weight, fee: tx.fee }); + } + } + + const effectiveFeePerVsize = txChunkIndex >= 0 ? clusterData.chunks[txChunkIndex].feerate : 0; + + return { + ancestors, + descendants, + effectiveFeePerVsize, + cluster: { + ...clusterData, + chunkIndex: txChunkIndex, + }, + }; + } } export default new TransactionRepository(); diff --git a/backend/src/rpc-api/commands.ts b/backend/src/rpc-api/commands.ts index 89ab9cfe6..475200fee 100644 --- a/backend/src/rpc-api/commands.ts +++ b/backend/src/rpc-api/commands.ts @@ -94,4 +94,5 @@ module.exports = { getTxoutSetinfo: 'gettxoutsetinfo', getIndexInfo: 'getindexinfo', testMempoolAccept: 'testmempoolaccept', + tweakFedPegScript: 'tweakfedpegscript', }; diff --git a/backend/src/utils/bitcoin-script.ts b/backend/src/utils/bitcoin-script.ts index 117fa61a7..2a88477b8 100644 --- a/backend/src/utils/bitcoin-script.ts +++ b/backend/src/utils/bitcoin-script.ts @@ -224,4 +224,27 @@ export function parseDATUMTemplateCreator(coinbaseRaw: string): string[] | null tagString = tagString.replace('\x00', ''); return tagString.split('\x0f').map((name) => name.replace(/[^a-zA-Z0-9 ]/g, '')); -} \ No newline at end of file +} + +/** Extracts miner names from a DMND coinbase transaction */ +export function parseDMNDTemplateCreator(coinbaseRaw: string): string[] { + try { + if (!coinbaseRaw || coinbaseRaw.length % 2 !== 0 || !/^[0-9a-fA-F]+$/.test(coinbaseRaw)) { + return []; + } + + const bytes = Buffer.from(coinbaseRaw, 'hex'); + const blockHeightLength = bytes[0]; + const tagDelimiterIndex = 1 + blockHeightLength; + if (bytes.length <= tagDelimiterIndex || bytes[tagDelimiterIndex] !== 0x00) { + return []; + } + + const tagStart = tagDelimiterIndex + 1; + const tagEnd = bytes.indexOf(0x00, tagStart); + const tags = bytes.subarray(tagStart, tagEnd === -1 ? undefined : tagEnd); + return tags.toString('utf8').split('/').slice(1, -1); + } catch { + return []; + } +} diff --git a/backend/tsconfig.build.json b/backend/tsconfig.build.json index e3d61b71c..225f0944a 100644 --- a/backend/tsconfig.build.json +++ b/backend/tsconfig.build.json @@ -1,6 +1,6 @@ { "extends": "./tsconfig", - "exclude": ["**/*.test.*", "**/__mocks__/*", "**/__tests__/*"], + "exclude": ["**/*.test.*", "**/__mocks__/*", "**/__tests__/*", "**/__e2e__/*"], "compilerOptions": { "types": ["node"] }, diff --git a/docker/backend/Dockerfile b/docker/backend/Dockerfile index 049f13f6f..1d4eb0132 100644 --- a/docker/backend/Dockerfile +++ b/docker/backend/Dockerfile @@ -19,7 +19,7 @@ ENV PATH="/usr/local/cargo/bin:$PATH" COPY --from=backend . . COPY --from=rustgbt . ../rust/ ENV FD=/build/rust-gbt -RUN npm install --omit=dev --omit=optional +RUN bash meta/scripts/check-install-scripts.sh && npm ci --omit=dev --omit=optional WORKDIR /build RUN npm run package diff --git a/docker/backend/mempool-config.json b/docker/backend/mempool-config.json index ee8e329a6..4c3e075ce 100644 --- a/docker/backend/mempool-config.json +++ b/docker/backend/mempool-config.json @@ -29,6 +29,8 @@ "AUDIT": __MEMPOOL_AUDIT__, "RUST_GBT": __MEMPOOL_RUST_GBT__, "LIMIT_GBT": __MEMPOOL_LIMIT_GBT__, + "CLUSTER_MEMPOOL": __MEMPOOL_CLUSTER_MEMPOOL__, + "CLUSTER_MEMPOOL_INDEXING": __MEMPOOL_CLUSTER_MEMPOOL_INDEXING__, "CPFP_INDEXING": __MEMPOOL_CPFP_INDEXING__, "MAX_BLOCKS_BULK_QUERY": __MEMPOOL_MAX_BLOCKS_BULK_QUERY__, "DISK_CACHE_BLOCK_INTERVAL": __MEMPOOL_DISK_CACHE_BLOCK_INTERVAL__, diff --git a/docker/backend/start.sh b/docker/backend/start.sh index ae0bc616f..bb1351b05 100755 --- a/docker/backend/start.sh +++ b/docker/backend/start.sh @@ -33,6 +33,8 @@ __MEMPOOL_POOLS_UPDATE_DELAY__=${MEMPOOL_POOLS_UPDATE_DELAY:=604800} __MEMPOOL_AUDIT__=${MEMPOOL_AUDIT:=false} __MEMPOOL_RUST_GBT__=${MEMPOOL_RUST_GBT:=true} __MEMPOOL_LIMIT_GBT__=${MEMPOOL_LIMIT_GBT:=false} +__MEMPOOL_CLUSTER_MEMPOOL__=${MEMPOOL_CLUSTER_MEMPOOL:=false} +__MEMPOOL_CLUSTER_MEMPOOL_INDEXING__=${MEMPOOL_CLUSTER_MEMPOOL_INDEXING:=false} __MEMPOOL_CPFP_INDEXING__=${MEMPOOL_CPFP_INDEXING:=false} __MEMPOOL_MAX_BLOCKS_BULK_QUERY__=${MEMPOOL_MAX_BLOCKS_BULK_QUERY:=0} __MEMPOOL_DISK_CACHE_BLOCK_INTERVAL__=${MEMPOOL_DISK_CACHE_BLOCK_INTERVAL:=6} @@ -197,6 +199,8 @@ sed -i "s!__MEMPOOL_POOLS_UPDATE_DELAY__!${__MEMPOOL_POOLS_UPDATE_DELAY__}!g" me sed -i "s!__MEMPOOL_AUDIT__!${__MEMPOOL_AUDIT__}!g" mempool-config.json sed -i "s!__MEMPOOL_RUST_GBT__!${__MEMPOOL_RUST_GBT__}!g" mempool-config.json sed -i "s!__MEMPOOL_LIMIT_GBT__!${__MEMPOOL_LIMIT_GBT__}!g" mempool-config.json +sed -i "s!__MEMPOOL_CLUSTER_MEMPOOL__!${__MEMPOOL_CLUSTER_MEMPOOL__}!g" mempool-config.json +sed -i "s!__MEMPOOL_CLUSTER_MEMPOOL_INDEXING__!${__MEMPOOL_CLUSTER_MEMPOOL_INDEXING__}!g" mempool-config.json sed -i "s!__MEMPOOL_CPFP_INDEXING__!${__MEMPOOL_CPFP_INDEXING__}!g" mempool-config.json sed -i "s!__MEMPOOL_MAX_BLOCKS_BULK_QUERY__!${__MEMPOOL_MAX_BLOCKS_BULK_QUERY__}!g" mempool-config.json sed -i "s!__MEMPOOL_DISK_CACHE_BLOCK_INTERVAL__!${__MEMPOOL_DISK_CACHE_BLOCK_INTERVAL__}!g" mempool-config.json diff --git a/docker/frontend/Dockerfile b/docker/frontend/Dockerfile index 6bbb2d5f3..90bc9a57e 100644 --- a/docker/frontend/Dockerfile +++ b/docker/frontend/Dockerfile @@ -9,11 +9,11 @@ COPY . . RUN apt-get update RUN apt-get install -y build-essential rsync RUN cp mempool-frontend-config.sample.json mempool-frontend-config.json -RUN npm install --omit=dev --omit=optional +RUN bash meta/scripts/check-install-scripts.sh && npm ci --omit=dev --omit=optional RUN npm run build -FROM nginx:1.27.0-alpine +FROM nginx:1.30.1-alpine WORKDIR /patch @@ -21,6 +21,7 @@ COPY --from=builder /build/entrypoint.sh . COPY --from=builder /build/wait-for . COPY --from=builder /build/dist/mempool /var/www/mempool COPY --from=builder /build/nginx.conf /etc/nginx/ +COPY --from=builder /build/http-basic.conf /etc/nginx/ COPY --from=builder /build/nginx-mempool.conf /etc/nginx/conf.d/ RUN chmod +x /patch/entrypoint.sh @@ -30,6 +31,7 @@ RUN chown -R 1000:1000 /patch && chmod -R 755 /patch && \ chown -R 1000:1000 /var/cache/nginx && \ chown -R 1000:1000 /var/log/nginx && \ chown -R 1000:1000 /etc/nginx/nginx.conf && \ + chown -R 1000:1000 /etc/nginx/http-basic.conf && \ chown -R 1000:1000 /etc/nginx/conf.d && \ chown -R 1000:1000 /var/www/mempool diff --git a/docker/frontend/entrypoint.sh b/docker/frontend/entrypoint.sh index 17af1f4e4..c1a99944f 100644 --- a/docker/frontend/entrypoint.sh +++ b/docker/frontend/entrypoint.sh @@ -25,7 +25,7 @@ fi __MAINNET_ENABLED__=${MAINNET_ENABLED:=true} __TESTNET_ENABLED__=${TESTNET_ENABLED:=false} -__TESTNET4_ENABLED__=${TESTNET_ENABLED:=false} +__TESTNET4_ENABLED__=${TESTNET4_ENABLED:=false} __SIGNET_ENABLED__=${SIGNET_ENABLED:=false} __REGTEST_ENABLED__=${REGTEST_ENABLED:=false} __LIQUID_ENABLED__=${LIQUID_ENABLED:=false} @@ -48,6 +48,12 @@ __MAINNET_BLOCK_AUDIT_START_HEIGHT__=${MAINNET_BLOCK_AUDIT_START_HEIGHT:=0} __TESTNET_BLOCK_AUDIT_START_HEIGHT__=${TESTNET_BLOCK_AUDIT_START_HEIGHT:=0} __SIGNET_BLOCK_AUDIT_START_HEIGHT__=${SIGNET_BLOCK_AUDIT_START_HEIGHT:=0} __REGTEST_BLOCK_AUDIT_START_HEIGHT__=${REGTEST_BLOCK_AUDIT_START_HEIGHT:=0} +__TESTNET4_BLOCK_AUDIT_START_HEIGHT__=${TESTNET4_BLOCK_AUDIT_START_HEIGHT:=0} +__MAINNET_TX_FIRST_SEEN_START_HEIGHT__=${MAINNET_TX_FIRST_SEEN_START_HEIGHT:=0} +__TESTNET_TX_FIRST_SEEN_START_HEIGHT__=${TESTNET_TX_FIRST_SEEN_START_HEIGHT:=0} +__TESTNET4_TX_FIRST_SEEN_START_HEIGHT__=${TESTNET4_TX_FIRST_SEEN_START_HEIGHT:=0} +__SIGNET_TX_FIRST_SEEN_START_HEIGHT__=${SIGNET_TX_FIRST_SEEN_START_HEIGHT:=0} +__REGTEST_TX_FIRST_SEEN_START_HEIGHT__=${REGTEST_TX_FIRST_SEEN_START_HEIGHT:=0} __ACCELERATOR__=${ACCELERATOR:=false} __ACCELERATOR_BUTTON__=${ACCELERATOR_BUTTON:=true} __SERVICES_API__=${SERVICES_API:=https://mempool.space/api/v1/services} @@ -82,6 +88,12 @@ export __MAINNET_BLOCK_AUDIT_START_HEIGHT__ export __TESTNET_BLOCK_AUDIT_START_HEIGHT__ export __SIGNET_BLOCK_AUDIT_START_HEIGHT__ export __REGTEST_BLOCK_AUDIT_START_HEIGHT__ +export __TESTNET4_BLOCK_AUDIT_START_HEIGHT__ +export __MAINNET_TX_FIRST_SEEN_START_HEIGHT__ +export __TESTNET_TX_FIRST_SEEN_START_HEIGHT__ +export __TESTNET4_TX_FIRST_SEEN_START_HEIGHT__ +export __SIGNET_TX_FIRST_SEEN_START_HEIGHT__ +export __REGTEST_TX_FIRST_SEEN_START_HEIGHT__ export __ACCELERATOR__ export __ACCELERATOR_BUTTON__ export __SERVICES_API__ diff --git a/docker/init.sh b/docker/init.sh index 3c5ec6aa3..f1cfd222f 100755 --- a/docker/init.sh +++ b/docker/init.sh @@ -12,6 +12,7 @@ wget -O ./backend/GeoIP/GeoLite2-ASN.mmdb https://raw.githubusercontent.com/memp localhostIP="127.0.0.1" cp ./docker/frontend/* ./frontend cp ./nginx.conf ./frontend/ +cp ./http-basic.conf ./frontend/ cp ./nginx-mempool.conf ./frontend/ sed -i"" -e "s/${localhostIP}:80/0.0.0.0:__MEMPOOL_FRONTEND_HTTP_PORT__/g" ./frontend/nginx.conf sed -i"" -e "s/${localhostIP}/0.0.0.0/g" ./frontend/nginx.conf diff --git a/frontend/.npmrc b/frontend/.npmrc new file mode 100644 index 000000000..7253a5cee --- /dev/null +++ b/frontend/.npmrc @@ -0,0 +1 @@ +min-release-age=7 diff --git a/frontend/cypress/e2e/liquid/liquid.spec.ts b/frontend/cypress/e2e/liquid/liquid.spec.ts index 20f983844..6d58bf5e8 100644 --- a/frontend/cypress/e2e/liquid/liquid.spec.ts +++ b/frontend/cypress/e2e/liquid/liquid.spec.ts @@ -113,7 +113,7 @@ describe('Liquid', () => { it('allows searching assets', () => { cy.visit(`${basePath}/assets`); cy.waitForSkeletonGone(); - cy.get('.container-xl input').click().type('Liquid Bitcoin').then(() => { + cy.get('.container-xl input').click().type('Tether USD').then(() => { cy.get('ngb-typeahead-window', { timeout: 30000 }).should('have.length', 1); }); }); diff --git a/frontend/cypress/e2e/liquidtestnet/liquidtestnet.spec.ts b/frontend/cypress/e2e/liquidtestnet/liquidtestnet.spec.ts index aef6dc51d..aa3ee6787 100644 --- a/frontend/cypress/e2e/liquidtestnet/liquidtestnet.spec.ts +++ b/frontend/cypress/e2e/liquidtestnet/liquidtestnet.spec.ts @@ -79,7 +79,7 @@ describe('Liquid Testnet', () => { it('allows searching assets', () => { cy.visit(`${basePath}/assets`); cy.waitForSkeletonGone(); - cy.get('.container-xl input').click().type('Liquid Bitcoin').then(() => { + cy.get('.container-xl input').click().type('Tether USD').then(() => { cy.get('ngb-typeahead-window').should('have.length', 1); }); }); diff --git a/frontend/cypress/e2e/mainnet/calculator.spec.ts b/frontend/cypress/e2e/mainnet/calculator.spec.ts index b09dff154..6866873fe 100644 --- a/frontend/cypress/e2e/mainnet/calculator.spec.ts +++ b/frontend/cypress/e2e/mainnet/calculator.spec.ts @@ -83,22 +83,28 @@ describe('Calculator', () => { }); describe('bitcoin input updates fiat and sats', () => { - it('updates fiat and sats when entering 0.5 BTC', () => { - const expectedFiat = Math.round(MOCK_BTC_PRICE_USD * 0.5 * 100) / 100; - cy.get('input[formControlName="bitcoin"]').clear().type('0.5'); - cy.get('input[formControlName="satoshis"]').invoke('val').should('equal', '50000000'); + it('updates fiat and sats when entering 0.33 BTC', () => { + const expectedFiat = Math.round(MOCK_BTC_PRICE_USD * 0.33 * 100) / 100; // 40740.48 USD + cy.get('input[formControlName="bitcoin"]').clear().type('0.33'); + cy.get('input[formControlName="satoshis"]').invoke('val').should('equal', '33000000'); cy.get('input[formControlName="fiat"]').invoke('val').then((fiatVal) => { const fiat = parseFloat(String(fiatVal).replace(/,/g, '')); expect(fiat).to.equal(expectedFiat); }); + cy.get('.fiat-text').invoke('text').then((text) => { + expect(text.trim()).to.equal('$40,740.48'); + }); }); it('updates fiat and sats when entering 1 sat (0.00000001 BTC)', () => { - const expectedFiat = (MOCK_BTC_PRICE_USD / 100_000_000 * 100 / 100).toFixed(8); + const expectedFiat = (MOCK_BTC_PRICE_USD / 100_000_000 * 100 / 100); cy.get('input[formControlName="bitcoin"]').clear().type('0.00000001'); cy.get('input[formControlName="satoshis"]').invoke('val').should('equal', '1'); cy.get('input[formControlName="fiat"]').invoke('val').then((fiatVal) => { - expect(String(fiatVal)).to.equal(expectedFiat); + expect(String(fiatVal)).to.equal(String(expectedFiat)); + }); + cy.get('.fiat-text').invoke('text').then((text) => { + expect(text.trim()).to.equal('$0.00'); }); }); }); @@ -220,6 +226,9 @@ describe('Calculator', () => { cy.get('.symbol').invoke('text').then((text) => { expect(text.replace(/,/g, '')).to.include(String(MOCK_BTC_PRICE_JPY)); }); + cy.get('.fiat-text').invoke('text').then((text) => { + expect(text.trim()).to.equal('¥11,057,757'); + }); }); it('displays 1 BTC with correct sats and fiat in JPY', () => { @@ -234,13 +243,17 @@ describe('Calculator', () => { }); it('updates fiat and sats when entering 0.5 BTC in JPY', () => { - const expectedFiat = Math.round(MOCK_BTC_PRICE_JPY * 0.5 * 100) / 100; + const expectedFiat = Math.round(MOCK_BTC_PRICE_JPY * 0.5) cy.get('input[formControlName="bitcoin"]').clear().type('0.5'); cy.get('input[formControlName="satoshis"]').invoke('val').should('equal', '50000000'); cy.get('input[formControlName="fiat"]').invoke('val').then((fiatVal) => { const fiat = parseFloat(String(fiatVal).replace(/,/g, '')); expect(fiat).to.equal(expectedFiat); }); + cy.get('.fiat-text').invoke('text').then((text) => { + expect(text.trim()).to.equal('¥5,528,879'); + }); + }); it('updates BTC and sats when entering fiat value in JPY', () => { @@ -258,13 +271,16 @@ describe('Calculator', () => { it('updates BTC and fiat when entering 10000 sats in JPY', () => { const satsAmount = 10000; - const expectedFiat = Math.round((satsAmount / 100_000_000) * MOCK_BTC_PRICE_JPY * 100) / 100; + const expectedFiat = Math.round((satsAmount / 100_000_000) * MOCK_BTC_PRICE_JPY); cy.get('input[formControlName="satoshis"]').clear().type(String(satsAmount)); cy.get('input[formControlName="bitcoin"]').invoke('val').should('equal', '0.00010000'); cy.get('input[formControlName="fiat"]').invoke('val').then((fiatVal) => { const fiat = parseFloat(String(fiatVal).replace(/,/g, '')); expect(fiat).to.equal(expectedFiat); }); + cy.get('.fiat-text').invoke('text').then((text) => { + expect(text.trim()).to.equal('¥1,106'); + }); }); }); diff --git a/frontend/cypress/e2e/mainnet/fiat-currency-formatting.spec.ts b/frontend/cypress/e2e/mainnet/fiat-currency-formatting.spec.ts new file mode 100644 index 000000000..90e17d032 --- /dev/null +++ b/frontend/cypress/e2e/mainnet/fiat-currency-formatting.spec.ts @@ -0,0 +1,275 @@ +const baseModule = Cypress.env('BASE_MODULE'); + +// Helper to select "Fiat" from the BTC/sats/Fiat amount selector dropdown +const selectFiatMode = () => { + cy.get('app-amount-selector').first().scrollIntoView(); + cy.get('app-amount-selector select').first().select('fiat'); +}; + +// Helper to select currency from the fiat selector dropdown +const selectCurrency = (currency: 'USD' | 'JPY') => { + cy.get('app-fiat-selector').first().scrollIntoView(); + cy.get('app-fiat-selector').first().click(); + cy.get('app-fiat-selector select').first().select(currency); +}; + +describe('Fiat Currency Formatting', () => { + + if (baseModule === 'mempool') { + + describe('Dashboard', () => { + beforeEach(() => { + cy.visit('/'); + cy.waitForSkeletonGone(); + selectFiatMode(); + cy.get('.latest-transactions', { timeout: 10000 }).should('exist'); + cy.get('.table-cell-fiat', { timeout: 10000 }).should('have.length.at.least', 1); + }); + + describe('USD formatting', () => { + beforeEach(() => { + selectCurrency('USD'); + }); + + it('displays USD values with correct currency symbol', () => { + cy.get('.table-cell-fiat').eq(1).invoke('text').then((text) => { + const trimmedText = text.trim(); + expect(trimmedText).to.include('$'); + }); + }); + + it('displays USD values with proper decimal format', () => { + cy.get('.table-cell-fiat').eq(1).invoke('text').then((text) => { + const trimmedText = text.trim(); + expect(trimmedText).to.match(/^\$[\d,]+(\.\d{2})?$/); + }); + }); + }); + + describe('JPY formatting', () => { + beforeEach(() => { + selectCurrency('JPY'); + cy.get('.table-cell-fiat').eq(1).should(($el) => { + expect($el.text()).to.include('¥'); + }); + }); + + it('displays JPY values with yen symbol', () => { + cy.get('.table-cell-fiat').eq(1).invoke('text').then((text) => { + const trimmedText = text.trim(); + expect(trimmedText).to.include('¥'); + }); + }); + + it('displays JPY values without decimal places', () => { + cy.get('.table-cell-fiat').eq(1).invoke('text').then((text) => { + const trimmedText = text.trim(); + expect(trimmedText).to.not.match(/\.\d+$/); + }); + }); + + it('formats all JPY values correctly without decimals', () => { + cy.get('.table-cell-fiat').each(($el) => { + const text = $el.text().trim(); + if (text.includes('¥')) { + expect(text).to.not.match(/\.\d+/); + } + }); + }); + }); + + describe('currency switching', () => { + it('correctly formats when switching from USD to JPY', () => { + selectCurrency('USD'); + cy.get('.table-cell-fiat').eq(1).invoke('text').then((usdText) => { + expect(usdText.trim()).to.include('$'); + }); + + selectCurrency('JPY'); + cy.get('.table-cell-fiat').eq(1).should(($el) => { + const text = $el.text().trim(); + expect(text).to.include('¥'); + expect(text).to.not.match(/\.\d+$/); + }); + }); + + it('correctly formats when switching from JPY back to USD', () => { + selectCurrency('JPY'); + cy.get('.table-cell-fiat').eq(1).should(($el) => { + expect($el.text()).to.include('¥'); + }); + + selectCurrency('USD'); + cy.get('.table-cell-fiat').eq(1).should(($el) => { + expect($el.text().trim()).to.include('$'); + }); + }); + }); + }); + + describe('Transaction Page', () => { + beforeEach(() => { + cy.visit('/tx/dd0faea1e9acd5bd812e5130c0912b62d6b63d04bac4558f2e07270ac613a8f2'); + cy.waitForSkeletonGone(); + }); + + it('displays USD fiat values with dollar symbol', () => { + selectCurrency('USD'); + selectFiatMode(); + + cy.get('app-transaction-details .fiat').invoke('text').then((text) => { + expect(text.trim()).to.include('$'); + }); + + cy.get('app-transactions-list .fiat', { timeout: 10000 }).first().invoke('text').then((text) => { + expect(text.trim()).to.include('$'); + }); + }); + + it('displays JPY fiat values without decimals', () => { + selectCurrency('JPY'); + selectFiatMode(); + + + cy.get('app-transaction-details .fiat').invoke('text').then((text) => { + const trimmedText = text.trim(); + expect(trimmedText).to.include('¥'); + expect(trimmedText).to.not.match(/\.\d+/); + }); + + cy.get('app-transactions-list .fiat').first().should(($el) => { + const text = $el.text().trim(); + expect(text).to.include('¥'); + expect(text).to.not.match(/\.\d+/); + }); + }); + }); + + describe('Block Page', () => { + beforeEach(() => { + cy.viewport(1080, 1920); // force taller screen to avoid scrollbars + cy.intercept('/api/v1/blocks/0').as('blocks-0'); + cy.intercept('/api/v1/blocks/10').as('blocks-10'); + cy.intercept('/api/v1/blocks/20').as('blocks-20'); + cy.intercept('/api/txs/outspends*').as('outspends'); + cy.visit('/block/100000'); + }); + + it('displays USD fiat values in block reward with dollar symbol', () => { + cy.wait('@outspends').then(() => { + cy.waitUntil(() => cy.get('.fiat').each(($el) => $el.is(':visible') && $el.text().trim().includes('$'))); + selectCurrency('USD'); + selectFiatMode(); + cy.get('.fiat').each(($el) => { + expect($el.text().trim()).to.include('$'); + }); + }); + }); + + it('displays JPY fiat values without decimals', () => { + cy.wait('@outspends').then(() => { + cy.waitUntil(() => cy.get('.fiat').each(($el) => $el.is(':visible') && $el.text().trim().includes('$'))); + selectCurrency('JPY'); + selectFiatMode(); + cy.get('.fiat').each(($el) => { + expect($el.text().trim()).to.include('¥'); + expect($el.text().trim()).to.not.match(/\.\d+/); + }); + }); + }) + }); + + describe('Address Page', () => { + beforeEach(() => { + cy.visit('/address/1wizaAB16Wrua9V58uNvqktyq2LBLtYso'); + }); + + it('displays USD fiat values with dollar symbol', () => { + selectCurrency('USD'); + selectFiatMode(); + cy.get('app-amount .fiat', { timeout: 10000 }).each(($el) => { + expect($el.text().trim()).to.include('$'); + }); + }); + + it('displays JPY fiat values without decimals', () => { + selectCurrency('JPY'); + selectFiatMode(); + cy.get('app-amount .fiat').first().should(($el) => { + const text = $el.text().trim(); + expect(text).to.include('¥'); + expect(text).to.not.match(/\.\d+/); + }); + }); + }); + + describe('Calculator Page', () => { + beforeEach(() => { + cy.visit('/tools/calculator'); + cy.waitForSkeletonGone(); + cy.get('input[formControlName="bitcoin"]', { timeout: 10000 }).should('be.visible'); + }); + + it('displays USD price with dollar symbol', () => { + selectCurrency('USD'); + cy.get('.symbol').invoke('text').then((text) => { + expect(text.trim()).to.include('$'); + }); + }); + + it('displays JPY price without decimals after switching currency', () => { + selectCurrency('JPY'); + cy.get('.symbol').should(($el) => { + const text = $el.text().trim(); + expect(text).to.include('¥'); + }); + + // Enter a value in BTC to see the fiat conversion + cy.get('input[formControlName="bitcoin"]').clear().type('1'); + + // Check that the fiat output doesn't have decimals for JPY + cy.get('input[formControlName="fiat"]').should(($el) => { + const value = $el.val() as string; + // JPY should not have decimal places in large values + expect(value).to.not.match(/\.\d+$/); + }); + }); + }); + + describe('Mempool Block Tooltip', () => { + beforeEach(() => { + cy.visit('/'); + cy.waitForSkeletonGone(); + selectFiatMode(); + }); + + it('displays USD fiat values in mempool block', () => { + selectCurrency('USD'); + cy.get('#mempool-block-0').scrollIntoView(); + cy.get('#mempool-block-0').click(); + + cy.waitForSkeletonGone(); + + cy.get('app-mempool-block .fiat').each(($el) => { + expect($el.text().trim()).to.include('$'); + }); + }); + + it('displays JPY fiat values in mempool block', () => { + selectCurrency('JPY'); + cy.get('#mempool-block-0').scrollIntoView(); + cy.get('#mempool-block-0').click(); + + cy.waitForSkeletonGone(); + + cy.get('app-mempool-block .fiat').invoke('text').then((text) => { + expect(text.trim()).to.include('¥'); + expect(text).to.not.match(/\.\d+$/); + }); + }); + }); + + } else { + it.skip(`Tests cannot be run on the selected BASE_MODULE ${baseModule}`); + } +}); diff --git a/frontend/cypress/e2e/mainnet/recent-transactions.spec.ts b/frontend/cypress/e2e/mainnet/recent-transactions.spec.ts new file mode 100644 index 000000000..89ae983e2 --- /dev/null +++ b/frontend/cypress/e2e/mainnet/recent-transactions.spec.ts @@ -0,0 +1,158 @@ +import { mockWebSocketV2, receiveWebSocketMessageFromServer } from '../../support/websocket'; + +const baseModule = Cypress.env('BASE_MODULE'); + +function randomHex(length: number): string { + let result = ''; + const chars = '0123456789abcdef'; + for (let i = 0; i < length; i++) { + result += chars[Math.floor(Math.random() * chars.length)]; + } + return result; +} + +function generateMockTransactions(count: number): any[] { + const txs = []; + for (let i = 0; i < count; i++) { + txs.push({ + txid: randomHex(64), + fee: 1000 + Math.floor(Math.random() * 50000), + vsize: 140 + Math.floor(Math.random() * 500), + value: 10000 + Math.floor(Math.random() * 10000000), + }); + } + return txs; +} + +function sendMockTransactions(count: number): string[] { + const txs = generateMockTransactions(count); + receiveWebSocketMessageFromServer({ + params: { + message: { + contents: JSON.stringify({ transactions: txs }), + }, + }, + }); + return txs.map((tx) => tx.txid); +} + +// Send init fixtures without waitForSkeletonGone (the /txs page has a +// skeleton row that only disappears once transactions fill the limit, +// which won't happen from mempool-info alone). +function initMempoolData(): void { + cy.window({ timeout: 5000 }) + .should((win) => { + expect(win.mockSocket).to.not.be.undefined; + }) + .then((win) => { + cy.readFile('cypress/fixtures/mainnet_live2hchart.json', 'utf-8').then((fixture) => { + win.mockSocket.send(JSON.stringify(fixture)); + }); + cy.readFile('cypress/fixtures/mainnet_mempoolInfo.json', 'utf-8').then((fixture) => { + win.mockSocket.send(JSON.stringify(fixture)); + }); + }); +} + +describe('Recent Transactions Page', () => { + if (baseModule === 'mempool') { + + it('updates the transaction list over time', () => { + mockWebSocketV2(); + cy.visit('/txs'); + initMempoolData(); + + sendMockTransactions(6); + cy.get('[data-cy="transactions-list"] tr').should('have.length.greaterThan', 0); + + const newTxids = sendMockTransactions(6); + const markerTxid = newTxids[0].substring(0, 10); + + cy.get('[data-cy="transactions-list"] tr .table-cell-txid a').should(($rows) => { + const visibleText = [...$rows].map((el) => el.textContent.trim()).join(' '); + expect(visibleText).to.include(markerTxid); + }); + }); + + it('pauses updates when clicking the pause icon', () => { + mockWebSocketV2(); + cy.visit('/txs'); + initMempoolData(); + + sendMockTransactions(6); + cy.get('[data-cy="transactions-list"] tr').should('have.length.greaterThan', 0); + + cy.get('[data-cy="btn-pause"]').click(); + + cy.get('[data-cy="transactions-list"] tr .table-cell-txid a').then(($rows) => { + const pausedTxids = [...$rows].map((el) => el.textContent.trim()); + + const newTxids = sendMockTransactions(6); + const markerTxid = newTxids[0].substring(0, 10); + + // The new txid should NOT appear in the list while paused + cy.wait(1000); + cy.get('[data-cy="transactions-list"] tr .table-cell-txid a').should(($updatedRows) => { + const visibleText = [...$updatedRows].map((el) => el.textContent.trim()).join(' '); + expect(visibleText).to.not.include(markerTxid); + const updatedTxids = [...$updatedRows].map((el) => el.textContent.trim()); + expect(updatedTxids).to.deep.equal(pausedTxids); + }); + }); + }); + + it('caps the list when changing the limit to 10', () => { + mockWebSocketV2(); + cy.visit('/txs'); + initMempoolData(); + + // Send enough batches to fill 50 transactions (6 per batch, need 9 batches) + for (let i = 0; i < 9; i++) { + sendMockTransactions(6); + } + + cy.get('[data-cy="transactions-list"] tr').should('have.length', 50); + cy.get('[data-cy="limit-10"]').click(); + cy.scrollTo('top'); + cy.get('[data-cy="transactions-list"] tr').should('have.length', 10); + }); + + it('shows the new transaction pill when there are new transactions', () => { + mockWebSocketV2(); + cy.visit('/txs'); + initMempoolData(); + + sendMockTransactions(6); + cy.get('[data-cy="transactions-list"] tr').should('have.length.greaterThan', 0); + cy.scrollTo('bottom'); + // Ensure scroll event has fired and auto-pause is active + cy.window().should((win) => { + expect(win.scrollY).to.be.greaterThan(0); + }); + + sendMockTransactions(6); + cy.get('[data-cy="new-tx-pill"]').should('be.visible'); + }); + + it('shows the new transaction pill when there are new transactions and scrolls to the top when clicked', () => { + mockWebSocketV2(); + cy.visit('/txs'); + initMempoolData(); + + sendMockTransactions(6); + cy.get('[data-cy="transactions-list"] tr').should('have.length.greaterThan', 0); + cy.scrollTo('bottom'); + cy.window().should((win) => { + expect(win.scrollY).to.be.greaterThan(0); + }); + + sendMockTransactions(6); + cy.get('[data-cy="new-tx-pill"]').should('be.visible'); + cy.get('[data-cy="new-tx-pill"]').click(); + cy.wait(1000); + cy.window().then((win) => { + expect(win.scrollY).to.be.eq(0); + }); + }); + } +}); diff --git a/frontend/generate-themes.js b/frontend/generate-themes.js index da7f06c20..ef8785203 100644 --- a/frontend/generate-themes.js +++ b/frontend/generate-themes.js @@ -3,7 +3,7 @@ const fs = require('fs'); const path = require('path'); const crypto = require('crypto'); -const THEMES = ['contrast', 'softsimon', 'bukele']; +const THEMES = ['contrast', 'softsimon', 'bukele', 'nymkappa']; const STAGING_DIR = path.join(__dirname, '.theme-build'); const DIST_DIR = path.join(__dirname, 'dist/mempool/browser'); const MANIFEST_FILE = path.join(__dirname, 'theme-manifest.json'); diff --git a/frontend/meta/scripts/check-install-scripts.sh b/frontend/meta/scripts/check-install-scripts.sh new file mode 100755 index 000000000..89a79489a --- /dev/null +++ b/frontend/meta/scripts/check-install-scripts.sh @@ -0,0 +1,73 @@ +#!/usr/bin/env bash +# +# Audit frontend package-lock.json for unexpected hasInstallScript entries. +# Exits non-zero if any package not on the whitelist has hasInstallScript: true. +# +# Usage (from repo root): +# frontend/meta/scripts/check-install-scripts.sh +# + +set -euo pipefail + +FRONTEND_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)" +LOCKFILE="${FRONTEND_DIR}/package-lock.json" + +ALLOWED=( + "mempool-frontend" + "@parcel/watcher" + "cypress" + "esbuild" + "fsevents" + "lmdb" + "msgpackr-extract" +) + +is_allowed() { + local pkg="$1" + for allowed in "${ALLOWED[@]}"; do + if [[ "$pkg" == "$allowed" ]]; then + return 0 + fi + done + return 1 +} + +if [[ ! -f "$LOCKFILE" ]]; then + echo "No package-lock.json found at ${LOCKFILE}" + exit 1 +fi + +found_violations=0 + +violations=$( + LOCKFILE_PATH="$LOCKFILE" node - <<'NODE' +const fs = require('fs'); + +const lock = JSON.parse(fs.readFileSync(process.env.LOCKFILE_PATH, 'utf8')); +const pkgs = lock.packages || {}; + +for (const [path, meta] of Object.entries(pkgs)) { + if (meta && meta.hasInstallScript) { + const name = path === '' ? (lock.name || '(root)') : path.replace(/^.*node_modules\//, ''); + console.log(name); + } +} +NODE +) + +while IFS= read -r pkg; do + [[ -z "$pkg" ]] && continue + if ! is_allowed "$pkg"; then + echo "VIOLATION: unauthorized install script in '${pkg}' (${LOCKFILE})" + found_violations=1 + fi +done <<< "$violations" + +if [[ "$found_violations" -eq 1 ]]; then + echo "" + echo "FAILED: Found packages with install scripts not on the whitelist." + echo "If this is a legitimate new dependency, add it to frontend/meta/scripts/check-install-scripts.sh" + exit 1 +else + echo "OK: All frontend install scripts are from whitelisted packages." +fi diff --git a/frontend/meta/scripts/safe-install.sh b/frontend/meta/scripts/safe-install.sh new file mode 100755 index 000000000..bdd8b72c9 --- /dev/null +++ b/frontend/meta/scripts/safe-install.sh @@ -0,0 +1,55 @@ +#!/usr/bin/env bash +# +# Safely install frontend npm dependencies by refreshing the lockfile without +# running install scripts, auditing it, then doing the real install. +# +# Usage (from repo root): +# frontend/meta/scripts/safe-install.sh +# + +set -euo pipefail + +SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" +FRONTEND_DIR="$(cd "${SCRIPT_DIR}/../.." && pwd)" +LOCKFILE="${FRONTEND_DIR}/package-lock.json" +RESTORE_LOCKFILE_DONE=0 + +# Back up the lockfile so we can restore on failure +if [[ -f "$LOCKFILE" ]]; then + cp "$LOCKFILE" "${LOCKFILE}.bak" +fi + +restore_lockfile() { + trap - ERR INT TERM + if [[ "${RESTORE_LOCKFILE_DONE}" -eq 1 ]]; then + return + fi + RESTORE_LOCKFILE_DONE=1 + + if [[ -f "${LOCKFILE}.bak" ]]; then + mv "${LOCKFILE}.bak" "$LOCKFILE" + echo "Restored original package-lock.json." + elif [[ -f "$LOCKFILE" ]]; then + rm "$LOCKFILE" + echo "Removed generated package-lock.json." + fi +} + +trap restore_lockfile ERR INT TERM + +echo "==> Refreshing frontend lockfile (--ignore-scripts --package-lock-only)..." +(cd "$FRONTEND_DIR" && npm install --ignore-scripts --package-lock-only --no-audit --no-fund) + +echo "" +echo "==> Auditing lockfile for install scripts..." +bash "${SCRIPT_DIR}/check-install-scripts.sh" + +trap - ERR INT TERM +rm -f "${LOCKFILE}.bak" + +echo "" +echo "==> Installing frontend (npm ci)..." +(cd "$FRONTEND_DIR" && npm ci) + +echo "" +echo "Done." diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 5280f9bf1..380138485 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -1,38 +1,38 @@ { "name": "mempool-frontend", - "version": "3.3-dev", + "version": "3.4-dev", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "mempool-frontend", - "version": "3.3-dev", + "version": "3.4-dev", "license": "GNU Affero General Public License v3.0", "dependencies": { - "@angular-devkit/build-angular": "^20.3.16", - "@angular/animations": "^20.3.16", - "@angular/cli": "^20.3.16", - "@angular/common": "^20.3.16", - "@angular/compiler": "^20.3.16", - "@angular/core": "^20.3.16", - "@angular/forms": "^20.3.16", - "@angular/localize": "^20.3.16", - "@angular/platform-browser": "^20.3.16", - "@angular/platform-browser-dynamic": "^20.3.16", - "@angular/platform-server": "^20.3.16", - "@angular/router": "^20.3.16", - "@angular/ssr": "^20.3.16", + "@angular-devkit/build-angular": "^20.3.25", + "@angular/animations": "^20.3.25", + "@angular/cli": "^20.3.25", + "@angular/common": "^20.3.25", + "@angular/compiler": "^20.3.25", + "@angular/core": "^20.3.25", + "@angular/forms": "^20.3.25", + "@angular/localize": "^20.3.25", + "@angular/platform-browser": "^20.3.25", + "@angular/platform-browser-dynamic": "^20.3.25", + "@angular/platform-server": "^20.3.25", + "@angular/router": "^20.3.25", + "@angular/ssr": "^20.3.25", "@fortawesome/angular-fontawesome": "^3.0.0", "@fortawesome/fontawesome-common-types": "~6.7.2", "@fortawesome/fontawesome-svg-core": "~6.7.2", "@fortawesome/free-solid-svg-icons": "~6.7.2", "@ng-bootstrap/ng-bootstrap": "^19.0.0", - "@noble/secp256k1": "^3.0.0", + "@noble/secp256k1": "^3.1.0", "@types/qrcode": "~1.5.0", - "bootstrap": "~4.6.2", + "bootstrap": "~5.3.8", "clipboard": "^2.0.11", "domino": "^2.1.6", - "echarts": "~5.4.0", + "echarts": "~6.1.0", "ngx-echarts": "~20.0.2", "ngx-infinite-scroll": "^20.0.0", "qrcode": "1.5.1", @@ -41,8 +41,8 @@ "zone.js": "~0.15.1" }, "devDependencies": { - "@angular/compiler-cli": "^20.3.16", - "@angular/language-service": "^20.3.16", + "@angular/compiler-cli": "^20.3.25", + "@angular/language-service": "^20.3.25", "@types/node": "^24.9.2", "@typescript-eslint/eslint-plugin": "^8.46.2", "@typescript-eslint/parser": "^8.46.2", @@ -56,7 +56,7 @@ }, "optionalDependencies": { "@cypress/schematic": "^2.5.0", - "cypress": "^15.9.0", + "cypress": "^15.16.0", "cypress-fail-on-console-error": "~5.1.1", "cypress-wait-until": "^3.0.1", "mock-socket": "~9.3.1", @@ -280,11 +280,12 @@ } }, "node_modules/@angular-devkit/architect": { - "version": "0.2003.16", - "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.2003.16.tgz", - "integrity": "sha512-W7FPVhZzIeHVP/duuKepfZU66LpQ0k9YMHFhrGpzaUuHPOwKmza6+pjVvvti3g6jzT8b1uVlb+XlYgNPZ5jrPQ==", + "version": "0.2003.25", + "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.2003.25.tgz", + "integrity": "sha512-39pTqt4wSmpD1WeCee46oSGXRh6TR1PFd9GZEwyZoMvBTMs8mE2sXGxUgd4Qyi5CkQ1XnCM5XfgJcjUWUQRoGg==", + "license": "MIT", "dependencies": { - "@angular-devkit/core": "20.3.16", + "@angular-devkit/core": "20.3.25", "rxjs": "7.8.2" }, "engines": { @@ -294,14 +295,15 @@ } }, "node_modules/@angular-devkit/architect/node_modules/@angular-devkit/core": { - "version": "20.3.16", - "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-20.3.16.tgz", - "integrity": "sha512-6L9Lpe3lbkyz32gzqxZGVC8MhXxXht+yV+4LUsb4+6T/mG/V9lW6UTW0dhwVOS3vpWMEwpy75XHT298t7HcKEg==", + "version": "20.3.25", + "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-20.3.25.tgz", + "integrity": "sha512-pSfeWEoS1y9zxqTOw0Etj2NXkRmp/aU52wdnyq3KqVA9cJtgxtlOHlBBNswTil4dReojEy+0K1xJm+mLuWuLxA==", + "license": "MIT", "dependencies": { - "ajv": "8.17.1", + "ajv": "8.18.0", "ajv-formats": "3.0.1", "jsonc-parser": "3.3.1", - "picomatch": "4.0.3", + "picomatch": "4.0.4", "rxjs": "7.8.2", "source-map": "0.7.6" }, @@ -320,9 +322,10 @@ } }, "node_modules/@angular-devkit/architect/node_modules/ajv": { - "version": "8.17.1", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz", - "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==", + "version": "8.18.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.18.0.tgz", + "integrity": "sha512-PlXPeEWMXMZ7sPYOHqmDyCJzcfNrUr3fGNKtezX14ykXOEIvyK81d+qydx89KY5O71FKMPaQ2vBfBFI5NHR63A==", + "license": "MIT", "dependencies": { "fast-deep-equal": "^3.1.3", "fast-uri": "^3.0.1", @@ -338,6 +341,7 @@ "version": "3.0.1", "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-3.0.1.tgz", "integrity": "sha512-8iUql50EUR+uUcdRQ3HDqa6EVyo3docL8g5WJ3FNcWmu62IbkGUue/pEyLBW8VGKKucTPgqeks4fIU1DA4yowQ==", + "license": "MIT", "dependencies": { "ajv": "^8.0.0" }, @@ -369,12 +373,14 @@ "node_modules/@angular-devkit/architect/node_modules/json-schema-traverse": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", - "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==" + "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==", + "license": "MIT" }, "node_modules/@angular-devkit/architect/node_modules/picomatch": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz", - "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==", + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz", + "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==", + "license": "MIT", "engines": { "node": ">=12" }, @@ -400,20 +406,22 @@ "version": "0.7.6", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.6.tgz", "integrity": "sha512-i5uvt8C3ikiWeNZSVZNWcfZPItFQOsYTUAOkcUPGd8DqDy1uOUikjt5dG+uRlwyvR108Fb9DOd4GvXfT0N2/uQ==", + "license": "BSD-3-Clause", "engines": { "node": ">= 12" } }, "node_modules/@angular-devkit/build-angular": { - "version": "20.3.16", - "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-20.3.16.tgz", - "integrity": "sha512-SsJmxRnBTrivG3UiRy0gaU1mGupRCAiEKrKlW30oe6Dm0UoIVXDi4srpSEECcng5Obr3jFPzJE6P16/gfp3ZBw==", + "version": "20.3.25", + "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-20.3.25.tgz", + "integrity": "sha512-jp2sbJhbVRT65RbGENY/lz3Z0W0D50Af3xzENmLDLBVp9uhlpIPSTC9LG4CEPV7T6H5Oq6ymHKM+OO5WwTlHHA==", + "license": "MIT", "dependencies": { "@ampproject/remapping": "2.3.0", - "@angular-devkit/architect": "0.2003.16", - "@angular-devkit/build-webpack": "0.2003.16", - "@angular-devkit/core": "20.3.16", - "@angular/build": "20.3.16", + "@angular-devkit/architect": "0.2003.25", + "@angular-devkit/build-webpack": "0.2003.25", + "@angular-devkit/core": "20.3.25", + "@angular/build": "20.3.25", "@babel/core": "7.28.3", "@babel/generator": "7.28.3", "@babel/helper-annotate-as-pure": "7.27.3", @@ -424,14 +432,14 @@ "@babel/preset-env": "7.28.3", "@babel/runtime": "7.28.3", "@discoveryjs/json-ext": "0.6.3", - "@ngtools/webpack": "20.3.16", + "@ngtools/webpack": "20.3.25", "ansi-colors": "4.1.3", "autoprefixer": "10.4.21", "babel-loader": "10.0.0", "browserslist": "^4.21.5", - "copy-webpack-plugin": "13.0.1", + "copy-webpack-plugin": "14.0.0", "css-loader": "7.1.2", - "esbuild-wasm": "0.25.9", + "esbuild-wasm": "0.28.0", "fast-glob": "3.3.3", "http-proxy-middleware": "3.0.5", "istanbul-lib-instrument": "6.0.3", @@ -444,9 +452,9 @@ "mini-css-extract-plugin": "2.9.4", "open": "10.2.0", "ora": "8.2.0", - "picomatch": "4.0.3", + "picomatch": "4.0.4", "piscina": "5.1.3", - "postcss": "8.5.6", + "postcss": "8.5.12", "postcss-loader": "8.1.1", "resolve-url-loader": "5.0.0", "rxjs": "7.8.2", @@ -470,7 +478,7 @@ "yarn": ">= 1.13.0" }, "optionalDependencies": { - "esbuild": "0.25.9" + "esbuild": "0.28.0" }, "peerDependencies": { "@angular/compiler-cli": "^20.0.0", @@ -479,7 +487,7 @@ "@angular/platform-browser": "^20.0.0", "@angular/platform-server": "^20.0.0", "@angular/service-worker": "^20.0.0", - "@angular/ssr": "^20.3.16", + "@angular/ssr": "^20.3.25", "@web/test-runner": "^0.20.0", "browser-sync": "^3.0.2", "jest": "^29.5.0 || ^30.2.0", @@ -536,14 +544,15 @@ } }, "node_modules/@angular-devkit/build-angular/node_modules/@angular-devkit/core": { - "version": "20.3.16", - "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-20.3.16.tgz", - "integrity": "sha512-6L9Lpe3lbkyz32gzqxZGVC8MhXxXht+yV+4LUsb4+6T/mG/V9lW6UTW0dhwVOS3vpWMEwpy75XHT298t7HcKEg==", + "version": "20.3.25", + "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-20.3.25.tgz", + "integrity": "sha512-pSfeWEoS1y9zxqTOw0Etj2NXkRmp/aU52wdnyq3KqVA9cJtgxtlOHlBBNswTil4dReojEy+0K1xJm+mLuWuLxA==", + "license": "MIT", "dependencies": { - "ajv": "8.17.1", + "ajv": "8.18.0", "ajv-formats": "3.0.1", "jsonc-parser": "3.3.1", - "picomatch": "4.0.3", + "picomatch": "4.0.4", "rxjs": "7.8.2", "source-map": "0.7.6" }, @@ -561,10 +570,427 @@ } } }, + "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/aix-ppc64": { + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.28.0.tgz", + "integrity": "sha512-lhRUCeuOyJQURhTxl4WkpFTjIsbDayJHih5kZC1giwE+MhIzAb7mEsQMqMf18rHLsrb5qI1tafG20mLxEWcWlA==", + "cpu": [ + "ppc64" + ], + "license": "MIT", + "optional": true, + "os": [ + "aix" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/android-arm": { + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.28.0.tgz", + "integrity": "sha512-wqh0ByljabXLKHeWXYLqoJ5jKC4XBaw6Hk08OfMrCRd2nP2ZQ5eleDZC41XHyCNgktBGYMbqnrJKq/K/lzPMSQ==", + "cpu": [ + "arm" + ], + "license": "MIT", + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/android-arm64": { + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.28.0.tgz", + "integrity": "sha512-+WzIXQOSaGs33tLEgYPYe/yQHf0WTU0X42Jca3y8NWMbUVhp7rUnw+vAsRC/QiDrdD31IszMrZy+qwPOPjd+rw==", + "cpu": [ + "arm64" + ], + "license": "MIT", + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/android-x64": { + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.28.0.tgz", + "integrity": "sha512-+VJggoaKhk2VNNqVL7f6S189UzShHC/mR9EE8rDdSkdpN0KflSwWY/gWjDrNxxisg8Fp1ZCD9jLMo4m0OUfeUA==", + "cpu": [ + "x64" + ], + "license": "MIT", + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/darwin-arm64": { + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.28.0.tgz", + "integrity": "sha512-0T+A9WZm+bZ84nZBtk1ckYsOvyA3x7e2Acj1KdVfV4/2tdG4fzUp91YHx+GArWLtwqp77pBXVCPn2We7Letr0Q==", + "cpu": [ + "arm64" + ], + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/darwin-x64": { + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.28.0.tgz", + "integrity": "sha512-fyzLm/DLDl/84OCfp2f/XQ4flmORsjU7VKt8HLjvIXChJoFFOIL6pLJPH4Yhd1n1gGFF9mPwtlN5Wf82DZs+LQ==", + "cpu": [ + "x64" + ], + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/freebsd-arm64": { + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.28.0.tgz", + "integrity": "sha512-l9GeW5UZBT9k9brBYI+0WDffcRxgHQD8ShN2Ur4xWq/NFzUKm3k5lsH4PdaRgb2w7mI9u61nr2gI2mLI27Nh3Q==", + "cpu": [ + "arm64" + ], + "license": "MIT", + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/freebsd-x64": { + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.28.0.tgz", + "integrity": "sha512-BXoQai/A0wPO6Es3yFJ7APCiKGc1tdAEOgeTNy3SsB491S3aHn4S4r3e976eUnPdU+NbdtmBuLncYir2tMU9Nw==", + "cpu": [ + "x64" + ], + "license": "MIT", + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/linux-arm": { + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.28.0.tgz", + "integrity": "sha512-CjaaREJagqJp7iTaNQjjidaNbCKYcd4IDkzbwwxtSvjI7NZm79qiHc8HqciMddQ6CKvJT6aBd8lO9kN/ZudLlw==", + "cpu": [ + "arm" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/linux-arm64": { + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.28.0.tgz", + "integrity": "sha512-RVyzfb3FWsGA55n6WY0MEIEPURL1FcbhFE6BffZEMEekfCzCIMtB5yyDcFnVbTnwk+CLAgTujmV/Lgvih56W+A==", + "cpu": [ + "arm64" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/linux-ia32": { + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.28.0.tgz", + "integrity": "sha512-KBnSTt1kxl9x70q+ydterVdl+Cn0H18ngRMRCEQfrbqdUuntQQ0LoMZv47uB97NljZFzY6HcfqEZ2SAyIUTQBQ==", + "cpu": [ + "ia32" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/linux-loong64": { + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.28.0.tgz", + "integrity": "sha512-zpSlUce1mnxzgBADvxKXX5sl8aYQHo2ezvMNI8I0lbblJtp8V4odlm3Yzlj7gPyt3T8ReksE6bK+pT3WD+aJRg==", + "cpu": [ + "loong64" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/linux-mips64el": { + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.28.0.tgz", + "integrity": "sha512-2jIfP6mmjkdmeTlsX/9vmdmhBmKADrWqN7zcdtHIeNSCH1SqIoNI63cYsjQR8J+wGa4Y5izRcSHSm8K3QWmk3w==", + "cpu": [ + "mips64el" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/linux-ppc64": { + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.28.0.tgz", + "integrity": "sha512-bc0FE9wWeC0WBm49IQMPSPILRocGTQt3j5KPCA8os6VprfuJ7KD+5PzESSrJ6GmPIPJK965ZJHTUlSA6GNYEhg==", + "cpu": [ + "ppc64" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/linux-riscv64": { + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.28.0.tgz", + "integrity": "sha512-SQPZOwoTTT/HXFXQJG/vBX8sOFagGqvZyXcgLA3NhIqcBv1BJU1d46c0rGcrij2B56Z2rNiSLaZOYW5cUk7yLQ==", + "cpu": [ + "riscv64" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/linux-s390x": { + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.28.0.tgz", + "integrity": "sha512-SCfR0HN8CEEjnYnySJTd2cw0k9OHB/YFzt5zgJEwa+wL/T/raGWYMBqwDNAC6dqFKmJYZoQBRfHjgwLHGSrn3Q==", + "cpu": [ + "s390x" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/linux-x64": { + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.28.0.tgz", + "integrity": "sha512-us0dSb9iFxIi8srnpl931Nvs65it/Jd2a2K3qs7fz2WfGPHqzfzZTfec7oxZJRNPXPnNYZtanmRc4AL/JwVzHQ==", + "cpu": [ + "x64" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/netbsd-arm64": { + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.28.0.tgz", + "integrity": "sha512-CR/RYotgtCKwtftMwJlUU7xCVNg3lMYZ0RzTmAHSfLCXw3NtZtNpswLEj/Kkf6kEL3Gw+BpOekRX0BYCtklhUw==", + "cpu": [ + "arm64" + ], + "license": "MIT", + "optional": true, + "os": [ + "netbsd" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/netbsd-x64": { + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.28.0.tgz", + "integrity": "sha512-nU1yhmYutL+fQ71Kxnhg8uEOdC0pwEW9entHykTgEbna2pw2dkbFSMeqjjyHZoCmt8SBkOSvV+yNmm94aUrrqw==", + "cpu": [ + "x64" + ], + "license": "MIT", + "optional": true, + "os": [ + "netbsd" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/openbsd-arm64": { + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.28.0.tgz", + "integrity": "sha512-cXb5vApOsRsxsEl4mcZ1XY3D4DzcoMxR/nnc4IyqYs0rTI8ZKmW6kyyg+11Z8yvgMfAEldKzP7AdP64HnSC/6g==", + "cpu": [ + "arm64" + ], + "license": "MIT", + "optional": true, + "os": [ + "openbsd" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/openbsd-x64": { + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.28.0.tgz", + "integrity": "sha512-8wZM2qqtv9UP3mzy7HiGYNH/zjTA355mpeuA+859TyR+e+Tc08IHYpLJuMsfpDJwoLo1ikIJI8jC3GFjnRClzA==", + "cpu": [ + "x64" + ], + "license": "MIT", + "optional": true, + "os": [ + "openbsd" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/openharmony-arm64": { + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/openharmony-arm64/-/openharmony-arm64-0.28.0.tgz", + "integrity": "sha512-FLGfyizszcef5C3YtoyQDACyg95+dndv79i2EekILBofh5wpCa1KuBqOWKrEHZg3zrL3t5ouE5jgr94vA+Wb2w==", + "cpu": [ + "arm64" + ], + "license": "MIT", + "optional": true, + "os": [ + "openharmony" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/sunos-x64": { + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.28.0.tgz", + "integrity": "sha512-1ZgjUoEdHZZl/YlV76TSCz9Hqj9h9YmMGAgAPYd+q4SicWNX3G5GCyx9uhQWSLcbvPW8Ni7lj4gDa1T40akdlw==", + "cpu": [ + "x64" + ], + "license": "MIT", + "optional": true, + "os": [ + "sunos" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/win32-arm64": { + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.28.0.tgz", + "integrity": "sha512-Q9StnDmQ/enxnpxCCLSg0oo4+34B9TdXpuyPeTedN/6+iXBJ4J+zwfQI28u/Jl40nOYAxGoNi7mFP40RUtkmUA==", + "cpu": [ + "arm64" + ], + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/win32-ia32": { + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.28.0.tgz", + "integrity": "sha512-zF3ag/gfiCe6U2iczcRzSYJKH1DCI+ByzSENHlM2FcDbEeo5Zd2C86Aq0tKUYAJJ1obRP84ymxIAksZUcdztHA==", + "cpu": [ + "ia32" + ], + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/win32-x64": { + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.28.0.tgz", + "integrity": "sha512-pEl1bO9mfAmIC+tW5btTmrKaujg3zGtUmWNdCw/xs70FBjwAL3o9OEKNHvNmnyylD6ubxUERiEhdsL0xBQ9efw==", + "cpu": [ + "x64" + ], + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=18" + } + }, "node_modules/@angular-devkit/build-angular/node_modules/ajv": { - "version": "8.17.1", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz", - "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==", + "version": "8.18.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.18.0.tgz", + "integrity": "sha512-PlXPeEWMXMZ7sPYOHqmDyCJzcfNrUr3fGNKtezX14ykXOEIvyK81d+qydx89KY5O71FKMPaQ2vBfBFI5NHR63A==", + "license": "MIT", "dependencies": { "fast-deep-equal": "^3.1.3", "fast-uri": "^3.0.1", @@ -580,6 +1006,7 @@ "version": "3.0.1", "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-3.0.1.tgz", "integrity": "sha512-8iUql50EUR+uUcdRQ3HDqa6EVyo3docL8g5WJ3FNcWmu62IbkGUue/pEyLBW8VGKKucTPgqeks4fIU1DA4yowQ==", + "license": "MIT", "dependencies": { "ajv": "^8.0.0" }, @@ -625,6 +1052,48 @@ } } }, + "node_modules/@angular-devkit/build-angular/node_modules/esbuild": { + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.28.0.tgz", + "integrity": "sha512-sNR9MHpXSUV/XB4zmsFKN+QgVG82Cc7+/aaxJ8Adi8hyOac+EXptIp45QBPaVyX3N70664wRbTcLTOemCAnyqw==", + "hasInstallScript": true, + "license": "MIT", + "optional": true, + "bin": { + "esbuild": "bin/esbuild" + }, + "engines": { + "node": ">=18" + }, + "optionalDependencies": { + "@esbuild/aix-ppc64": "0.28.0", + "@esbuild/android-arm": "0.28.0", + "@esbuild/android-arm64": "0.28.0", + "@esbuild/android-x64": "0.28.0", + "@esbuild/darwin-arm64": "0.28.0", + "@esbuild/darwin-x64": "0.28.0", + "@esbuild/freebsd-arm64": "0.28.0", + "@esbuild/freebsd-x64": "0.28.0", + "@esbuild/linux-arm": "0.28.0", + "@esbuild/linux-arm64": "0.28.0", + "@esbuild/linux-ia32": "0.28.0", + "@esbuild/linux-loong64": "0.28.0", + "@esbuild/linux-mips64el": "0.28.0", + "@esbuild/linux-ppc64": "0.28.0", + "@esbuild/linux-riscv64": "0.28.0", + "@esbuild/linux-s390x": "0.28.0", + "@esbuild/linux-x64": "0.28.0", + "@esbuild/netbsd-arm64": "0.28.0", + "@esbuild/netbsd-x64": "0.28.0", + "@esbuild/openbsd-arm64": "0.28.0", + "@esbuild/openbsd-x64": "0.28.0", + "@esbuild/openharmony-arm64": "0.28.0", + "@esbuild/sunos-x64": "0.28.0", + "@esbuild/win32-arm64": "0.28.0", + "@esbuild/win32-ia32": "0.28.0", + "@esbuild/win32-x64": "0.28.0" + } + }, "node_modules/@angular-devkit/build-angular/node_modules/http-proxy-middleware": { "version": "3.0.5", "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-3.0.5.tgz", @@ -654,7 +1123,8 @@ "node_modules/@angular-devkit/build-angular/node_modules/json-schema-traverse": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", - "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==" + "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==", + "license": "MIT" }, "node_modules/@angular-devkit/build-angular/node_modules/loader-utils": { "version": "3.3.1", @@ -672,9 +1142,10 @@ "license": "MIT" }, "node_modules/@angular-devkit/build-angular/node_modules/picomatch": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz", - "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==", + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz", + "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==", + "license": "MIT", "engines": { "node": ">=12" }, @@ -712,6 +1183,7 @@ "version": "0.7.6", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.6.tgz", "integrity": "sha512-i5uvt8C3ikiWeNZSVZNWcfZPItFQOsYTUAOkcUPGd8DqDy1uOUikjt5dG+uRlwyvR108Fb9DOd4GvXfT0N2/uQ==", + "license": "BSD-3-Clause", "engines": { "node": ">= 12" } @@ -735,11 +1207,12 @@ } }, "node_modules/@angular-devkit/build-webpack": { - "version": "0.2003.16", - "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.2003.16.tgz", - "integrity": "sha512-88c6jTNAzqVinwYswsHOJAinIUSq08PQd1PfRwoH7RXiZt8XzkSmeLmXKchtamSflDXdcnjNd+AZY29b279zDA==", + "version": "0.2003.25", + "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.2003.25.tgz", + "integrity": "sha512-jJMpYBdWeRfvrCna7JWsyMBbvjMcPblyzh4/pSfWw5znla3hJGzDtmb84qKZ+IB8eZNEcky4iGR5LK2jdGFLAg==", + "license": "MIT", "dependencies": { - "@angular-devkit/architect": "0.2003.16", + "@angular-devkit/architect": "0.2003.25", "rxjs": "7.8.2" }, "engines": { @@ -753,12 +1226,12 @@ } }, "node_modules/@angular-devkit/schematics": { - "version": "20.3.16", - "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-20.3.16.tgz", - "integrity": "sha512-3K8QwTpKjnLo3hIvNzB9sTjrlkeRyMK0TxdwgTbwJseewGhXLl98oBoTCWM2ygtpskiWNpYqXJNIhoslNN65WQ==", + "version": "20.3.25", + "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-20.3.25.tgz", + "integrity": "sha512-IB0IHf8ZRqr69hT/XIfHkYLPAYHWQ/WUc6+fKHBwq58jJlm/y5QUeTEuXvJ18IX/+hUIqw+E2Q3T0N9rLDLzXg==", "license": "MIT", "dependencies": { - "@angular-devkit/core": "20.3.16", + "@angular-devkit/core": "20.3.25", "jsonc-parser": "3.3.1", "magic-string": "0.30.17", "ora": "8.2.0", @@ -771,15 +1244,15 @@ } }, "node_modules/@angular-devkit/schematics/node_modules/@angular-devkit/core": { - "version": "20.3.16", - "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-20.3.16.tgz", - "integrity": "sha512-6L9Lpe3lbkyz32gzqxZGVC8MhXxXht+yV+4LUsb4+6T/mG/V9lW6UTW0dhwVOS3vpWMEwpy75XHT298t7HcKEg==", + "version": "20.3.25", + "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-20.3.25.tgz", + "integrity": "sha512-pSfeWEoS1y9zxqTOw0Etj2NXkRmp/aU52wdnyq3KqVA9cJtgxtlOHlBBNswTil4dReojEy+0K1xJm+mLuWuLxA==", "license": "MIT", "dependencies": { - "ajv": "8.17.1", + "ajv": "8.18.0", "ajv-formats": "3.0.1", "jsonc-parser": "3.3.1", - "picomatch": "4.0.3", + "picomatch": "4.0.4", "rxjs": "7.8.2", "source-map": "0.7.6" }, @@ -798,9 +1271,9 @@ } }, "node_modules/@angular-devkit/schematics/node_modules/ajv": { - "version": "8.17.1", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz", - "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==", + "version": "8.18.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.18.0.tgz", + "integrity": "sha512-PlXPeEWMXMZ7sPYOHqmDyCJzcfNrUr3fGNKtezX14ykXOEIvyK81d+qydx89KY5O71FKMPaQ2vBfBFI5NHR63A==", "license": "MIT", "dependencies": { "fast-deep-equal": "^3.1.3", @@ -834,7 +1307,6 @@ "version": "4.0.3", "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.3.tgz", "integrity": "sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA==", - "license": "MIT", "optional": true, "peer": true, "dependencies": { @@ -854,9 +1326,9 @@ "license": "MIT" }, "node_modules/@angular-devkit/schematics/node_modules/picomatch": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz", - "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==", + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz", + "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==", "license": "MIT", "engines": { "node": ">=12" @@ -869,7 +1341,6 @@ "version": "4.1.2", "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.1.2.tgz", "integrity": "sha512-GDhwkLfywWL2s6vEjyhri+eXmfH6j1L7JE27WhqLeYzoh/A3DBaYGEj2H/HFZCn/kMfim73FXxEJTw06WtxQwg==", - "license": "MIT", "optional": true, "peer": true, "engines": { @@ -890,9 +1361,10 @@ } }, "node_modules/@angular/animations": { - "version": "20.3.16", - "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-20.3.16.tgz", - "integrity": "sha512-N83/GFY5lKNyWgPV3xHHy2rb3/eP1ZLzSVI+dmMVbf3jbqwY1YPQcMiAG8UDzaILY1Dkus91kWLF8Qdr3nHAzg==", + "version": "20.3.25", + "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-20.3.25.tgz", + "integrity": "sha512-lQmti3tI85D525TjUVGqCNLzFxSUoZg+vgIyvuGJZPY0UU/o2S6KAxW6ObmcRotZZHNfenLHIxWgzamBDjIjuw==", + "deprecated": "@angular/animations is deprecated. Use `animate.enter` and `animate.leave` instead. For more information see: https://v22.angular.dev/guide/animations.", "license": "MIT", "dependencies": { "tslib": "^2.3.0" @@ -901,16 +1373,17 @@ "node": "^20.19.0 || ^22.12.0 || >=24.0.0" }, "peerDependencies": { - "@angular/core": "20.3.16" + "@angular/core": "20.3.25" } }, "node_modules/@angular/build": { - "version": "20.3.16", - "resolved": "https://registry.npmjs.org/@angular/build/-/build-20.3.16.tgz", - "integrity": "sha512-p1W3wwMG1Bs4tkPW7ceXO4woO1KCP28sjfpBJg32dIMW3dYSC+iWNmUkYS/wb4YEkqCV0wd6Apnd98mZjL6rNg==", + "version": "20.3.25", + "resolved": "https://registry.npmjs.org/@angular/build/-/build-20.3.25.tgz", + "integrity": "sha512-ddWmPzYuzDWz9ql0262u9w3OJHXpSjHVNIDFIYOG2XYyMj/Xve0RkJ8/xvV+Hv7T3iqyyGKtsO+n/d0GCJQCtQ==", + "license": "MIT", "dependencies": { "@ampproject/remapping": "2.3.0", - "@angular-devkit/architect": "0.2003.16", + "@angular-devkit/architect": "0.2003.25", "@babel/core": "7.28.3", "@babel/helper-annotate-as-pure": "7.27.3", "@babel/helper-split-export-declaration": "7.24.7", @@ -918,7 +1391,7 @@ "@vitejs/plugin-basic-ssl": "2.1.0", "beasties": "0.3.5", "browserslist": "^4.23.0", - "esbuild": "0.25.9", + "esbuild": "0.28.0", "https-proxy-agent": "7.0.6", "istanbul-lib-instrument": "6.0.3", "jsonc-parser": "3.3.1", @@ -926,14 +1399,14 @@ "magic-string": "0.30.17", "mrmime": "2.0.1", "parse5-html-rewriting-stream": "8.0.0", - "picomatch": "4.0.3", + "picomatch": "4.0.4", "piscina": "5.1.3", - "rollup": "4.52.3", + "rollup": "4.59.0", "sass": "1.90.0", "semver": "7.7.2", "source-map-support": "0.5.21", "tinyglobby": "0.2.14", - "vite": "7.1.11", + "vite": "7.3.2", "watchpack": "2.4.4" }, "engines": { @@ -952,7 +1425,7 @@ "@angular/platform-browser": "^20.0.0", "@angular/platform-server": "^20.0.0", "@angular/service-worker": "^20.0.0", - "@angular/ssr": "^20.3.16", + "@angular/ssr": "^20.3.25", "karma": "^6.4.0", "less": "^4.2.0", "ng-packagr": "^20.0.0", @@ -1001,24 +1474,427 @@ } } }, - "node_modules/@angular/build/node_modules/ansi-escapes": { - "version": "7.3.0", - "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-7.3.0.tgz", - "integrity": "sha512-BvU8nYgGQBxcmMuEeUEmNTvrMVjJNSH7RgW24vXexN4Ven6qCvy4TntnvlnwnMLTVlcRQQdbRY8NKnaIoeWDNg==", - "dependencies": { - "environment": "^1.0.0" - }, + "node_modules/@angular/build/node_modules/@esbuild/aix-ppc64": { + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.28.0.tgz", + "integrity": "sha512-lhRUCeuOyJQURhTxl4WkpFTjIsbDayJHih5kZC1giwE+MhIzAb7mEsQMqMf18rHLsrb5qI1tafG20mLxEWcWlA==", + "cpu": [ + "ppc64" + ], + "license": "MIT", + "optional": true, + "os": [ + "aix" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@angular/build/node_modules/@esbuild/android-arm": { + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.28.0.tgz", + "integrity": "sha512-wqh0ByljabXLKHeWXYLqoJ5jKC4XBaw6Hk08OfMrCRd2nP2ZQ5eleDZC41XHyCNgktBGYMbqnrJKq/K/lzPMSQ==", + "cpu": [ + "arm" + ], + "license": "MIT", + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@angular/build/node_modules/@esbuild/android-arm64": { + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.28.0.tgz", + "integrity": "sha512-+WzIXQOSaGs33tLEgYPYe/yQHf0WTU0X42Jca3y8NWMbUVhp7rUnw+vAsRC/QiDrdD31IszMrZy+qwPOPjd+rw==", + "cpu": [ + "arm64" + ], + "license": "MIT", + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@angular/build/node_modules/@esbuild/android-x64": { + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.28.0.tgz", + "integrity": "sha512-+VJggoaKhk2VNNqVL7f6S189UzShHC/mR9EE8rDdSkdpN0KflSwWY/gWjDrNxxisg8Fp1ZCD9jLMo4m0OUfeUA==", + "cpu": [ + "x64" + ], + "license": "MIT", + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@angular/build/node_modules/@esbuild/darwin-arm64": { + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.28.0.tgz", + "integrity": "sha512-0T+A9WZm+bZ84nZBtk1ckYsOvyA3x7e2Acj1KdVfV4/2tdG4fzUp91YHx+GArWLtwqp77pBXVCPn2We7Letr0Q==", + "cpu": [ + "arm64" + ], + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@angular/build/node_modules/@esbuild/darwin-x64": { + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.28.0.tgz", + "integrity": "sha512-fyzLm/DLDl/84OCfp2f/XQ4flmORsjU7VKt8HLjvIXChJoFFOIL6pLJPH4Yhd1n1gGFF9mPwtlN5Wf82DZs+LQ==", + "cpu": [ + "x64" + ], + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@angular/build/node_modules/@esbuild/freebsd-arm64": { + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.28.0.tgz", + "integrity": "sha512-l9GeW5UZBT9k9brBYI+0WDffcRxgHQD8ShN2Ur4xWq/NFzUKm3k5lsH4PdaRgb2w7mI9u61nr2gI2mLI27Nh3Q==", + "cpu": [ + "arm64" + ], + "license": "MIT", + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@angular/build/node_modules/@esbuild/freebsd-x64": { + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.28.0.tgz", + "integrity": "sha512-BXoQai/A0wPO6Es3yFJ7APCiKGc1tdAEOgeTNy3SsB491S3aHn4S4r3e976eUnPdU+NbdtmBuLncYir2tMU9Nw==", + "cpu": [ + "x64" + ], + "license": "MIT", + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@angular/build/node_modules/@esbuild/linux-arm": { + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.28.0.tgz", + "integrity": "sha512-CjaaREJagqJp7iTaNQjjidaNbCKYcd4IDkzbwwxtSvjI7NZm79qiHc8HqciMddQ6CKvJT6aBd8lO9kN/ZudLlw==", + "cpu": [ + "arm" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@angular/build/node_modules/@esbuild/linux-arm64": { + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.28.0.tgz", + "integrity": "sha512-RVyzfb3FWsGA55n6WY0MEIEPURL1FcbhFE6BffZEMEekfCzCIMtB5yyDcFnVbTnwk+CLAgTujmV/Lgvih56W+A==", + "cpu": [ + "arm64" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@angular/build/node_modules/@esbuild/linux-ia32": { + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.28.0.tgz", + "integrity": "sha512-KBnSTt1kxl9x70q+ydterVdl+Cn0H18ngRMRCEQfrbqdUuntQQ0LoMZv47uB97NljZFzY6HcfqEZ2SAyIUTQBQ==", + "cpu": [ + "ia32" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@angular/build/node_modules/@esbuild/linux-loong64": { + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.28.0.tgz", + "integrity": "sha512-zpSlUce1mnxzgBADvxKXX5sl8aYQHo2ezvMNI8I0lbblJtp8V4odlm3Yzlj7gPyt3T8ReksE6bK+pT3WD+aJRg==", + "cpu": [ + "loong64" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@angular/build/node_modules/@esbuild/linux-mips64el": { + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.28.0.tgz", + "integrity": "sha512-2jIfP6mmjkdmeTlsX/9vmdmhBmKADrWqN7zcdtHIeNSCH1SqIoNI63cYsjQR8J+wGa4Y5izRcSHSm8K3QWmk3w==", + "cpu": [ + "mips64el" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@angular/build/node_modules/@esbuild/linux-ppc64": { + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.28.0.tgz", + "integrity": "sha512-bc0FE9wWeC0WBm49IQMPSPILRocGTQt3j5KPCA8os6VprfuJ7KD+5PzESSrJ6GmPIPJK965ZJHTUlSA6GNYEhg==", + "cpu": [ + "ppc64" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@angular/build/node_modules/@esbuild/linux-riscv64": { + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.28.0.tgz", + "integrity": "sha512-SQPZOwoTTT/HXFXQJG/vBX8sOFagGqvZyXcgLA3NhIqcBv1BJU1d46c0rGcrij2B56Z2rNiSLaZOYW5cUk7yLQ==", + "cpu": [ + "riscv64" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@angular/build/node_modules/@esbuild/linux-s390x": { + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.28.0.tgz", + "integrity": "sha512-SCfR0HN8CEEjnYnySJTd2cw0k9OHB/YFzt5zgJEwa+wL/T/raGWYMBqwDNAC6dqFKmJYZoQBRfHjgwLHGSrn3Q==", + "cpu": [ + "s390x" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@angular/build/node_modules/@esbuild/linux-x64": { + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.28.0.tgz", + "integrity": "sha512-us0dSb9iFxIi8srnpl931Nvs65it/Jd2a2K3qs7fz2WfGPHqzfzZTfec7oxZJRNPXPnNYZtanmRc4AL/JwVzHQ==", + "cpu": [ + "x64" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@angular/build/node_modules/@esbuild/netbsd-arm64": { + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.28.0.tgz", + "integrity": "sha512-CR/RYotgtCKwtftMwJlUU7xCVNg3lMYZ0RzTmAHSfLCXw3NtZtNpswLEj/Kkf6kEL3Gw+BpOekRX0BYCtklhUw==", + "cpu": [ + "arm64" + ], + "license": "MIT", + "optional": true, + "os": [ + "netbsd" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@angular/build/node_modules/@esbuild/netbsd-x64": { + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.28.0.tgz", + "integrity": "sha512-nU1yhmYutL+fQ71Kxnhg8uEOdC0pwEW9entHykTgEbna2pw2dkbFSMeqjjyHZoCmt8SBkOSvV+yNmm94aUrrqw==", + "cpu": [ + "x64" + ], + "license": "MIT", + "optional": true, + "os": [ + "netbsd" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@angular/build/node_modules/@esbuild/openbsd-arm64": { + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.28.0.tgz", + "integrity": "sha512-cXb5vApOsRsxsEl4mcZ1XY3D4DzcoMxR/nnc4IyqYs0rTI8ZKmW6kyyg+11Z8yvgMfAEldKzP7AdP64HnSC/6g==", + "cpu": [ + "arm64" + ], + "license": "MIT", + "optional": true, + "os": [ + "openbsd" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@angular/build/node_modules/@esbuild/openbsd-x64": { + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.28.0.tgz", + "integrity": "sha512-8wZM2qqtv9UP3mzy7HiGYNH/zjTA355mpeuA+859TyR+e+Tc08IHYpLJuMsfpDJwoLo1ikIJI8jC3GFjnRClzA==", + "cpu": [ + "x64" + ], + "license": "MIT", + "optional": true, + "os": [ + "openbsd" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@angular/build/node_modules/@esbuild/openharmony-arm64": { + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/openharmony-arm64/-/openharmony-arm64-0.28.0.tgz", + "integrity": "sha512-FLGfyizszcef5C3YtoyQDACyg95+dndv79i2EekILBofh5wpCa1KuBqOWKrEHZg3zrL3t5ouE5jgr94vA+Wb2w==", + "cpu": [ + "arm64" + ], + "license": "MIT", + "optional": true, + "os": [ + "openharmony" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@angular/build/node_modules/@esbuild/sunos-x64": { + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.28.0.tgz", + "integrity": "sha512-1ZgjUoEdHZZl/YlV76TSCz9Hqj9h9YmMGAgAPYd+q4SicWNX3G5GCyx9uhQWSLcbvPW8Ni7lj4gDa1T40akdlw==", + "cpu": [ + "x64" + ], + "license": "MIT", + "optional": true, + "os": [ + "sunos" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@angular/build/node_modules/@esbuild/win32-arm64": { + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.28.0.tgz", + "integrity": "sha512-Q9StnDmQ/enxnpxCCLSg0oo4+34B9TdXpuyPeTedN/6+iXBJ4J+zwfQI28u/Jl40nOYAxGoNi7mFP40RUtkmUA==", + "cpu": [ + "arm64" + ], + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@angular/build/node_modules/@esbuild/win32-ia32": { + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.28.0.tgz", + "integrity": "sha512-zF3ag/gfiCe6U2iczcRzSYJKH1DCI+ByzSENHlM2FcDbEeo5Zd2C86Aq0tKUYAJJ1obRP84ymxIAksZUcdztHA==", + "cpu": [ + "ia32" + ], + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@angular/build/node_modules/@esbuild/win32-x64": { + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.28.0.tgz", + "integrity": "sha512-pEl1bO9mfAmIC+tW5btTmrKaujg3zGtUmWNdCw/xs70FBjwAL3o9OEKNHvNmnyylD6ubxUERiEhdsL0xBQ9efw==", + "cpu": [ + "x64" + ], + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], "engines": { "node": ">=18" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/@angular/build/node_modules/ansi-regex": { "version": "6.2.2", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.2.tgz", "integrity": "sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==", + "license": "MIT", "engines": { "node": ">=12" }, @@ -1030,6 +1906,7 @@ "version": "6.2.3", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.3.tgz", "integrity": "sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==", + "license": "MIT", "engines": { "node": ">=12" }, @@ -1037,24 +1914,11 @@ "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, - "node_modules/@angular/build/node_modules/cli-cursor": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-5.0.0.tgz", - "integrity": "sha512-aCj4O5wKyszjMmDT4tZj93kxyydN/K5zPWSCe6/0AV/AA1pqe5ZBIw0a2ZfPQV7lL5/yb5HsUreJ6UFAF1tEQw==", - "dependencies": { - "restore-cursor": "^5.0.0" - }, - "engines": { - "node": ">=18" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/@angular/build/node_modules/cli-truncate": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-4.0.0.tgz", "integrity": "sha512-nPdaFdQ0h/GEigbPClz11D0v/ZJEwxmeVZGeMo3Z5StPtUTkA9o1lD6QwoirYiSDzbcwn2XcjwmCp68W1IS4TA==", + "license": "MIT", "dependencies": { "slice-ansi": "^5.0.0", "string-width": "^7.0.0" @@ -1069,17 +1933,61 @@ "node_modules/@angular/build/node_modules/emoji-regex": { "version": "10.6.0", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.6.0.tgz", - "integrity": "sha512-toUI84YS5YmxW219erniWD0CIVOo46xGKColeNQRgOzDorgBi1v4D71/OFzgD9GO2UGKIv1C3Sp8DAn0+j5w7A==" + "integrity": "sha512-toUI84YS5YmxW219erniWD0CIVOo46xGKColeNQRgOzDorgBi1v4D71/OFzgD9GO2UGKIv1C3Sp8DAn0+j5w7A==", + "license": "MIT" + }, + "node_modules/@angular/build/node_modules/esbuild": { + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.28.0.tgz", + "integrity": "sha512-sNR9MHpXSUV/XB4zmsFKN+QgVG82Cc7+/aaxJ8Adi8hyOac+EXptIp45QBPaVyX3N70664wRbTcLTOemCAnyqw==", + "hasInstallScript": true, + "license": "MIT", + "bin": { + "esbuild": "bin/esbuild" + }, + "engines": { + "node": ">=18" + }, + "optionalDependencies": { + "@esbuild/aix-ppc64": "0.28.0", + "@esbuild/android-arm": "0.28.0", + "@esbuild/android-arm64": "0.28.0", + "@esbuild/android-x64": "0.28.0", + "@esbuild/darwin-arm64": "0.28.0", + "@esbuild/darwin-x64": "0.28.0", + "@esbuild/freebsd-arm64": "0.28.0", + "@esbuild/freebsd-x64": "0.28.0", + "@esbuild/linux-arm": "0.28.0", + "@esbuild/linux-arm64": "0.28.0", + "@esbuild/linux-ia32": "0.28.0", + "@esbuild/linux-loong64": "0.28.0", + "@esbuild/linux-mips64el": "0.28.0", + "@esbuild/linux-ppc64": "0.28.0", + "@esbuild/linux-riscv64": "0.28.0", + "@esbuild/linux-s390x": "0.28.0", + "@esbuild/linux-x64": "0.28.0", + "@esbuild/netbsd-arm64": "0.28.0", + "@esbuild/netbsd-x64": "0.28.0", + "@esbuild/openbsd-arm64": "0.28.0", + "@esbuild/openbsd-x64": "0.28.0", + "@esbuild/openharmony-arm64": "0.28.0", + "@esbuild/sunos-x64": "0.28.0", + "@esbuild/win32-arm64": "0.28.0", + "@esbuild/win32-ia32": "0.28.0", + "@esbuild/win32-x64": "0.28.0" + } }, "node_modules/@angular/build/node_modules/eventemitter3": { "version": "5.0.4", "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-5.0.4.tgz", - "integrity": "sha512-mlsTRyGaPBjPedk6Bvw+aqbsXDtoAyAzm5MO7JgU+yVRyMQ5O8bD4Kcci7BS85f93veegeCPkL8R4GLClnjLFw==" + "integrity": "sha512-mlsTRyGaPBjPedk6Bvw+aqbsXDtoAyAzm5MO7JgU+yVRyMQ5O8bD4Kcci7BS85f93veegeCPkL8R4GLClnjLFw==", + "license": "MIT" }, "node_modules/@angular/build/node_modules/is-fullwidth-code-point": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-4.0.0.tgz", "integrity": "sha512-O4L094N2/dZ7xqVdrXhh9r1KODPJpFms8B5sGdJLPy664AgvXsreZUyCQQNItZRDlYug4xStLjNp/sz3HvBowQ==", + "license": "MIT", "engines": { "node": ">=12" }, @@ -1091,6 +1999,7 @@ "version": "9.0.1", "resolved": "https://registry.npmjs.org/listr2/-/listr2-9.0.1.tgz", "integrity": "sha512-SL0JY3DaxylDuo/MecFeiC+7pedM0zia33zl0vcjgwcq1q1FWWF1To9EIauPbl8GbMCU0R2e0uJ8bZunhYKD2g==", + "license": "MIT", "dependencies": { "cli-truncate": "^4.0.0", "colorette": "^2.0.20", @@ -1103,71 +2012,11 @@ "node": ">=20.0.0" } }, - "node_modules/@angular/build/node_modules/log-update": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/log-update/-/log-update-6.1.0.tgz", - "integrity": "sha512-9ie8ItPR6tjY5uYJh8K/Zrv/RMZ5VOlOWvtZdEHYSTFKZfIBPQa9tOAEeAWhd+AnIneLJ22w5fjOYtoutpWq5w==", - "dependencies": { - "ansi-escapes": "^7.0.0", - "cli-cursor": "^5.0.0", - "slice-ansi": "^7.1.0", - "strip-ansi": "^7.1.0", - "wrap-ansi": "^9.0.0" - }, - "engines": { - "node": ">=18" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/@angular/build/node_modules/log-update/node_modules/is-fullwidth-code-point": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-5.1.0.tgz", - "integrity": "sha512-5XHYaSyiqADb4RnZ1Bdad6cPp8Toise4TzEjcOYDHZkTCbKgiUl7WTUCpNWHuxmDt91wnsZBc9xinNzopv3JMQ==", - "dependencies": { - "get-east-asian-width": "^1.3.1" - }, - "engines": { - "node": ">=18" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/@angular/build/node_modules/log-update/node_modules/slice-ansi": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-7.1.2.tgz", - "integrity": "sha512-iOBWFgUX7caIZiuutICxVgX1SdxwAVFFKwt1EvMYYec/NWO5meOJ6K5uQxhrYBdQJne4KxiqZc+KptFOWFSI9w==", - "dependencies": { - "ansi-styles": "^6.2.1", - "is-fullwidth-code-point": "^5.0.0" - }, - "engines": { - "node": ">=18" - }, - "funding": { - "url": "https://github.com/chalk/slice-ansi?sponsor=1" - } - }, - "node_modules/@angular/build/node_modules/onetime": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/onetime/-/onetime-7.0.0.tgz", - "integrity": "sha512-VXJjc87FScF88uafS3JllDgvAm+c/Slfz06lorj2uAY34rlUu0Nt+v8wreiImcrgAjjIHp1rXpTDlLOGw29WwQ==", - "dependencies": { - "mimic-function": "^5.0.0" - }, - "engines": { - "node": ">=18" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/@angular/build/node_modules/picomatch": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz", - "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==", + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz", + "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==", + "license": "MIT", "engines": { "node": ">=12" }, @@ -1175,25 +2024,11 @@ "url": "https://github.com/sponsors/jonschlinkert" } }, - "node_modules/@angular/build/node_modules/restore-cursor": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-5.1.0.tgz", - "integrity": "sha512-oMA2dcrw6u0YfxJQXm342bFKX/E4sG9rbTzO9ptUcR/e8A33cHuvStiYOwH7fszkZlZ1z/ta9AAoPk2F4qIOHA==", - "dependencies": { - "onetime": "^7.0.0", - "signal-exit": "^4.1.0" - }, - "engines": { - "node": ">=18" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/@angular/build/node_modules/semver": { "version": "7.7.2", "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz", "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==", + "license": "ISC", "bin": { "semver": "bin/semver.js" }, @@ -1201,21 +2036,11 @@ "node": ">=10" } }, - "node_modules/@angular/build/node_modules/signal-exit": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", - "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", - "engines": { - "node": ">=14" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, "node_modules/@angular/build/node_modules/slice-ansi": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-5.0.0.tgz", "integrity": "sha512-FC+lgizVPfie0kkhqUScwRu1O/lF6NOgJmlCgK+/LYxDCTk8sGelYaHDhFcDN+Sn3Cv+3VSa4Byeo+IMCzpMgQ==", + "license": "MIT", "dependencies": { "ansi-styles": "^6.0.0", "is-fullwidth-code-point": "^4.0.0" @@ -1231,6 +2056,7 @@ "version": "7.2.0", "resolved": "https://registry.npmjs.org/string-width/-/string-width-7.2.0.tgz", "integrity": "sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==", + "license": "MIT", "dependencies": { "emoji-regex": "^10.3.0", "get-east-asian-width": "^1.0.0", @@ -1244,11 +2070,12 @@ } }, "node_modules/@angular/build/node_modules/strip-ansi": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.2.tgz", - "integrity": "sha512-gmBGslpoQJtgnMAvOVqGZpEz9dyoKTCzy2nfz/n8aIFhN/jCE/rCmcxabB6jOOHV+0WNnylOxaxBQPSvcWklhA==", + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.2.0.tgz", + "integrity": "sha512-yDPMNjp4WyfYBkHnjIRLfca1i6KMyGCtsVgoKe/z1+6vukgaENdgGBZt+ZmKPc4gavvEZ5OgHfHdrazhgNyG7w==", + "license": "MIT", "dependencies": { - "ansi-regex": "^6.0.1" + "ansi-regex": "^6.2.2" }, "engines": { "node": ">=12" @@ -1261,6 +2088,7 @@ "version": "9.0.2", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-9.0.2.tgz", "integrity": "sha512-42AtmgqjV+X1VpdOfyTGOYRi0/zsoLqtXQckTmqTeybT+BDIbM/Guxo7x3pE2vtpr1ok6xRqM9OpBe+Jyoqyww==", + "license": "MIT", "dependencies": { "ansi-styles": "^6.2.1", "string-width": "^7.0.0", @@ -1274,18 +2102,18 @@ } }, "node_modules/@angular/cli": { - "version": "20.3.16", - "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-20.3.16.tgz", - "integrity": "sha512-kjGp0ywIWebWrH6U5eCRkS4Tx1D/yMe2iT7DXMfEcLc8iMSrBozEriMJppbot9ou8O2LeEH5d1Nw0efNNo78Kw==", + "version": "20.3.25", + "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-20.3.25.tgz", + "integrity": "sha512-QOSxza45CZY11kqPVpqsU+WGYF99rR/r9A9GykZQWuAHb5SEAxlXHyaaGMu/BMtBHy5HNIlJH25UlzelrbaNyQ==", "license": "MIT", "dependencies": { - "@angular-devkit/architect": "0.2003.16", - "@angular-devkit/core": "20.3.16", - "@angular-devkit/schematics": "20.3.16", + "@angular-devkit/architect": "0.2003.25", + "@angular-devkit/core": "20.3.25", + "@angular-devkit/schematics": "20.3.25", "@inquirer/prompts": "7.8.2", "@listr2/prompt-adapter-inquirer": "3.0.1", "@modelcontextprotocol/sdk": "1.26.0", - "@schematics/angular": "20.3.16", + "@schematics/angular": "20.3.25", "@yarnpkg/lockfile": "1.1.0", "algoliasearch": "5.35.0", "ini": "5.0.0", @@ -1308,15 +2136,15 @@ } }, "node_modules/@angular/cli/node_modules/@angular-devkit/core": { - "version": "20.3.16", - "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-20.3.16.tgz", - "integrity": "sha512-6L9Lpe3lbkyz32gzqxZGVC8MhXxXht+yV+4LUsb4+6T/mG/V9lW6UTW0dhwVOS3vpWMEwpy75XHT298t7HcKEg==", + "version": "20.3.25", + "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-20.3.25.tgz", + "integrity": "sha512-pSfeWEoS1y9zxqTOw0Etj2NXkRmp/aU52wdnyq3KqVA9cJtgxtlOHlBBNswTil4dReojEy+0K1xJm+mLuWuLxA==", "license": "MIT", "dependencies": { - "ajv": "8.17.1", + "ajv": "8.18.0", "ajv-formats": "3.0.1", "jsonc-parser": "3.3.1", - "picomatch": "4.0.3", + "picomatch": "4.0.4", "rxjs": "7.8.2", "source-map": "0.7.6" }, @@ -1351,9 +2179,9 @@ } }, "node_modules/@angular/cli/node_modules/ajv": { - "version": "8.17.1", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz", - "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==", + "version": "8.18.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.18.0.tgz", + "integrity": "sha512-PlXPeEWMXMZ7sPYOHqmDyCJzcfNrUr3fGNKtezX14ykXOEIvyK81d+qydx89KY5O71FKMPaQ2vBfBFI5NHR63A==", "license": "MIT", "dependencies": { "fast-deep-equal": "^3.1.3", @@ -1383,21 +2211,6 @@ } } }, - "node_modules/@angular/cli/node_modules/ansi-escapes": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-7.2.0.tgz", - "integrity": "sha512-g6LhBsl+GBPRWGWsBtutpzBYuIIdBkLEvad5C/va/74Db018+5TZiyA26cZJAr3Rft5lprVqOIPxf5Vid6tqAw==", - "license": "MIT", - "dependencies": { - "environment": "^1.0.0" - }, - "engines": { - "node": ">=18" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/@angular/cli/node_modules/ansi-regex": { "version": "6.2.2", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.2.tgz", @@ -1426,7 +2239,6 @@ "version": "4.0.3", "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.3.tgz", "integrity": "sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA==", - "license": "MIT", "optional": true, "peer": true, "dependencies": { @@ -1439,21 +2251,6 @@ "url": "https://paulmillr.com/funding/" } }, - "node_modules/@angular/cli/node_modules/cli-cursor": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-5.0.0.tgz", - "integrity": "sha512-aCj4O5wKyszjMmDT4tZj93kxyydN/K5zPWSCe6/0AV/AA1pqe5ZBIw0a2ZfPQV7lL5/yb5HsUreJ6UFAF1tEQw==", - "license": "MIT", - "dependencies": { - "restore-cursor": "^5.0.0" - }, - "engines": { - "node": ">=18" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/@angular/cli/node_modules/cli-truncate": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-4.0.0.tgz", @@ -1470,20 +2267,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/@angular/cli/node_modules/cliui": { - "version": "9.0.1", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-9.0.1.tgz", - "integrity": "sha512-k7ndgKhwoQveBL+/1tqGJYNz097I7WOvwbmmU2AR5+magtbjPWQTS1C5vzGkBC8Ym8UWRzfKUzUUqFLypY4Q+w==", - "license": "ISC", - "dependencies": { - "string-width": "^7.2.0", - "strip-ansi": "^7.1.0", - "wrap-ansi": "^9.0.0" - }, - "engines": { - "node": ">=20" - } - }, "node_modules/@angular/cli/node_modules/emoji-regex": { "version": "10.6.0", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.6.0.tgz", @@ -1491,9 +2274,9 @@ "license": "MIT" }, "node_modules/@angular/cli/node_modules/eventemitter3": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-5.0.1.tgz", - "integrity": "sha512-GWkBvjiSZK87ELrYOSESUYeVIc9mvLLf/nXalMOS5dYrgZq9o5OVkbZAVM06CVxYsCwH9BDZFPlQTlPA1j4ahA==", + "version": "5.0.4", + "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-5.0.4.tgz", + "integrity": "sha512-mlsTRyGaPBjPedk6Bvw+aqbsXDtoAyAzm5MO7JgU+yVRyMQ5O8bD4Kcci7BS85f93veegeCPkL8R4GLClnjLFw==", "license": "MIT" }, "node_modules/@angular/cli/node_modules/is-fullwidth-code-point": { @@ -1531,75 +2314,10 @@ "node": ">=20.0.0" } }, - "node_modules/@angular/cli/node_modules/log-update": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/log-update/-/log-update-6.1.0.tgz", - "integrity": "sha512-9ie8ItPR6tjY5uYJh8K/Zrv/RMZ5VOlOWvtZdEHYSTFKZfIBPQa9tOAEeAWhd+AnIneLJ22w5fjOYtoutpWq5w==", - "license": "MIT", - "dependencies": { - "ansi-escapes": "^7.0.0", - "cli-cursor": "^5.0.0", - "slice-ansi": "^7.1.0", - "strip-ansi": "^7.1.0", - "wrap-ansi": "^9.0.0" - }, - "engines": { - "node": ">=18" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/@angular/cli/node_modules/log-update/node_modules/is-fullwidth-code-point": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-5.1.0.tgz", - "integrity": "sha512-5XHYaSyiqADb4RnZ1Bdad6cPp8Toise4TzEjcOYDHZkTCbKgiUl7WTUCpNWHuxmDt91wnsZBc9xinNzopv3JMQ==", - "license": "MIT", - "dependencies": { - "get-east-asian-width": "^1.3.1" - }, - "engines": { - "node": ">=18" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/@angular/cli/node_modules/log-update/node_modules/slice-ansi": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-7.1.2.tgz", - "integrity": "sha512-iOBWFgUX7caIZiuutICxVgX1SdxwAVFFKwt1EvMYYec/NWO5meOJ6K5uQxhrYBdQJne4KxiqZc+KptFOWFSI9w==", - "license": "MIT", - "dependencies": { - "ansi-styles": "^6.2.1", - "is-fullwidth-code-point": "^5.0.0" - }, - "engines": { - "node": ">=18" - }, - "funding": { - "url": "https://github.com/chalk/slice-ansi?sponsor=1" - } - }, - "node_modules/@angular/cli/node_modules/onetime": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/onetime/-/onetime-7.0.0.tgz", - "integrity": "sha512-VXJjc87FScF88uafS3JllDgvAm+c/Slfz06lorj2uAY34rlUu0Nt+v8wreiImcrgAjjIHp1rXpTDlLOGw29WwQ==", - "license": "MIT", - "dependencies": { - "mimic-function": "^5.0.0" - }, - "engines": { - "node": ">=18" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/@angular/cli/node_modules/picomatch": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz", - "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==", + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz", + "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==", "license": "MIT", "engines": { "node": ">=12" @@ -1612,7 +2330,6 @@ "version": "4.1.2", "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.1.2.tgz", "integrity": "sha512-GDhwkLfywWL2s6vEjyhri+eXmfH6j1L7JE27WhqLeYzoh/A3DBaYGEj2H/HFZCn/kMfim73FXxEJTw06WtxQwg==", - "license": "MIT", "optional": true, "peer": true, "engines": { @@ -1623,22 +2340,6 @@ "url": "https://paulmillr.com/funding/" } }, - "node_modules/@angular/cli/node_modules/restore-cursor": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-5.1.0.tgz", - "integrity": "sha512-oMA2dcrw6u0YfxJQXm342bFKX/E4sG9rbTzO9ptUcR/e8A33cHuvStiYOwH7fszkZlZ1z/ta9AAoPk2F4qIOHA==", - "license": "MIT", - "dependencies": { - "onetime": "^7.0.0", - "signal-exit": "^4.1.0" - }, - "engines": { - "node": ">=18" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/@angular/cli/node_modules/semver": { "version": "7.7.2", "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz", @@ -1651,18 +2352,6 @@ "node": ">=10" } }, - "node_modules/@angular/cli/node_modules/signal-exit": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", - "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", - "license": "ISC", - "engines": { - "node": ">=14" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, "node_modules/@angular/cli/node_modules/slice-ansi": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-5.0.0.tgz", @@ -1706,12 +2395,12 @@ } }, "node_modules/@angular/cli/node_modules/strip-ansi": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.2.tgz", - "integrity": "sha512-gmBGslpoQJtgnMAvOVqGZpEz9dyoKTCzy2nfz/n8aIFhN/jCE/rCmcxabB6jOOHV+0WNnylOxaxBQPSvcWklhA==", + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.2.0.tgz", + "integrity": "sha512-yDPMNjp4WyfYBkHnjIRLfca1i6KMyGCtsVgoKe/z1+6vukgaENdgGBZt+ZmKPc4gavvEZ5OgHfHdrazhgNyG7w==", "license": "MIT", "dependencies": { - "ansi-regex": "^6.0.1" + "ansi-regex": "^6.2.2" }, "engines": { "node": ">=12" @@ -1737,45 +2426,10 @@ "url": "https://github.com/chalk/wrap-ansi?sponsor=1" } }, - "node_modules/@angular/cli/node_modules/y18n": { - "version": "5.0.8", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", - "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", - "license": "ISC", - "engines": { - "node": ">=10" - } - }, - "node_modules/@angular/cli/node_modules/yargs": { - "version": "18.0.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-18.0.0.tgz", - "integrity": "sha512-4UEqdc2RYGHZc7Doyqkrqiln3p9X2DZVxaGbwhn2pi7MrRagKaOcIKe8L3OxYcbhXLgLFUS3zAYuQjKBQgmuNg==", - "license": "MIT", - "dependencies": { - "cliui": "^9.0.1", - "escalade": "^3.1.1", - "get-caller-file": "^2.0.5", - "string-width": "^7.2.0", - "y18n": "^5.0.5", - "yargs-parser": "^22.0.0" - }, - "engines": { - "node": "^20.19.0 || ^22.12.0 || >=23" - } - }, - "node_modules/@angular/cli/node_modules/yargs-parser": { - "version": "22.0.0", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-22.0.0.tgz", - "integrity": "sha512-rwu/ClNdSMpkSrUb+d6BRsSkLUq1fmfsY6TOpYzTwvwkg1/NRG85KBy3kq++A8LKQwX6lsu+aWad+2khvuXrqw==", - "license": "ISC", - "engines": { - "node": "^20.19.0 || ^22.12.0 || >=23" - } - }, "node_modules/@angular/common": { - "version": "20.3.16", - "resolved": "https://registry.npmjs.org/@angular/common/-/common-20.3.16.tgz", - "integrity": "sha512-GRAziNlntwdnJy3F+8zCOvDdy7id0gITjDnM6P9+n2lXvtDuBLGJKU3DWBbvxcCjtD6JK/g/rEX5fbCxbUHkQQ==", + "version": "20.3.25", + "resolved": "https://registry.npmjs.org/@angular/common/-/common-20.3.25.tgz", + "integrity": "sha512-rnRGcXbjet0DHgkRL4Dqxk21G2T4UypVfiTV/fay58H8w9U89PJ1L6gRmk8B/uyfpii/9r23cBwnpcguQykxYw==", "license": "MIT", "dependencies": { "tslib": "^2.3.0" @@ -1784,14 +2438,14 @@ "node": "^20.19.0 || ^22.12.0 || >=24.0.0" }, "peerDependencies": { - "@angular/core": "20.3.16", + "@angular/core": "20.3.25", "rxjs": "^6.5.3 || ^7.4.0" } }, "node_modules/@angular/compiler": { - "version": "20.3.16", - "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-20.3.16.tgz", - "integrity": "sha512-Pt9Ms9GwTThgzdxWBwMfN8cH1JEtQ2DK5dc2yxYtPSaD+WKmG9AVL1PrzIYQEbaKcWk2jxASUHpEWSlNiwo8uw==", + "version": "20.3.25", + "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-20.3.25.tgz", + "integrity": "sha512-TSh6gVoQqlLPqWwsYMK0lfVEQYENQO+USzS+BHFXEHFfgBRap6qDpIUGnRdj0Y2PlaVJUVFbeq1855EZUPUEoA==", "license": "MIT", "dependencies": { "tslib": "^2.3.0" @@ -1801,9 +2455,9 @@ } }, "node_modules/@angular/compiler-cli": { - "version": "20.3.16", - "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-20.3.16.tgz", - "integrity": "sha512-l3xF/fXfJAl/UrNnH9Ufkr79myjMgXdHq1mmmph2UnpeqilRB1b8lC9sLBV9MipQHVn3dwocxMIvtrcryfOaXw==", + "version": "20.3.25", + "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-20.3.25.tgz", + "integrity": "sha512-iqxwVo5Pgzt3EfT49OZ6plxA6KKxwv7ixx1XNH7QRvaOJC9gmsPScWpx+LO7ZsVZdo/NkA+rnXDl0PauUgGciw==", "license": "MIT", "dependencies": { "@babel/core": "7.28.3", @@ -1823,7 +2477,7 @@ "node": "^20.19.0 || ^22.12.0 || >=24.0.0" }, "peerDependencies": { - "@angular/compiler": "20.3.16", + "@angular/compiler": "20.3.25", "typescript": ">=5.8 <6.0" }, "peerDependenciesMeta": { @@ -1832,30 +2486,6 @@ } } }, - "node_modules/@angular/compiler-cli/node_modules/ansi-regex": { - "version": "6.2.2", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.2.tgz", - "integrity": "sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==", - "license": "MIT", - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/ansi-regex?sponsor=1" - } - }, - "node_modules/@angular/compiler-cli/node_modules/ansi-styles": { - "version": "6.2.3", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.3.tgz", - "integrity": "sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==", - "license": "MIT", - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, "node_modules/@angular/compiler-cli/node_modules/chokidar": { "version": "4.0.3", "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.3.tgz", @@ -1871,26 +2501,6 @@ "url": "https://paulmillr.com/funding/" } }, - "node_modules/@angular/compiler-cli/node_modules/cliui": { - "version": "9.0.1", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-9.0.1.tgz", - "integrity": "sha512-k7ndgKhwoQveBL+/1tqGJYNz097I7WOvwbmmU2AR5+magtbjPWQTS1C5vzGkBC8Ym8UWRzfKUzUUqFLypY4Q+w==", - "license": "ISC", - "dependencies": { - "string-width": "^7.2.0", - "strip-ansi": "^7.1.0", - "wrap-ansi": "^9.0.0" - }, - "engines": { - "node": ">=20" - } - }, - "node_modules/@angular/compiler-cli/node_modules/emoji-regex": { - "version": "10.6.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.6.0.tgz", - "integrity": "sha512-toUI84YS5YmxW219erniWD0CIVOo46xGKColeNQRgOzDorgBi1v4D71/OFzgD9GO2UGKIv1C3Sp8DAn0+j5w7A==", - "license": "MIT" - }, "node_modules/@angular/compiler-cli/node_modules/readdirp": { "version": "4.1.2", "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.1.2.tgz", @@ -1904,94 +2514,10 @@ "url": "https://paulmillr.com/funding/" } }, - "node_modules/@angular/compiler-cli/node_modules/string-width": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-7.2.0.tgz", - "integrity": "sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==", - "license": "MIT", - "dependencies": { - "emoji-regex": "^10.3.0", - "get-east-asian-width": "^1.0.0", - "strip-ansi": "^7.1.0" - }, - "engines": { - "node": ">=18" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/@angular/compiler-cli/node_modules/strip-ansi": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.2.tgz", - "integrity": "sha512-gmBGslpoQJtgnMAvOVqGZpEz9dyoKTCzy2nfz/n8aIFhN/jCE/rCmcxabB6jOOHV+0WNnylOxaxBQPSvcWklhA==", - "license": "MIT", - "dependencies": { - "ansi-regex": "^6.0.1" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/strip-ansi?sponsor=1" - } - }, - "node_modules/@angular/compiler-cli/node_modules/wrap-ansi": { - "version": "9.0.2", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-9.0.2.tgz", - "integrity": "sha512-42AtmgqjV+X1VpdOfyTGOYRi0/zsoLqtXQckTmqTeybT+BDIbM/Guxo7x3pE2vtpr1ok6xRqM9OpBe+Jyoqyww==", - "license": "MIT", - "dependencies": { - "ansi-styles": "^6.2.1", - "string-width": "^7.0.0", - "strip-ansi": "^7.1.0" - }, - "engines": { - "node": ">=18" - }, - "funding": { - "url": "https://github.com/chalk/wrap-ansi?sponsor=1" - } - }, - "node_modules/@angular/compiler-cli/node_modules/y18n": { - "version": "5.0.8", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", - "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", - "license": "ISC", - "engines": { - "node": ">=10" - } - }, - "node_modules/@angular/compiler-cli/node_modules/yargs": { - "version": "18.0.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-18.0.0.tgz", - "integrity": "sha512-4UEqdc2RYGHZc7Doyqkrqiln3p9X2DZVxaGbwhn2pi7MrRagKaOcIKe8L3OxYcbhXLgLFUS3zAYuQjKBQgmuNg==", - "license": "MIT", - "dependencies": { - "cliui": "^9.0.1", - "escalade": "^3.1.1", - "get-caller-file": "^2.0.5", - "string-width": "^7.2.0", - "y18n": "^5.0.5", - "yargs-parser": "^22.0.0" - }, - "engines": { - "node": "^20.19.0 || ^22.12.0 || >=23" - } - }, - "node_modules/@angular/compiler-cli/node_modules/yargs-parser": { - "version": "22.0.0", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-22.0.0.tgz", - "integrity": "sha512-rwu/ClNdSMpkSrUb+d6BRsSkLUq1fmfsY6TOpYzTwvwkg1/NRG85KBy3kq++A8LKQwX6lsu+aWad+2khvuXrqw==", - "license": "ISC", - "engines": { - "node": "^20.19.0 || ^22.12.0 || >=23" - } - }, "node_modules/@angular/core": { - "version": "20.3.16", - "resolved": "https://registry.npmjs.org/@angular/core/-/core-20.3.16.tgz", - "integrity": "sha512-KSFPKvOmWWLCJBbEO+CuRUXfecX2FRuO0jNi9c54ptXMOPHlK1lIojUnyXmMNzjdHgRug8ci9qDuftvC2B7MKg==", + "version": "20.3.25", + "resolved": "https://registry.npmjs.org/@angular/core/-/core-20.3.25.tgz", + "integrity": "sha512-B4XnnR5jzikZDvZ4PjwjAWZMT14dxrKrmJdwa/n0yp7rMPkIJTKF6ZJMg4d1pLWLLSsc2oWHioN3UrWlGqIKnA==", "license": "MIT", "dependencies": { "tslib": "^2.3.0" @@ -2000,7 +2526,7 @@ "node": "^20.19.0 || ^22.12.0 || >=24.0.0" }, "peerDependencies": { - "@angular/compiler": "20.3.16", + "@angular/compiler": "20.3.25", "rxjs": "^6.5.3 || ^7.4.0", "zone.js": "~0.15.0" }, @@ -2014,9 +2540,9 @@ } }, "node_modules/@angular/forms": { - "version": "20.3.16", - "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-20.3.16.tgz", - "integrity": "sha512-1yzbXpExTqATpVcqA3wGrq4ACFIP3mRxA4pbso5KoJU+/4JfzNFwLsDaFXKpm5uxwchVnj8KM2vPaDOkvtp7NA==", + "version": "20.3.25", + "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-20.3.25.tgz", + "integrity": "sha512-vGRo1LVPFo2Cu0k+QyDTlsBv5UbN0c3Et2YMS+43oyi1c4keocntBccOjLyM5C0kpMz4+pP81MqqYpAWu2k+TQ==", "license": "MIT", "dependencies": { "tslib": "^2.3.0" @@ -2025,16 +2551,16 @@ "node": "^20.19.0 || ^22.12.0 || >=24.0.0" }, "peerDependencies": { - "@angular/common": "20.3.16", - "@angular/core": "20.3.16", - "@angular/platform-browser": "20.3.16", + "@angular/common": "20.3.25", + "@angular/core": "20.3.25", + "@angular/platform-browser": "20.3.25", "rxjs": "^6.5.3 || ^7.4.0" } }, "node_modules/@angular/language-service": { - "version": "20.3.16", - "resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-20.3.16.tgz", - "integrity": "sha512-0A/tSQPq5geIz2mMcZA5fzzbzT39v+ADQksnfPr8htNxtkYWy+EI5+d0+++k59NuvjLY4uTBqhRTRB9b1PKrjw==", + "version": "20.3.25", + "resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-20.3.25.tgz", + "integrity": "sha512-3PZUwbDUVQXk9BLSiNUpDxTnRXGR3szwK9QFQaGDt8lhmLYaQLh3VJsY0FHDRghHZYIGR2P2MbVxGQHytF+IPw==", "dev": true, "license": "MIT", "engines": { @@ -2042,9 +2568,9 @@ } }, "node_modules/@angular/localize": { - "version": "20.3.16", - "resolved": "https://registry.npmjs.org/@angular/localize/-/localize-20.3.16.tgz", - "integrity": "sha512-7S2ACDZC1Ag1+rc991BMvW6gDyBCH7ykGWpZL1aHOmnq4K70Sf8p2VyQMtYhaz7XfWeXxwBQjCncVYv6D7RO5A==", + "version": "20.3.25", + "resolved": "https://registry.npmjs.org/@angular/localize/-/localize-20.3.25.tgz", + "integrity": "sha512-N4wmEBH44h58Av+1ivQ7LAe6Q0QP/2oBngvmnkO39AM6tadlnQGmaOvVzCUZe4BpOWYrrXQNiszSxGD3mUGgHg==", "license": "MIT", "dependencies": { "@babel/core": "7.28.3", @@ -2061,142 +2587,14 @@ "node": "^20.19.0 || ^22.12.0 || >=24.0.0" }, "peerDependencies": { - "@angular/compiler": "20.3.16", - "@angular/compiler-cli": "20.3.16" - } - }, - "node_modules/@angular/localize/node_modules/ansi-regex": { - "version": "6.2.2", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.2.tgz", - "integrity": "sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==", - "license": "MIT", - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/ansi-regex?sponsor=1" - } - }, - "node_modules/@angular/localize/node_modules/ansi-styles": { - "version": "6.2.3", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.3.tgz", - "integrity": "sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==", - "license": "MIT", - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/@angular/localize/node_modules/cliui": { - "version": "9.0.1", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-9.0.1.tgz", - "integrity": "sha512-k7ndgKhwoQveBL+/1tqGJYNz097I7WOvwbmmU2AR5+magtbjPWQTS1C5vzGkBC8Ym8UWRzfKUzUUqFLypY4Q+w==", - "license": "ISC", - "dependencies": { - "string-width": "^7.2.0", - "strip-ansi": "^7.1.0", - "wrap-ansi": "^9.0.0" - }, - "engines": { - "node": ">=20" - } - }, - "node_modules/@angular/localize/node_modules/emoji-regex": { - "version": "10.6.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.6.0.tgz", - "integrity": "sha512-toUI84YS5YmxW219erniWD0CIVOo46xGKColeNQRgOzDorgBi1v4D71/OFzgD9GO2UGKIv1C3Sp8DAn0+j5w7A==", - "license": "MIT" - }, - "node_modules/@angular/localize/node_modules/string-width": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-7.2.0.tgz", - "integrity": "sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==", - "license": "MIT", - "dependencies": { - "emoji-regex": "^10.3.0", - "get-east-asian-width": "^1.0.0", - "strip-ansi": "^7.1.0" - }, - "engines": { - "node": ">=18" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/@angular/localize/node_modules/strip-ansi": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.2.tgz", - "integrity": "sha512-gmBGslpoQJtgnMAvOVqGZpEz9dyoKTCzy2nfz/n8aIFhN/jCE/rCmcxabB6jOOHV+0WNnylOxaxBQPSvcWklhA==", - "license": "MIT", - "dependencies": { - "ansi-regex": "^6.0.1" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/strip-ansi?sponsor=1" - } - }, - "node_modules/@angular/localize/node_modules/wrap-ansi": { - "version": "9.0.2", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-9.0.2.tgz", - "integrity": "sha512-42AtmgqjV+X1VpdOfyTGOYRi0/zsoLqtXQckTmqTeybT+BDIbM/Guxo7x3pE2vtpr1ok6xRqM9OpBe+Jyoqyww==", - "license": "MIT", - "dependencies": { - "ansi-styles": "^6.2.1", - "string-width": "^7.0.0", - "strip-ansi": "^7.1.0" - }, - "engines": { - "node": ">=18" - }, - "funding": { - "url": "https://github.com/chalk/wrap-ansi?sponsor=1" - } - }, - "node_modules/@angular/localize/node_modules/y18n": { - "version": "5.0.8", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", - "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", - "license": "ISC", - "engines": { - "node": ">=10" - } - }, - "node_modules/@angular/localize/node_modules/yargs": { - "version": "18.0.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-18.0.0.tgz", - "integrity": "sha512-4UEqdc2RYGHZc7Doyqkrqiln3p9X2DZVxaGbwhn2pi7MrRagKaOcIKe8L3OxYcbhXLgLFUS3zAYuQjKBQgmuNg==", - "license": "MIT", - "dependencies": { - "cliui": "^9.0.1", - "escalade": "^3.1.1", - "get-caller-file": "^2.0.5", - "string-width": "^7.2.0", - "y18n": "^5.0.5", - "yargs-parser": "^22.0.0" - }, - "engines": { - "node": "^20.19.0 || ^22.12.0 || >=23" - } - }, - "node_modules/@angular/localize/node_modules/yargs-parser": { - "version": "22.0.0", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-22.0.0.tgz", - "integrity": "sha512-rwu/ClNdSMpkSrUb+d6BRsSkLUq1fmfsY6TOpYzTwvwkg1/NRG85KBy3kq++A8LKQwX6lsu+aWad+2khvuXrqw==", - "license": "ISC", - "engines": { - "node": "^20.19.0 || ^22.12.0 || >=23" + "@angular/compiler": "20.3.25", + "@angular/compiler-cli": "20.3.25" } }, "node_modules/@angular/platform-browser": { - "version": "20.3.16", - "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-20.3.16.tgz", - "integrity": "sha512-YsrLS6vyS77i4pVHg4gdSBW74qvzHjpQRTVQ5Lv/OxIjJdYYYkMmjNalCNgy1ZuyY6CaLIB11ccxhrNnxfKGOQ==", + "version": "20.3.25", + "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-20.3.25.tgz", + "integrity": "sha512-0k06U/AJRQifGMLkcU3R9uEHWbuKEzkKMuKcGagXTrkeFvCG2Ub4JdsbcjFNWB2bspWgaxIMSceuj7c83U5wOA==", "license": "MIT", "dependencies": { "tslib": "^2.3.0" @@ -2205,9 +2603,9 @@ "node": "^20.19.0 || ^22.12.0 || >=24.0.0" }, "peerDependencies": { - "@angular/animations": "20.3.16", - "@angular/common": "20.3.16", - "@angular/core": "20.3.16" + "@angular/animations": "20.3.25", + "@angular/common": "20.3.25", + "@angular/core": "20.3.25" }, "peerDependenciesMeta": { "@angular/animations": { @@ -2216,9 +2614,9 @@ } }, "node_modules/@angular/platform-browser-dynamic": { - "version": "20.3.16", - "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-20.3.16.tgz", - "integrity": "sha512-5mECCV9YeKH6ue239GXRTGeDSd/eTbM1j8dDejhm5cGnPBhTxRw4o+GgSrWTYtb6VmIYdwUGBTC+wCBphiaQ2A==", + "version": "20.3.25", + "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-20.3.25.tgz", + "integrity": "sha512-3Ku+IsN4tQPVBsw75SoLbLf7TsXAGL0rGPHSsyNYFhG2ZZeQuYNIAi8mc4cwz/qMDnuassHFrCxuLDgN6Yab5w==", "license": "MIT", "dependencies": { "tslib": "^2.3.0" @@ -2227,16 +2625,16 @@ "node": "^20.19.0 || ^22.12.0 || >=24.0.0" }, "peerDependencies": { - "@angular/common": "20.3.16", - "@angular/compiler": "20.3.16", - "@angular/core": "20.3.16", - "@angular/platform-browser": "20.3.16" + "@angular/common": "20.3.25", + "@angular/compiler": "20.3.25", + "@angular/core": "20.3.25", + "@angular/platform-browser": "20.3.25" } }, "node_modules/@angular/platform-server": { - "version": "20.3.16", - "resolved": "https://registry.npmjs.org/@angular/platform-server/-/platform-server-20.3.16.tgz", - "integrity": "sha512-LxQscYd3UCWV8H3sdlnM05UB60MZVuVsdsHvXdkJ9+WOQjVDN1l1rYhj2aDL/5KkaRd/nqo0yFRnVjwceXDJhQ==", + "version": "20.3.25", + "resolved": "https://registry.npmjs.org/@angular/platform-server/-/platform-server-20.3.25.tgz", + "integrity": "sha512-uOpLILe5QP9WLXhwshA3fbHc+Wx/4nrUBZNns/dw3t06bRHMbbkutF8eVs+n6Atl332y4mOcStzMX1ilBUSFHw==", "license": "MIT", "dependencies": { "tslib": "^2.3.0", @@ -2246,17 +2644,17 @@ "node": "^20.19.0 || ^22.12.0 || >=24.0.0" }, "peerDependencies": { - "@angular/common": "20.3.16", - "@angular/compiler": "20.3.16", - "@angular/core": "20.3.16", - "@angular/platform-browser": "20.3.16", + "@angular/common": "20.3.25", + "@angular/compiler": "20.3.25", + "@angular/core": "20.3.25", + "@angular/platform-browser": "20.3.25", "rxjs": "^6.5.3 || ^7.4.0" } }, "node_modules/@angular/router": { - "version": "20.3.16", - "resolved": "https://registry.npmjs.org/@angular/router/-/router-20.3.16.tgz", - "integrity": "sha512-e1LiQFZaajKqc00cY5FboIrWJZSMnZ64GDp5R0UejritYrqorQQQNOqP1W85BMuY2owibMmxVfX+dJg/Mc8PuQ==", + "version": "20.3.25", + "resolved": "https://registry.npmjs.org/@angular/router/-/router-20.3.25.tgz", + "integrity": "sha512-YIjLHWAufTaukNj15hEoys29e7XNhnCRsS1/95h/OqR69R3adbB8hV7ut7gO6XdXokriYqb4gtoUjoESxR+xFQ==", "license": "MIT", "dependencies": { "tslib": "^2.3.0" @@ -2265,16 +2663,17 @@ "node": "^20.19.0 || ^22.12.0 || >=24.0.0" }, "peerDependencies": { - "@angular/common": "20.3.16", - "@angular/core": "20.3.16", - "@angular/platform-browser": "20.3.16", + "@angular/common": "20.3.25", + "@angular/core": "20.3.25", + "@angular/platform-browser": "20.3.25", "rxjs": "^6.5.3 || ^7.4.0" } }, "node_modules/@angular/ssr": { - "version": "20.3.16", - "resolved": "https://registry.npmjs.org/@angular/ssr/-/ssr-20.3.16.tgz", - "integrity": "sha512-EpPSc9kUiLbe3Lpj0GUplt0JNPFmyuTnOv/h4bJqfj07xvSbn5vH3W0wl78RQrcOh9hfXua4xVCvCF/6nV6zPg==", + "version": "20.3.25", + "resolved": "https://registry.npmjs.org/@angular/ssr/-/ssr-20.3.25.tgz", + "integrity": "sha512-A/lbXQ+GucLAQfCJ5img7/xuqlftWjJU+iJABq/ARDkOOE/rNHrxFkXjJBntj97+oXjr7HBYI2sxYRZCCEiEag==", + "license": "MIT", "dependencies": { "tslib": "^2.3.0" }, @@ -2291,12 +2690,12 @@ } }, "node_modules/@babel/code-frame": { - "version": "7.27.1", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.27.1.tgz", - "integrity": "sha512-cjQ7ZlQ0Mv3b47hABuTevyTuYN4i+loJKGeV9flcCgIK37cCXRh+L1bd3iBHlynerhQ7BhCkn2BPbQUL+rGqFg==", + "version": "7.29.0", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.29.0.tgz", + "integrity": "sha512-9NhCeYjq9+3uxgdtp20LSiJXJvN0FeCtNGpJxuMFZ1Kv3cWUNb6DOhJwUvcVCzKGR66cw4njwM6hrJLqgOwbcw==", "license": "MIT", "dependencies": { - "@babel/helper-validator-identifier": "^7.27.1", + "@babel/helper-validator-identifier": "^7.28.5", "js-tokens": "^4.0.0", "picocolors": "^1.1.1" }, @@ -2552,27 +2951,27 @@ } }, "node_modules/@babel/helper-module-imports": { - "version": "7.27.1", - "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.27.1.tgz", - "integrity": "sha512-0gSFWUPNXNopqtIPQvlD5WgXYI5GY2kP2cCvoT8kczjbfcfuIljTbcWrulD1CIPIX2gt1wghbDy08yE1p+/r3w==", + "version": "7.28.6", + "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.28.6.tgz", + "integrity": "sha512-l5XkZK7r7wa9LucGw9LwZyyCUscb4x37JWTPz7swwFE/0FMQAGpiWUZn8u9DzkSBWEcK25jmvubfpw2dnAMdbw==", "license": "MIT", "dependencies": { - "@babel/traverse": "^7.27.1", - "@babel/types": "^7.27.1" + "@babel/traverse": "^7.28.6", + "@babel/types": "^7.28.6" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-module-transforms": { - "version": "7.28.3", - "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.28.3.tgz", - "integrity": "sha512-gytXUbs8k2sXS9PnQptz5o0QnpLL51SwASIORY6XaBKF88nsOT0Zw9szLqlSGQDP/4TljBAD5y98p2U1fqkdsw==", + "version": "7.28.6", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.28.6.tgz", + "integrity": "sha512-67oXFAYr2cDLDVGLXTEABjdBJZ6drElUSI7WKp70NrpyISso3plG9SAGEF6y7zbha/wOzUByWWTJvEDVNIUGcA==", "license": "MIT", "dependencies": { - "@babel/helper-module-imports": "^7.27.1", - "@babel/helper-validator-identifier": "^7.27.1", - "@babel/traverse": "^7.28.3" + "@babel/helper-module-imports": "^7.28.6", + "@babel/helper-validator-identifier": "^7.28.5", + "@babel/traverse": "^7.28.6" }, "engines": { "node": ">=6.9.0" @@ -2594,9 +2993,9 @@ } }, "node_modules/@babel/helper-plugin-utils": { - "version": "7.27.1", - "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.27.1.tgz", - "integrity": "sha512-1gn1Up5YXka3YYAHGKpbideQ5Yjf1tDa9qYcgysz+cNCXukyLl6DjPXhD3VRwSb8c0J9tA4b2+rHEZtc6R0tlw==", + "version": "7.28.6", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.28.6.tgz", + "integrity": "sha512-S9gzZ/bz83GRysI7gAD4wPT/AI3uCnY+9xn+Mx/KPs2JwHJIz1W8PZkg2cqyt3RNOBM8ejcXhV6y8Og7ly/Dug==", "license": "MIT", "engines": { "node": ">=6.9.0" @@ -2715,12 +3114,12 @@ } }, "node_modules/@babel/parser": { - "version": "7.28.5", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.28.5.tgz", - "integrity": "sha512-KKBU1VGYR7ORr3At5HAtUQ+TV3SzRCXmA/8OdDZiLDBIZxVyzXuztPjfLd3BV1PRAQGCMWWSHYhL0F8d5uHBDQ==", + "version": "7.29.3", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.29.3.tgz", + "integrity": "sha512-b3ctpQwp+PROvU/cttc4OYl4MzfJUWy6FZg+PMXfzmt/+39iHVF0sDfqay8TQM3JA2EUOyKcFZt75jWriQijsA==", "license": "MIT", "dependencies": { - "@babel/types": "^7.28.5" + "@babel/types": "^7.29.0" }, "bin": { "parser": "bin/babel-parser.js" @@ -3263,15 +3662,15 @@ } }, "node_modules/@babel/plugin-transform-modules-systemjs": { - "version": "7.28.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.28.5.tgz", - "integrity": "sha512-vn5Jma98LCOeBy/KpeQhXcV2WZgaRUtjwQmjoBuLNlOmkg0fB5pdvYVeWRYI69wWKwK2cD1QbMiUQnoujWvrew==", + "version": "7.29.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.29.0.tgz", + "integrity": "sha512-PrujnVFbOdUpw4UHiVwKvKRLMMic8+eC0CuNlxjsyZUiBjhFdPsewdXCkveh2KqBA9/waD0W1b4hXSOBQJezpQ==", "license": "MIT", "dependencies": { - "@babel/helper-module-transforms": "^7.28.3", - "@babel/helper-plugin-utils": "^7.27.1", + "@babel/helper-module-transforms": "^7.28.6", + "@babel/helper-plugin-utils": "^7.28.6", "@babel/helper-validator-identifier": "^7.28.5", - "@babel/traverse": "^7.28.5" + "@babel/traverse": "^7.29.0" }, "engines": { "node": ">=6.9.0" @@ -3817,31 +4216,31 @@ } }, "node_modules/@babel/template": { - "version": "7.27.2", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.27.2.tgz", - "integrity": "sha512-LPDZ85aEJyYSd18/DkjNh4/y1ntkE5KwUHWTiqgRxruuZL2F1yuHligVHLvcHY2vMHXttKFpJn6LwfI7cw7ODw==", + "version": "7.28.6", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.28.6.tgz", + "integrity": "sha512-YA6Ma2KsCdGb+WC6UpBVFJGXL58MDA6oyONbjyF/+5sBgxY/dwkhLogbMT2GXXyU84/IhRw/2D1Os1B/giz+BQ==", "license": "MIT", "dependencies": { - "@babel/code-frame": "^7.27.1", - "@babel/parser": "^7.27.2", - "@babel/types": "^7.27.1" + "@babel/code-frame": "^7.28.6", + "@babel/parser": "^7.28.6", + "@babel/types": "^7.28.6" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/traverse": { - "version": "7.28.5", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.28.5.tgz", - "integrity": "sha512-TCCj4t55U90khlYkVV/0TfkJkAkUg3jZFA3Neb7unZT8CPok7iiRfaX0F+WnqWqt7OxhOn0uBKXCw4lbL8W0aQ==", + "version": "7.29.0", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.29.0.tgz", + "integrity": "sha512-4HPiQr0X7+waHfyXPZpWPfWL/J7dcN1mx9gL6WdQVMbPnF3+ZhSMs8tCxN7oHddJE9fhNE7+lxdnlyemKfJRuA==", "license": "MIT", "dependencies": { - "@babel/code-frame": "^7.27.1", - "@babel/generator": "^7.28.5", + "@babel/code-frame": "^7.29.0", + "@babel/generator": "^7.29.0", "@babel/helper-globals": "^7.28.0", - "@babel/parser": "^7.28.5", - "@babel/template": "^7.27.2", - "@babel/types": "^7.28.5", + "@babel/parser": "^7.29.0", + "@babel/template": "^7.28.6", + "@babel/types": "^7.29.0", "debug": "^4.3.1" }, "engines": { @@ -3849,13 +4248,13 @@ } }, "node_modules/@babel/traverse/node_modules/@babel/generator": { - "version": "7.28.5", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.28.5.tgz", - "integrity": "sha512-3EwLFhZ38J4VyIP6WNtt2kUdW9dokXA9Cr4IVIFHuCpZ3H8/YFOl5JjZHisrn1fATPBmKKqXzDFvh9fUwHz6CQ==", + "version": "7.29.1", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.29.1.tgz", + "integrity": "sha512-qsaF+9Qcm2Qv8SRIMMscAvG4O3lJ0F1GuMo5HR/Bp02LopNgnZBC/EkbevHFeGs4ls/oPz9v+Bsmzbkbe+0dUw==", "license": "MIT", "dependencies": { - "@babel/parser": "^7.28.5", - "@babel/types": "^7.28.5", + "@babel/parser": "^7.29.0", + "@babel/types": "^7.29.0", "@jridgewell/gen-mapping": "^0.3.12", "@jridgewell/trace-mapping": "^0.3.28", "jsesc": "^3.0.2" @@ -3875,9 +4274,9 @@ } }, "node_modules/@babel/types": { - "version": "7.28.5", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.28.5.tgz", - "integrity": "sha512-qQ5m48eI/MFLQ5PxQj4PFaprjyCTLI37ElWMmNs0K8Lk3dVeOdNpB3ks8jc7yM5CDmVC73eMVk/trk3fgmrUpA==", + "version": "7.29.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.29.0.tgz", + "integrity": "sha512-LwdZHpScM4Qz8Xw2iKSzS+cfglZzJGvofQICy7W7v4caru4EaAmyUuO6BGrbyQ2mYV11W0U8j5mBhd14dd3B0A==", "license": "MIT", "dependencies": { "@babel/helper-string-parser": "^7.27.1", @@ -3900,10 +4299,9 @@ } }, "node_modules/@cypress/request": { - "version": "3.0.10", - "resolved": "https://registry.npmjs.org/@cypress/request/-/request-3.0.10.tgz", - "integrity": "sha512-hauBrOdvu08vOsagkZ/Aju5XuiZx6ldsLfByg1htFeldhex+PeMrYauANzFsMJeAA0+dyPLbDoX2OYuvVoLDkQ==", - "license": "Apache-2.0", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/@cypress/request/-/request-4.0.1.tgz", + "integrity": "sha512-y20e+e6dFYkOUUJLVUZTsJRuTiXZaUQ32WD+R/ux/HBybbTx4ge7cNINcua0pU8+SNkKuRbOF12mBmzuzM8n5w==", "optional": true, "dependencies": { "aws-sign2": "~0.7.0", @@ -3919,14 +4317,28 @@ "json-stringify-safe": "~5.0.1", "mime-types": "~2.1.19", "performance-now": "^2.1.0", - "qs": "~6.14.1", + "qs": "^6.15.2", "safe-buffer": "^5.1.2", "tough-cookie": "^5.0.0", - "tunnel-agent": "^0.6.0", - "uuid": "^8.3.2" + "tunnel-agent": "^0.6.0" }, "engines": { - "node": ">= 6" + "node": ">= 14.17.0" + } + }, + "node_modules/@cypress/request/node_modules/qs": { + "version": "6.15.2", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.15.2.tgz", + "integrity": "sha512-Rzq0KEyX/w/tEybncDgdkZrJgVUsUMk3xjh3t5bv3S1HTAtg+uOYt72+ZfwiQwKdysThkTBdL/rTi6HDmX9Ddw==", + "optional": true, + "dependencies": { + "side-channel": "^1.1.0" + }, + "engines": { + "node": ">=0.6" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, "node_modules/@cypress/schematic": { @@ -3990,12 +4402,13 @@ } }, "node_modules/@esbuild/aix-ppc64": { - "version": "0.25.9", - "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.9.tgz", - "integrity": "sha512-OaGtL73Jck6pBKjNIe24BnFE6agGl+6KxDtTfHhy1HmhthfKouEcOhqpSL64K4/0WCtbKFLOdzD/44cJ4k9opA==", + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.27.7.tgz", + "integrity": "sha512-EKX3Qwmhz1eMdEJokhALr0YiD0lhQNwDqkPYyPhiSwKrh7/4KRjQc04sZ8db+5DVVnZ1LmbNDI1uAMPEUBnQPg==", "cpu": [ "ppc64" ], + "license": "MIT", "optional": true, "os": [ "aix" @@ -4005,12 +4418,13 @@ } }, "node_modules/@esbuild/android-arm": { - "version": "0.25.9", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.25.9.tgz", - "integrity": "sha512-5WNI1DaMtxQ7t7B6xa572XMXpHAaI/9Hnhk8lcxF4zVN4xstUgTlvuGDorBguKEnZO70qwEcLpfifMLoxiPqHQ==", + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.27.7.tgz", + "integrity": "sha512-jbPXvB4Yj2yBV7HUfE2KHe4GJX51QplCN1pGbYjvsyCZbQmies29EoJbkEc+vYuU5o45AfQn37vZlyXy4YJ8RQ==", "cpu": [ "arm" ], + "license": "MIT", "optional": true, "os": [ "android" @@ -4020,12 +4434,13 @@ } }, "node_modules/@esbuild/android-arm64": { - "version": "0.25.9", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.25.9.tgz", - "integrity": "sha512-IDrddSmpSv51ftWslJMvl3Q2ZT98fUSL2/rlUXuVqRXHCs5EUF1/f+jbjF5+NG9UffUDMCiTyh8iec7u8RlTLg==", + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.27.7.tgz", + "integrity": "sha512-62dPZHpIXzvChfvfLJow3q5dDtiNMkwiRzPylSCfriLvZeq0a1bWChrGx/BbUbPwOrsWKMn8idSllklzBy+dgQ==", "cpu": [ "arm64" ], + "license": "MIT", "optional": true, "os": [ "android" @@ -4035,12 +4450,13 @@ } }, "node_modules/@esbuild/android-x64": { - "version": "0.25.9", - "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.25.9.tgz", - "integrity": "sha512-I853iMZ1hWZdNllhVZKm34f4wErd4lMyeV7BLzEExGEIZYsOzqDWDf+y082izYUE8gtJnYHdeDpN/6tUdwvfiw==", + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.27.7.tgz", + "integrity": "sha512-x5VpMODneVDb70PYV2VQOmIUUiBtY3D3mPBG8NxVk5CogneYhkR7MmM3yR/uMdITLrC1ml/NV1rj4bMJuy9MCg==", "cpu": [ "x64" ], + "license": "MIT", "optional": true, "os": [ "android" @@ -4050,12 +4466,13 @@ } }, "node_modules/@esbuild/darwin-arm64": { - "version": "0.25.9", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.25.9.tgz", - "integrity": "sha512-XIpIDMAjOELi/9PB30vEbVMs3GV1v2zkkPnuyRRURbhqjyzIINwj+nbQATh4H9GxUgH1kFsEyQMxwiLFKUS6Rg==", + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.27.7.tgz", + "integrity": "sha512-5lckdqeuBPlKUwvoCXIgI2D9/ABmPq3Rdp7IfL70393YgaASt7tbju3Ac+ePVi3KDH6N2RqePfHnXkaDtY9fkw==", "cpu": [ "arm64" ], + "license": "MIT", "optional": true, "os": [ "darwin" @@ -4065,12 +4482,13 @@ } }, "node_modules/@esbuild/darwin-x64": { - "version": "0.25.9", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.25.9.tgz", - "integrity": "sha512-jhHfBzjYTA1IQu8VyrjCX4ApJDnH+ez+IYVEoJHeqJm9VhG9Dh2BYaJritkYK3vMaXrf7Ogr/0MQ8/MeIefsPQ==", + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.27.7.tgz", + "integrity": "sha512-rYnXrKcXuT7Z+WL5K980jVFdvVKhCHhUwid+dDYQpH+qu+TefcomiMAJpIiC2EM3Rjtq0sO3StMV/+3w3MyyqQ==", "cpu": [ "x64" ], + "license": "MIT", "optional": true, "os": [ "darwin" @@ -4080,12 +4498,13 @@ } }, "node_modules/@esbuild/freebsd-arm64": { - "version": "0.25.9", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.9.tgz", - "integrity": "sha512-z93DmbnY6fX9+KdD4Ue/H6sYs+bhFQJNCPZsi4XWJoYblUqT06MQUdBCpcSfuiN72AbqeBFu5LVQTjfXDE2A6Q==", + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.27.7.tgz", + "integrity": "sha512-B48PqeCsEgOtzME2GbNM2roU29AMTuOIN91dsMO30t+Ydis3z/3Ngoj5hhnsOSSwNzS+6JppqWsuhTp6E82l2w==", "cpu": [ "arm64" ], + "license": "MIT", "optional": true, "os": [ "freebsd" @@ -4095,12 +4514,13 @@ } }, "node_modules/@esbuild/freebsd-x64": { - "version": "0.25.9", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.25.9.tgz", - "integrity": "sha512-mrKX6H/vOyo5v71YfXWJxLVxgy1kyt1MQaD8wZJgJfG4gq4DpQGpgTB74e5yBeQdyMTbgxp0YtNj7NuHN0PoZg==", + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.27.7.tgz", + "integrity": "sha512-jOBDK5XEjA4m5IJK3bpAQF9/Lelu/Z9ZcdhTRLf4cajlB+8VEhFFRjWgfy3M1O4rO2GQ/b2dLwCUGpiF/eATNQ==", "cpu": [ "x64" ], + "license": "MIT", "optional": true, "os": [ "freebsd" @@ -4110,12 +4530,13 @@ } }, "node_modules/@esbuild/linux-arm": { - "version": "0.25.9", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.25.9.tgz", - "integrity": "sha512-HBU2Xv78SMgaydBmdor38lg8YDnFKSARg1Q6AT0/y2ezUAKiZvc211RDFHlEZRFNRVhcMamiToo7bDx3VEOYQw==", + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.27.7.tgz", + "integrity": "sha512-RkT/YXYBTSULo3+af8Ib0ykH8u2MBh57o7q/DAs3lTJlyVQkgQvlrPTnjIzzRPQyavxtPtfg0EopvDyIt0j1rA==", "cpu": [ "arm" ], + "license": "MIT", "optional": true, "os": [ "linux" @@ -4125,12 +4546,13 @@ } }, "node_modules/@esbuild/linux-arm64": { - "version": "0.25.9", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.25.9.tgz", - "integrity": "sha512-BlB7bIcLT3G26urh5Dmse7fiLmLXnRlopw4s8DalgZ8ef79Jj4aUcYbk90g8iCa2467HX8SAIidbL7gsqXHdRw==", + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.27.7.tgz", + "integrity": "sha512-RZPHBoxXuNnPQO9rvjh5jdkRmVizktkT7TCDkDmQ0W2SwHInKCAV95GRuvdSvA7w4VMwfCjUiPwDi0ZO6Nfe9A==", "cpu": [ "arm64" ], + "license": "MIT", "optional": true, "os": [ "linux" @@ -4140,12 +4562,13 @@ } }, "node_modules/@esbuild/linux-ia32": { - "version": "0.25.9", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.25.9.tgz", - "integrity": "sha512-e7S3MOJPZGp2QW6AK6+Ly81rC7oOSerQ+P8L0ta4FhVi+/j/v2yZzx5CqqDaWjtPFfYz21Vi1S0auHrap3Ma3A==", + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.27.7.tgz", + "integrity": "sha512-GA48aKNkyQDbd3KtkplYWT102C5sn/EZTY4XROkxONgruHPU72l+gW+FfF8tf2cFjeHaRbWpOYa/uRBz/Xq1Pg==", "cpu": [ "ia32" ], + "license": "MIT", "optional": true, "os": [ "linux" @@ -4155,12 +4578,13 @@ } }, "node_modules/@esbuild/linux-loong64": { - "version": "0.25.9", - "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.25.9.tgz", - "integrity": "sha512-Sbe10Bnn0oUAB2AalYztvGcK+o6YFFA/9829PhOCUS9vkJElXGdphz0A3DbMdP8gmKkqPmPcMJmJOrI3VYB1JQ==", + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.27.7.tgz", + "integrity": "sha512-a4POruNM2oWsD4WKvBSEKGIiWQF8fZOAsycHOt6JBpZ+JN2n2JH9WAv56SOyu9X5IqAjqSIPTaJkqN8F7XOQ5Q==", "cpu": [ "loong64" ], + "license": "MIT", "optional": true, "os": [ "linux" @@ -4170,12 +4594,13 @@ } }, "node_modules/@esbuild/linux-mips64el": { - "version": "0.25.9", - "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.25.9.tgz", - "integrity": "sha512-YcM5br0mVyZw2jcQeLIkhWtKPeVfAerES5PvOzaDxVtIyZ2NUBZKNLjC5z3/fUlDgT6w89VsxP2qzNipOaaDyA==", + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.27.7.tgz", + "integrity": "sha512-KabT5I6StirGfIz0FMgl1I+R1H73Gp0ofL9A3nG3i/cYFJzKHhouBV5VWK1CSgKvVaG4q1RNpCTR2LuTVB3fIw==", "cpu": [ "mips64el" ], + "license": "MIT", "optional": true, "os": [ "linux" @@ -4185,12 +4610,13 @@ } }, "node_modules/@esbuild/linux-ppc64": { - "version": "0.25.9", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.25.9.tgz", - "integrity": "sha512-++0HQvasdo20JytyDpFvQtNrEsAgNG2CY1CLMwGXfFTKGBGQT3bOeLSYE2l1fYdvML5KUuwn9Z8L1EWe2tzs1w==", + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.27.7.tgz", + "integrity": "sha512-gRsL4x6wsGHGRqhtI+ifpN/vpOFTQtnbsupUF5R5YTAg+y/lKelYR1hXbnBdzDjGbMYjVJLJTd2OFmMewAgwlQ==", "cpu": [ "ppc64" ], + "license": "MIT", "optional": true, "os": [ "linux" @@ -4200,12 +4626,13 @@ } }, "node_modules/@esbuild/linux-riscv64": { - "version": "0.25.9", - "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.25.9.tgz", - "integrity": "sha512-uNIBa279Y3fkjV+2cUjx36xkx7eSjb8IvnL01eXUKXez/CBHNRw5ekCGMPM0BcmqBxBcdgUWuUXmVWwm4CH9kg==", + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.27.7.tgz", + "integrity": "sha512-hL25LbxO1QOngGzu2U5xeXtxXcW+/GvMN3ejANqXkxZ/opySAZMrc+9LY/WyjAan41unrR3YrmtTsUpwT66InQ==", "cpu": [ "riscv64" ], + "license": "MIT", "optional": true, "os": [ "linux" @@ -4215,12 +4642,13 @@ } }, "node_modules/@esbuild/linux-s390x": { - "version": "0.25.9", - "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.25.9.tgz", - "integrity": "sha512-Mfiphvp3MjC/lctb+7D287Xw1DGzqJPb/J2aHHcHxflUo+8tmN/6d4k6I2yFR7BVo5/g7x2Monq4+Yew0EHRIA==", + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.27.7.tgz", + "integrity": "sha512-2k8go8Ycu1Kb46vEelhu1vqEP+UeRVj2zY1pSuPdgvbd5ykAw82Lrro28vXUrRmzEsUV0NzCf54yARIK8r0fdw==", "cpu": [ "s390x" ], + "license": "MIT", "optional": true, "os": [ "linux" @@ -4230,12 +4658,13 @@ } }, "node_modules/@esbuild/linux-x64": { - "version": "0.25.9", - "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.25.9.tgz", - "integrity": "sha512-iSwByxzRe48YVkmpbgoxVzn76BXjlYFXC7NvLYq+b+kDjyyk30J0JY47DIn8z1MO3K0oSl9fZoRmZPQI4Hklzg==", + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.27.7.tgz", + "integrity": "sha512-hzznmADPt+OmsYzw1EE33ccA+HPdIqiCRq7cQeL1Jlq2gb1+OyWBkMCrYGBJ+sxVzve2ZJEVeePbLM2iEIZSxA==", "cpu": [ "x64" ], + "license": "MIT", "optional": true, "os": [ "linux" @@ -4245,12 +4674,13 @@ } }, "node_modules/@esbuild/netbsd-arm64": { - "version": "0.25.9", - "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.9.tgz", - "integrity": "sha512-9jNJl6FqaUG+COdQMjSCGW4QiMHH88xWbvZ+kRVblZsWrkXlABuGdFJ1E9L7HK+T0Yqd4akKNa/lO0+jDxQD4Q==", + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.27.7.tgz", + "integrity": "sha512-b6pqtrQdigZBwZxAn1UpazEisvwaIDvdbMbmrly7cDTMFnw/+3lVxxCTGOrkPVnsYIosJJXAsILG9XcQS+Yu6w==", "cpu": [ "arm64" ], + "license": "MIT", "optional": true, "os": [ "netbsd" @@ -4260,12 +4690,13 @@ } }, "node_modules/@esbuild/netbsd-x64": { - "version": "0.25.9", - "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.25.9.tgz", - "integrity": "sha512-RLLdkflmqRG8KanPGOU7Rpg829ZHu8nFy5Pqdi9U01VYtG9Y0zOG6Vr2z4/S+/3zIyOxiK6cCeYNWOFR9QP87g==", + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.27.7.tgz", + "integrity": "sha512-OfatkLojr6U+WN5EDYuoQhtM+1xco+/6FSzJJnuWiUw5eVcicbyK3dq5EeV/QHT1uy6GoDhGbFpprUiHUYggrw==", "cpu": [ "x64" ], + "license": "MIT", "optional": true, "os": [ "netbsd" @@ -4275,12 +4706,13 @@ } }, "node_modules/@esbuild/openbsd-arm64": { - "version": "0.25.9", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.9.tgz", - "integrity": "sha512-YaFBlPGeDasft5IIM+CQAhJAqS3St3nJzDEgsgFixcfZeyGPCd6eJBWzke5piZuZ7CtL656eOSYKk4Ls2C0FRQ==", + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.27.7.tgz", + "integrity": "sha512-AFuojMQTxAz75Fo8idVcqoQWEHIXFRbOc1TrVcFSgCZtQfSdc1RXgB3tjOn/krRHENUB4j00bfGjyl2mJrU37A==", "cpu": [ "arm64" ], + "license": "MIT", "optional": true, "os": [ "openbsd" @@ -4290,12 +4722,13 @@ } }, "node_modules/@esbuild/openbsd-x64": { - "version": "0.25.9", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.25.9.tgz", - "integrity": "sha512-1MkgTCuvMGWuqVtAvkpkXFmtL8XhWy+j4jaSO2wxfJtilVCi0ZE37b8uOdMItIHz4I6z1bWWtEX4CJwcKYLcuA==", + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.27.7.tgz", + "integrity": "sha512-+A1NJmfM8WNDv5CLVQYJ5PshuRm/4cI6WMZRg1by1GwPIQPCTs1GLEUHwiiQGT5zDdyLiRM/l1G0Pv54gvtKIg==", "cpu": [ "x64" ], + "license": "MIT", "optional": true, "os": [ "openbsd" @@ -4305,12 +4738,13 @@ } }, "node_modules/@esbuild/openharmony-arm64": { - "version": "0.25.9", - "resolved": "https://registry.npmjs.org/@esbuild/openharmony-arm64/-/openharmony-arm64-0.25.9.tgz", - "integrity": "sha512-4Xd0xNiMVXKh6Fa7HEJQbrpP3m3DDn43jKxMjxLLRjWnRsfxjORYJlXPO4JNcXtOyfajXorRKY9NkOpTHptErg==", + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/openharmony-arm64/-/openharmony-arm64-0.27.7.tgz", + "integrity": "sha512-+KrvYb/C8zA9CU/g0sR6w2RBw7IGc5J2BPnc3dYc5VJxHCSF1yNMxTV5LQ7GuKteQXZtspjFbiuW5/dOj7H4Yw==", "cpu": [ "arm64" ], + "license": "MIT", "optional": true, "os": [ "openharmony" @@ -4320,12 +4754,13 @@ } }, "node_modules/@esbuild/sunos-x64": { - "version": "0.25.9", - "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.25.9.tgz", - "integrity": "sha512-WjH4s6hzo00nNezhp3wFIAfmGZ8U7KtrJNlFMRKxiI9mxEK1scOMAaa9i4crUtu+tBr+0IN6JCuAcSBJZfnphw==", + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.27.7.tgz", + "integrity": "sha512-ikktIhFBzQNt/QDyOL580ti9+5mL/YZeUPKU2ivGtGjdTYoqz6jObj6nOMfhASpS4GU4Q/Clh1QtxWAvcYKamA==", "cpu": [ "x64" ], + "license": "MIT", "optional": true, "os": [ "sunos" @@ -4335,12 +4770,13 @@ } }, "node_modules/@esbuild/win32-arm64": { - "version": "0.25.9", - "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.25.9.tgz", - "integrity": "sha512-mGFrVJHmZiRqmP8xFOc6b84/7xa5y5YvR1x8djzXpJBSv/UsNK6aqec+6JDjConTgvvQefdGhFDAs2DLAds6gQ==", + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.27.7.tgz", + "integrity": "sha512-7yRhbHvPqSpRUV7Q20VuDwbjW5kIMwTHpptuUzV+AA46kiPze5Z7qgt6CLCK3pWFrHeNfDd1VKgyP4O+ng17CA==", "cpu": [ "arm64" ], + "license": "MIT", "optional": true, "os": [ "win32" @@ -4350,12 +4786,13 @@ } }, "node_modules/@esbuild/win32-ia32": { - "version": "0.25.9", - "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.25.9.tgz", - "integrity": "sha512-b33gLVU2k11nVx1OhX3C8QQP6UHQK4ZtN56oFWvVXvz2VkDoe6fbG8TOgHFxEvqeqohmRnIHe5A1+HADk4OQww==", + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.27.7.tgz", + "integrity": "sha512-SmwKXe6VHIyZYbBLJrhOoCJRB/Z1tckzmgTLfFYOfpMAx63BJEaL9ExI8x7v0oAO3Zh6D/Oi1gVxEYr5oUCFhw==", "cpu": [ "ia32" ], + "license": "MIT", "optional": true, "os": [ "win32" @@ -4365,12 +4802,13 @@ } }, "node_modules/@esbuild/win32-x64": { - "version": "0.25.9", - "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.25.9.tgz", - "integrity": "sha512-PPOl1mi6lpLNQxnGoyAfschAodRFYXJ+9fs6WHXz7CSWKbOqiMZsubC+BQsVKuul+3vKLuwTHsS2c2y9EoKwxQ==", + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.27.7.tgz", + "integrity": "sha512-56hiAJPhwQ1R4i+21FVF7V8kSD5zZTdHcVuRFMW0hn753vVfQN8xlx4uOPT4xoGH0Z/oVATuR82AiqSTDIpaHg==", "cpu": [ "x64" ], + "license": "MIT", "optional": true, "os": [ "win32" @@ -4642,9 +5080,9 @@ } }, "node_modules/@hono/node-server": { - "version": "1.19.9", - "resolved": "https://registry.npmjs.org/@hono/node-server/-/node-server-1.19.9.tgz", - "integrity": "sha512-vHL6w3ecZsky+8P5MD+eFfaGTyCeOHUIFYMGpQGbrBTSmNNoxv0if69rEZ5giu36weC5saFuznL411gRX7bJDw==", + "version": "1.19.14", + "resolved": "https://registry.npmjs.org/@hono/node-server/-/node-server-1.19.14.tgz", + "integrity": "sha512-GwtvgtXxnWsucXvbQXkRgqksiH2Qed37H9xHZocE5sA3N8O8O8/8FA3uclQXxXVzc9XBZuEOMK7+r02FmSpHtw==", "license": "MIT", "engines": { "node": ">=18.14.1" @@ -5067,25 +5505,6 @@ } } }, - "node_modules/@isaacs/balanced-match": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/@isaacs/balanced-match/-/balanced-match-4.0.1.tgz", - "integrity": "sha512-yzMTt9lEb8Gv7zRioUilSglI0c0smZ9k5D65677DLWLtWJaXIS3CqcGyUFByYKlnUj6TkjLVs54fBl6+TiGQDQ==", - "engines": { - "node": "20 || >=22" - } - }, - "node_modules/@isaacs/brace-expansion": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/@isaacs/brace-expansion/-/brace-expansion-5.0.1.tgz", - "integrity": "sha512-WMz71T1JS624nWj2n2fnYAuPovhv7EUhk69R6i9dsVyzxt5eM3bjwvgk9L+APE1TRscGysAVMANkB0jh0LQZrQ==", - "dependencies": { - "@isaacs/balanced-match": "^4.0.1" - }, - "engines": { - "node": "20 || >=22" - } - }, "node_modules/@isaacs/fs-minipass": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/@isaacs/fs-minipass/-/fs-minipass-4.0.1.tgz", @@ -6149,9 +6568,10 @@ } }, "node_modules/@ngtools/webpack": { - "version": "20.3.16", - "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-20.3.16.tgz", - "integrity": "sha512-yXxo0CKkCa9SuP05OskOeFt9l1wirCzh7MhwW1S18Rpi6cyPbV1bc7GEz05+dfi5Ee8Dlbx3sbmdty0xtHvFQw==", + "version": "20.3.25", + "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-20.3.25.tgz", + "integrity": "sha512-p/YopAgukaIvezv3hsJzJevnNUBNTM8UQIkyDHPY5/aANdKraUTKDQUwlVxRiyD8U+PTSeD/BI56oOnuKrdFZQ==", + "license": "MIT", "engines": { "node": "^20.19.0 || ^22.12.0 || >=24.0.0", "npm": "^6.11.0 || ^7.5.6 || >=8.0.0", @@ -6164,10 +6584,9 @@ } }, "node_modules/@noble/secp256k1": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@noble/secp256k1/-/secp256k1-3.0.0.tgz", - "integrity": "sha512-NJBaR352KyIvj3t6sgT/+7xrNyF9Xk9QlLSIqUGVUYlsnDTAUqY8LOmwpcgEx4AMJXRITQ5XEVHD+mMaPfr3mg==", - "license": "MIT", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/@noble/secp256k1/-/secp256k1-3.1.0.tgz", + "integrity": "sha512-+F7iS7tUMaNGXcc9X3PjmjvuQnXEuSjCRNzVVA2xAcKXgCaP0dHYz4SFyt4FKNHef7sOP//xihowcySSS7PK9g==", "funding": { "url": "https://paulmillr.com/funding/" } @@ -6756,277 +7175,338 @@ } }, "node_modules/@rollup/rollup-android-arm-eabi": { - "version": "4.52.3", - "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.52.3.tgz", - "integrity": "sha512-h6cqHGZ6VdnwliFG1NXvMPTy/9PS3h8oLh7ImwR+kl+oYnQizgjxsONmmPSb2C66RksfkfIxEVtDSEcJiO0tqw==", + "version": "4.59.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.59.0.tgz", + "integrity": "sha512-upnNBkA6ZH2VKGcBj9Fyl9IGNPULcjXRlg0LLeaioQWueH30p6IXtJEbKAgvyv+mJaMxSm1l6xwDXYjpEMiLMg==", "cpu": [ "arm" ], + "license": "MIT", "optional": true, "os": [ "android" ] }, "node_modules/@rollup/rollup-android-arm64": { - "version": "4.52.3", - "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.52.3.tgz", - "integrity": "sha512-wd+u7SLT/u6knklV/ifG7gr5Qy4GUbH2hMWcDauPFJzmCZUAJ8L2bTkVXC2niOIxp8lk3iH/QX8kSrUxVZrOVw==", + "version": "4.59.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.59.0.tgz", + "integrity": "sha512-hZ+Zxj3SySm4A/DylsDKZAeVg0mvi++0PYVceVyX7hemkw7OreKdCvW2oQ3T1FMZvCaQXqOTHb8qmBShoqk69Q==", "cpu": [ "arm64" ], + "license": "MIT", "optional": true, "os": [ "android" ] }, "node_modules/@rollup/rollup-darwin-arm64": { - "version": "4.52.3", - "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.52.3.tgz", - "integrity": "sha512-lj9ViATR1SsqycwFkJCtYfQTheBdvlWJqzqxwc9f2qrcVrQaF/gCuBRTiTolkRWS6KvNxSk4KHZWG7tDktLgjg==", + "version": "4.59.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.59.0.tgz", + "integrity": "sha512-W2Psnbh1J8ZJw0xKAd8zdNgF9HRLkdWwwdWqubSVk0pUuQkoHnv7rx4GiF9rT4t5DIZGAsConRE3AxCdJ4m8rg==", "cpu": [ "arm64" ], + "license": "MIT", "optional": true, "os": [ "darwin" ] }, "node_modules/@rollup/rollup-darwin-x64": { - "version": "4.52.3", - "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.52.3.tgz", - "integrity": "sha512-+Dyo7O1KUmIsbzx1l+4V4tvEVnVQqMOIYtrxK7ncLSknl1xnMHLgn7gddJVrYPNZfEB8CIi3hK8gq8bDhb3h5A==", + "version": "4.59.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.59.0.tgz", + "integrity": "sha512-ZW2KkwlS4lwTv7ZVsYDiARfFCnSGhzYPdiOU4IM2fDbL+QGlyAbjgSFuqNRbSthybLbIJ915UtZBtmuLrQAT/w==", "cpu": [ "x64" ], + "license": "MIT", "optional": true, "os": [ "darwin" ] }, "node_modules/@rollup/rollup-freebsd-arm64": { - "version": "4.52.3", - "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.52.3.tgz", - "integrity": "sha512-u9Xg2FavYbD30g3DSfNhxgNrxhi6xVG4Y6i9Ur1C7xUuGDW3banRbXj+qgnIrwRN4KeJ396jchwy9bCIzbyBEQ==", + "version": "4.59.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.59.0.tgz", + "integrity": "sha512-EsKaJ5ytAu9jI3lonzn3BgG8iRBjV4LxZexygcQbpiU0wU0ATxhNVEpXKfUa0pS05gTcSDMKpn3Sx+QB9RlTTA==", "cpu": [ "arm64" ], + "license": "MIT", "optional": true, "os": [ "freebsd" ] }, "node_modules/@rollup/rollup-freebsd-x64": { - "version": "4.52.3", - "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.52.3.tgz", - "integrity": "sha512-5M8kyi/OX96wtD5qJR89a/3x5x8x5inXBZO04JWhkQb2JWavOWfjgkdvUqibGJeNNaz1/Z1PPza5/tAPXICI6A==", + "version": "4.59.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.59.0.tgz", + "integrity": "sha512-d3DuZi2KzTMjImrxoHIAODUZYoUUMsuUiY4SRRcJy6NJoZ6iIqWnJu9IScV9jXysyGMVuW+KNzZvBLOcpdl3Vg==", "cpu": [ "x64" ], + "license": "MIT", "optional": true, "os": [ "freebsd" ] }, "node_modules/@rollup/rollup-linux-arm-gnueabihf": { - "version": "4.52.3", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.52.3.tgz", - "integrity": "sha512-IoerZJ4l1wRMopEHRKOO16e04iXRDyZFZnNZKrWeNquh5d6bucjezgd+OxG03mOMTnS1x7hilzb3uURPkJ0OfA==", + "version": "4.59.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.59.0.tgz", + "integrity": "sha512-t4ONHboXi/3E0rT6OZl1pKbl2Vgxf9vJfWgmUoCEVQVxhW6Cw/c8I6hbbu7DAvgp82RKiH7TpLwxnJeKv2pbsw==", "cpu": [ "arm" ], + "license": "MIT", "optional": true, "os": [ "linux" ] }, "node_modules/@rollup/rollup-linux-arm-musleabihf": { - "version": "4.52.3", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.52.3.tgz", - "integrity": "sha512-ZYdtqgHTDfvrJHSh3W22TvjWxwOgc3ThK/XjgcNGP2DIwFIPeAPNsQxrJO5XqleSlgDux2VAoWQ5iJrtaC1TbA==", + "version": "4.59.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.59.0.tgz", + "integrity": "sha512-CikFT7aYPA2ufMD086cVORBYGHffBo4K8MQ4uPS/ZnY54GKj36i196u8U+aDVT2LX4eSMbyHtyOh7D7Zvk2VvA==", "cpu": [ "arm" ], + "license": "MIT", "optional": true, "os": [ "linux" ] }, "node_modules/@rollup/rollup-linux-arm64-gnu": { - "version": "4.52.3", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.52.3.tgz", - "integrity": "sha512-NcViG7A0YtuFDA6xWSgmFb6iPFzHlf5vcqb2p0lGEbT+gjrEEz8nC/EeDHvx6mnGXnGCC1SeVV+8u+smj0CeGQ==", + "version": "4.59.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.59.0.tgz", + "integrity": "sha512-jYgUGk5aLd1nUb1CtQ8E+t5JhLc9x5WdBKew9ZgAXg7DBk0ZHErLHdXM24rfX+bKrFe+Xp5YuJo54I5HFjGDAA==", "cpu": [ "arm64" ], + "license": "MIT", "optional": true, "os": [ "linux" ] }, "node_modules/@rollup/rollup-linux-arm64-musl": { - "version": "4.52.3", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.52.3.tgz", - "integrity": "sha512-d3pY7LWno6SYNXRm6Ebsq0DJGoiLXTb83AIPCXl9fmtIQs/rXoS8SJxxUNtFbJ5MiOvs+7y34np77+9l4nfFMw==", + "version": "4.59.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.59.0.tgz", + "integrity": "sha512-peZRVEdnFWZ5Bh2KeumKG9ty7aCXzzEsHShOZEFiCQlDEepP1dpUl/SrUNXNg13UmZl+gzVDPsiCwnV1uI0RUA==", "cpu": [ "arm64" ], + "license": "MIT", "optional": true, "os": [ "linux" ] }, "node_modules/@rollup/rollup-linux-loong64-gnu": { - "version": "4.52.3", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-gnu/-/rollup-linux-loong64-gnu-4.52.3.tgz", - "integrity": "sha512-3y5GA0JkBuirLqmjwAKwB0keDlI6JfGYduMlJD/Rl7fvb4Ni8iKdQs1eiunMZJhwDWdCvrcqXRY++VEBbvk6Eg==", + "version": "4.59.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-gnu/-/rollup-linux-loong64-gnu-4.59.0.tgz", + "integrity": "sha512-gbUSW/97f7+r4gHy3Jlup8zDG190AuodsWnNiXErp9mT90iCy9NKKU0Xwx5k8VlRAIV2uU9CsMnEFg/xXaOfXg==", "cpu": [ "loong64" ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-loong64-musl": { + "version": "4.59.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-musl/-/rollup-linux-loong64-musl-4.59.0.tgz", + "integrity": "sha512-yTRONe79E+o0FWFijasoTjtzG9EBedFXJMl888NBEDCDV9I2wGbFFfJQQe63OijbFCUZqxpHz1GzpbtSFikJ4Q==", + "cpu": [ + "loong64" + ], + "license": "MIT", "optional": true, "os": [ "linux" ] }, "node_modules/@rollup/rollup-linux-ppc64-gnu": { - "version": "4.52.3", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.52.3.tgz", - "integrity": "sha512-AUUH65a0p3Q0Yfm5oD2KVgzTKgwPyp9DSXc3UA7DtxhEb/WSPfbG4wqXeSN62OG5gSo18em4xv6dbfcUGXcagw==", + "version": "4.59.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.59.0.tgz", + "integrity": "sha512-sw1o3tfyk12k3OEpRddF68a1unZ5VCN7zoTNtSn2KndUE+ea3m3ROOKRCZxEpmT9nsGnogpFP9x6mnLTCaoLkA==", "cpu": [ "ppc64" ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-ppc64-musl": { + "version": "4.59.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-musl/-/rollup-linux-ppc64-musl-4.59.0.tgz", + "integrity": "sha512-+2kLtQ4xT3AiIxkzFVFXfsmlZiG5FXYW7ZyIIvGA7Bdeuh9Z0aN4hVyXS/G1E9bTP/vqszNIN/pUKCk/BTHsKA==", + "cpu": [ + "ppc64" + ], + "license": "MIT", "optional": true, "os": [ "linux" ] }, "node_modules/@rollup/rollup-linux-riscv64-gnu": { - "version": "4.52.3", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.52.3.tgz", - "integrity": "sha512-1makPhFFVBqZE+XFg3Dkq+IkQ7JvmUrwwqaYBL2CE+ZpxPaqkGaiWFEWVGyvTwZace6WLJHwjVh/+CXbKDGPmg==", + "version": "4.59.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.59.0.tgz", + "integrity": "sha512-NDYMpsXYJJaj+I7UdwIuHHNxXZ/b/N2hR15NyH3m2qAtb/hHPA4g4SuuvrdxetTdndfj9b1WOmy73kcPRoERUg==", "cpu": [ "riscv64" ], + "license": "MIT", "optional": true, "os": [ "linux" ] }, "node_modules/@rollup/rollup-linux-riscv64-musl": { - "version": "4.52.3", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.52.3.tgz", - "integrity": "sha512-OOFJa28dxfl8kLOPMUOQBCO6z3X2SAfzIE276fwT52uXDWUS178KWq0pL7d6p1kz7pkzA0yQwtqL0dEPoVcRWg==", + "version": "4.59.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.59.0.tgz", + "integrity": "sha512-nLckB8WOqHIf1bhymk+oHxvM9D3tyPndZH8i8+35p/1YiVoVswPid2yLzgX7ZJP0KQvnkhM4H6QZ5m0LzbyIAg==", "cpu": [ "riscv64" ], + "license": "MIT", "optional": true, "os": [ "linux" ] }, "node_modules/@rollup/rollup-linux-s390x-gnu": { - "version": "4.52.3", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.52.3.tgz", - "integrity": "sha512-jMdsML2VI5l+V7cKfZx3ak+SLlJ8fKvLJ0Eoa4b9/vCUrzXKgoKxvHqvJ/mkWhFiyp88nCkM5S2v6nIwRtPcgg==", + "version": "4.59.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.59.0.tgz", + "integrity": "sha512-oF87Ie3uAIvORFBpwnCvUzdeYUqi2wY6jRFWJAy1qus/udHFYIkplYRW+wo+GRUP4sKzYdmE1Y3+rY5Gc4ZO+w==", "cpu": [ "s390x" ], + "license": "MIT", "optional": true, "os": [ "linux" ] }, "node_modules/@rollup/rollup-linux-x64-gnu": { - "version": "4.52.3", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.52.3.tgz", - "integrity": "sha512-tPgGd6bY2M2LJTA1uGq8fkSPK8ZLYjDjY+ZLK9WHncCnfIz29LIXIqUgzCR0hIefzy6Hpbe8Th5WOSwTM8E7LA==", + "version": "4.59.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.59.0.tgz", + "integrity": "sha512-3AHmtQq/ppNuUspKAlvA8HtLybkDflkMuLK4DPo77DfthRb71V84/c4MlWJXixZz4uruIH4uaa07IqoAkG64fg==", "cpu": [ "x64" ], + "license": "MIT", "optional": true, "os": [ "linux" ] }, "node_modules/@rollup/rollup-linux-x64-musl": { - "version": "4.52.3", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.52.3.tgz", - "integrity": "sha512-BCFkJjgk+WFzP+tcSMXq77ymAPIxsX9lFJWs+2JzuZTLtksJ2o5hvgTdIcZ5+oKzUDMwI0PfWzRBYAydAHF2Mw==", + "version": "4.59.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.59.0.tgz", + "integrity": "sha512-2UdiwS/9cTAx7qIUZB/fWtToJwvt0Vbo0zmnYt7ED35KPg13Q0ym1g442THLC7VyI6JfYTP4PiSOWyoMdV2/xg==", "cpu": [ "x64" ], + "license": "MIT", "optional": true, "os": [ "linux" ] }, + "node_modules/@rollup/rollup-openbsd-x64": { + "version": "4.59.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-openbsd-x64/-/rollup-openbsd-x64-4.59.0.tgz", + "integrity": "sha512-M3bLRAVk6GOwFlPTIxVBSYKUaqfLrn8l0psKinkCFxl4lQvOSz8ZrKDz2gxcBwHFpci0B6rttydI4IpS4IS/jQ==", + "cpu": [ + "x64" + ], + "license": "MIT", + "optional": true, + "os": [ + "openbsd" + ] + }, "node_modules/@rollup/rollup-openharmony-arm64": { - "version": "4.52.3", - "resolved": "https://registry.npmjs.org/@rollup/rollup-openharmony-arm64/-/rollup-openharmony-arm64-4.52.3.tgz", - "integrity": "sha512-KTD/EqjZF3yvRaWUJdD1cW+IQBk4fbQaHYJUmP8N4XoKFZilVL8cobFSTDnjTtxWJQ3JYaMgF4nObY/+nYkumA==", + "version": "4.59.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-openharmony-arm64/-/rollup-openharmony-arm64-4.59.0.tgz", + "integrity": "sha512-tt9KBJqaqp5i5HUZzoafHZX8b5Q2Fe7UjYERADll83O4fGqJ49O1FsL6LpdzVFQcpwvnyd0i+K/VSwu/o/nWlA==", "cpu": [ "arm64" ], + "license": "MIT", "optional": true, "os": [ "openharmony" ] }, "node_modules/@rollup/rollup-win32-arm64-msvc": { - "version": "4.52.3", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.52.3.tgz", - "integrity": "sha512-+zteHZdoUYLkyYKObGHieibUFLbttX2r+58l27XZauq0tcWYYuKUwY2wjeCN9oK1Um2YgH2ibd6cnX/wFD7DuA==", + "version": "4.59.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.59.0.tgz", + "integrity": "sha512-V5B6mG7OrGTwnxaNUzZTDTjDS7F75PO1ae6MJYdiMu60sq0CqN5CVeVsbhPxalupvTX8gXVSU9gq+Rx1/hvu6A==", "cpu": [ "arm64" ], + "license": "MIT", "optional": true, "os": [ "win32" ] }, "node_modules/@rollup/rollup-win32-ia32-msvc": { - "version": "4.52.3", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.52.3.tgz", - "integrity": "sha512-of1iHkTQSo3kr6dTIRX6t81uj/c/b15HXVsPcEElN5sS859qHrOepM5p9G41Hah+CTqSh2r8Bm56dL2z9UQQ7g==", + "version": "4.59.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.59.0.tgz", + "integrity": "sha512-UKFMHPuM9R0iBegwzKF4y0C4J9u8C6MEJgFuXTBerMk7EJ92GFVFYBfOZaSGLu6COf7FxpQNqhNS4c4icUPqxA==", "cpu": [ "ia32" ], + "license": "MIT", "optional": true, "os": [ "win32" ] }, "node_modules/@rollup/rollup-win32-x64-gnu": { - "version": "4.52.3", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-gnu/-/rollup-win32-x64-gnu-4.52.3.tgz", - "integrity": "sha512-s0hybmlHb56mWVZQj8ra9048/WZTPLILKxcvcq+8awSZmyiSUZjjem1AhU3Tf4ZKpYhK4mg36HtHDOe8QJS5PQ==", + "version": "4.59.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-gnu/-/rollup-win32-x64-gnu-4.59.0.tgz", + "integrity": "sha512-laBkYlSS1n2L8fSo1thDNGrCTQMmxjYY5G0WFWjFFYZkKPjsMBsgJfGf4TLxXrF6RyhI60L8TMOjBMvXiTcxeA==", "cpu": [ "x64" ], + "license": "MIT", "optional": true, "os": [ "win32" ] }, "node_modules/@rollup/rollup-win32-x64-msvc": { - "version": "4.52.3", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.52.3.tgz", - "integrity": "sha512-zGIbEVVXVtauFgl3MRwGWEN36P5ZGenHRMgNw88X5wEhEBpq0XrMEZwOn07+ICrwM17XO5xfMZqh0OldCH5VTA==", + "version": "4.59.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.59.0.tgz", + "integrity": "sha512-2HRCml6OztYXyJXAvdDXPKcawukWY2GpR5/nxKp4iBgiO3wcoEGkAaqctIbZcNB6KlUQBIqt8VYkNSj2397EfA==", "cpu": [ "x64" ], + "license": "MIT", "optional": true, "os": [ "win32" ] }, "node_modules/@schematics/angular": { - "version": "20.3.16", - "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-20.3.16.tgz", - "integrity": "sha512-KeOcsM5piwv/6tUKBmLD1zXTwtJlZBnR2WM/4T9ImaQbmFGe1MMHUABT5SQ3Bifv1YKCw58ImxiaQUY9sdNqEQ==", + "version": "20.3.25", + "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-20.3.25.tgz", + "integrity": "sha512-ezoJpPKhhjXgE3LxuNcJO/ghSXs8f73xrqGvqouag7IbuliJYbHrt22WH3X75XSbD0+iOdiqA2bARvAO/ezyxQ==", "license": "MIT", "dependencies": { - "@angular-devkit/core": "20.3.16", - "@angular-devkit/schematics": "20.3.16", + "@angular-devkit/core": "20.3.25", + "@angular-devkit/schematics": "20.3.25", "jsonc-parser": "3.3.1" }, "engines": { @@ -7036,15 +7516,15 @@ } }, "node_modules/@schematics/angular/node_modules/@angular-devkit/core": { - "version": "20.3.16", - "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-20.3.16.tgz", - "integrity": "sha512-6L9Lpe3lbkyz32gzqxZGVC8MhXxXht+yV+4LUsb4+6T/mG/V9lW6UTW0dhwVOS3vpWMEwpy75XHT298t7HcKEg==", + "version": "20.3.25", + "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-20.3.25.tgz", + "integrity": "sha512-pSfeWEoS1y9zxqTOw0Etj2NXkRmp/aU52wdnyq3KqVA9cJtgxtlOHlBBNswTil4dReojEy+0K1xJm+mLuWuLxA==", "license": "MIT", "dependencies": { - "ajv": "8.17.1", + "ajv": "8.18.0", "ajv-formats": "3.0.1", "jsonc-parser": "3.3.1", - "picomatch": "4.0.3", + "picomatch": "4.0.4", "rxjs": "7.8.2", "source-map": "0.7.6" }, @@ -7063,9 +7543,9 @@ } }, "node_modules/@schematics/angular/node_modules/ajv": { - "version": "8.17.1", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz", - "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==", + "version": "8.18.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.18.0.tgz", + "integrity": "sha512-PlXPeEWMXMZ7sPYOHqmDyCJzcfNrUr3fGNKtezX14ykXOEIvyK81d+qydx89KY5O71FKMPaQ2vBfBFI5NHR63A==", "license": "MIT", "dependencies": { "fast-deep-equal": "^3.1.3", @@ -7099,7 +7579,6 @@ "version": "4.0.3", "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.3.tgz", "integrity": "sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA==", - "license": "MIT", "optional": true, "peer": true, "dependencies": { @@ -7119,9 +7598,9 @@ "license": "MIT" }, "node_modules/@schematics/angular/node_modules/picomatch": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz", - "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==", + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz", + "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==", "license": "MIT", "engines": { "node": ">=12" @@ -7134,7 +7613,6 @@ "version": "4.1.2", "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.1.2.tgz", "integrity": "sha512-GDhwkLfywWL2s6vEjyhri+eXmfH6j1L7JE27WhqLeYzoh/A3DBaYGEj2H/HFZCn/kMfim73FXxEJTw06WtxQwg==", - "license": "MIT", "optional": true, "peer": true, "engines": { @@ -7281,10 +7759,9 @@ "devOptional": true }, "node_modules/@standard-schema/spec": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@standard-schema/spec/-/spec-1.0.0.tgz", - "integrity": "sha512-m2bOd0f2RT9k8QJx1JN85cZYyH1RqFBdlwtkSlf4tBDYLCiiZnv1fIIwacK6cqwXavOydf0NPToMQgpKq+dVlA==", - "license": "MIT", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@standard-schema/spec/-/spec-1.1.0.tgz", + "integrity": "sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w==", "optional": true }, "node_modules/@tsconfig/node10": { @@ -7331,15 +7808,35 @@ "node": "^20.17.0 || >=22.9.0" } }, - "node_modules/@tufjs/models/node_modules/minimatch": { - "version": "10.1.1", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.1.1.tgz", - "integrity": "sha512-enIvLvRAFZYXJzkCYG5RKmPfrFArdLv+R+lbQ53BmIMLIry74bjKzX6iHAm8WYamJkhSSEabrWN5D97XnKObjQ==", + "node_modules/@tufjs/models/node_modules/balanced-match": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-4.0.4.tgz", + "integrity": "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==", + "engines": { + "node": "18 || 20 || >=22" + } + }, + "node_modules/@tufjs/models/node_modules/brace-expansion": { + "version": "5.0.5", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.5.tgz", + "integrity": "sha512-VZznLgtwhn+Mact9tfiwx64fA9erHH/MCXEUfB/0bX/6Fz6ny5EGTXYltMocqg4xFAQZtnO3DHWWXi8RiuN7cQ==", + "license": "MIT", "dependencies": { - "@isaacs/brace-expansion": "^5.0.0" + "balanced-match": "^4.0.2" }, "engines": { - "node": "20 || >=22" + "node": "18 || 20 || >=22" + } + }, + "node_modules/@tufjs/models/node_modules/minimatch": { + "version": "10.2.3", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.3.tgz", + "integrity": "sha512-Rwi3pnapEqirPSbWbrZaa6N3nmqq4Xer/2XooiOKyV3q12ML06f7MOuc5DVH8ONZIFhwIYQ3yzPH4nt7iWHaTg==", + "dependencies": { + "brace-expansion": "^5.0.2" + }, + "engines": { + "node": "18 || 20 || >=22" }, "funding": { "url": "https://github.com/sponsors/isaacs" @@ -7624,15 +8121,6 @@ "@types/node": "*" } }, - "node_modules/@types/yauzl": { - "version": "2.10.0", - "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.0.tgz", - "integrity": "sha512-Cn6WYCm0tXv8p6k+A8PvbDG763EDpBoTzHdA+Q/MF6H3sapGjCm9NzoaJncJS9tUKSuCoDs9XHxYYsQDgxR6kw==", - "optional": true, - "dependencies": { - "@types/node": "*" - } - }, "node_modules/@typescript-eslint/eslint-plugin": { "version": "8.46.2", "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.46.2.tgz", @@ -7813,24 +8301,35 @@ "typescript": ">=4.8.4 <6.0.0" } }, + "node_modules/@typescript-eslint/typescript-estree/node_modules/balanced-match": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-4.0.4.tgz", + "integrity": "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==", + "dev": true, + "engines": { + "node": "18 || 20 || >=22" + } + }, "node_modules/@typescript-eslint/typescript-estree/node_modules/brace-expansion": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz", - "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==", + "version": "5.0.5", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.5.tgz", + "integrity": "sha512-VZznLgtwhn+Mact9tfiwx64fA9erHH/MCXEUfB/0bX/6Fz6ny5EGTXYltMocqg4xFAQZtnO3DHWWXi8RiuN7cQ==", "dev": true, "license": "MIT", "dependencies": { - "balanced-match": "^1.0.0" + "balanced-match": "^4.0.2" + }, + "engines": { + "node": "18 || 20 || >=22" } }, "node_modules/@typescript-eslint/typescript-estree/node_modules/minimatch": { - "version": "9.0.5", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz", - "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==", + "version": "9.0.7", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.7.tgz", + "integrity": "sha512-MOwgjc8tfrpn5QQEvjijjmDVtMw2oL88ugTevzxQnzRLm6l3fVEF2gzU0kYeYYKD8C66+IdGX6peJ4MyUlUnPg==", "dev": true, - "license": "ISC", "dependencies": { - "brace-expansion": "^2.0.1" + "brace-expansion": "^5.0.2" }, "engines": { "node": ">=16 || 14 >=14.17" @@ -8131,24 +8630,12 @@ "node": ">= 14" } }, - "node_modules/aggregate-error": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz", - "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==", - "optional": true, - "dependencies": { - "clean-stack": "^2.0.0", - "indent-string": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/ajv": { - "version": "6.12.6", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", - "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", + "version": "6.14.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.14.0.tgz", + "integrity": "sha512-IWrosm/yrn43eiKqkfkHis7QioDleaXQHdDVPKg0FSwwd/DuvyX79TZnFOnYpB7dcsFAMmtFztZuXPDvSePkFw==", "dev": true, + "license": "MIT", "dependencies": { "fast-deep-equal": "^3.1.1", "fast-json-stable-stringify": "^2.0.0", @@ -8178,9 +8665,9 @@ } }, "node_modules/ajv-formats/node_modules/ajv": { - "version": "8.17.1", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz", - "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==", + "version": "8.18.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.18.0.tgz", + "integrity": "sha512-PlXPeEWMXMZ7sPYOHqmDyCJzcfNrUr3fGNKtezX14ykXOEIvyK81d+qydx89KY5O71FKMPaQ2vBfBFI5NHR63A==", "license": "MIT", "dependencies": { "fast-deep-equal": "^3.1.3", @@ -8233,15 +8720,14 @@ } }, "node_modules/ansi-escapes": { - "version": "4.3.2", - "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz", - "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==", - "optional": true, + "version": "7.3.0", + "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-7.3.0.tgz", + "integrity": "sha512-BvU8nYgGQBxcmMuEeUEmNTvrMVjJNSH7RgW24vXexN4Ven6qCvy4TntnvlnwnMLTVlcRQQdbRY8NKnaIoeWDNg==", "dependencies": { - "type-fest": "^0.21.3" + "environment": "^1.0.0" }, "engines": { - "node": ">=8" + "node": ">=18" }, "funding": { "url": "https://github.com/sponsors/sindresorhus" @@ -8334,7 +8820,6 @@ "version": "0.2.6", "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.6.tgz", "integrity": "sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==", - "license": "MIT", "optional": true, "dependencies": { "safer-buffer": "~2.1.0" @@ -8344,7 +8829,6 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==", - "license": "MIT", "optional": true, "engines": { "node": ">=0.8" @@ -8359,15 +8843,6 @@ "node": "*" } }, - "node_modules/astral-regex": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz", - "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==", - "optional": true, - "engines": { - "node": ">=8" - } - }, "node_modules/async-each-series": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/async-each-series/-/async-each-series-0.1.1.tgz", @@ -8433,7 +8908,6 @@ "version": "0.7.0", "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz", "integrity": "sha512-08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA==", - "license": "Apache-2.0", "optional": true, "engines": { "node": "*" @@ -8443,26 +8917,29 @@ "version": "1.13.2", "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.13.2.tgz", "integrity": "sha512-lHe62zvbTB5eEABUVi/AwVh0ZKY9rMMDhmm+eeyuuUQbQ3+J+fONVQOZyj+DdrvD4BY33uYniyRJ4UJIaSKAfw==", - "license": "MIT", "optional": true }, "node_modules/axios": { - "version": "1.13.5", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.13.5.tgz", - "integrity": "sha512-cz4ur7Vb0xS4/KUN0tPWe44eqxrIu31me+fbang3ijiNscE129POzipJJA6zniq2C/Z6sJCjMimjS8Lc/GAs8Q==", + "version": "1.16.0", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.16.0.tgz", + "integrity": "sha512-6hp5CwvTPlN2A31g5dxnwAX0orzM7pmCRDLnZSX772mv8WDqICwFjowHuPs04Mc8deIld1+ejhtaMn5vp6b+1w==", + "license": "MIT", "optional": true, "dependencies": { - "follow-redirects": "^1.15.11", + "follow-redirects": "^1.16.0", "form-data": "^4.0.5", - "proxy-from-env": "^1.1.0" + "proxy-from-env": "^2.1.0" } }, "node_modules/axios/node_modules/proxy-from-env": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", - "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-2.1.0.tgz", + "integrity": "sha512-cJ+oHTW1VAEa8cJslgmUZrc+sjRKgAKl3Zyse6+PV38hZe/V6Z14TbCuXcan9F9ghlz4QrFr2c92TNF82UkYHA==", "license": "MIT", - "optional": true + "optional": true, + "engines": { + "node": ">=10" + } }, "node_modules/babel-loader": { "version": "10.0.0", @@ -8626,7 +9103,6 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz", "integrity": "sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w==", - "license": "BSD-3-Clause", "optional": true, "dependencies": { "tweetnacl": "^0.14.3" @@ -8767,9 +9243,9 @@ "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==" }, "node_modules/bootstrap": { - "version": "4.6.2", - "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.6.2.tgz", - "integrity": "sha512-51Bbp/Uxr9aTuy6ca/8FbFloBUJZLHwnhTcnjIeRn2suQWsWzcuJhGjKDB5eppVte/8oCdOL3VuwxvZDUggwGQ==", + "version": "5.3.8", + "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.3.8.tgz", + "integrity": "sha512-HP1SZDqaLDPwsNiqRqi5NcP0SSXciX2s9E+RyqJIIqGo+vJeN5AJVM98CXmW/Wux0nQ5L7jeWUdplCEf0Ee+tg==", "funding": [ { "type": "github", @@ -8780,15 +9256,15 @@ "url": "https://opencollective.com/bootstrap" } ], + "license": "MIT", "peerDependencies": { - "jquery": "1.9.1 - 3", - "popper.js": "^1.16.1" + "@popperjs/core": "^2.11.8" } }, "node_modules/brace-expansion": { - "version": "1.1.12", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz", - "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==", + "version": "1.1.14", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.14.tgz", + "integrity": "sha512-MWPGfDxnyzKU7rNOW9SP/c50vi3xrmrua/+6hfPbCS2ABNWfx24vPidzvC7krjU/RTo235sV776ymlsMtGKj8g==", "devOptional": true, "license": "MIT", "dependencies": { @@ -9059,15 +9535,6 @@ "ieee754": "^1.1.13" } }, - "node_modules/buffer-crc32": { - "version": "0.2.13", - "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz", - "integrity": "sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==", - "optional": true, - "engines": { - "node": "*" - } - }, "node_modules/buffer-from": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz", @@ -9128,9 +9595,9 @@ } }, "node_modules/cachedir": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/cachedir/-/cachedir-2.3.0.tgz", - "integrity": "sha512-A+Fezp4zxnit6FanDmv9EqXNAi3vt9DWp51/71UEhXukb7QUuvtv9344h91dyAxuTLoSYJFU299qzR3tzwPAhw==", + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/cachedir/-/cachedir-2.4.0.tgz", + "integrity": "sha512-9EtFOZR8g22CL7BWjJ9BUx1+A/djkofnyW3aOXZORNW2kxoUpx2h+uN2cOqwPmFhnpVmxg+KW2OjOSgChTEvsQ==", "optional": true, "engines": { "node": ">=6" @@ -9202,7 +9669,6 @@ "version": "0.12.0", "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", "integrity": "sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==", - "license": "Apache-2.0", "optional": true }, "node_modules/chai": { @@ -9334,25 +9800,18 @@ "node": ">=8" } }, - "node_modules/clean-stack": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz", - "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==", - "optional": true, - "engines": { - "node": ">=6" - } - }, "node_modules/cli-cursor": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz", - "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==", - "optional": true, + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-5.0.0.tgz", + "integrity": "sha512-aCj4O5wKyszjMmDT4tZj93kxyydN/K5zPWSCe6/0AV/AA1pqe5ZBIw0a2ZfPQV7lL5/yb5HsUreJ6UFAF1tEQw==", "dependencies": { - "restore-cursor": "^3.1.0" + "restore-cursor": "^5.0.0" }, "engines": { - "node": ">=8" + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/cli-spinners": { @@ -9384,21 +9843,64 @@ } }, "node_modules/cli-truncate": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-2.1.0.tgz", - "integrity": "sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg==", + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-5.2.0.tgz", + "integrity": "sha512-xRwvIOMGrfOAnM1JYtqQImuaNtDEv9v6oIYAs4LIHwTiKee8uwvIi363igssOC0O5U04i4AlENs79LQLu9tEMw==", "optional": true, "dependencies": { - "slice-ansi": "^3.0.0", - "string-width": "^4.2.0" + "slice-ansi": "^8.0.0", + "string-width": "^8.2.0" }, "engines": { - "node": ">=8" + "node": ">=20" }, "funding": { "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/cli-truncate/node_modules/ansi-regex": { + "version": "6.2.2", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.2.tgz", + "integrity": "sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==", + "optional": true, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-regex?sponsor=1" + } + }, + "node_modules/cli-truncate/node_modules/string-width": { + "version": "8.2.1", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-8.2.1.tgz", + "integrity": "sha512-IIaP0g3iy9Cyy18w3M9YcaDudujEAVHKt3a3QJg1+sr/oX96TbaGUubG0hJyCjCBThFH+tFpcIyoUHUn1ogaLA==", + "optional": true, + "dependencies": { + "get-east-asian-width": "^1.5.0", + "strip-ansi": "^7.1.2" + }, + "engines": { + "node": ">=20" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/cli-truncate/node_modules/strip-ansi": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.2.0.tgz", + "integrity": "sha512-yDPMNjp4WyfYBkHnjIRLfca1i6KMyGCtsVgoKe/z1+6vukgaENdgGBZt+ZmKPc4gavvEZ5OgHfHdrazhgNyG7w==", + "optional": true, + "dependencies": { + "ansi-regex": "^6.2.2" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/strip-ansi?sponsor=1" + } + }, "node_modules/cli-width": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-4.1.0.tgz", @@ -9679,19 +10181,19 @@ } }, "node_modules/copy-webpack-plugin": { - "version": "13.0.1", - "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-13.0.1.tgz", - "integrity": "sha512-J+YV3WfhY6W/Xf9h+J1znYuqTye2xkBUIGyTPWuBAT27qajBa5mR4f8WBmfDY3YjRftT2kqZZiLi1qf0H+UOFw==", + "version": "14.0.0", + "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-14.0.0.tgz", + "integrity": "sha512-3JLW90aBGeaTLpM7mYQKpnVdgsUZRExY55giiZgLuX/xTQRUs1dOCwbBnWnvY6Q6rfZoXMNwzOQJCSZPppfqXA==", "license": "MIT", "dependencies": { "glob-parent": "^6.0.1", "normalize-path": "^3.0.0", "schema-utils": "^4.2.0", - "serialize-javascript": "^6.0.2", + "serialize-javascript": "^7.0.3", "tinyglobby": "^0.2.12" }, "engines": { - "node": ">= 18.12.0" + "node": ">= 20.9.0" }, "funding": { "type": "opencollective", @@ -9862,13 +10364,13 @@ } }, "node_modules/cypress": { - "version": "15.9.0", - "resolved": "https://registry.npmjs.org/cypress/-/cypress-15.9.0.tgz", - "integrity": "sha512-Ks6Bdilz3TtkLZtTQyqYaqtL/WT3X3APKaSLhTV96TmTyudzSjc6EJsJCHmBb7DxO+3R12q3Jkbjgm/iPgmwfg==", + "version": "15.16.0", + "resolved": "https://registry.npmjs.org/cypress/-/cypress-15.16.0.tgz", + "integrity": "sha512-fy0M0c9xDLEp4v9y7LLKFeAQhIdDsobxDSKpD3JcZpqQefjy9TSzEyVV3HA0zu7hUi0bGHlSYlI7ASub8wgR9A==", "hasInstallScript": true, "optional": true, "dependencies": { - "@cypress/request": "^3.0.10", + "@cypress/request": "^4.0.0", "@cypress/xvfb": "^1.2.4", "@types/sinonjs__fake-timers": "8.1.1", "@types/sizzle": "^2.3.2", @@ -9877,26 +10379,22 @@ "blob-util": "^2.0.2", "bluebird": "^3.7.2", "buffer": "^5.7.1", - "cachedir": "^2.3.0", + "cachedir": "^2.4.0", "chalk": "^4.1.0", "ci-info": "^4.1.0", - "cli-cursor": "^3.1.0", "cli-table3": "0.6.1", "commander": "^6.2.1", "common-tags": "^1.8.0", "dayjs": "^1.10.4", "debug": "^4.3.4", - "enquirer": "^2.3.6", "eventemitter2": "6.4.7", "execa": "4.1.0", "executable": "^4.1.1", - "extract-zip": "2.0.1", - "figures": "^3.2.0", "fs-extra": "^9.1.0", "hasha": "5.2.2", "is-installed-globally": "~0.4.0", - "listr2": "^3.8.3", - "lodash": "^4.17.21", + "listr2": "^9.0.5", + "lodash": "^4.17.23", "log-symbols": "^4.0.0", "minimist": "^1.2.8", "ospath": "^1.2.2", @@ -9905,11 +10403,12 @@ "proxy-from-env": "1.0.0", "request-progress": "^3.0.0", "supports-color": "^8.1.1", - "systeminformation": "^5.27.14", + "systeminformation": "^5.31.1", "tmp": "~0.2.4", "tree-kill": "1.2.2", + "tslib": "1.14.1", "untildify": "^4.0.0", - "yauzl": "^2.10.0" + "yauzl": "^3.3.1" }, "bin": { "cypress": "bin/cypress" @@ -10025,11 +10524,16 @@ "node": ">=14.14" } }, + "node_modules/cypress/node_modules/tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", + "optional": true + }, "node_modules/dashdash": { "version": "1.14.1", "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", "integrity": "sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==", - "license": "MIT", "optional": true, "dependencies": { "assert-plus": "^1.0.0" @@ -10310,7 +10814,6 @@ "version": "0.1.2", "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz", "integrity": "sha512-eh9O+hwRHNbG4BLTjEl3nw044CkGm5X6LoaCf7LPp7UU8Qrt47JYNi6nPX8xjW97TKGKm1ouctg0QSpZe9qrnw==", - "license": "MIT", "optional": true, "dependencies": { "jsbn": "~0.1.0", @@ -10318,13 +10821,12 @@ } }, "node_modules/echarts": { - "version": "5.4.3", - "resolved": "https://registry.npmjs.org/echarts/-/echarts-5.4.3.tgz", - "integrity": "sha512-mYKxLxhzy6zyTi/FaEbJMOZU1ULGEQHaeIeuMR5L+JnJTpz+YR03mnnpBhbR4+UYJAgiXgpyTVLffPAjOTLkZA==", - "license": "Apache-2.0", + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/echarts/-/echarts-6.1.0.tgz", + "integrity": "sha512-q0yaFPggC9FUdsWH4blavRWFmxdrIodbkoKNAjJudAI6CA9gNPxHtV2RcZNEepZVlk4yvBYkOkbk6HIVpIyHZA==", "dependencies": { "tslib": "2.3.0", - "zrender": "5.4.4" + "zrender": "6.1.0" } }, "node_modules/echarts/node_modules/tslib": { @@ -10453,20 +10955,6 @@ "node": ">=10.13.0" } }, - "node_modules/enquirer": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.4.1.tgz", - "integrity": "sha512-rRqJg/6gd538VHvR3PSrdRBb/1Vy2YfzHqzvbhGIQpDRKIa4FgV/54b5Q1xYSxOOwKvjXweS26E0Q+nAMwp2pQ==", - "license": "MIT", - "optional": true, - "dependencies": { - "ansi-colors": "^4.1.1", - "strip-ansi": "^6.0.1" - }, - "engines": { - "node": ">=8.6" - } - }, "node_modules/entities": { "version": "4.5.0", "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz", @@ -10490,7 +10978,6 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/environment/-/environment-1.1.0.tgz", "integrity": "sha512-xUtoPkMggbz0MPyPiIWr1Kp4aeWJjDZ6SMvURhimjdZgsRuDplF5/s9hcgGhyXMhs+6vpnuoiZ2kFiu3FMnS8Q==", - "license": "MIT", "engines": { "node": ">=18" }, @@ -10572,10 +11059,11 @@ } }, "node_modules/esbuild": { - "version": "0.25.9", - "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.25.9.tgz", - "integrity": "sha512-CRbODhYyQx3qp7ZEwzxOk4JBqmD/seJrzPa/cGjY1VtIn5E09Oi9/dB4JwctnfZ8Q8iT7rioVv5k/FNT/uf54g==", + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.27.7.tgz", + "integrity": "sha512-IxpibTjyVnmrIQo5aqNpCgoACA/dTKLTlhMHihVHhdkxKyPO1uBBthumT0rdHmcsk9uMonIWS0m4FljWzILh3w==", "hasInstallScript": true, + "license": "MIT", "bin": { "esbuild": "bin/esbuild" }, @@ -10583,38 +11071,38 @@ "node": ">=18" }, "optionalDependencies": { - "@esbuild/aix-ppc64": "0.25.9", - "@esbuild/android-arm": "0.25.9", - "@esbuild/android-arm64": "0.25.9", - "@esbuild/android-x64": "0.25.9", - "@esbuild/darwin-arm64": "0.25.9", - "@esbuild/darwin-x64": "0.25.9", - "@esbuild/freebsd-arm64": "0.25.9", - "@esbuild/freebsd-x64": "0.25.9", - "@esbuild/linux-arm": "0.25.9", - "@esbuild/linux-arm64": "0.25.9", - "@esbuild/linux-ia32": "0.25.9", - "@esbuild/linux-loong64": "0.25.9", - "@esbuild/linux-mips64el": "0.25.9", - "@esbuild/linux-ppc64": "0.25.9", - "@esbuild/linux-riscv64": "0.25.9", - "@esbuild/linux-s390x": "0.25.9", - "@esbuild/linux-x64": "0.25.9", - "@esbuild/netbsd-arm64": "0.25.9", - "@esbuild/netbsd-x64": "0.25.9", - "@esbuild/openbsd-arm64": "0.25.9", - "@esbuild/openbsd-x64": "0.25.9", - "@esbuild/openharmony-arm64": "0.25.9", - "@esbuild/sunos-x64": "0.25.9", - "@esbuild/win32-arm64": "0.25.9", - "@esbuild/win32-ia32": "0.25.9", - "@esbuild/win32-x64": "0.25.9" + "@esbuild/aix-ppc64": "0.27.7", + "@esbuild/android-arm": "0.27.7", + "@esbuild/android-arm64": "0.27.7", + "@esbuild/android-x64": "0.27.7", + "@esbuild/darwin-arm64": "0.27.7", + "@esbuild/darwin-x64": "0.27.7", + "@esbuild/freebsd-arm64": "0.27.7", + "@esbuild/freebsd-x64": "0.27.7", + "@esbuild/linux-arm": "0.27.7", + "@esbuild/linux-arm64": "0.27.7", + "@esbuild/linux-ia32": "0.27.7", + "@esbuild/linux-loong64": "0.27.7", + "@esbuild/linux-mips64el": "0.27.7", + "@esbuild/linux-ppc64": "0.27.7", + "@esbuild/linux-riscv64": "0.27.7", + "@esbuild/linux-s390x": "0.27.7", + "@esbuild/linux-x64": "0.27.7", + "@esbuild/netbsd-arm64": "0.27.7", + "@esbuild/netbsd-x64": "0.27.7", + "@esbuild/openbsd-arm64": "0.27.7", + "@esbuild/openbsd-x64": "0.27.7", + "@esbuild/openharmony-arm64": "0.27.7", + "@esbuild/sunos-x64": "0.27.7", + "@esbuild/win32-arm64": "0.27.7", + "@esbuild/win32-ia32": "0.27.7", + "@esbuild/win32-x64": "0.27.7" } }, "node_modules/esbuild-wasm": { - "version": "0.25.9", - "resolved": "https://registry.npmjs.org/esbuild-wasm/-/esbuild-wasm-0.25.9.tgz", - "integrity": "sha512-Jpv5tCSwQg18aCqCRD3oHIX/prBhXMDapIoG//A+6+dV0e7KQMGFg85ihJ5T1EeMjbZjON3TqFy0VrGAnIHLDA==", + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/esbuild-wasm/-/esbuild-wasm-0.28.0.tgz", + "integrity": "sha512-5TRVKExcEmeMkccIZMzUq+Az6X2RoMAJyfl6SMMO1dMVhmvt0I2mx7gAb6zYi42n4d1ETcatFXazGKzA+aW7fg==", "license": "MIT", "bin": { "esbuild": "bin/esbuild" @@ -10637,15 +11125,6 @@ "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=" }, - "node_modules/escape-string-regexp": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", - "optional": true, - "engines": { - "node": ">=0.8.0" - } - }, "node_modules/eslint": { "version": "9.39.0", "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.39.0.tgz", @@ -11110,12 +11589,12 @@ } }, "node_modules/express-rate-limit": { - "version": "8.2.1", - "resolved": "https://registry.npmjs.org/express-rate-limit/-/express-rate-limit-8.2.1.tgz", - "integrity": "sha512-PCZEIEIxqwhzw4KF0n7QF4QqruVTcF73O5kFKUnGOyjbCCgizBBiFaYpd/fnBLUMPw/BWw9OsiN7GgrNYr7j6g==", + "version": "8.4.1", + "resolved": "https://registry.npmjs.org/express-rate-limit/-/express-rate-limit-8.4.1.tgz", + "integrity": "sha512-NGVYwQSAyEQgzxX1iCM978PP9AdO/hW93gMcF6ZwQCm+rFvLsBH6w4xcXWTcliS8La5EPRN3p9wzItqBwJrfNw==", "license": "MIT", "dependencies": { - "ip-address": "10.0.1" + "ip-address": "10.1.0" }, "engines": { "node": ">= 16" @@ -11127,15 +11606,6 @@ "express": ">= 4.11" } }, - "node_modules/express-rate-limit/node_modules/ip-address": { - "version": "10.0.1", - "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-10.0.1.tgz", - "integrity": "sha512-NWv9YLW4PoW2B7xtzaS3NCot75m6nK7Icdv0o3lfMceJVRfSoQwqD4wEH5rLwoKJwUiZ/rfpiVBhnaF0FK4HoA==", - "license": "MIT", - "engines": { - "node": ">= 12" - } - }, "node_modules/express/node_modules/accepts": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/accepts/-/accepts-2.0.0.tgz", @@ -11394,41 +11864,6 @@ "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==", "optional": true }, - "node_modules/extract-zip": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz", - "integrity": "sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==", - "optional": true, - "dependencies": { - "debug": "^4.1.1", - "get-stream": "^5.1.0", - "yauzl": "^2.10.0" - }, - "bin": { - "extract-zip": "cli.js" - }, - "engines": { - "node": ">= 10.17.0" - }, - "optionalDependencies": { - "@types/yauzl": "^2.9.1" - } - }, - "node_modules/extract-zip/node_modules/get-stream": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz", - "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==", - "optional": true, - "dependencies": { - "pump": "^3.0.0" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/extsprintf": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz", @@ -11436,7 +11871,6 @@ "engines": [ "node >=0.6.0" ], - "license": "MIT", "optional": true }, "node_modules/fast-deep-equal": { @@ -11508,30 +11942,6 @@ "node": ">=0.8.0" } }, - "node_modules/fd-slicer": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz", - "integrity": "sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==", - "optional": true, - "dependencies": { - "pend": "~1.2.0" - } - }, - "node_modules/figures": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz", - "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==", - "optional": true, - "dependencies": { - "escape-string-regexp": "^1.0.5" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/file-entry-cache": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-8.0.0.tgz", @@ -11666,21 +12076,23 @@ } }, "node_modules/flatted": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.1.tgz", - "integrity": "sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==", - "dev": true + "version": "3.4.2", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.4.2.tgz", + "integrity": "sha512-PjDse7RzhcPkIJwy5t7KPWQSZ9cAbzQXcafsetQoD7sOJRQlGikNbx7yZp2OotDnJyrDcbyRq3Ttb18iYOqkxA==", + "dev": true, + "license": "ISC" }, "node_modules/follow-redirects": { - "version": "1.15.11", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.11.tgz", - "integrity": "sha512-deG2P0JfjrTxl50XGCDyfI97ZGVCxIpfKYmfyrQ54n5FO/0gfIES8C/Psl6kWVDolizcaaxZJnTS0QSMxvnsBQ==", + "version": "1.16.0", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.16.0.tgz", + "integrity": "sha512-y5rN/uOsadFT/JfYwhxRS5R7Qce+g3zG97+JrtFZlC9klX/W5hD7iiLzScI4nZqUS7DNUdhPgw4xI8W2LuXlUw==", "funding": [ { "type": "individual", "url": "https://github.com/sponsors/RubenVerborgh" } ], + "license": "MIT", "engines": { "node": ">=4.0" }, @@ -11694,7 +12106,6 @@ "version": "0.6.1", "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", "integrity": "sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw==", - "license": "Apache-2.0", "optional": true, "engines": { "node": "*" @@ -11801,10 +12212,9 @@ } }, "node_modules/get-east-asian-width": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/get-east-asian-width/-/get-east-asian-width-1.4.0.tgz", - "integrity": "sha512-QZjmEOC+IT1uk6Rx0sX22V6uHWVwbdbxf1faPqJ1QhLdGgsRGCZoyaQBm/piRdJy/D2um6hM1UP7ZEeQ4EkP+Q==", - "license": "MIT", + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/get-east-asian-width/-/get-east-asian-width-1.6.0.tgz", + "integrity": "sha512-QRbvDIbx6YklUe6RxeTeleMR0yv3cYH6PsPZHcnVn7xv7zO1BHN8r0XETu8n6Ye3Q+ahtSarc3WgtNWmehIBfA==", "engines": { "node": ">=18" }, @@ -11872,7 +12282,6 @@ "version": "0.1.7", "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", "integrity": "sha512-0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng==", - "license": "MIT", "optional": true, "dependencies": { "assert-plus": "^1.0.0" @@ -11925,15 +12334,35 @@ "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz", "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==" }, - "node_modules/glob/node_modules/minimatch": { - "version": "10.1.1", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.1.1.tgz", - "integrity": "sha512-enIvLvRAFZYXJzkCYG5RKmPfrFArdLv+R+lbQ53BmIMLIry74bjKzX6iHAm8WYamJkhSSEabrWN5D97XnKObjQ==", + "node_modules/glob/node_modules/balanced-match": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-4.0.4.tgz", + "integrity": "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==", + "engines": { + "node": "18 || 20 || >=22" + } + }, + "node_modules/glob/node_modules/brace-expansion": { + "version": "5.0.5", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.5.tgz", + "integrity": "sha512-VZznLgtwhn+Mact9tfiwx64fA9erHH/MCXEUfB/0bX/6Fz6ny5EGTXYltMocqg4xFAQZtnO3DHWWXi8RiuN7cQ==", + "license": "MIT", "dependencies": { - "@isaacs/brace-expansion": "^5.0.0" + "balanced-match": "^4.0.2" }, "engines": { - "node": "20 || >=22" + "node": "18 || 20 || >=22" + } + }, + "node_modules/glob/node_modules/minimatch": { + "version": "10.2.3", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.3.tgz", + "integrity": "sha512-Rwi3pnapEqirPSbWbrZaa6N3nmqq4Xer/2XooiOKyV3q12ML06f7MOuc5DVH8ONZIFhwIYQ3yzPH4nt7iWHaTg==", + "dependencies": { + "brace-expansion": "^5.0.2" + }, + "engines": { + "node": "18 || 20 || >=22" }, "funding": { "url": "https://github.com/sponsors/isaacs" @@ -12087,9 +12516,9 @@ } }, "node_modules/hono": { - "version": "4.12.0", - "resolved": "https://registry.npmjs.org/hono/-/hono-4.12.0.tgz", - "integrity": "sha512-NekXntS5M94pUfiVZ8oXXK/kkri+5WpX2/Ik+LVsl+uvw+soj4roXIsPqO+XsWrAw20mOzaXOZf3Q7PfB9A/IA==", + "version": "4.12.25", + "resolved": "https://registry.npmjs.org/hono/-/hono-4.12.25.tgz", + "integrity": "sha512-2NFaIyNVgJmBs/ecmtGzlmluTFs5cHEWGTdu0t1HBwYzoGXOL5nUQBRMXsXWla5i4KkG//QMzVP88m1+I3fdAQ==", "engines": { "node": ">=16.9.0" } @@ -12264,7 +12693,6 @@ "version": "1.4.0", "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.4.0.tgz", "integrity": "sha512-G5akfn7eKbpDN+8nPS/cb57YeA1jLTVxjpCj7tmm3QKPdyDy7T+qSC40e9ptydSWvkwjSXw1VbkpyEm39ukeAg==", - "license": "MIT", "optional": true, "dependencies": { "assert-plus": "^1.0.0", @@ -12369,15 +12797,35 @@ "node": "^20.17.0 || >=22.9.0" } }, - "node_modules/ignore-walk/node_modules/minimatch": { - "version": "10.1.1", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.1.1.tgz", - "integrity": "sha512-enIvLvRAFZYXJzkCYG5RKmPfrFArdLv+R+lbQ53BmIMLIry74bjKzX6iHAm8WYamJkhSSEabrWN5D97XnKObjQ==", + "node_modules/ignore-walk/node_modules/balanced-match": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-4.0.4.tgz", + "integrity": "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==", + "engines": { + "node": "18 || 20 || >=22" + } + }, + "node_modules/ignore-walk/node_modules/brace-expansion": { + "version": "5.0.5", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.5.tgz", + "integrity": "sha512-VZznLgtwhn+Mact9tfiwx64fA9erHH/MCXEUfB/0bX/6Fz6ny5EGTXYltMocqg4xFAQZtnO3DHWWXi8RiuN7cQ==", + "license": "MIT", "dependencies": { - "@isaacs/brace-expansion": "^5.0.0" + "balanced-match": "^4.0.2" }, "engines": { - "node": "20 || >=22" + "node": "18 || 20 || >=22" + } + }, + "node_modules/ignore-walk/node_modules/minimatch": { + "version": "10.2.3", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.3.tgz", + "integrity": "sha512-Rwi3pnapEqirPSbWbrZaa6N3nmqq4Xer/2XooiOKyV3q12ML06f7MOuc5DVH8ONZIFhwIYQ3yzPH4nt7iWHaTg==", + "dependencies": { + "brace-expansion": "^5.0.2" + }, + "engines": { + "node": "18 || 20 || >=22" }, "funding": { "url": "https://github.com/sponsors/isaacs" @@ -12397,10 +12845,11 @@ } }, "node_modules/immutable": { - "version": "3.8.2", - "resolved": "https://registry.npmjs.org/immutable/-/immutable-3.8.2.tgz", - "integrity": "sha512-15gZoQ38eYjEjxkorfbcgBKBL6R7T459OuK+CpcWt7O3KF4uPCx2tD0uFETlUDIyo+1789crbMhTvQBSR5yBMg==", + "version": "3.8.3", + "resolved": "https://registry.npmjs.org/immutable/-/immutable-3.8.3.tgz", + "integrity": "sha512-AUY/VyX0E5XlibOmWt10uabJzam1zlYjwiEgQSDc5+UIkFNaF9WM0JxXKaNMGf+F/ffUF+7kRKXM9A7C0xXqMg==", "devOptional": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -12436,15 +12885,6 @@ "node": ">=0.8.19" } }, - "node_modules/indent-string": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz", - "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==", - "optional": true, - "engines": { - "node": ">=8" - } - }, "node_modules/inherits": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", @@ -12674,7 +13114,6 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", "integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==", - "license": "MIT", "optional": true }, "node_modules/is-unicode-supported": { @@ -12732,7 +13171,6 @@ "version": "0.1.2", "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", "integrity": "sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g==", - "license": "MIT", "optional": true }, "node_modules/istanbul-lib-coverage": { @@ -12794,10 +13232,9 @@ } }, "node_modules/joi": { - "version": "18.0.1", - "resolved": "https://registry.npmjs.org/joi/-/joi-18.0.1.tgz", - "integrity": "sha512-IiQpRyypSnLisQf3PwuN2eIHAsAIGZIrLZkd4zdvIar2bDyhM91ubRjy8a3eYablXsh9BeI/c7dmPYHca5qtoA==", - "license": "BSD-3-Clause", + "version": "18.2.1", + "resolved": "https://registry.npmjs.org/joi/-/joi-18.2.1.tgz", + "integrity": "sha512-2/OKlogiESf2Nh3TFCrRjrr9z1DRHeW0I+KReF67+4J0Ns+8hBtHRmoWAZ2OFU6I5+TWLEe6sVlSdXPjHm5UbQ==", "optional": true, "dependencies": { "@hapi/address": "^5.1.1", @@ -12806,7 +13243,7 @@ "@hapi/pinpoint": "^2.0.1", "@hapi/tlds": "^1.1.1", "@hapi/topo": "^6.0.2", - "@standard-schema/spec": "^1.0.0" + "@standard-schema/spec": "^1.1.0" }, "engines": { "node": ">= 20" @@ -12821,12 +13258,6 @@ "url": "https://github.com/sponsors/panva" } }, - "node_modules/jquery": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.0.tgz", - "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==", - "peer": true - }, "node_modules/js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -12834,10 +13265,19 @@ "license": "MIT" }, "node_modules/js-yaml": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.1.tgz", - "integrity": "sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==", - "license": "MIT", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.2.0.tgz", + "integrity": "sha512-ePWsvanv0DWuDRsW8dnt+R4jQ31SCRCQ7hhNcPXZPsoBZiemuZNYGf7adZdqX2D86j6rvKp3RpCxVTSb8WQlOw==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/puzrin" + }, + { + "type": "github", + "url": "https://github.com/sponsors/nodeca" + } + ], "dependencies": { "argparse": "^2.0.1" }, @@ -12849,7 +13289,6 @@ "version": "0.1.1", "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz", "integrity": "sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==", - "license": "MIT", "optional": true }, "node_modules/jsesc": { @@ -12880,7 +13319,6 @@ "version": "0.4.0", "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz", "integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==", - "license": "(AFL-2.1 OR BSD-3-Clause)", "optional": true }, "node_modules/json-schema-traverse": { @@ -12906,7 +13344,6 @@ "version": "5.0.1", "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", "integrity": "sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==", - "license": "ISC", "optional": true }, "node_modules/json5": { @@ -12953,7 +13390,6 @@ "engines": [ "node >=0.6.0" ], - "license": "MIT", "optional": true, "dependencies": { "assert-plus": "1.0.0", @@ -12996,12 +13432,12 @@ } }, "node_modules/launch-editor": { - "version": "2.12.0", - "resolved": "https://registry.npmjs.org/launch-editor/-/launch-editor-2.12.0.tgz", - "integrity": "sha512-giOHXoOtifjdHqUamwKq6c49GzBdLjvxrd2D+Q4V6uOHopJv7p9VJxikDsQ/CBXZbEITgUqSVHXLTG3VhPP1Dg==", + "version": "2.14.1", + "resolved": "https://registry.npmjs.org/launch-editor/-/launch-editor-2.14.1.tgz", + "integrity": "sha512-QWBrQsMpH7gPr965dsKD/3cKWiNoTjpATQf++Xq63N6sKRGMwlVXz41O1IZTMfZQgBctD/K5Zt06+/I6pP6+HA==", "dependencies": { "picocolors": "^1.1.1", - "shell-quote": "^1.8.3" + "shell-quote": "^1.8.4" } }, "node_modules/lazy-ass": { @@ -13120,44 +13556,102 @@ "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==" }, "node_modules/listr2": { - "version": "3.14.0", - "resolved": "https://registry.npmjs.org/listr2/-/listr2-3.14.0.tgz", - "integrity": "sha512-TyWI8G99GX9GjE54cJ+RrNMcIFBfwMPxc3XTFiAYGN4s10hWROGtOg7+O6u6LE3mNkyld7RSLE6nrKBvTfcs3g==", + "version": "9.0.5", + "resolved": "https://registry.npmjs.org/listr2/-/listr2-9.0.5.tgz", + "integrity": "sha512-ME4Fb83LgEgwNw96RKNvKV4VTLuXfoKudAmm2lP8Kk87KaMK0/Xrx/aAkMWmT8mDb+3MlFDspfbCs7adjRxA2g==", "optional": true, "dependencies": { - "cli-truncate": "^2.1.0", - "colorette": "^2.0.16", - "log-update": "^4.0.0", - "p-map": "^4.0.0", - "rfdc": "^1.3.0", - "rxjs": "^7.5.1", - "through": "^2.3.8", - "wrap-ansi": "^7.0.0" + "cli-truncate": "^5.0.0", + "colorette": "^2.0.20", + "eventemitter3": "^5.0.1", + "log-update": "^6.1.0", + "rfdc": "^1.4.1", + "wrap-ansi": "^9.0.0" }, "engines": { - "node": ">=10.0.0" + "node": ">=20.0.0" + } + }, + "node_modules/listr2/node_modules/ansi-regex": { + "version": "6.2.2", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.2.tgz", + "integrity": "sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==", + "optional": true, + "engines": { + "node": ">=12" }, - "peerDependencies": { - "enquirer": ">= 2.3.0 < 3" + "funding": { + "url": "https://github.com/chalk/ansi-regex?sponsor=1" + } + }, + "node_modules/listr2/node_modules/ansi-styles": { + "version": "6.2.3", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.3.tgz", + "integrity": "sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==", + "optional": true, + "engines": { + "node": ">=12" }, - "peerDependenciesMeta": { - "enquirer": { - "optional": true - } + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/listr2/node_modules/emoji-regex": { + "version": "10.6.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.6.0.tgz", + "integrity": "sha512-toUI84YS5YmxW219erniWD0CIVOo46xGKColeNQRgOzDorgBi1v4D71/OFzgD9GO2UGKIv1C3Sp8DAn0+j5w7A==", + "optional": true + }, + "node_modules/listr2/node_modules/eventemitter3": { + "version": "5.0.4", + "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-5.0.4.tgz", + "integrity": "sha512-mlsTRyGaPBjPedk6Bvw+aqbsXDtoAyAzm5MO7JgU+yVRyMQ5O8bD4Kcci7BS85f93veegeCPkL8R4GLClnjLFw==", + "optional": true + }, + "node_modules/listr2/node_modules/string-width": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-7.2.0.tgz", + "integrity": "sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==", + "optional": true, + "dependencies": { + "emoji-regex": "^10.3.0", + "get-east-asian-width": "^1.0.0", + "strip-ansi": "^7.1.0" + }, + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/listr2/node_modules/strip-ansi": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.2.0.tgz", + "integrity": "sha512-yDPMNjp4WyfYBkHnjIRLfca1i6KMyGCtsVgoKe/z1+6vukgaENdgGBZt+ZmKPc4gavvEZ5OgHfHdrazhgNyG7w==", + "optional": true, + "dependencies": { + "ansi-regex": "^6.2.2" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/strip-ansi?sponsor=1" } }, "node_modules/listr2/node_modules/wrap-ansi": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", - "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "version": "9.0.2", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-9.0.2.tgz", + "integrity": "sha512-42AtmgqjV+X1VpdOfyTGOYRi0/zsoLqtXQckTmqTeybT+BDIbM/Guxo7x3pE2vtpr1ok6xRqM9OpBe+Jyoqyww==", "optional": true, "dependencies": { - "ansi-styles": "^4.0.0", - "string-width": "^4.1.0", - "strip-ansi": "^6.0.0" + "ansi-styles": "^6.2.1", + "string-width": "^7.0.0", + "strip-ansi": "^7.1.0" }, "engines": { - "node": ">=10" + "node": ">=18" }, "funding": { "url": "https://github.com/chalk/wrap-ansi?sponsor=1" @@ -13226,10 +13720,11 @@ } }, "node_modules/lodash": { - "version": "4.17.23", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.23.tgz", - "integrity": "sha512-LgVTMpQtIopCi79SJeDiP0TfWi5CNEc/L/aRdTh3yIvmZXTnheWpKjSZhnvMl8iXbC1tFg9gdHHDMLoV7CnG+w==", - "devOptional": true + "version": "4.18.1", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.18.1.tgz", + "integrity": "sha512-dMInicTPVE8d1e5otfwmmjlxkZoUpiVLwyeTdUsi/Caj/gfzzblBcCE5sRHV/AsjuCmxWrte2TNGSYuCeCq+0Q==", + "devOptional": true, + "license": "MIT" }, "node_modules/lodash.debounce": { "version": "4.0.8", @@ -13279,40 +13774,125 @@ } }, "node_modules/log-update": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/log-update/-/log-update-4.0.0.tgz", - "integrity": "sha512-9fkkDevMefjg0mmzWFBW8YkFP91OrizzkW3diF7CpG+S2EYdy4+TVfGwz1zeF8x7hCx1ovSPTOE9Ngib74qqUg==", - "optional": true, + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/log-update/-/log-update-6.1.0.tgz", + "integrity": "sha512-9ie8ItPR6tjY5uYJh8K/Zrv/RMZ5VOlOWvtZdEHYSTFKZfIBPQa9tOAEeAWhd+AnIneLJ22w5fjOYtoutpWq5w==", "dependencies": { - "ansi-escapes": "^4.3.0", - "cli-cursor": "^3.1.0", - "slice-ansi": "^4.0.0", - "wrap-ansi": "^6.2.0" + "ansi-escapes": "^7.0.0", + "cli-cursor": "^5.0.0", + "slice-ansi": "^7.1.0", + "strip-ansi": "^7.1.0", + "wrap-ansi": "^9.0.0" }, "engines": { - "node": ">=10" + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/log-update/node_modules/ansi-regex": { + "version": "6.2.2", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.2.tgz", + "integrity": "sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-regex?sponsor=1" + } + }, + "node_modules/log-update/node_modules/ansi-styles": { + "version": "6.2.3", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.3.tgz", + "integrity": "sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/log-update/node_modules/emoji-regex": { + "version": "10.6.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.6.0.tgz", + "integrity": "sha512-toUI84YS5YmxW219erniWD0CIVOo46xGKColeNQRgOzDorgBi1v4D71/OFzgD9GO2UGKIv1C3Sp8DAn0+j5w7A==" + }, + "node_modules/log-update/node_modules/is-fullwidth-code-point": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-5.1.0.tgz", + "integrity": "sha512-5XHYaSyiqADb4RnZ1Bdad6cPp8Toise4TzEjcOYDHZkTCbKgiUl7WTUCpNWHuxmDt91wnsZBc9xinNzopv3JMQ==", + "dependencies": { + "get-east-asian-width": "^1.3.1" + }, + "engines": { + "node": ">=18" }, "funding": { "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/log-update/node_modules/slice-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz", - "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==", - "optional": true, + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-7.1.2.tgz", + "integrity": "sha512-iOBWFgUX7caIZiuutICxVgX1SdxwAVFFKwt1EvMYYec/NWO5meOJ6K5uQxhrYBdQJne4KxiqZc+KptFOWFSI9w==", "dependencies": { - "ansi-styles": "^4.0.0", - "astral-regex": "^2.0.0", - "is-fullwidth-code-point": "^3.0.0" + "ansi-styles": "^6.2.1", + "is-fullwidth-code-point": "^5.0.0" }, "engines": { - "node": ">=10" + "node": ">=18" }, "funding": { "url": "https://github.com/chalk/slice-ansi?sponsor=1" } }, + "node_modules/log-update/node_modules/string-width": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-7.2.0.tgz", + "integrity": "sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==", + "dependencies": { + "emoji-regex": "^10.3.0", + "get-east-asian-width": "^1.0.0", + "strip-ansi": "^7.1.0" + }, + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/log-update/node_modules/strip-ansi": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.2.0.tgz", + "integrity": "sha512-yDPMNjp4WyfYBkHnjIRLfca1i6KMyGCtsVgoKe/z1+6vukgaENdgGBZt+ZmKPc4gavvEZ5OgHfHdrazhgNyG7w==", + "dependencies": { + "ansi-regex": "^6.2.2" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/strip-ansi?sponsor=1" + } + }, + "node_modules/log-update/node_modules/wrap-ansi": { + "version": "9.0.2", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-9.0.2.tgz", + "integrity": "sha512-42AtmgqjV+X1VpdOfyTGOYRi0/zsoLqtXQckTmqTeybT+BDIbM/Guxo7x3pE2vtpr1ok6xRqM9OpBe+Jyoqyww==", + "dependencies": { + "ansi-styles": "^6.2.1", + "string-width": "^7.0.0", + "strip-ansi": "^7.1.0" + }, + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, "node_modules/loupe": { "version": "2.3.7", "resolved": "https://registry.npmjs.org/loupe/-/loupe-2.3.7.tgz", @@ -13543,7 +14123,6 @@ "version": "5.0.1", "resolved": "https://registry.npmjs.org/mimic-function/-/mimic-function-5.0.1.tgz", "integrity": "sha512-VP79XUPxV2CigYP3jWwAUFSku2aKqBH7uTAapFWCBqutsbmDo96KY5o8uh6U+/YSIn5OxJnXp73beVkpqMIGhA==", - "license": "MIT", "engines": { "node": ">=18" }, @@ -13577,9 +14156,9 @@ "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==" }, "node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "version": "3.1.4", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.4.tgz", + "integrity": "sha512-twmL+S8+7yIsE9wsqgzU3E8/LumN3M3QELrBZ20OdmQ9jB2JvW5oZtBEmft84k/Gs5CG9mqtWc6Y9vW+JEzGxw==", "devOptional": true, "dependencies": { "brace-expansion": "^1.1.7" @@ -13959,9 +14538,10 @@ "optional": true }, "node_modules/node-forge": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.3.tgz", - "integrity": "sha512-rLvcdSyRCyouf6jcOIPe/BgwG/d7hKjzMKOas33/pHEr6gbq18IK9zV7DiPvzsz0oBJPme6qr6H6kGZuI9/DZg==", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.4.0.tgz", + "integrity": "sha512-LarFH0+6VfriEhqMMcLX2F7SwSXeWwnEAJEsYm5QKWchiVYVvJyV9v7UDvUv+w5HO23ZpQTXDv/GxdDdMyOuoQ==", + "license": "(BSD-3-Clause OR GPL-2.0)", "engines": { "node": ">= 6.13.0" } @@ -14369,21 +14949,6 @@ "url": "https://github.com/chalk/chalk?sponsor=1" } }, - "node_modules/ora/node_modules/cli-cursor": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-5.0.0.tgz", - "integrity": "sha512-aCj4O5wKyszjMmDT4tZj93kxyydN/K5zPWSCe6/0AV/AA1pqe5ZBIw0a2ZfPQV7lL5/yb5HsUreJ6UFAF1tEQw==", - "license": "MIT", - "dependencies": { - "restore-cursor": "^5.0.0" - }, - "engines": { - "node": ">=18" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/ora/node_modules/emoji-regex": { "version": "10.6.0", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.6.0.tgz", @@ -14430,49 +14995,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/ora/node_modules/onetime": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/onetime/-/onetime-7.0.0.tgz", - "integrity": "sha512-VXJjc87FScF88uafS3JllDgvAm+c/Slfz06lorj2uAY34rlUu0Nt+v8wreiImcrgAjjIHp1rXpTDlLOGw29WwQ==", - "license": "MIT", - "dependencies": { - "mimic-function": "^5.0.0" - }, - "engines": { - "node": ">=18" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/ora/node_modules/restore-cursor": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-5.1.0.tgz", - "integrity": "sha512-oMA2dcrw6u0YfxJQXm342bFKX/E4sG9rbTzO9ptUcR/e8A33cHuvStiYOwH7fszkZlZ1z/ta9AAoPk2F4qIOHA==", - "license": "MIT", - "dependencies": { - "onetime": "^7.0.0", - "signal-exit": "^4.1.0" - }, - "engines": { - "node": ">=18" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/ora/node_modules/signal-exit": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", - "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", - "license": "ISC", - "engines": { - "node": ">=14" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, "node_modules/ora/node_modules/string-width": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/string-width/-/string-width-7.2.0.tgz", @@ -14556,21 +15078,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/p-map": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz", - "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==", - "optional": true, - "dependencies": { - "aggregate-error": "^3.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/p-retry": { "version": "6.2.1", "resolved": "https://registry.npmjs.org/p-retry/-/p-retry-6.2.1.tgz", @@ -14780,9 +15287,9 @@ } }, "node_modules/path-to-regexp": { - "version": "8.3.0", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-8.3.0.tgz", - "integrity": "sha512-7jdwVIRtsP8MYpdXSwOS0YdD0Du+qOoF/AEPIt88PcCFrZCzx41oxku1jD88hZBwbNUIEfpqvuhjFaMAqMTWnA==", + "version": "8.4.2", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-8.4.2.tgz", + "integrity": "sha512-qRcuIdP69NPm4qbACK+aDogI5CBDMi1jKe0ry5rSQJz8JVLsC7jV8XpiJjGRLLol3N+R5ihGYcrPLTno6pAdBA==", "license": "MIT", "funding": { "type": "opencollective", @@ -14817,7 +15324,6 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", "integrity": "sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==", - "license": "MIT", "optional": true }, "node_modules/picocolors": { @@ -14827,9 +15333,10 @@ "license": "ISC" }, "node_modules/picomatch": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", - "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.2.tgz", + "integrity": "sha512-V7+vQEJ06Z+c5tSye8S+nHUfI51xoXIXjHQ99cQtKUkQqqO1kO/KCJUfZXuB47h/YBlDhah2H3hdUGXn8ie0oA==", + "license": "MIT", "engines": { "node": ">=8.6" }, @@ -14874,17 +15381,6 @@ "node": ">=10.13.0" } }, - "node_modules/popper.js": { - "version": "1.16.1", - "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1.tgz", - "integrity": "sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ==", - "deprecated": "You can find the new Popper v2 at @popperjs/core, this package is dedicated to the legacy v1", - "peer": true, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/popperjs" - } - }, "node_modules/portscanner": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/portscanner/-/portscanner-2.2.0.tgz", @@ -14909,9 +15405,9 @@ } }, "node_modules/postcss": { - "version": "8.5.6", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.6.tgz", - "integrity": "sha512-3Ybi1tAuwAP9s0r1UQ2J4n5Y0G05bJkpUIO0/bI9MhwmD70S5aTWbXGBwxHrelT+XM1k6dM0pk+SwNkpTRN7Pg==", + "version": "8.5.12", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.12.tgz", + "integrity": "sha512-W62t/Se6rA0Az3DfCL0AqJwXuKwBeYg6nOaIgzP+xZ7N5BFCI7DYi1qs6ygUYT6rvfi6t9k65UMLJC+PHZpDAA==", "funding": [ { "type": "opencollective", @@ -15252,14 +15748,6 @@ } ] }, - "node_modules/randombytes": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz", - "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==", - "dependencies": { - "safe-buffer": "^5.1.0" - } - }, "node_modules/range-parser": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz", @@ -15500,16 +15988,43 @@ "devOptional": true }, "node_modules/restore-cursor": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz", - "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==", - "optional": true, + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-5.1.0.tgz", + "integrity": "sha512-oMA2dcrw6u0YfxJQXm342bFKX/E4sG9rbTzO9ptUcR/e8A33cHuvStiYOwH7fszkZlZ1z/ta9AAoPk2F4qIOHA==", "dependencies": { - "onetime": "^5.1.0", - "signal-exit": "^3.0.2" + "onetime": "^7.0.0", + "signal-exit": "^4.1.0" }, "engines": { - "node": ">=8" + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/restore-cursor/node_modules/onetime": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-7.0.0.tgz", + "integrity": "sha512-VXJjc87FScF88uafS3JllDgvAm+c/Slfz06lorj2uAY34rlUu0Nt+v8wreiImcrgAjjIHp1rXpTDlLOGw29WwQ==", + "dependencies": { + "mimic-function": "^5.0.0" + }, + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/restore-cursor/node_modules/signal-exit": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", + "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" } }, "node_modules/retry": { @@ -15536,9 +16051,10 @@ "license": "MIT" }, "node_modules/rollup": { - "version": "4.52.3", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.52.3.tgz", - "integrity": "sha512-RIDh866U8agLgiIcdpB+COKnlCreHJLfIhWC3LVflku5YHfpnsIKigRZeFfMfCc4dVcqNVfQQ5gO/afOck064A==", + "version": "4.59.0", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.59.0.tgz", + "integrity": "sha512-2oMpl67a3zCH9H79LeMcbDhXW/UmWG/y2zuqnF2jQq5uq9TbM9TVyXvA4+t+ne2IIkBdrLpAaRQAvo7YI/Yyeg==", + "license": "MIT", "dependencies": { "@types/estree": "1.0.8" }, @@ -15550,28 +16066,31 @@ "npm": ">=8.0.0" }, "optionalDependencies": { - "@rollup/rollup-android-arm-eabi": "4.52.3", - "@rollup/rollup-android-arm64": "4.52.3", - "@rollup/rollup-darwin-arm64": "4.52.3", - "@rollup/rollup-darwin-x64": "4.52.3", - "@rollup/rollup-freebsd-arm64": "4.52.3", - "@rollup/rollup-freebsd-x64": "4.52.3", - "@rollup/rollup-linux-arm-gnueabihf": "4.52.3", - "@rollup/rollup-linux-arm-musleabihf": "4.52.3", - "@rollup/rollup-linux-arm64-gnu": "4.52.3", - "@rollup/rollup-linux-arm64-musl": "4.52.3", - "@rollup/rollup-linux-loong64-gnu": "4.52.3", - "@rollup/rollup-linux-ppc64-gnu": "4.52.3", - "@rollup/rollup-linux-riscv64-gnu": "4.52.3", - "@rollup/rollup-linux-riscv64-musl": "4.52.3", - "@rollup/rollup-linux-s390x-gnu": "4.52.3", - "@rollup/rollup-linux-x64-gnu": "4.52.3", - "@rollup/rollup-linux-x64-musl": "4.52.3", - "@rollup/rollup-openharmony-arm64": "4.52.3", - "@rollup/rollup-win32-arm64-msvc": "4.52.3", - "@rollup/rollup-win32-ia32-msvc": "4.52.3", - "@rollup/rollup-win32-x64-gnu": "4.52.3", - "@rollup/rollup-win32-x64-msvc": "4.52.3", + "@rollup/rollup-android-arm-eabi": "4.59.0", + "@rollup/rollup-android-arm64": "4.59.0", + "@rollup/rollup-darwin-arm64": "4.59.0", + "@rollup/rollup-darwin-x64": "4.59.0", + "@rollup/rollup-freebsd-arm64": "4.59.0", + "@rollup/rollup-freebsd-x64": "4.59.0", + "@rollup/rollup-linux-arm-gnueabihf": "4.59.0", + "@rollup/rollup-linux-arm-musleabihf": "4.59.0", + "@rollup/rollup-linux-arm64-gnu": "4.59.0", + "@rollup/rollup-linux-arm64-musl": "4.59.0", + "@rollup/rollup-linux-loong64-gnu": "4.59.0", + "@rollup/rollup-linux-loong64-musl": "4.59.0", + "@rollup/rollup-linux-ppc64-gnu": "4.59.0", + "@rollup/rollup-linux-ppc64-musl": "4.59.0", + "@rollup/rollup-linux-riscv64-gnu": "4.59.0", + "@rollup/rollup-linux-riscv64-musl": "4.59.0", + "@rollup/rollup-linux-s390x-gnu": "4.59.0", + "@rollup/rollup-linux-x64-gnu": "4.59.0", + "@rollup/rollup-linux-x64-musl": "4.59.0", + "@rollup/rollup-openbsd-x64": "4.59.0", + "@rollup/rollup-openharmony-arm64": "4.59.0", + "@rollup/rollup-win32-arm64-msvc": "4.59.0", + "@rollup/rollup-win32-ia32-msvc": "4.59.0", + "@rollup/rollup-win32-x64-gnu": "4.59.0", + "@rollup/rollup-win32-x64-msvc": "4.59.0", "fsevents": "~2.3.2" } }, @@ -15762,9 +16281,9 @@ } }, "node_modules/sass/node_modules/immutable": { - "version": "5.1.4", - "resolved": "https://registry.npmjs.org/immutable/-/immutable-5.1.4.tgz", - "integrity": "sha512-p6u1bG3YSnINT5RQmx/yRZBpenIl30kVxkTLDyHLIMk0gict704Q9n+thfDI7lTRm9vXdDYutVzXhzcThxTnXA==", + "version": "5.1.5", + "resolved": "https://registry.npmjs.org/immutable/-/immutable-5.1.5.tgz", + "integrity": "sha512-t7xcm2siw+hlUM68I+UEOK+z84RzmN59as9DZ7P1l0994DKUWV7UXBMQZVxaoMSRQ+PBZbHCOoBt7a2wxOMt+A==", "license": "MIT" }, "node_modules/sass/node_modules/readdirp": { @@ -15807,9 +16326,9 @@ } }, "node_modules/schema-utils/node_modules/ajv": { - "version": "8.17.1", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz", - "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==", + "version": "8.18.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.18.0.tgz", + "integrity": "sha512-PlXPeEWMXMZ7sPYOHqmDyCJzcfNrUr3fGNKtezX14ykXOEIvyK81d+qydx89KY5O71FKMPaQ2vBfBFI5NHR63A==", "license": "MIT", "dependencies": { "fast-deep-equal": "^3.1.3", @@ -15946,12 +16465,12 @@ } }, "node_modules/serialize-javascript": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz", - "integrity": "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==", + "version": "7.0.5", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-7.0.5.tgz", + "integrity": "sha512-F4LcB0UqUl1zErq+1nYEEzSHJnIwb3AF2XWB94b+afhrekOUijwooAYqFyRbjYkm2PAKBabx6oYv/xDxNi8IBw==", "license": "BSD-3-Clause", - "dependencies": { - "randombytes": "^2.1.0" + "engines": { + "node": ">=20.0.0" } }, "node_modules/serve-index": { @@ -16086,9 +16605,9 @@ } }, "node_modules/shell-quote": { - "version": "1.8.3", - "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.3.tgz", - "integrity": "sha512-ObmnIF4hXNg1BqhnHmgbDETF8dLPCggZWBjkQfhZpbszZnYur5DUljTcCHii5LC3J5E0yeO/1LIMyH+UvHQgyw==", + "version": "1.8.4", + "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.4.tgz", + "integrity": "sha512-VsC6n6vz1ihYYyZZwX7YZSF5l5x36ca17OC+a69h94YqB7X6XLwf+5MOgynYir2SLFUbl8gIYvBo8K8RoNQ6bQ==", "engines": { "node": ">= 0.4" }, @@ -16229,17 +16748,46 @@ } }, "node_modules/slice-ansi": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-3.0.0.tgz", - "integrity": "sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==", + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-8.0.0.tgz", + "integrity": "sha512-stxByr12oeeOyY2BlviTNQlYV5xOj47GirPr4yA1hE9JCtxfQN0+tVbkxwCtYDQWhEKWFHsEK48ORg5jrouCAg==", "optional": true, "dependencies": { - "ansi-styles": "^4.0.0", - "astral-regex": "^2.0.0", - "is-fullwidth-code-point": "^3.0.0" + "ansi-styles": "^6.2.3", + "is-fullwidth-code-point": "^5.1.0" }, "engines": { - "node": ">=8" + "node": ">=20" + }, + "funding": { + "url": "https://github.com/chalk/slice-ansi?sponsor=1" + } + }, + "node_modules/slice-ansi/node_modules/ansi-styles": { + "version": "6.2.3", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.3.tgz", + "integrity": "sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==", + "optional": true, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/slice-ansi/node_modules/is-fullwidth-code-point": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-5.1.0.tgz", + "integrity": "sha512-5XHYaSyiqADb4RnZ1Bdad6cPp8Toise4TzEjcOYDHZkTCbKgiUl7WTUCpNWHuxmDt91wnsZBc9xinNzopv3JMQ==", + "optional": true, + "dependencies": { + "get-east-asian-width": "^1.3.1" + }, + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/smart-buffer": { @@ -16295,18 +16843,44 @@ } }, "node_modules/socket.io-parser": { - "version": "4.2.4", - "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.2.4.tgz", - "integrity": "sha512-/GbIKmo8ioc+NIWIhwdecY0ge+qVBSMdgxGygevmdHj24bsfgtCmcUUcQ5ZzcylGFHsN3k4HB4Cgkl96KVnuew==", + "version": "4.2.6", + "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.2.6.tgz", + "integrity": "sha512-asJqbVBDsBCJx0pTqw3WfesSY0iRX+2xzWEWzrpcH7L6fLzrhyF8WPI8UaeM4YCuDfpwA/cgsdugMsmtz8EJeg==", "devOptional": true, + "license": "MIT", "dependencies": { "@socket.io/component-emitter": "~3.1.0", - "debug": "~4.3.1" + "debug": "~4.4.1" }, "engines": { "node": ">=10.0.0" } }, + "node_modules/socket.io-parser/node_modules/debug": { + "version": "4.4.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz", + "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==", + "devOptional": true, + "license": "MIT", + "dependencies": { + "ms": "^2.1.3" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/socket.io-parser/node_modules/ms": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", + "devOptional": true, + "license": "MIT" + }, "node_modules/sockjs": { "version": "0.3.24", "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.24.tgz", @@ -16472,7 +17046,6 @@ "version": "1.18.0", "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.18.0.tgz", "integrity": "sha512-2p2KJZTSqQ/I3+HX42EpYOa2l3f8Erv8MWKsy2I9uf4wA7yFIkXRffYdsx86y6z4vHtV8u7g+pPlr8/4ouAxsQ==", - "license": "MIT", "optional": true, "dependencies": { "asn1": "~0.2.3", @@ -16714,9 +17287,9 @@ } }, "node_modules/tar": { - "version": "7.5.9", - "resolved": "https://registry.npmjs.org/tar/-/tar-7.5.9.tgz", - "integrity": "sha512-BTLcK0xsDh2+PUe9F6c2TlRp4zOOBMTkoQHQIWSIzI0R7KG46uEwq4OPk2W7bZcprBMsuaeFsqwYr7pjh6CuHg==", + "version": "7.5.16", + "resolved": "https://registry.npmjs.org/tar/-/tar-7.5.16.tgz", + "integrity": "sha512-56adEpPMouktRlBLXiaYFFzZ/3+JXa8P9n7WbR+ibIjtviN55mEaOkiysCnPnWm+7kkui1Dn8J9l+g6zV8731w==", "dependencies": { "@isaacs/fs-minipass": "^4.0.0", "chownr": "^3.0.0", @@ -16746,14 +17319,14 @@ } }, "node_modules/terser-webpack-plugin": { - "version": "5.3.16", - "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.16.tgz", - "integrity": "sha512-h9oBFCWrq78NyWWVcSwZarJkZ01c2AyGrzs1crmHZO3QUg9D61Wu4NPjBy69n7JqylFF5y+CsUZYmYEIZ3mR+Q==", + "version": "5.4.0", + "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.4.0.tgz", + "integrity": "sha512-Bn5vxm48flOIfkdl5CaD2+1CiUVbonWQ3KQPyP7/EuIl9Gbzq/gQFOzaMFUEgVjB1396tcK0SG8XcNJ/2kDH8g==", + "license": "MIT", "dependencies": { "@jridgewell/trace-mapping": "^0.3.25", "jest-worker": "^27.4.5", "schema-utils": "^4.3.0", - "serialize-javascript": "^6.0.2", "terser": "^5.31.1" }, "engines": { @@ -16858,9 +17431,9 @@ } }, "node_modules/tinyglobby/node_modules/picomatch": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz", - "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==", + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz", + "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==", "license": "MIT", "engines": { "node": ">=12" @@ -16873,7 +17446,6 @@ "version": "6.1.86", "resolved": "https://registry.npmjs.org/tldts/-/tldts-6.1.86.tgz", "integrity": "sha512-WMi/OQ2axVTf/ykqCQgXiIct+mSQDFdH2fkwhPwgEwvJ1kSzZRiinb0zF2Xb8u4+OqPChmyI6MEu4EezNJz+FQ==", - "license": "MIT", "optional": true, "dependencies": { "tldts-core": "^6.1.86" @@ -16886,7 +17458,6 @@ "version": "6.1.86", "resolved": "https://registry.npmjs.org/tldts-core/-/tldts-core-6.1.86.tgz", "integrity": "sha512-Je6p7pkk+KMzMv2XXKmAE3McmolOQFdxkKw0R8EYNr7sELW46JqnNeTX8ybPiQgvg1ymCoF8LXs5fzFaZvJPTA==", - "license": "MIT", "optional": true }, "node_modules/to-regex-range": { @@ -16912,7 +17483,6 @@ "version": "5.1.2", "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-5.1.2.tgz", "integrity": "sha512-FVDYdxtnj0G6Qm/DhNPSb8Ju59ULcup3tuJxkFb5K8Bv2pUXILbf0xZWU8PX8Ov19OXljbUyveOFwRMwkXzO+A==", - "license": "BSD-3-Clause", "optional": true, "dependencies": { "tldts": "^6.1.32" @@ -17053,7 +17623,6 @@ "version": "0.6.0", "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", "integrity": "sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==", - "license": "Apache-2.0", "optional": true, "dependencies": { "safe-buffer": "^5.0.1" @@ -17066,7 +17635,6 @@ "version": "0.14.5", "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", "integrity": "sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==", - "license": "Unlicense", "optional": true }, "node_modules/type-check": { @@ -17091,18 +17659,6 @@ "node": ">=4" } }, - "node_modules/type-fest": { - "version": "0.21.3", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz", - "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==", - "optional": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/type-is": { "version": "1.6.18", "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz", @@ -17325,7 +17881,6 @@ "engines": [ "node >=0.6.0" ], - "license": "MIT", "optional": true, "dependencies": { "assert-plus": "^1.0.0", @@ -17334,11 +17889,12 @@ } }, "node_modules/vite": { - "version": "7.1.11", - "resolved": "https://registry.npmjs.org/vite/-/vite-7.1.11.tgz", - "integrity": "sha512-uzcxnSDVjAopEUjljkWh8EIrg6tlzrjFUfMcR1EVsRDGwf/ccef0qQPRyOrROwhrTDaApueq+ja+KLPlzR/zdg==", + "version": "7.3.2", + "resolved": "https://registry.npmjs.org/vite/-/vite-7.3.2.tgz", + "integrity": "sha512-Bby3NOsna2jsjfLVOHKes8sGwgl4TT0E6vvpYgnAYDIF/tie7MRaFthmKuHx1NSXjiTueXH3do80FMQgvEktRg==", + "license": "MIT", "dependencies": { - "esbuild": "^0.25.0", + "esbuild": "^0.27.0", "fdir": "^6.5.0", "picomatch": "^4.0.3", "postcss": "^8.5.6", @@ -17423,9 +17979,10 @@ } }, "node_modules/vite/node_modules/picomatch": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz", - "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==", + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz", + "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==", + "license": "MIT", "engines": { "node": ">=12" }, @@ -17772,9 +18329,10 @@ } }, "node_modules/webpack-dev-server/node_modules/path-to-regexp": { - "version": "0.1.12", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.12.tgz", - "integrity": "sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ==" + "version": "0.1.13", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.13.tgz", + "integrity": "sha512-A/AGNMFN3c8bOlvV9RreMdrv7jsmF9XIfDeCd87+I8RNg6s78BhJxMu69NEMHBSJFxKidViTEdruRwEk/WIKqA==", + "license": "MIT" }, "node_modules/webpack-dev-server/node_modules/statuses": { "version": "2.0.2", @@ -18011,6 +18569,23 @@ "node": ">=18" } }, + "node_modules/yargs": { + "version": "18.0.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-18.0.0.tgz", + "integrity": "sha512-4UEqdc2RYGHZc7Doyqkrqiln3p9X2DZVxaGbwhn2pi7MrRagKaOcIKe8L3OxYcbhXLgLFUS3zAYuQjKBQgmuNg==", + "license": "MIT", + "dependencies": { + "cliui": "^9.0.1", + "escalade": "^3.1.1", + "get-caller-file": "^2.0.5", + "string-width": "^7.2.0", + "y18n": "^5.0.5", + "yargs-parser": "^22.0.0" + }, + "engines": { + "node": "^20.19.0 || ^22.12.0 || >=23" + } + }, "node_modules/yargs-parser": { "version": "18.1.3", "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz", @@ -18023,14 +18598,127 @@ "node": ">=6" } }, + "node_modules/yargs/node_modules/ansi-regex": { + "version": "6.2.2", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.2.tgz", + "integrity": "sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==", + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-regex?sponsor=1" + } + }, + "node_modules/yargs/node_modules/ansi-styles": { + "version": "6.2.3", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.3.tgz", + "integrity": "sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==", + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/yargs/node_modules/cliui": { + "version": "9.0.1", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-9.0.1.tgz", + "integrity": "sha512-k7ndgKhwoQveBL+/1tqGJYNz097I7WOvwbmmU2AR5+magtbjPWQTS1C5vzGkBC8Ym8UWRzfKUzUUqFLypY4Q+w==", + "license": "ISC", + "dependencies": { + "string-width": "^7.2.0", + "strip-ansi": "^7.1.0", + "wrap-ansi": "^9.0.0" + }, + "engines": { + "node": ">=20" + } + }, + "node_modules/yargs/node_modules/emoji-regex": { + "version": "10.6.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.6.0.tgz", + "integrity": "sha512-toUI84YS5YmxW219erniWD0CIVOo46xGKColeNQRgOzDorgBi1v4D71/OFzgD9GO2UGKIv1C3Sp8DAn0+j5w7A==", + "license": "MIT" + }, + "node_modules/yargs/node_modules/string-width": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-7.2.0.tgz", + "integrity": "sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==", + "license": "MIT", + "dependencies": { + "emoji-regex": "^10.3.0", + "get-east-asian-width": "^1.0.0", + "strip-ansi": "^7.1.0" + }, + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/yargs/node_modules/strip-ansi": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.2.0.tgz", + "integrity": "sha512-yDPMNjp4WyfYBkHnjIRLfca1i6KMyGCtsVgoKe/z1+6vukgaENdgGBZt+ZmKPc4gavvEZ5OgHfHdrazhgNyG7w==", + "license": "MIT", + "dependencies": { + "ansi-regex": "^6.2.2" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/strip-ansi?sponsor=1" + } + }, + "node_modules/yargs/node_modules/wrap-ansi": { + "version": "9.0.2", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-9.0.2.tgz", + "integrity": "sha512-42AtmgqjV+X1VpdOfyTGOYRi0/zsoLqtXQckTmqTeybT+BDIbM/Guxo7x3pE2vtpr1ok6xRqM9OpBe+Jyoqyww==", + "license": "MIT", + "dependencies": { + "ansi-styles": "^6.2.1", + "string-width": "^7.0.0", + "strip-ansi": "^7.1.0" + }, + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, + "node_modules/yargs/node_modules/y18n": { + "version": "5.0.8", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", + "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", + "license": "ISC", + "engines": { + "node": ">=10" + } + }, + "node_modules/yargs/node_modules/yargs-parser": { + "version": "22.0.0", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-22.0.0.tgz", + "integrity": "sha512-rwu/ClNdSMpkSrUb+d6BRsSkLUq1fmfsY6TOpYzTwvwkg1/NRG85KBy3kq++A8LKQwX6lsu+aWad+2khvuXrqw==", + "license": "ISC", + "engines": { + "node": "^20.19.0 || ^22.12.0 || >=23" + } + }, "node_modules/yauzl": { - "version": "2.10.0", - "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz", - "integrity": "sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==", + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-3.4.0.tgz", + "integrity": "sha512-jIH9yLR9wqr0wOS0TpBvo/g/2UgZH5qePVbjgRliiF0BYvOZyaBknKsF+x9Iht0O6sqgnB93rCICdOZFecJuDw==", "optional": true, "dependencies": { - "buffer-crc32": "~0.2.3", - "fd-slicer": "~1.1.0" + "pend": "~1.2.0" + }, + "engines": { + "node": ">=12" } }, "node_modules/yn": { @@ -18090,10 +18778,9 @@ "license": "MIT" }, "node_modules/zrender": { - "version": "5.4.4", - "resolved": "https://registry.npmjs.org/zrender/-/zrender-5.4.4.tgz", - "integrity": "sha512-0VxCNJ7AGOMCWeHVyTrGzUgrK4asT4ml9PEkeGirAkKNYXYzoPJCLvmyfdoOXcjTHPs10OZVMfD1Rwg16AZyYw==", - "license": "BSD-3-Clause", + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/zrender/-/zrender-6.1.0.tgz", + "integrity": "sha512-oEGMDB6pOP2S6OwRR4PdVv610zrjnA3Bh+JnSG12fYJlBKjtNAoEb5fSUoCOOINlH96I2fU38/A2UpRKs67xYQ==", "dependencies": { "tslib": "2.3.0" } @@ -18101,8 +18788,7 @@ "node_modules/zrender/node_modules/tslib": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.0.tgz", - "integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==", - "license": "0BSD" + "integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==" } }, "dependencies": { @@ -18266,31 +18952,31 @@ } }, "@angular-devkit/architect": { - "version": "0.2003.16", - "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.2003.16.tgz", - "integrity": "sha512-W7FPVhZzIeHVP/duuKepfZU66LpQ0k9YMHFhrGpzaUuHPOwKmza6+pjVvvti3g6jzT8b1uVlb+XlYgNPZ5jrPQ==", + "version": "0.2003.25", + "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.2003.25.tgz", + "integrity": "sha512-39pTqt4wSmpD1WeCee46oSGXRh6TR1PFd9GZEwyZoMvBTMs8mE2sXGxUgd4Qyi5CkQ1XnCM5XfgJcjUWUQRoGg==", "requires": { - "@angular-devkit/core": "20.3.16", + "@angular-devkit/core": "20.3.25", "rxjs": "7.8.2" }, "dependencies": { "@angular-devkit/core": { - "version": "20.3.16", - "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-20.3.16.tgz", - "integrity": "sha512-6L9Lpe3lbkyz32gzqxZGVC8MhXxXht+yV+4LUsb4+6T/mG/V9lW6UTW0dhwVOS3vpWMEwpy75XHT298t7HcKEg==", + "version": "20.3.25", + "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-20.3.25.tgz", + "integrity": "sha512-pSfeWEoS1y9zxqTOw0Etj2NXkRmp/aU52wdnyq3KqVA9cJtgxtlOHlBBNswTil4dReojEy+0K1xJm+mLuWuLxA==", "requires": { - "ajv": "8.17.1", + "ajv": "8.18.0", "ajv-formats": "3.0.1", "jsonc-parser": "3.3.1", - "picomatch": "4.0.3", + "picomatch": "4.0.4", "rxjs": "7.8.2", "source-map": "0.7.6" } }, "ajv": { - "version": "8.17.1", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz", - "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==", + "version": "8.18.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.18.0.tgz", + "integrity": "sha512-PlXPeEWMXMZ7sPYOHqmDyCJzcfNrUr3fGNKtezX14ykXOEIvyK81d+qydx89KY5O71FKMPaQ2vBfBFI5NHR63A==", "requires": { "fast-deep-equal": "^3.1.3", "fast-uri": "^3.0.1", @@ -18322,9 +19008,9 @@ "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==" }, "picomatch": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz", - "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==" + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz", + "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==" }, "readdirp": { "version": "4.1.2", @@ -18341,15 +19027,15 @@ } }, "@angular-devkit/build-angular": { - "version": "20.3.16", - "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-20.3.16.tgz", - "integrity": "sha512-SsJmxRnBTrivG3UiRy0gaU1mGupRCAiEKrKlW30oe6Dm0UoIVXDi4srpSEECcng5Obr3jFPzJE6P16/gfp3ZBw==", + "version": "20.3.25", + "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-20.3.25.tgz", + "integrity": "sha512-jp2sbJhbVRT65RbGENY/lz3Z0W0D50Af3xzENmLDLBVp9uhlpIPSTC9LG4CEPV7T6H5Oq6ymHKM+OO5WwTlHHA==", "requires": { "@ampproject/remapping": "2.3.0", - "@angular-devkit/architect": "0.2003.16", - "@angular-devkit/build-webpack": "0.2003.16", - "@angular-devkit/core": "20.3.16", - "@angular/build": "20.3.16", + "@angular-devkit/architect": "0.2003.25", + "@angular-devkit/build-webpack": "0.2003.25", + "@angular-devkit/core": "20.3.25", + "@angular/build": "20.3.25", "@babel/core": "7.28.3", "@babel/generator": "7.28.3", "@babel/helper-annotate-as-pure": "7.27.3", @@ -18360,15 +19046,15 @@ "@babel/preset-env": "7.28.3", "@babel/runtime": "7.28.3", "@discoveryjs/json-ext": "0.6.3", - "@ngtools/webpack": "20.3.16", + "@ngtools/webpack": "20.3.25", "ansi-colors": "4.1.3", "autoprefixer": "10.4.21", "babel-loader": "10.0.0", "browserslist": "^4.21.5", - "copy-webpack-plugin": "13.0.1", + "copy-webpack-plugin": "14.0.0", "css-loader": "7.1.2", - "esbuild": "0.25.9", - "esbuild-wasm": "0.25.9", + "esbuild": "0.28.0", + "esbuild-wasm": "0.28.0", "fast-glob": "3.3.3", "http-proxy-middleware": "3.0.5", "istanbul-lib-instrument": "6.0.3", @@ -18381,9 +19067,9 @@ "mini-css-extract-plugin": "2.9.4", "open": "10.2.0", "ora": "8.2.0", - "picomatch": "4.0.3", + "picomatch": "4.0.4", "piscina": "5.1.3", - "postcss": "8.5.6", + "postcss": "8.5.12", "postcss-loader": "8.1.1", "resolve-url-loader": "5.0.0", "rxjs": "7.8.2", @@ -18403,22 +19089,178 @@ }, "dependencies": { "@angular-devkit/core": { - "version": "20.3.16", - "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-20.3.16.tgz", - "integrity": "sha512-6L9Lpe3lbkyz32gzqxZGVC8MhXxXht+yV+4LUsb4+6T/mG/V9lW6UTW0dhwVOS3vpWMEwpy75XHT298t7HcKEg==", + "version": "20.3.25", + "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-20.3.25.tgz", + "integrity": "sha512-pSfeWEoS1y9zxqTOw0Etj2NXkRmp/aU52wdnyq3KqVA9cJtgxtlOHlBBNswTil4dReojEy+0K1xJm+mLuWuLxA==", "requires": { - "ajv": "8.17.1", + "ajv": "8.18.0", "ajv-formats": "3.0.1", "jsonc-parser": "3.3.1", - "picomatch": "4.0.3", + "picomatch": "4.0.4", "rxjs": "7.8.2", "source-map": "0.7.6" } }, + "@esbuild/aix-ppc64": { + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.28.0.tgz", + "integrity": "sha512-lhRUCeuOyJQURhTxl4WkpFTjIsbDayJHih5kZC1giwE+MhIzAb7mEsQMqMf18rHLsrb5qI1tafG20mLxEWcWlA==", + "optional": true + }, + "@esbuild/android-arm": { + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.28.0.tgz", + "integrity": "sha512-wqh0ByljabXLKHeWXYLqoJ5jKC4XBaw6Hk08OfMrCRd2nP2ZQ5eleDZC41XHyCNgktBGYMbqnrJKq/K/lzPMSQ==", + "optional": true + }, + "@esbuild/android-arm64": { + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.28.0.tgz", + "integrity": "sha512-+WzIXQOSaGs33tLEgYPYe/yQHf0WTU0X42Jca3y8NWMbUVhp7rUnw+vAsRC/QiDrdD31IszMrZy+qwPOPjd+rw==", + "optional": true + }, + "@esbuild/android-x64": { + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.28.0.tgz", + "integrity": "sha512-+VJggoaKhk2VNNqVL7f6S189UzShHC/mR9EE8rDdSkdpN0KflSwWY/gWjDrNxxisg8Fp1ZCD9jLMo4m0OUfeUA==", + "optional": true + }, + "@esbuild/darwin-arm64": { + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.28.0.tgz", + "integrity": "sha512-0T+A9WZm+bZ84nZBtk1ckYsOvyA3x7e2Acj1KdVfV4/2tdG4fzUp91YHx+GArWLtwqp77pBXVCPn2We7Letr0Q==", + "optional": true + }, + "@esbuild/darwin-x64": { + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.28.0.tgz", + "integrity": "sha512-fyzLm/DLDl/84OCfp2f/XQ4flmORsjU7VKt8HLjvIXChJoFFOIL6pLJPH4Yhd1n1gGFF9mPwtlN5Wf82DZs+LQ==", + "optional": true + }, + "@esbuild/freebsd-arm64": { + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.28.0.tgz", + "integrity": "sha512-l9GeW5UZBT9k9brBYI+0WDffcRxgHQD8ShN2Ur4xWq/NFzUKm3k5lsH4PdaRgb2w7mI9u61nr2gI2mLI27Nh3Q==", + "optional": true + }, + "@esbuild/freebsd-x64": { + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.28.0.tgz", + "integrity": "sha512-BXoQai/A0wPO6Es3yFJ7APCiKGc1tdAEOgeTNy3SsB491S3aHn4S4r3e976eUnPdU+NbdtmBuLncYir2tMU9Nw==", + "optional": true + }, + "@esbuild/linux-arm": { + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.28.0.tgz", + "integrity": "sha512-CjaaREJagqJp7iTaNQjjidaNbCKYcd4IDkzbwwxtSvjI7NZm79qiHc8HqciMddQ6CKvJT6aBd8lO9kN/ZudLlw==", + "optional": true + }, + "@esbuild/linux-arm64": { + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.28.0.tgz", + "integrity": "sha512-RVyzfb3FWsGA55n6WY0MEIEPURL1FcbhFE6BffZEMEekfCzCIMtB5yyDcFnVbTnwk+CLAgTujmV/Lgvih56W+A==", + "optional": true + }, + "@esbuild/linux-ia32": { + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.28.0.tgz", + "integrity": "sha512-KBnSTt1kxl9x70q+ydterVdl+Cn0H18ngRMRCEQfrbqdUuntQQ0LoMZv47uB97NljZFzY6HcfqEZ2SAyIUTQBQ==", + "optional": true + }, + "@esbuild/linux-loong64": { + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.28.0.tgz", + "integrity": "sha512-zpSlUce1mnxzgBADvxKXX5sl8aYQHo2ezvMNI8I0lbblJtp8V4odlm3Yzlj7gPyt3T8ReksE6bK+pT3WD+aJRg==", + "optional": true + }, + "@esbuild/linux-mips64el": { + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.28.0.tgz", + "integrity": "sha512-2jIfP6mmjkdmeTlsX/9vmdmhBmKADrWqN7zcdtHIeNSCH1SqIoNI63cYsjQR8J+wGa4Y5izRcSHSm8K3QWmk3w==", + "optional": true + }, + "@esbuild/linux-ppc64": { + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.28.0.tgz", + "integrity": "sha512-bc0FE9wWeC0WBm49IQMPSPILRocGTQt3j5KPCA8os6VprfuJ7KD+5PzESSrJ6GmPIPJK965ZJHTUlSA6GNYEhg==", + "optional": true + }, + "@esbuild/linux-riscv64": { + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.28.0.tgz", + "integrity": "sha512-SQPZOwoTTT/HXFXQJG/vBX8sOFagGqvZyXcgLA3NhIqcBv1BJU1d46c0rGcrij2B56Z2rNiSLaZOYW5cUk7yLQ==", + "optional": true + }, + "@esbuild/linux-s390x": { + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.28.0.tgz", + "integrity": "sha512-SCfR0HN8CEEjnYnySJTd2cw0k9OHB/YFzt5zgJEwa+wL/T/raGWYMBqwDNAC6dqFKmJYZoQBRfHjgwLHGSrn3Q==", + "optional": true + }, + "@esbuild/linux-x64": { + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.28.0.tgz", + "integrity": "sha512-us0dSb9iFxIi8srnpl931Nvs65it/Jd2a2K3qs7fz2WfGPHqzfzZTfec7oxZJRNPXPnNYZtanmRc4AL/JwVzHQ==", + "optional": true + }, + "@esbuild/netbsd-arm64": { + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.28.0.tgz", + "integrity": "sha512-CR/RYotgtCKwtftMwJlUU7xCVNg3lMYZ0RzTmAHSfLCXw3NtZtNpswLEj/Kkf6kEL3Gw+BpOekRX0BYCtklhUw==", + "optional": true + }, + "@esbuild/netbsd-x64": { + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.28.0.tgz", + "integrity": "sha512-nU1yhmYutL+fQ71Kxnhg8uEOdC0pwEW9entHykTgEbna2pw2dkbFSMeqjjyHZoCmt8SBkOSvV+yNmm94aUrrqw==", + "optional": true + }, + "@esbuild/openbsd-arm64": { + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.28.0.tgz", + "integrity": "sha512-cXb5vApOsRsxsEl4mcZ1XY3D4DzcoMxR/nnc4IyqYs0rTI8ZKmW6kyyg+11Z8yvgMfAEldKzP7AdP64HnSC/6g==", + "optional": true + }, + "@esbuild/openbsd-x64": { + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.28.0.tgz", + "integrity": "sha512-8wZM2qqtv9UP3mzy7HiGYNH/zjTA355mpeuA+859TyR+e+Tc08IHYpLJuMsfpDJwoLo1ikIJI8jC3GFjnRClzA==", + "optional": true + }, + "@esbuild/openharmony-arm64": { + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/openharmony-arm64/-/openharmony-arm64-0.28.0.tgz", + "integrity": "sha512-FLGfyizszcef5C3YtoyQDACyg95+dndv79i2EekILBofh5wpCa1KuBqOWKrEHZg3zrL3t5ouE5jgr94vA+Wb2w==", + "optional": true + }, + "@esbuild/sunos-x64": { + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.28.0.tgz", + "integrity": "sha512-1ZgjUoEdHZZl/YlV76TSCz9Hqj9h9YmMGAgAPYd+q4SicWNX3G5GCyx9uhQWSLcbvPW8Ni7lj4gDa1T40akdlw==", + "optional": true + }, + "@esbuild/win32-arm64": { + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.28.0.tgz", + "integrity": "sha512-Q9StnDmQ/enxnpxCCLSg0oo4+34B9TdXpuyPeTedN/6+iXBJ4J+zwfQI28u/Jl40nOYAxGoNi7mFP40RUtkmUA==", + "optional": true + }, + "@esbuild/win32-ia32": { + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.28.0.tgz", + "integrity": "sha512-zF3ag/gfiCe6U2iczcRzSYJKH1DCI+ByzSENHlM2FcDbEeo5Zd2C86Aq0tKUYAJJ1obRP84ymxIAksZUcdztHA==", + "optional": true + }, + "@esbuild/win32-x64": { + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.28.0.tgz", + "integrity": "sha512-pEl1bO9mfAmIC+tW5btTmrKaujg3zGtUmWNdCw/xs70FBjwAL3o9OEKNHvNmnyylD6ubxUERiEhdsL0xBQ9efw==", + "optional": true + }, "ajv": { - "version": "8.17.1", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz", - "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==", + "version": "8.18.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.18.0.tgz", + "integrity": "sha512-PlXPeEWMXMZ7sPYOHqmDyCJzcfNrUr3fGNKtezX14ykXOEIvyK81d+qydx89KY5O71FKMPaQ2vBfBFI5NHR63A==", "requires": { "fast-deep-equal": "^3.1.3", "fast-uri": "^3.0.1", @@ -18452,6 +19294,40 @@ "ms": "^2.1.3" } }, + "esbuild": { + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.28.0.tgz", + "integrity": "sha512-sNR9MHpXSUV/XB4zmsFKN+QgVG82Cc7+/aaxJ8Adi8hyOac+EXptIp45QBPaVyX3N70664wRbTcLTOemCAnyqw==", + "optional": true, + "requires": { + "@esbuild/aix-ppc64": "0.28.0", + "@esbuild/android-arm": "0.28.0", + "@esbuild/android-arm64": "0.28.0", + "@esbuild/android-x64": "0.28.0", + "@esbuild/darwin-arm64": "0.28.0", + "@esbuild/darwin-x64": "0.28.0", + "@esbuild/freebsd-arm64": "0.28.0", + "@esbuild/freebsd-x64": "0.28.0", + "@esbuild/linux-arm": "0.28.0", + "@esbuild/linux-arm64": "0.28.0", + "@esbuild/linux-ia32": "0.28.0", + "@esbuild/linux-loong64": "0.28.0", + "@esbuild/linux-mips64el": "0.28.0", + "@esbuild/linux-ppc64": "0.28.0", + "@esbuild/linux-riscv64": "0.28.0", + "@esbuild/linux-s390x": "0.28.0", + "@esbuild/linux-x64": "0.28.0", + "@esbuild/netbsd-arm64": "0.28.0", + "@esbuild/netbsd-x64": "0.28.0", + "@esbuild/openbsd-arm64": "0.28.0", + "@esbuild/openbsd-x64": "0.28.0", + "@esbuild/openharmony-arm64": "0.28.0", + "@esbuild/sunos-x64": "0.28.0", + "@esbuild/win32-arm64": "0.28.0", + "@esbuild/win32-ia32": "0.28.0", + "@esbuild/win32-x64": "0.28.0" + } + }, "http-proxy-middleware": { "version": "3.0.5", "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-3.0.5.tgz", @@ -18486,9 +19362,9 @@ "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" }, "picomatch": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz", - "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==" + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz", + "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==" }, "readdirp": { "version": "4.1.2", @@ -18521,20 +19397,20 @@ } }, "@angular-devkit/build-webpack": { - "version": "0.2003.16", - "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.2003.16.tgz", - "integrity": "sha512-88c6jTNAzqVinwYswsHOJAinIUSq08PQd1PfRwoH7RXiZt8XzkSmeLmXKchtamSflDXdcnjNd+AZY29b279zDA==", + "version": "0.2003.25", + "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.2003.25.tgz", + "integrity": "sha512-jJMpYBdWeRfvrCna7JWsyMBbvjMcPblyzh4/pSfWw5znla3hJGzDtmb84qKZ+IB8eZNEcky4iGR5LK2jdGFLAg==", "requires": { - "@angular-devkit/architect": "0.2003.16", + "@angular-devkit/architect": "0.2003.25", "rxjs": "7.8.2" } }, "@angular-devkit/schematics": { - "version": "20.3.16", - "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-20.3.16.tgz", - "integrity": "sha512-3K8QwTpKjnLo3hIvNzB9sTjrlkeRyMK0TxdwgTbwJseewGhXLl98oBoTCWM2ygtpskiWNpYqXJNIhoslNN65WQ==", + "version": "20.3.25", + "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-20.3.25.tgz", + "integrity": "sha512-IB0IHf8ZRqr69hT/XIfHkYLPAYHWQ/WUc6+fKHBwq58jJlm/y5QUeTEuXvJ18IX/+hUIqw+E2Q3T0N9rLDLzXg==", "requires": { - "@angular-devkit/core": "20.3.16", + "@angular-devkit/core": "20.3.25", "jsonc-parser": "3.3.1", "magic-string": "0.30.17", "ora": "8.2.0", @@ -18542,22 +19418,22 @@ }, "dependencies": { "@angular-devkit/core": { - "version": "20.3.16", - "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-20.3.16.tgz", - "integrity": "sha512-6L9Lpe3lbkyz32gzqxZGVC8MhXxXht+yV+4LUsb4+6T/mG/V9lW6UTW0dhwVOS3vpWMEwpy75XHT298t7HcKEg==", + "version": "20.3.25", + "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-20.3.25.tgz", + "integrity": "sha512-pSfeWEoS1y9zxqTOw0Etj2NXkRmp/aU52wdnyq3KqVA9cJtgxtlOHlBBNswTil4dReojEy+0K1xJm+mLuWuLxA==", "requires": { - "ajv": "8.17.1", + "ajv": "8.18.0", "ajv-formats": "3.0.1", "jsonc-parser": "3.3.1", - "picomatch": "4.0.3", + "picomatch": "4.0.4", "rxjs": "7.8.2", "source-map": "0.7.6" } }, "ajv": { - "version": "8.17.1", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz", - "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==", + "version": "8.18.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.18.0.tgz", + "integrity": "sha512-PlXPeEWMXMZ7sPYOHqmDyCJzcfNrUr3fGNKtezX14ykXOEIvyK81d+qydx89KY5O71FKMPaQ2vBfBFI5NHR63A==", "requires": { "fast-deep-equal": "^3.1.3", "fast-uri": "^3.0.1", @@ -18589,9 +19465,9 @@ "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==" }, "picomatch": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz", - "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==" + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz", + "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==" }, "readdirp": { "version": "4.1.2", @@ -18608,20 +19484,20 @@ } }, "@angular/animations": { - "version": "20.3.16", - "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-20.3.16.tgz", - "integrity": "sha512-N83/GFY5lKNyWgPV3xHHy2rb3/eP1ZLzSVI+dmMVbf3jbqwY1YPQcMiAG8UDzaILY1Dkus91kWLF8Qdr3nHAzg==", + "version": "20.3.25", + "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-20.3.25.tgz", + "integrity": "sha512-lQmti3tI85D525TjUVGqCNLzFxSUoZg+vgIyvuGJZPY0UU/o2S6KAxW6ObmcRotZZHNfenLHIxWgzamBDjIjuw==", "requires": { "tslib": "^2.3.0" } }, "@angular/build": { - "version": "20.3.16", - "resolved": "https://registry.npmjs.org/@angular/build/-/build-20.3.16.tgz", - "integrity": "sha512-p1W3wwMG1Bs4tkPW7ceXO4woO1KCP28sjfpBJg32dIMW3dYSC+iWNmUkYS/wb4YEkqCV0wd6Apnd98mZjL6rNg==", + "version": "20.3.25", + "resolved": "https://registry.npmjs.org/@angular/build/-/build-20.3.25.tgz", + "integrity": "sha512-ddWmPzYuzDWz9ql0262u9w3OJHXpSjHVNIDFIYOG2XYyMj/Xve0RkJ8/xvV+Hv7T3iqyyGKtsO+n/d0GCJQCtQ==", "requires": { "@ampproject/remapping": "2.3.0", - "@angular-devkit/architect": "0.2003.16", + "@angular-devkit/architect": "0.2003.25", "@babel/core": "7.28.3", "@babel/helper-annotate-as-pure": "7.27.3", "@babel/helper-split-export-declaration": "7.24.7", @@ -18629,7 +19505,7 @@ "@vitejs/plugin-basic-ssl": "2.1.0", "beasties": "0.3.5", "browserslist": "^4.23.0", - "esbuild": "0.25.9", + "esbuild": "0.28.0", "https-proxy-agent": "7.0.6", "istanbul-lib-instrument": "6.0.3", "jsonc-parser": "3.3.1", @@ -18638,23 +19514,365 @@ "magic-string": "0.30.17", "mrmime": "2.0.1", "parse5-html-rewriting-stream": "8.0.0", - "picomatch": "4.0.3", + "picomatch": "4.0.4", "piscina": "5.1.3", - "rollup": "4.52.3", + "rollup": "4.59.0", "sass": "1.90.0", "semver": "7.7.2", "source-map-support": "0.5.21", "tinyglobby": "0.2.14", - "vite": "7.1.11", + "vite": "7.3.2", "watchpack": "2.4.4" }, "dependencies": { - "ansi-escapes": { - "version": "7.3.0", - "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-7.3.0.tgz", - "integrity": "sha512-BvU8nYgGQBxcmMuEeUEmNTvrMVjJNSH7RgW24vXexN4Ven6qCvy4TntnvlnwnMLTVlcRQQdbRY8NKnaIoeWDNg==", + "@esbuild/aix-ppc64": { + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.28.0.tgz", + "integrity": "sha512-lhRUCeuOyJQURhTxl4WkpFTjIsbDayJHih5kZC1giwE+MhIzAb7mEsQMqMf18rHLsrb5qI1tafG20mLxEWcWlA==", + "optional": true + }, + "@esbuild/android-arm": { + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.28.0.tgz", + "integrity": "sha512-wqh0ByljabXLKHeWXYLqoJ5jKC4XBaw6Hk08OfMrCRd2nP2ZQ5eleDZC41XHyCNgktBGYMbqnrJKq/K/lzPMSQ==", + "optional": true + }, + "@esbuild/android-arm64": { + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.28.0.tgz", + "integrity": "sha512-+WzIXQOSaGs33tLEgYPYe/yQHf0WTU0X42Jca3y8NWMbUVhp7rUnw+vAsRC/QiDrdD31IszMrZy+qwPOPjd+rw==", + "optional": true + }, + "@esbuild/android-x64": { + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.28.0.tgz", + "integrity": "sha512-+VJggoaKhk2VNNqVL7f6S189UzShHC/mR9EE8rDdSkdpN0KflSwWY/gWjDrNxxisg8Fp1ZCD9jLMo4m0OUfeUA==", + "optional": true + }, + "@esbuild/darwin-arm64": { + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.28.0.tgz", + "integrity": "sha512-0T+A9WZm+bZ84nZBtk1ckYsOvyA3x7e2Acj1KdVfV4/2tdG4fzUp91YHx+GArWLtwqp77pBXVCPn2We7Letr0Q==", + "optional": true + }, + "@esbuild/darwin-x64": { + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.28.0.tgz", + "integrity": "sha512-fyzLm/DLDl/84OCfp2f/XQ4flmORsjU7VKt8HLjvIXChJoFFOIL6pLJPH4Yhd1n1gGFF9mPwtlN5Wf82DZs+LQ==", + "optional": true + }, + "@esbuild/freebsd-arm64": { + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.28.0.tgz", + "integrity": "sha512-l9GeW5UZBT9k9brBYI+0WDffcRxgHQD8ShN2Ur4xWq/NFzUKm3k5lsH4PdaRgb2w7mI9u61nr2gI2mLI27Nh3Q==", + "optional": true + }, + "@esbuild/freebsd-x64": { + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.28.0.tgz", + "integrity": "sha512-BXoQai/A0wPO6Es3yFJ7APCiKGc1tdAEOgeTNy3SsB491S3aHn4S4r3e976eUnPdU+NbdtmBuLncYir2tMU9Nw==", + "optional": true + }, + "@esbuild/linux-arm": { + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.28.0.tgz", + "integrity": "sha512-CjaaREJagqJp7iTaNQjjidaNbCKYcd4IDkzbwwxtSvjI7NZm79qiHc8HqciMddQ6CKvJT6aBd8lO9kN/ZudLlw==", + "optional": true + }, + "@esbuild/linux-arm64": { + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.28.0.tgz", + "integrity": "sha512-RVyzfb3FWsGA55n6WY0MEIEPURL1FcbhFE6BffZEMEekfCzCIMtB5yyDcFnVbTnwk+CLAgTujmV/Lgvih56W+A==", + "optional": true + }, + "@esbuild/linux-ia32": { + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.28.0.tgz", + "integrity": "sha512-KBnSTt1kxl9x70q+ydterVdl+Cn0H18ngRMRCEQfrbqdUuntQQ0LoMZv47uB97NljZFzY6HcfqEZ2SAyIUTQBQ==", + "optional": true + }, + "@esbuild/linux-loong64": { + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.28.0.tgz", + "integrity": "sha512-zpSlUce1mnxzgBADvxKXX5sl8aYQHo2ezvMNI8I0lbblJtp8V4odlm3Yzlj7gPyt3T8ReksE6bK+pT3WD+aJRg==", + "optional": true + }, + "@esbuild/linux-mips64el": { + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.28.0.tgz", + "integrity": "sha512-2jIfP6mmjkdmeTlsX/9vmdmhBmKADrWqN7zcdtHIeNSCH1SqIoNI63cYsjQR8J+wGa4Y5izRcSHSm8K3QWmk3w==", + "optional": true + }, + "@esbuild/linux-ppc64": { + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.28.0.tgz", + "integrity": "sha512-bc0FE9wWeC0WBm49IQMPSPILRocGTQt3j5KPCA8os6VprfuJ7KD+5PzESSrJ6GmPIPJK965ZJHTUlSA6GNYEhg==", + "optional": true + }, + "@esbuild/linux-riscv64": { + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.28.0.tgz", + "integrity": "sha512-SQPZOwoTTT/HXFXQJG/vBX8sOFagGqvZyXcgLA3NhIqcBv1BJU1d46c0rGcrij2B56Z2rNiSLaZOYW5cUk7yLQ==", + "optional": true + }, + "@esbuild/linux-s390x": { + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.28.0.tgz", + "integrity": "sha512-SCfR0HN8CEEjnYnySJTd2cw0k9OHB/YFzt5zgJEwa+wL/T/raGWYMBqwDNAC6dqFKmJYZoQBRfHjgwLHGSrn3Q==", + "optional": true + }, + "@esbuild/linux-x64": { + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.28.0.tgz", + "integrity": "sha512-us0dSb9iFxIi8srnpl931Nvs65it/Jd2a2K3qs7fz2WfGPHqzfzZTfec7oxZJRNPXPnNYZtanmRc4AL/JwVzHQ==", + "optional": true + }, + "@esbuild/netbsd-arm64": { + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.28.0.tgz", + "integrity": "sha512-CR/RYotgtCKwtftMwJlUU7xCVNg3lMYZ0RzTmAHSfLCXw3NtZtNpswLEj/Kkf6kEL3Gw+BpOekRX0BYCtklhUw==", + "optional": true + }, + "@esbuild/netbsd-x64": { + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.28.0.tgz", + "integrity": "sha512-nU1yhmYutL+fQ71Kxnhg8uEOdC0pwEW9entHykTgEbna2pw2dkbFSMeqjjyHZoCmt8SBkOSvV+yNmm94aUrrqw==", + "optional": true + }, + "@esbuild/openbsd-arm64": { + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.28.0.tgz", + "integrity": "sha512-cXb5vApOsRsxsEl4mcZ1XY3D4DzcoMxR/nnc4IyqYs0rTI8ZKmW6kyyg+11Z8yvgMfAEldKzP7AdP64HnSC/6g==", + "optional": true + }, + "@esbuild/openbsd-x64": { + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.28.0.tgz", + "integrity": "sha512-8wZM2qqtv9UP3mzy7HiGYNH/zjTA355mpeuA+859TyR+e+Tc08IHYpLJuMsfpDJwoLo1ikIJI8jC3GFjnRClzA==", + "optional": true + }, + "@esbuild/openharmony-arm64": { + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/openharmony-arm64/-/openharmony-arm64-0.28.0.tgz", + "integrity": "sha512-FLGfyizszcef5C3YtoyQDACyg95+dndv79i2EekILBofh5wpCa1KuBqOWKrEHZg3zrL3t5ouE5jgr94vA+Wb2w==", + "optional": true + }, + "@esbuild/sunos-x64": { + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.28.0.tgz", + "integrity": "sha512-1ZgjUoEdHZZl/YlV76TSCz9Hqj9h9YmMGAgAPYd+q4SicWNX3G5GCyx9uhQWSLcbvPW8Ni7lj4gDa1T40akdlw==", + "optional": true + }, + "@esbuild/win32-arm64": { + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.28.0.tgz", + "integrity": "sha512-Q9StnDmQ/enxnpxCCLSg0oo4+34B9TdXpuyPeTedN/6+iXBJ4J+zwfQI28u/Jl40nOYAxGoNi7mFP40RUtkmUA==", + "optional": true + }, + "@esbuild/win32-ia32": { + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.28.0.tgz", + "integrity": "sha512-zF3ag/gfiCe6U2iczcRzSYJKH1DCI+ByzSENHlM2FcDbEeo5Zd2C86Aq0tKUYAJJ1obRP84ymxIAksZUcdztHA==", + "optional": true + }, + "@esbuild/win32-x64": { + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.28.0.tgz", + "integrity": "sha512-pEl1bO9mfAmIC+tW5btTmrKaujg3zGtUmWNdCw/xs70FBjwAL3o9OEKNHvNmnyylD6ubxUERiEhdsL0xBQ9efw==", + "optional": true + }, + "ansi-regex": { + "version": "6.2.2", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.2.tgz", + "integrity": "sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==" + }, + "ansi-styles": { + "version": "6.2.3", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.3.tgz", + "integrity": "sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==" + }, + "cli-truncate": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-4.0.0.tgz", + "integrity": "sha512-nPdaFdQ0h/GEigbPClz11D0v/ZJEwxmeVZGeMo3Z5StPtUTkA9o1lD6QwoirYiSDzbcwn2XcjwmCp68W1IS4TA==", "requires": { - "environment": "^1.0.0" + "slice-ansi": "^5.0.0", + "string-width": "^7.0.0" + } + }, + "emoji-regex": { + "version": "10.6.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.6.0.tgz", + "integrity": "sha512-toUI84YS5YmxW219erniWD0CIVOo46xGKColeNQRgOzDorgBi1v4D71/OFzgD9GO2UGKIv1C3Sp8DAn0+j5w7A==" + }, + "esbuild": { + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.28.0.tgz", + "integrity": "sha512-sNR9MHpXSUV/XB4zmsFKN+QgVG82Cc7+/aaxJ8Adi8hyOac+EXptIp45QBPaVyX3N70664wRbTcLTOemCAnyqw==", + "requires": { + "@esbuild/aix-ppc64": "0.28.0", + "@esbuild/android-arm": "0.28.0", + "@esbuild/android-arm64": "0.28.0", + "@esbuild/android-x64": "0.28.0", + "@esbuild/darwin-arm64": "0.28.0", + "@esbuild/darwin-x64": "0.28.0", + "@esbuild/freebsd-arm64": "0.28.0", + "@esbuild/freebsd-x64": "0.28.0", + "@esbuild/linux-arm": "0.28.0", + "@esbuild/linux-arm64": "0.28.0", + "@esbuild/linux-ia32": "0.28.0", + "@esbuild/linux-loong64": "0.28.0", + "@esbuild/linux-mips64el": "0.28.0", + "@esbuild/linux-ppc64": "0.28.0", + "@esbuild/linux-riscv64": "0.28.0", + "@esbuild/linux-s390x": "0.28.0", + "@esbuild/linux-x64": "0.28.0", + "@esbuild/netbsd-arm64": "0.28.0", + "@esbuild/netbsd-x64": "0.28.0", + "@esbuild/openbsd-arm64": "0.28.0", + "@esbuild/openbsd-x64": "0.28.0", + "@esbuild/openharmony-arm64": "0.28.0", + "@esbuild/sunos-x64": "0.28.0", + "@esbuild/win32-arm64": "0.28.0", + "@esbuild/win32-ia32": "0.28.0", + "@esbuild/win32-x64": "0.28.0" + } + }, + "eventemitter3": { + "version": "5.0.4", + "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-5.0.4.tgz", + "integrity": "sha512-mlsTRyGaPBjPedk6Bvw+aqbsXDtoAyAzm5MO7JgU+yVRyMQ5O8bD4Kcci7BS85f93veegeCPkL8R4GLClnjLFw==" + }, + "is-fullwidth-code-point": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-4.0.0.tgz", + "integrity": "sha512-O4L094N2/dZ7xqVdrXhh9r1KODPJpFms8B5sGdJLPy664AgvXsreZUyCQQNItZRDlYug4xStLjNp/sz3HvBowQ==" + }, + "listr2": { + "version": "9.0.1", + "resolved": "https://registry.npmjs.org/listr2/-/listr2-9.0.1.tgz", + "integrity": "sha512-SL0JY3DaxylDuo/MecFeiC+7pedM0zia33zl0vcjgwcq1q1FWWF1To9EIauPbl8GbMCU0R2e0uJ8bZunhYKD2g==", + "requires": { + "cli-truncate": "^4.0.0", + "colorette": "^2.0.20", + "eventemitter3": "^5.0.1", + "log-update": "^6.1.0", + "rfdc": "^1.4.1", + "wrap-ansi": "^9.0.0" + } + }, + "picomatch": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz", + "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==" + }, + "semver": { + "version": "7.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz", + "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==" + }, + "slice-ansi": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-5.0.0.tgz", + "integrity": "sha512-FC+lgizVPfie0kkhqUScwRu1O/lF6NOgJmlCgK+/LYxDCTk8sGelYaHDhFcDN+Sn3Cv+3VSa4Byeo+IMCzpMgQ==", + "requires": { + "ansi-styles": "^6.0.0", + "is-fullwidth-code-point": "^4.0.0" + } + }, + "string-width": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-7.2.0.tgz", + "integrity": "sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==", + "requires": { + "emoji-regex": "^10.3.0", + "get-east-asian-width": "^1.0.0", + "strip-ansi": "^7.1.0" + } + }, + "strip-ansi": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.2.0.tgz", + "integrity": "sha512-yDPMNjp4WyfYBkHnjIRLfca1i6KMyGCtsVgoKe/z1+6vukgaENdgGBZt+ZmKPc4gavvEZ5OgHfHdrazhgNyG7w==", + "requires": { + "ansi-regex": "^6.2.2" + } + }, + "wrap-ansi": { + "version": "9.0.2", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-9.0.2.tgz", + "integrity": "sha512-42AtmgqjV+X1VpdOfyTGOYRi0/zsoLqtXQckTmqTeybT+BDIbM/Guxo7x3pE2vtpr1ok6xRqM9OpBe+Jyoqyww==", + "requires": { + "ansi-styles": "^6.2.1", + "string-width": "^7.0.0", + "strip-ansi": "^7.1.0" + } + } + } + }, + "@angular/cli": { + "version": "20.3.25", + "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-20.3.25.tgz", + "integrity": "sha512-QOSxza45CZY11kqPVpqsU+WGYF99rR/r9A9GykZQWuAHb5SEAxlXHyaaGMu/BMtBHy5HNIlJH25UlzelrbaNyQ==", + "requires": { + "@angular-devkit/architect": "0.2003.25", + "@angular-devkit/core": "20.3.25", + "@angular-devkit/schematics": "20.3.25", + "@inquirer/prompts": "7.8.2", + "@listr2/prompt-adapter-inquirer": "3.0.1", + "@modelcontextprotocol/sdk": "1.26.0", + "@schematics/angular": "20.3.25", + "@yarnpkg/lockfile": "1.1.0", + "algoliasearch": "5.35.0", + "ini": "5.0.0", + "jsonc-parser": "3.3.1", + "listr2": "9.0.1", + "npm-package-arg": "13.0.0", + "pacote": "21.0.4", + "resolve": "1.22.10", + "semver": "7.7.2", + "yargs": "18.0.0", + "zod": "4.1.13" + }, + "dependencies": { + "@angular-devkit/core": { + "version": "20.3.25", + "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-20.3.25.tgz", + "integrity": "sha512-pSfeWEoS1y9zxqTOw0Etj2NXkRmp/aU52wdnyq3KqVA9cJtgxtlOHlBBNswTil4dReojEy+0K1xJm+mLuWuLxA==", + "requires": { + "ajv": "8.18.0", + "ajv-formats": "3.0.1", + "jsonc-parser": "3.3.1", + "picomatch": "4.0.4", + "rxjs": "7.8.2", + "source-map": "0.7.6" + } + }, + "@listr2/prompt-adapter-inquirer": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/@listr2/prompt-adapter-inquirer/-/prompt-adapter-inquirer-3.0.1.tgz", + "integrity": "sha512-3XFmGwm3u6ioREG+ynAQB7FoxfajgQnMhIu8wC5eo/Lsih4aKDg0VuIMGaOsYn7hJSJagSeaD4K8yfpkEoDEmA==", + "requires": { + "@inquirer/type": "^3.0.7" + } + }, + "ajv": { + "version": "8.18.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.18.0.tgz", + "integrity": "sha512-PlXPeEWMXMZ7sPYOHqmDyCJzcfNrUr3fGNKtezX14ykXOEIvyK81d+qydx89KY5O71FKMPaQ2vBfBFI5NHR63A==", + "requires": { + "fast-deep-equal": "^3.1.3", + "fast-uri": "^3.0.1", + "json-schema-traverse": "^1.0.0", + "require-from-string": "^2.0.2" + } + }, + "ajv-formats": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-3.0.1.tgz", + "integrity": "sha512-8iUql50EUR+uUcdRQ3HDqa6EVyo3docL8g5WJ3FNcWmu62IbkGUue/pEyLBW8VGKKucTPgqeks4fIU1DA4yowQ==", + "requires": { + "ajv": "^8.0.0" } }, "ansi-regex": { @@ -18667,12 +19885,14 @@ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.3.tgz", "integrity": "sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==" }, - "cli-cursor": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-5.0.0.tgz", - "integrity": "sha512-aCj4O5wKyszjMmDT4tZj93kxyydN/K5zPWSCe6/0AV/AA1pqe5ZBIw0a2ZfPQV7lL5/yb5HsUreJ6UFAF1tEQw==", + "chokidar": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.3.tgz", + "integrity": "sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA==", + "optional": true, + "peer": true, "requires": { - "restore-cursor": "^5.0.0" + "readdirp": "^4.0.1" } }, "cli-truncate": { @@ -18699,256 +19919,6 @@ "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-4.0.0.tgz", "integrity": "sha512-O4L094N2/dZ7xqVdrXhh9r1KODPJpFms8B5sGdJLPy664AgvXsreZUyCQQNItZRDlYug4xStLjNp/sz3HvBowQ==" }, - "listr2": { - "version": "9.0.1", - "resolved": "https://registry.npmjs.org/listr2/-/listr2-9.0.1.tgz", - "integrity": "sha512-SL0JY3DaxylDuo/MecFeiC+7pedM0zia33zl0vcjgwcq1q1FWWF1To9EIauPbl8GbMCU0R2e0uJ8bZunhYKD2g==", - "requires": { - "cli-truncate": "^4.0.0", - "colorette": "^2.0.20", - "eventemitter3": "^5.0.1", - "log-update": "^6.1.0", - "rfdc": "^1.4.1", - "wrap-ansi": "^9.0.0" - } - }, - "log-update": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/log-update/-/log-update-6.1.0.tgz", - "integrity": "sha512-9ie8ItPR6tjY5uYJh8K/Zrv/RMZ5VOlOWvtZdEHYSTFKZfIBPQa9tOAEeAWhd+AnIneLJ22w5fjOYtoutpWq5w==", - "requires": { - "ansi-escapes": "^7.0.0", - "cli-cursor": "^5.0.0", - "slice-ansi": "^7.1.0", - "strip-ansi": "^7.1.0", - "wrap-ansi": "^9.0.0" - }, - "dependencies": { - "is-fullwidth-code-point": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-5.1.0.tgz", - "integrity": "sha512-5XHYaSyiqADb4RnZ1Bdad6cPp8Toise4TzEjcOYDHZkTCbKgiUl7WTUCpNWHuxmDt91wnsZBc9xinNzopv3JMQ==", - "requires": { - "get-east-asian-width": "^1.3.1" - } - }, - "slice-ansi": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-7.1.2.tgz", - "integrity": "sha512-iOBWFgUX7caIZiuutICxVgX1SdxwAVFFKwt1EvMYYec/NWO5meOJ6K5uQxhrYBdQJne4KxiqZc+KptFOWFSI9w==", - "requires": { - "ansi-styles": "^6.2.1", - "is-fullwidth-code-point": "^5.0.0" - } - } - } - }, - "onetime": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/onetime/-/onetime-7.0.0.tgz", - "integrity": "sha512-VXJjc87FScF88uafS3JllDgvAm+c/Slfz06lorj2uAY34rlUu0Nt+v8wreiImcrgAjjIHp1rXpTDlLOGw29WwQ==", - "requires": { - "mimic-function": "^5.0.0" - } - }, - "picomatch": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz", - "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==" - }, - "restore-cursor": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-5.1.0.tgz", - "integrity": "sha512-oMA2dcrw6u0YfxJQXm342bFKX/E4sG9rbTzO9ptUcR/e8A33cHuvStiYOwH7fszkZlZ1z/ta9AAoPk2F4qIOHA==", - "requires": { - "onetime": "^7.0.0", - "signal-exit": "^4.1.0" - } - }, - "semver": { - "version": "7.7.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz", - "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==" - }, - "signal-exit": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", - "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==" - }, - "slice-ansi": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-5.0.0.tgz", - "integrity": "sha512-FC+lgizVPfie0kkhqUScwRu1O/lF6NOgJmlCgK+/LYxDCTk8sGelYaHDhFcDN+Sn3Cv+3VSa4Byeo+IMCzpMgQ==", - "requires": { - "ansi-styles": "^6.0.0", - "is-fullwidth-code-point": "^4.0.0" - } - }, - "string-width": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-7.2.0.tgz", - "integrity": "sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==", - "requires": { - "emoji-regex": "^10.3.0", - "get-east-asian-width": "^1.0.0", - "strip-ansi": "^7.1.0" - } - }, - "strip-ansi": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.2.tgz", - "integrity": "sha512-gmBGslpoQJtgnMAvOVqGZpEz9dyoKTCzy2nfz/n8aIFhN/jCE/rCmcxabB6jOOHV+0WNnylOxaxBQPSvcWklhA==", - "requires": { - "ansi-regex": "^6.0.1" - } - }, - "wrap-ansi": { - "version": "9.0.2", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-9.0.2.tgz", - "integrity": "sha512-42AtmgqjV+X1VpdOfyTGOYRi0/zsoLqtXQckTmqTeybT+BDIbM/Guxo7x3pE2vtpr1ok6xRqM9OpBe+Jyoqyww==", - "requires": { - "ansi-styles": "^6.2.1", - "string-width": "^7.0.0", - "strip-ansi": "^7.1.0" - } - } - } - }, - "@angular/cli": { - "version": "20.3.16", - "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-20.3.16.tgz", - "integrity": "sha512-kjGp0ywIWebWrH6U5eCRkS4Tx1D/yMe2iT7DXMfEcLc8iMSrBozEriMJppbot9ou8O2LeEH5d1Nw0efNNo78Kw==", - "requires": { - "@angular-devkit/architect": "0.2003.16", - "@angular-devkit/core": "20.3.16", - "@angular-devkit/schematics": "20.3.16", - "@inquirer/prompts": "7.8.2", - "@listr2/prompt-adapter-inquirer": "3.0.1", - "@modelcontextprotocol/sdk": "1.26.0", - "@schematics/angular": "20.3.16", - "@yarnpkg/lockfile": "1.1.0", - "algoliasearch": "5.35.0", - "ini": "5.0.0", - "jsonc-parser": "3.3.1", - "listr2": "9.0.1", - "npm-package-arg": "13.0.0", - "pacote": "21.0.4", - "resolve": "1.22.10", - "semver": "7.7.2", - "yargs": "18.0.0", - "zod": "4.1.13" - }, - "dependencies": { - "@angular-devkit/core": { - "version": "20.3.16", - "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-20.3.16.tgz", - "integrity": "sha512-6L9Lpe3lbkyz32gzqxZGVC8MhXxXht+yV+4LUsb4+6T/mG/V9lW6UTW0dhwVOS3vpWMEwpy75XHT298t7HcKEg==", - "requires": { - "ajv": "8.17.1", - "ajv-formats": "3.0.1", - "jsonc-parser": "3.3.1", - "picomatch": "4.0.3", - "rxjs": "7.8.2", - "source-map": "0.7.6" - } - }, - "@listr2/prompt-adapter-inquirer": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/@listr2/prompt-adapter-inquirer/-/prompt-adapter-inquirer-3.0.1.tgz", - "integrity": "sha512-3XFmGwm3u6ioREG+ynAQB7FoxfajgQnMhIu8wC5eo/Lsih4aKDg0VuIMGaOsYn7hJSJagSeaD4K8yfpkEoDEmA==", - "requires": { - "@inquirer/type": "^3.0.7" - } - }, - "ajv": { - "version": "8.17.1", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz", - "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==", - "requires": { - "fast-deep-equal": "^3.1.3", - "fast-uri": "^3.0.1", - "json-schema-traverse": "^1.0.0", - "require-from-string": "^2.0.2" - } - }, - "ajv-formats": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-3.0.1.tgz", - "integrity": "sha512-8iUql50EUR+uUcdRQ3HDqa6EVyo3docL8g5WJ3FNcWmu62IbkGUue/pEyLBW8VGKKucTPgqeks4fIU1DA4yowQ==", - "requires": { - "ajv": "^8.0.0" - } - }, - "ansi-escapes": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-7.2.0.tgz", - "integrity": "sha512-g6LhBsl+GBPRWGWsBtutpzBYuIIdBkLEvad5C/va/74Db018+5TZiyA26cZJAr3Rft5lprVqOIPxf5Vid6tqAw==", - "requires": { - "environment": "^1.0.0" - } - }, - "ansi-regex": { - "version": "6.2.2", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.2.tgz", - "integrity": "sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==" - }, - "ansi-styles": { - "version": "6.2.3", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.3.tgz", - "integrity": "sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==" - }, - "chokidar": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.3.tgz", - "integrity": "sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA==", - "optional": true, - "peer": true, - "requires": { - "readdirp": "^4.0.1" - } - }, - "cli-cursor": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-5.0.0.tgz", - "integrity": "sha512-aCj4O5wKyszjMmDT4tZj93kxyydN/K5zPWSCe6/0AV/AA1pqe5ZBIw0a2ZfPQV7lL5/yb5HsUreJ6UFAF1tEQw==", - "requires": { - "restore-cursor": "^5.0.0" - } - }, - "cli-truncate": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-4.0.0.tgz", - "integrity": "sha512-nPdaFdQ0h/GEigbPClz11D0v/ZJEwxmeVZGeMo3Z5StPtUTkA9o1lD6QwoirYiSDzbcwn2XcjwmCp68W1IS4TA==", - "requires": { - "slice-ansi": "^5.0.0", - "string-width": "^7.0.0" - } - }, - "cliui": { - "version": "9.0.1", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-9.0.1.tgz", - "integrity": "sha512-k7ndgKhwoQveBL+/1tqGJYNz097I7WOvwbmmU2AR5+magtbjPWQTS1C5vzGkBC8Ym8UWRzfKUzUUqFLypY4Q+w==", - "requires": { - "string-width": "^7.2.0", - "strip-ansi": "^7.1.0", - "wrap-ansi": "^9.0.0" - } - }, - "emoji-regex": { - "version": "10.6.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.6.0.tgz", - "integrity": "sha512-toUI84YS5YmxW219erniWD0CIVOo46xGKColeNQRgOzDorgBi1v4D71/OFzgD9GO2UGKIv1C3Sp8DAn0+j5w7A==" - }, - "eventemitter3": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-5.0.1.tgz", - "integrity": "sha512-GWkBvjiSZK87ELrYOSESUYeVIc9mvLLf/nXalMOS5dYrgZq9o5OVkbZAVM06CVxYsCwH9BDZFPlQTlPA1j4ahA==" - }, - "is-fullwidth-code-point": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-4.0.0.tgz", - "integrity": "sha512-O4L094N2/dZ7xqVdrXhh9r1KODPJpFms8B5sGdJLPy664AgvXsreZUyCQQNItZRDlYug4xStLjNp/sz3HvBowQ==" - }, "json-schema-traverse": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", @@ -18967,49 +19937,10 @@ "wrap-ansi": "^9.0.0" } }, - "log-update": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/log-update/-/log-update-6.1.0.tgz", - "integrity": "sha512-9ie8ItPR6tjY5uYJh8K/Zrv/RMZ5VOlOWvtZdEHYSTFKZfIBPQa9tOAEeAWhd+AnIneLJ22w5fjOYtoutpWq5w==", - "requires": { - "ansi-escapes": "^7.0.0", - "cli-cursor": "^5.0.0", - "slice-ansi": "^7.1.0", - "strip-ansi": "^7.1.0", - "wrap-ansi": "^9.0.0" - }, - "dependencies": { - "is-fullwidth-code-point": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-5.1.0.tgz", - "integrity": "sha512-5XHYaSyiqADb4RnZ1Bdad6cPp8Toise4TzEjcOYDHZkTCbKgiUl7WTUCpNWHuxmDt91wnsZBc9xinNzopv3JMQ==", - "requires": { - "get-east-asian-width": "^1.3.1" - } - }, - "slice-ansi": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-7.1.2.tgz", - "integrity": "sha512-iOBWFgUX7caIZiuutICxVgX1SdxwAVFFKwt1EvMYYec/NWO5meOJ6K5uQxhrYBdQJne4KxiqZc+KptFOWFSI9w==", - "requires": { - "ansi-styles": "^6.2.1", - "is-fullwidth-code-point": "^5.0.0" - } - } - } - }, - "onetime": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/onetime/-/onetime-7.0.0.tgz", - "integrity": "sha512-VXJjc87FScF88uafS3JllDgvAm+c/Slfz06lorj2uAY34rlUu0Nt+v8wreiImcrgAjjIHp1rXpTDlLOGw29WwQ==", - "requires": { - "mimic-function": "^5.0.0" - } - }, "picomatch": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz", - "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==" + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz", + "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==" }, "readdirp": { "version": "4.1.2", @@ -19018,25 +19949,11 @@ "optional": true, "peer": true }, - "restore-cursor": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-5.1.0.tgz", - "integrity": "sha512-oMA2dcrw6u0YfxJQXm342bFKX/E4sG9rbTzO9ptUcR/e8A33cHuvStiYOwH7fszkZlZ1z/ta9AAoPk2F4qIOHA==", - "requires": { - "onetime": "^7.0.0", - "signal-exit": "^4.1.0" - } - }, "semver": { "version": "7.7.2", "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz", "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==" }, - "signal-exit": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", - "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==" - }, "slice-ansi": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-5.0.0.tgz", @@ -19062,11 +19979,11 @@ } }, "strip-ansi": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.2.tgz", - "integrity": "sha512-gmBGslpoQJtgnMAvOVqGZpEz9dyoKTCzy2nfz/n8aIFhN/jCE/rCmcxabB6jOOHV+0WNnylOxaxBQPSvcWklhA==", + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.2.0.tgz", + "integrity": "sha512-yDPMNjp4WyfYBkHnjIRLfca1i6KMyGCtsVgoKe/z1+6vukgaENdgGBZt+ZmKPc4gavvEZ5OgHfHdrazhgNyG7w==", "requires": { - "ansi-regex": "^6.0.1" + "ansi-regex": "^6.2.2" } }, "wrap-ansi": { @@ -19078,52 +19995,29 @@ "string-width": "^7.0.0", "strip-ansi": "^7.1.0" } - }, - "y18n": { - "version": "5.0.8", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", - "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==" - }, - "yargs": { - "version": "18.0.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-18.0.0.tgz", - "integrity": "sha512-4UEqdc2RYGHZc7Doyqkrqiln3p9X2DZVxaGbwhn2pi7MrRagKaOcIKe8L3OxYcbhXLgLFUS3zAYuQjKBQgmuNg==", - "requires": { - "cliui": "^9.0.1", - "escalade": "^3.1.1", - "get-caller-file": "^2.0.5", - "string-width": "^7.2.0", - "y18n": "^5.0.5", - "yargs-parser": "^22.0.0" - } - }, - "yargs-parser": { - "version": "22.0.0", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-22.0.0.tgz", - "integrity": "sha512-rwu/ClNdSMpkSrUb+d6BRsSkLUq1fmfsY6TOpYzTwvwkg1/NRG85KBy3kq++A8LKQwX6lsu+aWad+2khvuXrqw==" } } }, "@angular/common": { - "version": "20.3.16", - "resolved": "https://registry.npmjs.org/@angular/common/-/common-20.3.16.tgz", - "integrity": "sha512-GRAziNlntwdnJy3F+8zCOvDdy7id0gITjDnM6P9+n2lXvtDuBLGJKU3DWBbvxcCjtD6JK/g/rEX5fbCxbUHkQQ==", + "version": "20.3.25", + "resolved": "https://registry.npmjs.org/@angular/common/-/common-20.3.25.tgz", + "integrity": "sha512-rnRGcXbjet0DHgkRL4Dqxk21G2T4UypVfiTV/fay58H8w9U89PJ1L6gRmk8B/uyfpii/9r23cBwnpcguQykxYw==", "requires": { "tslib": "^2.3.0" } }, "@angular/compiler": { - "version": "20.3.16", - "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-20.3.16.tgz", - "integrity": "sha512-Pt9Ms9GwTThgzdxWBwMfN8cH1JEtQ2DK5dc2yxYtPSaD+WKmG9AVL1PrzIYQEbaKcWk2jxASUHpEWSlNiwo8uw==", + "version": "20.3.25", + "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-20.3.25.tgz", + "integrity": "sha512-TSh6gVoQqlLPqWwsYMK0lfVEQYENQO+USzS+BHFXEHFfgBRap6qDpIUGnRdj0Y2PlaVJUVFbeq1855EZUPUEoA==", "requires": { "tslib": "^2.3.0" } }, "@angular/compiler-cli": { - "version": "20.3.16", - "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-20.3.16.tgz", - "integrity": "sha512-l3xF/fXfJAl/UrNnH9Ufkr79myjMgXdHq1mmmph2UnpeqilRB1b8lC9sLBV9MipQHVn3dwocxMIvtrcryfOaXw==", + "version": "20.3.25", + "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-20.3.25.tgz", + "integrity": "sha512-iqxwVo5Pgzt3EfT49OZ6plxA6KKxwv7ixx1XNH7QRvaOJC9gmsPScWpx+LO7ZsVZdo/NkA+rnXDl0PauUgGciw==", "requires": { "@babel/core": "7.28.3", "@jridgewell/sourcemap-codec": "^1.4.14", @@ -19135,16 +20029,6 @@ "yargs": "^18.0.0" }, "dependencies": { - "ansi-regex": { - "version": "6.2.2", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.2.tgz", - "integrity": "sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==" - }, - "ansi-styles": { - "version": "6.2.3", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.3.tgz", - "integrity": "sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==" - }, "chokidar": { "version": "4.0.3", "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.3.tgz", @@ -19153,237 +20037,93 @@ "readdirp": "^4.0.1" } }, - "cliui": { - "version": "9.0.1", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-9.0.1.tgz", - "integrity": "sha512-k7ndgKhwoQveBL+/1tqGJYNz097I7WOvwbmmU2AR5+magtbjPWQTS1C5vzGkBC8Ym8UWRzfKUzUUqFLypY4Q+w==", - "requires": { - "string-width": "^7.2.0", - "strip-ansi": "^7.1.0", - "wrap-ansi": "^9.0.0" - } - }, - "emoji-regex": { - "version": "10.6.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.6.0.tgz", - "integrity": "sha512-toUI84YS5YmxW219erniWD0CIVOo46xGKColeNQRgOzDorgBi1v4D71/OFzgD9GO2UGKIv1C3Sp8DAn0+j5w7A==" - }, "readdirp": { "version": "4.1.2", "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.1.2.tgz", "integrity": "sha512-GDhwkLfywWL2s6vEjyhri+eXmfH6j1L7JE27WhqLeYzoh/A3DBaYGEj2H/HFZCn/kMfim73FXxEJTw06WtxQwg==" - }, - "string-width": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-7.2.0.tgz", - "integrity": "sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==", - "requires": { - "emoji-regex": "^10.3.0", - "get-east-asian-width": "^1.0.0", - "strip-ansi": "^7.1.0" - } - }, - "strip-ansi": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.2.tgz", - "integrity": "sha512-gmBGslpoQJtgnMAvOVqGZpEz9dyoKTCzy2nfz/n8aIFhN/jCE/rCmcxabB6jOOHV+0WNnylOxaxBQPSvcWklhA==", - "requires": { - "ansi-regex": "^6.0.1" - } - }, - "wrap-ansi": { - "version": "9.0.2", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-9.0.2.tgz", - "integrity": "sha512-42AtmgqjV+X1VpdOfyTGOYRi0/zsoLqtXQckTmqTeybT+BDIbM/Guxo7x3pE2vtpr1ok6xRqM9OpBe+Jyoqyww==", - "requires": { - "ansi-styles": "^6.2.1", - "string-width": "^7.0.0", - "strip-ansi": "^7.1.0" - } - }, - "y18n": { - "version": "5.0.8", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", - "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==" - }, - "yargs": { - "version": "18.0.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-18.0.0.tgz", - "integrity": "sha512-4UEqdc2RYGHZc7Doyqkrqiln3p9X2DZVxaGbwhn2pi7MrRagKaOcIKe8L3OxYcbhXLgLFUS3zAYuQjKBQgmuNg==", - "requires": { - "cliui": "^9.0.1", - "escalade": "^3.1.1", - "get-caller-file": "^2.0.5", - "string-width": "^7.2.0", - "y18n": "^5.0.5", - "yargs-parser": "^22.0.0" - } - }, - "yargs-parser": { - "version": "22.0.0", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-22.0.0.tgz", - "integrity": "sha512-rwu/ClNdSMpkSrUb+d6BRsSkLUq1fmfsY6TOpYzTwvwkg1/NRG85KBy3kq++A8LKQwX6lsu+aWad+2khvuXrqw==" } } }, "@angular/core": { - "version": "20.3.16", - "resolved": "https://registry.npmjs.org/@angular/core/-/core-20.3.16.tgz", - "integrity": "sha512-KSFPKvOmWWLCJBbEO+CuRUXfecX2FRuO0jNi9c54ptXMOPHlK1lIojUnyXmMNzjdHgRug8ci9qDuftvC2B7MKg==", + "version": "20.3.25", + "resolved": "https://registry.npmjs.org/@angular/core/-/core-20.3.25.tgz", + "integrity": "sha512-B4XnnR5jzikZDvZ4PjwjAWZMT14dxrKrmJdwa/n0yp7rMPkIJTKF6ZJMg4d1pLWLLSsc2oWHioN3UrWlGqIKnA==", "requires": { "tslib": "^2.3.0" } }, "@angular/forms": { - "version": "20.3.16", - "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-20.3.16.tgz", - "integrity": "sha512-1yzbXpExTqATpVcqA3wGrq4ACFIP3mRxA4pbso5KoJU+/4JfzNFwLsDaFXKpm5uxwchVnj8KM2vPaDOkvtp7NA==", + "version": "20.3.25", + "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-20.3.25.tgz", + "integrity": "sha512-vGRo1LVPFo2Cu0k+QyDTlsBv5UbN0c3Et2YMS+43oyi1c4keocntBccOjLyM5C0kpMz4+pP81MqqYpAWu2k+TQ==", "requires": { "tslib": "^2.3.0" } }, "@angular/language-service": { - "version": "20.3.16", - "resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-20.3.16.tgz", - "integrity": "sha512-0A/tSQPq5geIz2mMcZA5fzzbzT39v+ADQksnfPr8htNxtkYWy+EI5+d0+++k59NuvjLY4uTBqhRTRB9b1PKrjw==", + "version": "20.3.25", + "resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-20.3.25.tgz", + "integrity": "sha512-3PZUwbDUVQXk9BLSiNUpDxTnRXGR3szwK9QFQaGDt8lhmLYaQLh3VJsY0FHDRghHZYIGR2P2MbVxGQHytF+IPw==", "dev": true }, "@angular/localize": { - "version": "20.3.16", - "resolved": "https://registry.npmjs.org/@angular/localize/-/localize-20.3.16.tgz", - "integrity": "sha512-7S2ACDZC1Ag1+rc991BMvW6gDyBCH7ykGWpZL1aHOmnq4K70Sf8p2VyQMtYhaz7XfWeXxwBQjCncVYv6D7RO5A==", + "version": "20.3.25", + "resolved": "https://registry.npmjs.org/@angular/localize/-/localize-20.3.25.tgz", + "integrity": "sha512-N4wmEBH44h58Av+1ivQ7LAe6Q0QP/2oBngvmnkO39AM6tadlnQGmaOvVzCUZe4BpOWYrrXQNiszSxGD3mUGgHg==", "requires": { "@babel/core": "7.28.3", "@types/babel__core": "7.20.5", "tinyglobby": "^0.2.12", "yargs": "^18.0.0" - }, - "dependencies": { - "ansi-regex": { - "version": "6.2.2", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.2.tgz", - "integrity": "sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==" - }, - "ansi-styles": { - "version": "6.2.3", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.3.tgz", - "integrity": "sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==" - }, - "cliui": { - "version": "9.0.1", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-9.0.1.tgz", - "integrity": "sha512-k7ndgKhwoQveBL+/1tqGJYNz097I7WOvwbmmU2AR5+magtbjPWQTS1C5vzGkBC8Ym8UWRzfKUzUUqFLypY4Q+w==", - "requires": { - "string-width": "^7.2.0", - "strip-ansi": "^7.1.0", - "wrap-ansi": "^9.0.0" - } - }, - "emoji-regex": { - "version": "10.6.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.6.0.tgz", - "integrity": "sha512-toUI84YS5YmxW219erniWD0CIVOo46xGKColeNQRgOzDorgBi1v4D71/OFzgD9GO2UGKIv1C3Sp8DAn0+j5w7A==" - }, - "string-width": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-7.2.0.tgz", - "integrity": "sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==", - "requires": { - "emoji-regex": "^10.3.0", - "get-east-asian-width": "^1.0.0", - "strip-ansi": "^7.1.0" - } - }, - "strip-ansi": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.2.tgz", - "integrity": "sha512-gmBGslpoQJtgnMAvOVqGZpEz9dyoKTCzy2nfz/n8aIFhN/jCE/rCmcxabB6jOOHV+0WNnylOxaxBQPSvcWklhA==", - "requires": { - "ansi-regex": "^6.0.1" - } - }, - "wrap-ansi": { - "version": "9.0.2", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-9.0.2.tgz", - "integrity": "sha512-42AtmgqjV+X1VpdOfyTGOYRi0/zsoLqtXQckTmqTeybT+BDIbM/Guxo7x3pE2vtpr1ok6xRqM9OpBe+Jyoqyww==", - "requires": { - "ansi-styles": "^6.2.1", - "string-width": "^7.0.0", - "strip-ansi": "^7.1.0" - } - }, - "y18n": { - "version": "5.0.8", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", - "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==" - }, - "yargs": { - "version": "18.0.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-18.0.0.tgz", - "integrity": "sha512-4UEqdc2RYGHZc7Doyqkrqiln3p9X2DZVxaGbwhn2pi7MrRagKaOcIKe8L3OxYcbhXLgLFUS3zAYuQjKBQgmuNg==", - "requires": { - "cliui": "^9.0.1", - "escalade": "^3.1.1", - "get-caller-file": "^2.0.5", - "string-width": "^7.2.0", - "y18n": "^5.0.5", - "yargs-parser": "^22.0.0" - } - }, - "yargs-parser": { - "version": "22.0.0", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-22.0.0.tgz", - "integrity": "sha512-rwu/ClNdSMpkSrUb+d6BRsSkLUq1fmfsY6TOpYzTwvwkg1/NRG85KBy3kq++A8LKQwX6lsu+aWad+2khvuXrqw==" - } } }, "@angular/platform-browser": { - "version": "20.3.16", - "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-20.3.16.tgz", - "integrity": "sha512-YsrLS6vyS77i4pVHg4gdSBW74qvzHjpQRTVQ5Lv/OxIjJdYYYkMmjNalCNgy1ZuyY6CaLIB11ccxhrNnxfKGOQ==", + "version": "20.3.25", + "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-20.3.25.tgz", + "integrity": "sha512-0k06U/AJRQifGMLkcU3R9uEHWbuKEzkKMuKcGagXTrkeFvCG2Ub4JdsbcjFNWB2bspWgaxIMSceuj7c83U5wOA==", "requires": { "tslib": "^2.3.0" } }, "@angular/platform-browser-dynamic": { - "version": "20.3.16", - "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-20.3.16.tgz", - "integrity": "sha512-5mECCV9YeKH6ue239GXRTGeDSd/eTbM1j8dDejhm5cGnPBhTxRw4o+GgSrWTYtb6VmIYdwUGBTC+wCBphiaQ2A==", + "version": "20.3.25", + "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-20.3.25.tgz", + "integrity": "sha512-3Ku+IsN4tQPVBsw75SoLbLf7TsXAGL0rGPHSsyNYFhG2ZZeQuYNIAi8mc4cwz/qMDnuassHFrCxuLDgN6Yab5w==", "requires": { "tslib": "^2.3.0" } }, "@angular/platform-server": { - "version": "20.3.16", - "resolved": "https://registry.npmjs.org/@angular/platform-server/-/platform-server-20.3.16.tgz", - "integrity": "sha512-LxQscYd3UCWV8H3sdlnM05UB60MZVuVsdsHvXdkJ9+WOQjVDN1l1rYhj2aDL/5KkaRd/nqo0yFRnVjwceXDJhQ==", + "version": "20.3.25", + "resolved": "https://registry.npmjs.org/@angular/platform-server/-/platform-server-20.3.25.tgz", + "integrity": "sha512-uOpLILe5QP9WLXhwshA3fbHc+Wx/4nrUBZNns/dw3t06bRHMbbkutF8eVs+n6Atl332y4mOcStzMX1ilBUSFHw==", "requires": { "tslib": "^2.3.0", "xhr2": "^0.2.0" } }, "@angular/router": { - "version": "20.3.16", - "resolved": "https://registry.npmjs.org/@angular/router/-/router-20.3.16.tgz", - "integrity": "sha512-e1LiQFZaajKqc00cY5FboIrWJZSMnZ64GDp5R0UejritYrqorQQQNOqP1W85BMuY2owibMmxVfX+dJg/Mc8PuQ==", + "version": "20.3.25", + "resolved": "https://registry.npmjs.org/@angular/router/-/router-20.3.25.tgz", + "integrity": "sha512-YIjLHWAufTaukNj15hEoys29e7XNhnCRsS1/95h/OqR69R3adbB8hV7ut7gO6XdXokriYqb4gtoUjoESxR+xFQ==", "requires": { "tslib": "^2.3.0" } }, "@angular/ssr": { - "version": "20.3.16", - "resolved": "https://registry.npmjs.org/@angular/ssr/-/ssr-20.3.16.tgz", - "integrity": "sha512-EpPSc9kUiLbe3Lpj0GUplt0JNPFmyuTnOv/h4bJqfj07xvSbn5vH3W0wl78RQrcOh9hfXua4xVCvCF/6nV6zPg==", + "version": "20.3.25", + "resolved": "https://registry.npmjs.org/@angular/ssr/-/ssr-20.3.25.tgz", + "integrity": "sha512-A/lbXQ+GucLAQfCJ5img7/xuqlftWjJU+iJABq/ARDkOOE/rNHrxFkXjJBntj97+oXjr7HBYI2sxYRZCCEiEag==", "requires": { "tslib": "^2.3.0" } }, "@babel/code-frame": { - "version": "7.27.1", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.27.1.tgz", - "integrity": "sha512-cjQ7ZlQ0Mv3b47hABuTevyTuYN4i+loJKGeV9flcCgIK37cCXRh+L1bd3iBHlynerhQ7BhCkn2BPbQUL+rGqFg==", + "version": "7.29.0", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.29.0.tgz", + "integrity": "sha512-9NhCeYjq9+3uxgdtp20LSiJXJvN0FeCtNGpJxuMFZ1Kv3cWUNb6DOhJwUvcVCzKGR66cw4njwM6hrJLqgOwbcw==", "requires": { - "@babel/helper-validator-identifier": "^7.27.1", + "@babel/helper-validator-identifier": "^7.28.5", "js-tokens": "^4.0.0", "picocolors": "^1.1.1" } @@ -19570,22 +20310,22 @@ } }, "@babel/helper-module-imports": { - "version": "7.27.1", - "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.27.1.tgz", - "integrity": "sha512-0gSFWUPNXNopqtIPQvlD5WgXYI5GY2kP2cCvoT8kczjbfcfuIljTbcWrulD1CIPIX2gt1wghbDy08yE1p+/r3w==", + "version": "7.28.6", + "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.28.6.tgz", + "integrity": "sha512-l5XkZK7r7wa9LucGw9LwZyyCUscb4x37JWTPz7swwFE/0FMQAGpiWUZn8u9DzkSBWEcK25jmvubfpw2dnAMdbw==", "requires": { - "@babel/traverse": "^7.27.1", - "@babel/types": "^7.27.1" + "@babel/traverse": "^7.28.6", + "@babel/types": "^7.28.6" } }, "@babel/helper-module-transforms": { - "version": "7.28.3", - "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.28.3.tgz", - "integrity": "sha512-gytXUbs8k2sXS9PnQptz5o0QnpLL51SwASIORY6XaBKF88nsOT0Zw9szLqlSGQDP/4TljBAD5y98p2U1fqkdsw==", + "version": "7.28.6", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.28.6.tgz", + "integrity": "sha512-67oXFAYr2cDLDVGLXTEABjdBJZ6drElUSI7WKp70NrpyISso3plG9SAGEF6y7zbha/wOzUByWWTJvEDVNIUGcA==", "requires": { - "@babel/helper-module-imports": "^7.27.1", - "@babel/helper-validator-identifier": "^7.27.1", - "@babel/traverse": "^7.28.3" + "@babel/helper-module-imports": "^7.28.6", + "@babel/helper-validator-identifier": "^7.28.5", + "@babel/traverse": "^7.28.6" } }, "@babel/helper-optimise-call-expression": { @@ -19597,9 +20337,9 @@ } }, "@babel/helper-plugin-utils": { - "version": "7.27.1", - "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.27.1.tgz", - "integrity": "sha512-1gn1Up5YXka3YYAHGKpbideQ5Yjf1tDa9qYcgysz+cNCXukyLl6DjPXhD3VRwSb8c0J9tA4b2+rHEZtc6R0tlw==" + "version": "7.28.6", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.28.6.tgz", + "integrity": "sha512-S9gzZ/bz83GRysI7gAD4wPT/AI3uCnY+9xn+Mx/KPs2JwHJIz1W8PZkg2cqyt3RNOBM8ejcXhV6y8Og7ly/Dug==" }, "@babel/helper-remap-async-to-generator": { "version": "7.27.1", @@ -19673,11 +20413,11 @@ } }, "@babel/parser": { - "version": "7.28.5", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.28.5.tgz", - "integrity": "sha512-KKBU1VGYR7ORr3At5HAtUQ+TV3SzRCXmA/8OdDZiLDBIZxVyzXuztPjfLd3BV1PRAQGCMWWSHYhL0F8d5uHBDQ==", + "version": "7.29.3", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.29.3.tgz", + "integrity": "sha512-b3ctpQwp+PROvU/cttc4OYl4MzfJUWy6FZg+PMXfzmt/+39iHVF0sDfqay8TQM3JA2EUOyKcFZt75jWriQijsA==", "requires": { - "@babel/types": "^7.28.5" + "@babel/types": "^7.29.0" } }, "@babel/plugin-bugfix-firefox-class-in-computed-class-key": { @@ -19977,14 +20717,14 @@ } }, "@babel/plugin-transform-modules-systemjs": { - "version": "7.28.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.28.5.tgz", - "integrity": "sha512-vn5Jma98LCOeBy/KpeQhXcV2WZgaRUtjwQmjoBuLNlOmkg0fB5pdvYVeWRYI69wWKwK2cD1QbMiUQnoujWvrew==", + "version": "7.29.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.29.0.tgz", + "integrity": "sha512-PrujnVFbOdUpw4UHiVwKvKRLMMic8+eC0CuNlxjsyZUiBjhFdPsewdXCkveh2KqBA9/waD0W1b4hXSOBQJezpQ==", "requires": { - "@babel/helper-module-transforms": "^7.28.3", - "@babel/helper-plugin-utils": "^7.27.1", + "@babel/helper-module-transforms": "^7.28.6", + "@babel/helper-plugin-utils": "^7.28.6", "@babel/helper-validator-identifier": "^7.28.5", - "@babel/traverse": "^7.28.5" + "@babel/traverse": "^7.29.0" } }, "@babel/plugin-transform-modules-umd": { @@ -20323,36 +21063,36 @@ "integrity": "sha512-9uIQ10o0WGdpP6GDhXcdOJPJuDgFtIDtN/9+ArJQ2NAfAmiuhTQdzkaTGR33v43GYS2UrSA0eX2pPPHoFVvpxA==" }, "@babel/template": { - "version": "7.27.2", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.27.2.tgz", - "integrity": "sha512-LPDZ85aEJyYSd18/DkjNh4/y1ntkE5KwUHWTiqgRxruuZL2F1yuHligVHLvcHY2vMHXttKFpJn6LwfI7cw7ODw==", + "version": "7.28.6", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.28.6.tgz", + "integrity": "sha512-YA6Ma2KsCdGb+WC6UpBVFJGXL58MDA6oyONbjyF/+5sBgxY/dwkhLogbMT2GXXyU84/IhRw/2D1Os1B/giz+BQ==", "requires": { - "@babel/code-frame": "^7.27.1", - "@babel/parser": "^7.27.2", - "@babel/types": "^7.27.1" + "@babel/code-frame": "^7.28.6", + "@babel/parser": "^7.28.6", + "@babel/types": "^7.28.6" } }, "@babel/traverse": { - "version": "7.28.5", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.28.5.tgz", - "integrity": "sha512-TCCj4t55U90khlYkVV/0TfkJkAkUg3jZFA3Neb7unZT8CPok7iiRfaX0F+WnqWqt7OxhOn0uBKXCw4lbL8W0aQ==", + "version": "7.29.0", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.29.0.tgz", + "integrity": "sha512-4HPiQr0X7+waHfyXPZpWPfWL/J7dcN1mx9gL6WdQVMbPnF3+ZhSMs8tCxN7oHddJE9fhNE7+lxdnlyemKfJRuA==", "requires": { - "@babel/code-frame": "^7.27.1", - "@babel/generator": "^7.28.5", + "@babel/code-frame": "^7.29.0", + "@babel/generator": "^7.29.0", "@babel/helper-globals": "^7.28.0", - "@babel/parser": "^7.28.5", - "@babel/template": "^7.27.2", - "@babel/types": "^7.28.5", + "@babel/parser": "^7.29.0", + "@babel/template": "^7.28.6", + "@babel/types": "^7.29.0", "debug": "^4.3.1" }, "dependencies": { "@babel/generator": { - "version": "7.28.5", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.28.5.tgz", - "integrity": "sha512-3EwLFhZ38J4VyIP6WNtt2kUdW9dokXA9Cr4IVIFHuCpZ3H8/YFOl5JjZHisrn1fATPBmKKqXzDFvh9fUwHz6CQ==", + "version": "7.29.1", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.29.1.tgz", + "integrity": "sha512-qsaF+9Qcm2Qv8SRIMMscAvG4O3lJ0F1GuMo5HR/Bp02LopNgnZBC/EkbevHFeGs4ls/oPz9v+Bsmzbkbe+0dUw==", "requires": { - "@babel/parser": "^7.28.5", - "@babel/types": "^7.28.5", + "@babel/parser": "^7.29.0", + "@babel/types": "^7.29.0", "@jridgewell/gen-mapping": "^0.3.12", "@jridgewell/trace-mapping": "^0.3.28", "jsesc": "^3.0.2" @@ -20370,9 +21110,9 @@ } }, "@babel/types": { - "version": "7.28.5", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.28.5.tgz", - "integrity": "sha512-qQ5m48eI/MFLQ5PxQj4PFaprjyCTLI37ElWMmNs0K8Lk3dVeOdNpB3ks8jc7yM5CDmVC73eMVk/trk3fgmrUpA==", + "version": "7.29.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.29.0.tgz", + "integrity": "sha512-LwdZHpScM4Qz8Xw2iKSzS+cfglZzJGvofQICy7W7v4caru4EaAmyUuO6BGrbyQ2mYV11W0U8j5mBhd14dd3B0A==", "requires": { "@babel/helper-string-parser": "^7.27.1", "@babel/helper-validator-identifier": "^7.28.5" @@ -20388,9 +21128,9 @@ } }, "@cypress/request": { - "version": "3.0.10", - "resolved": "https://registry.npmjs.org/@cypress/request/-/request-3.0.10.tgz", - "integrity": "sha512-hauBrOdvu08vOsagkZ/Aju5XuiZx6ldsLfByg1htFeldhex+PeMrYauANzFsMJeAA0+dyPLbDoX2OYuvVoLDkQ==", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/@cypress/request/-/request-4.0.1.tgz", + "integrity": "sha512-y20e+e6dFYkOUUJLVUZTsJRuTiXZaUQ32WD+R/ux/HBybbTx4ge7cNINcua0pU8+SNkKuRbOF12mBmzuzM8n5w==", "optional": true, "requires": { "aws-sign2": "~0.7.0", @@ -20406,11 +21146,21 @@ "json-stringify-safe": "~5.0.1", "mime-types": "~2.1.19", "performance-now": "^2.1.0", - "qs": "~6.14.1", + "qs": "^6.15.2", "safe-buffer": "^5.1.2", "tough-cookie": "^5.0.0", - "tunnel-agent": "^0.6.0", - "uuid": "^8.3.2" + "tunnel-agent": "^0.6.0" + }, + "dependencies": { + "qs": { + "version": "6.15.2", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.15.2.tgz", + "integrity": "sha512-Rzq0KEyX/w/tEybncDgdkZrJgVUsUMk3xjh3t5bv3S1HTAtg+uOYt72+ZfwiQwKdysThkTBdL/rTi6HDmX9Ddw==", + "optional": true, + "requires": { + "side-channel": "^1.1.0" + } + } } }, "@cypress/schematic": { @@ -20467,159 +21217,159 @@ "integrity": "sha512-4B4OijXeVNOPZlYA2oEwWOTkzyltLao+xbotHQeqN++Rv27Y6s818+n2Qkp8q+Fxhn0t/5lA5X1Mxktud8eayQ==" }, "@esbuild/aix-ppc64": { - "version": "0.25.9", - "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.9.tgz", - "integrity": "sha512-OaGtL73Jck6pBKjNIe24BnFE6agGl+6KxDtTfHhy1HmhthfKouEcOhqpSL64K4/0WCtbKFLOdzD/44cJ4k9opA==", + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.27.7.tgz", + "integrity": "sha512-EKX3Qwmhz1eMdEJokhALr0YiD0lhQNwDqkPYyPhiSwKrh7/4KRjQc04sZ8db+5DVVnZ1LmbNDI1uAMPEUBnQPg==", "optional": true }, "@esbuild/android-arm": { - "version": "0.25.9", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.25.9.tgz", - "integrity": "sha512-5WNI1DaMtxQ7t7B6xa572XMXpHAaI/9Hnhk8lcxF4zVN4xstUgTlvuGDorBguKEnZO70qwEcLpfifMLoxiPqHQ==", + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.27.7.tgz", + "integrity": "sha512-jbPXvB4Yj2yBV7HUfE2KHe4GJX51QplCN1pGbYjvsyCZbQmies29EoJbkEc+vYuU5o45AfQn37vZlyXy4YJ8RQ==", "optional": true }, "@esbuild/android-arm64": { - "version": "0.25.9", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.25.9.tgz", - "integrity": "sha512-IDrddSmpSv51ftWslJMvl3Q2ZT98fUSL2/rlUXuVqRXHCs5EUF1/f+jbjF5+NG9UffUDMCiTyh8iec7u8RlTLg==", + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.27.7.tgz", + "integrity": "sha512-62dPZHpIXzvChfvfLJow3q5dDtiNMkwiRzPylSCfriLvZeq0a1bWChrGx/BbUbPwOrsWKMn8idSllklzBy+dgQ==", "optional": true }, "@esbuild/android-x64": { - "version": "0.25.9", - "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.25.9.tgz", - "integrity": "sha512-I853iMZ1hWZdNllhVZKm34f4wErd4lMyeV7BLzEExGEIZYsOzqDWDf+y082izYUE8gtJnYHdeDpN/6tUdwvfiw==", + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.27.7.tgz", + "integrity": "sha512-x5VpMODneVDb70PYV2VQOmIUUiBtY3D3mPBG8NxVk5CogneYhkR7MmM3yR/uMdITLrC1ml/NV1rj4bMJuy9MCg==", "optional": true }, "@esbuild/darwin-arm64": { - "version": "0.25.9", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.25.9.tgz", - "integrity": "sha512-XIpIDMAjOELi/9PB30vEbVMs3GV1v2zkkPnuyRRURbhqjyzIINwj+nbQATh4H9GxUgH1kFsEyQMxwiLFKUS6Rg==", + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.27.7.tgz", + "integrity": "sha512-5lckdqeuBPlKUwvoCXIgI2D9/ABmPq3Rdp7IfL70393YgaASt7tbju3Ac+ePVi3KDH6N2RqePfHnXkaDtY9fkw==", "optional": true }, "@esbuild/darwin-x64": { - "version": "0.25.9", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.25.9.tgz", - "integrity": "sha512-jhHfBzjYTA1IQu8VyrjCX4ApJDnH+ez+IYVEoJHeqJm9VhG9Dh2BYaJritkYK3vMaXrf7Ogr/0MQ8/MeIefsPQ==", + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.27.7.tgz", + "integrity": "sha512-rYnXrKcXuT7Z+WL5K980jVFdvVKhCHhUwid+dDYQpH+qu+TefcomiMAJpIiC2EM3Rjtq0sO3StMV/+3w3MyyqQ==", "optional": true }, "@esbuild/freebsd-arm64": { - "version": "0.25.9", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.9.tgz", - "integrity": "sha512-z93DmbnY6fX9+KdD4Ue/H6sYs+bhFQJNCPZsi4XWJoYblUqT06MQUdBCpcSfuiN72AbqeBFu5LVQTjfXDE2A6Q==", + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.27.7.tgz", + "integrity": "sha512-B48PqeCsEgOtzME2GbNM2roU29AMTuOIN91dsMO30t+Ydis3z/3Ngoj5hhnsOSSwNzS+6JppqWsuhTp6E82l2w==", "optional": true }, "@esbuild/freebsd-x64": { - "version": "0.25.9", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.25.9.tgz", - "integrity": "sha512-mrKX6H/vOyo5v71YfXWJxLVxgy1kyt1MQaD8wZJgJfG4gq4DpQGpgTB74e5yBeQdyMTbgxp0YtNj7NuHN0PoZg==", + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.27.7.tgz", + "integrity": "sha512-jOBDK5XEjA4m5IJK3bpAQF9/Lelu/Z9ZcdhTRLf4cajlB+8VEhFFRjWgfy3M1O4rO2GQ/b2dLwCUGpiF/eATNQ==", "optional": true }, "@esbuild/linux-arm": { - "version": "0.25.9", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.25.9.tgz", - "integrity": "sha512-HBU2Xv78SMgaydBmdor38lg8YDnFKSARg1Q6AT0/y2ezUAKiZvc211RDFHlEZRFNRVhcMamiToo7bDx3VEOYQw==", + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.27.7.tgz", + "integrity": "sha512-RkT/YXYBTSULo3+af8Ib0ykH8u2MBh57o7q/DAs3lTJlyVQkgQvlrPTnjIzzRPQyavxtPtfg0EopvDyIt0j1rA==", "optional": true }, "@esbuild/linux-arm64": { - "version": "0.25.9", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.25.9.tgz", - "integrity": "sha512-BlB7bIcLT3G26urh5Dmse7fiLmLXnRlopw4s8DalgZ8ef79Jj4aUcYbk90g8iCa2467HX8SAIidbL7gsqXHdRw==", + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.27.7.tgz", + "integrity": "sha512-RZPHBoxXuNnPQO9rvjh5jdkRmVizktkT7TCDkDmQ0W2SwHInKCAV95GRuvdSvA7w4VMwfCjUiPwDi0ZO6Nfe9A==", "optional": true }, "@esbuild/linux-ia32": { - "version": "0.25.9", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.25.9.tgz", - "integrity": "sha512-e7S3MOJPZGp2QW6AK6+Ly81rC7oOSerQ+P8L0ta4FhVi+/j/v2yZzx5CqqDaWjtPFfYz21Vi1S0auHrap3Ma3A==", + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.27.7.tgz", + "integrity": "sha512-GA48aKNkyQDbd3KtkplYWT102C5sn/EZTY4XROkxONgruHPU72l+gW+FfF8tf2cFjeHaRbWpOYa/uRBz/Xq1Pg==", "optional": true }, "@esbuild/linux-loong64": { - "version": "0.25.9", - "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.25.9.tgz", - "integrity": "sha512-Sbe10Bnn0oUAB2AalYztvGcK+o6YFFA/9829PhOCUS9vkJElXGdphz0A3DbMdP8gmKkqPmPcMJmJOrI3VYB1JQ==", + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.27.7.tgz", + "integrity": "sha512-a4POruNM2oWsD4WKvBSEKGIiWQF8fZOAsycHOt6JBpZ+JN2n2JH9WAv56SOyu9X5IqAjqSIPTaJkqN8F7XOQ5Q==", "optional": true }, "@esbuild/linux-mips64el": { - "version": "0.25.9", - "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.25.9.tgz", - "integrity": "sha512-YcM5br0mVyZw2jcQeLIkhWtKPeVfAerES5PvOzaDxVtIyZ2NUBZKNLjC5z3/fUlDgT6w89VsxP2qzNipOaaDyA==", + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.27.7.tgz", + "integrity": "sha512-KabT5I6StirGfIz0FMgl1I+R1H73Gp0ofL9A3nG3i/cYFJzKHhouBV5VWK1CSgKvVaG4q1RNpCTR2LuTVB3fIw==", "optional": true }, "@esbuild/linux-ppc64": { - "version": "0.25.9", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.25.9.tgz", - "integrity": "sha512-++0HQvasdo20JytyDpFvQtNrEsAgNG2CY1CLMwGXfFTKGBGQT3bOeLSYE2l1fYdvML5KUuwn9Z8L1EWe2tzs1w==", + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.27.7.tgz", + "integrity": "sha512-gRsL4x6wsGHGRqhtI+ifpN/vpOFTQtnbsupUF5R5YTAg+y/lKelYR1hXbnBdzDjGbMYjVJLJTd2OFmMewAgwlQ==", "optional": true }, "@esbuild/linux-riscv64": { - "version": "0.25.9", - "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.25.9.tgz", - "integrity": "sha512-uNIBa279Y3fkjV+2cUjx36xkx7eSjb8IvnL01eXUKXez/CBHNRw5ekCGMPM0BcmqBxBcdgUWuUXmVWwm4CH9kg==", + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.27.7.tgz", + "integrity": "sha512-hL25LbxO1QOngGzu2U5xeXtxXcW+/GvMN3ejANqXkxZ/opySAZMrc+9LY/WyjAan41unrR3YrmtTsUpwT66InQ==", "optional": true }, "@esbuild/linux-s390x": { - "version": "0.25.9", - "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.25.9.tgz", - "integrity": "sha512-Mfiphvp3MjC/lctb+7D287Xw1DGzqJPb/J2aHHcHxflUo+8tmN/6d4k6I2yFR7BVo5/g7x2Monq4+Yew0EHRIA==", + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.27.7.tgz", + "integrity": "sha512-2k8go8Ycu1Kb46vEelhu1vqEP+UeRVj2zY1pSuPdgvbd5ykAw82Lrro28vXUrRmzEsUV0NzCf54yARIK8r0fdw==", "optional": true }, "@esbuild/linux-x64": { - "version": "0.25.9", - "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.25.9.tgz", - "integrity": "sha512-iSwByxzRe48YVkmpbgoxVzn76BXjlYFXC7NvLYq+b+kDjyyk30J0JY47DIn8z1MO3K0oSl9fZoRmZPQI4Hklzg==", + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.27.7.tgz", + "integrity": "sha512-hzznmADPt+OmsYzw1EE33ccA+HPdIqiCRq7cQeL1Jlq2gb1+OyWBkMCrYGBJ+sxVzve2ZJEVeePbLM2iEIZSxA==", "optional": true }, "@esbuild/netbsd-arm64": { - "version": "0.25.9", - "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.9.tgz", - "integrity": "sha512-9jNJl6FqaUG+COdQMjSCGW4QiMHH88xWbvZ+kRVblZsWrkXlABuGdFJ1E9L7HK+T0Yqd4akKNa/lO0+jDxQD4Q==", + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.27.7.tgz", + "integrity": "sha512-b6pqtrQdigZBwZxAn1UpazEisvwaIDvdbMbmrly7cDTMFnw/+3lVxxCTGOrkPVnsYIosJJXAsILG9XcQS+Yu6w==", "optional": true }, "@esbuild/netbsd-x64": { - "version": "0.25.9", - "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.25.9.tgz", - "integrity": "sha512-RLLdkflmqRG8KanPGOU7Rpg829ZHu8nFy5Pqdi9U01VYtG9Y0zOG6Vr2z4/S+/3zIyOxiK6cCeYNWOFR9QP87g==", + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.27.7.tgz", + "integrity": "sha512-OfatkLojr6U+WN5EDYuoQhtM+1xco+/6FSzJJnuWiUw5eVcicbyK3dq5EeV/QHT1uy6GoDhGbFpprUiHUYggrw==", "optional": true }, "@esbuild/openbsd-arm64": { - "version": "0.25.9", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.9.tgz", - "integrity": "sha512-YaFBlPGeDasft5IIM+CQAhJAqS3St3nJzDEgsgFixcfZeyGPCd6eJBWzke5piZuZ7CtL656eOSYKk4Ls2C0FRQ==", + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.27.7.tgz", + "integrity": "sha512-AFuojMQTxAz75Fo8idVcqoQWEHIXFRbOc1TrVcFSgCZtQfSdc1RXgB3tjOn/krRHENUB4j00bfGjyl2mJrU37A==", "optional": true }, "@esbuild/openbsd-x64": { - "version": "0.25.9", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.25.9.tgz", - "integrity": "sha512-1MkgTCuvMGWuqVtAvkpkXFmtL8XhWy+j4jaSO2wxfJtilVCi0ZE37b8uOdMItIHz4I6z1bWWtEX4CJwcKYLcuA==", + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.27.7.tgz", + "integrity": "sha512-+A1NJmfM8WNDv5CLVQYJ5PshuRm/4cI6WMZRg1by1GwPIQPCTs1GLEUHwiiQGT5zDdyLiRM/l1G0Pv54gvtKIg==", "optional": true }, "@esbuild/openharmony-arm64": { - "version": "0.25.9", - "resolved": "https://registry.npmjs.org/@esbuild/openharmony-arm64/-/openharmony-arm64-0.25.9.tgz", - "integrity": "sha512-4Xd0xNiMVXKh6Fa7HEJQbrpP3m3DDn43jKxMjxLLRjWnRsfxjORYJlXPO4JNcXtOyfajXorRKY9NkOpTHptErg==", + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/openharmony-arm64/-/openharmony-arm64-0.27.7.tgz", + "integrity": "sha512-+KrvYb/C8zA9CU/g0sR6w2RBw7IGc5J2BPnc3dYc5VJxHCSF1yNMxTV5LQ7GuKteQXZtspjFbiuW5/dOj7H4Yw==", "optional": true }, "@esbuild/sunos-x64": { - "version": "0.25.9", - "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.25.9.tgz", - "integrity": "sha512-WjH4s6hzo00nNezhp3wFIAfmGZ8U7KtrJNlFMRKxiI9mxEK1scOMAaa9i4crUtu+tBr+0IN6JCuAcSBJZfnphw==", + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.27.7.tgz", + "integrity": "sha512-ikktIhFBzQNt/QDyOL580ti9+5mL/YZeUPKU2ivGtGjdTYoqz6jObj6nOMfhASpS4GU4Q/Clh1QtxWAvcYKamA==", "optional": true }, "@esbuild/win32-arm64": { - "version": "0.25.9", - "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.25.9.tgz", - "integrity": "sha512-mGFrVJHmZiRqmP8xFOc6b84/7xa5y5YvR1x8djzXpJBSv/UsNK6aqec+6JDjConTgvvQefdGhFDAs2DLAds6gQ==", + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.27.7.tgz", + "integrity": "sha512-7yRhbHvPqSpRUV7Q20VuDwbjW5kIMwTHpptuUzV+AA46kiPze5Z7qgt6CLCK3pWFrHeNfDd1VKgyP4O+ng17CA==", "optional": true }, "@esbuild/win32-ia32": { - "version": "0.25.9", - "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.25.9.tgz", - "integrity": "sha512-b33gLVU2k11nVx1OhX3C8QQP6UHQK4ZtN56oFWvVXvz2VkDoe6fbG8TOgHFxEvqeqohmRnIHe5A1+HADk4OQww==", + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.27.7.tgz", + "integrity": "sha512-SmwKXe6VHIyZYbBLJrhOoCJRB/Z1tckzmgTLfFYOfpMAx63BJEaL9ExI8x7v0oAO3Zh6D/Oi1gVxEYr5oUCFhw==", "optional": true }, "@esbuild/win32-x64": { - "version": "0.25.9", - "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.25.9.tgz", - "integrity": "sha512-PPOl1mi6lpLNQxnGoyAfschAodRFYXJ+9fs6WHXz7CSWKbOqiMZsubC+BQsVKuul+3vKLuwTHsS2c2y9EoKwxQ==", + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.27.7.tgz", + "integrity": "sha512-56hiAJPhwQ1R4i+21FVF7V8kSD5zZTdHcVuRFMW0hn753vVfQN8xlx4uOPT4xoGH0Z/oVATuR82AiqSTDIpaHg==", "optional": true }, "@eslint-community/eslint-utils": { @@ -20801,9 +21551,9 @@ } }, "@hono/node-server": { - "version": "1.19.9", - "resolved": "https://registry.npmjs.org/@hono/node-server/-/node-server-1.19.9.tgz", - "integrity": "sha512-vHL6w3ecZsky+8P5MD+eFfaGTyCeOHUIFYMGpQGbrBTSmNNoxv0if69rEZ5giu36weC5saFuznL411gRX7bJDw==", + "version": "1.19.14", + "resolved": "https://registry.npmjs.org/@hono/node-server/-/node-server-1.19.14.tgz", + "integrity": "sha512-GwtvgtXxnWsucXvbQXkRgqksiH2Qed37H9xHZocE5sA3N8O8O8/8FA3uclQXxXVzc9XBZuEOMK7+r02FmSpHtw==", "requires": {} }, "@humanfs/core": { @@ -21010,19 +21760,6 @@ "integrity": "sha512-QPaNt/nmE2bLGQa9b7wwyRJoLZ7pN6rcyXvzU0YCmivmJyq1BVo94G98tStRWkoD1RgDX5C+dPlhhHzNdu/W/w==", "requires": {} }, - "@isaacs/balanced-match": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/@isaacs/balanced-match/-/balanced-match-4.0.1.tgz", - "integrity": "sha512-yzMTt9lEb8Gv7zRioUilSglI0c0smZ9k5D65677DLWLtWJaXIS3CqcGyUFByYKlnUj6TkjLVs54fBl6+TiGQDQ==" - }, - "@isaacs/brace-expansion": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/@isaacs/brace-expansion/-/brace-expansion-5.0.1.tgz", - "integrity": "sha512-WMz71T1JS624nWj2n2fnYAuPovhv7EUhk69R6i9dsVyzxt5eM3bjwvgk9L+APE1TRscGysAVMANkB0jh0LQZrQ==", - "requires": { - "@isaacs/balanced-match": "^4.0.1" - } - }, "@isaacs/fs-minipass": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/@isaacs/fs-minipass/-/fs-minipass-4.0.1.tgz", @@ -21581,15 +22318,15 @@ } }, "@ngtools/webpack": { - "version": "20.3.16", - "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-20.3.16.tgz", - "integrity": "sha512-yXxo0CKkCa9SuP05OskOeFt9l1wirCzh7MhwW1S18Rpi6cyPbV1bc7GEz05+dfi5Ee8Dlbx3sbmdty0xtHvFQw==", + "version": "20.3.25", + "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-20.3.25.tgz", + "integrity": "sha512-p/YopAgukaIvezv3hsJzJevnNUBNTM8UQIkyDHPY5/aANdKraUTKDQUwlVxRiyD8U+PTSeD/BI56oOnuKrdFZQ==", "requires": {} }, "@noble/secp256k1": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@noble/secp256k1/-/secp256k1-3.0.0.tgz", - "integrity": "sha512-NJBaR352KyIvj3t6sgT/+7xrNyF9Xk9QlLSIqUGVUYlsnDTAUqY8LOmwpcgEx4AMJXRITQ5XEVHD+mMaPfr3mg==" + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/@noble/secp256k1/-/secp256k1-3.1.0.tgz", + "integrity": "sha512-+F7iS7tUMaNGXcc9X3PjmjvuQnXEuSjCRNzVVA2xAcKXgCaP0dHYz4SFyt4FKNHef7sOP//xihowcySSS7PK9g==" }, "@nodelib/fs.scandir": { "version": "2.1.5", @@ -21899,164 +22636,182 @@ "peer": true }, "@rollup/rollup-android-arm-eabi": { - "version": "4.52.3", - "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.52.3.tgz", - "integrity": "sha512-h6cqHGZ6VdnwliFG1NXvMPTy/9PS3h8oLh7ImwR+kl+oYnQizgjxsONmmPSb2C66RksfkfIxEVtDSEcJiO0tqw==", + "version": "4.59.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.59.0.tgz", + "integrity": "sha512-upnNBkA6ZH2VKGcBj9Fyl9IGNPULcjXRlg0LLeaioQWueH30p6IXtJEbKAgvyv+mJaMxSm1l6xwDXYjpEMiLMg==", "optional": true }, "@rollup/rollup-android-arm64": { - "version": "4.52.3", - "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.52.3.tgz", - "integrity": "sha512-wd+u7SLT/u6knklV/ifG7gr5Qy4GUbH2hMWcDauPFJzmCZUAJ8L2bTkVXC2niOIxp8lk3iH/QX8kSrUxVZrOVw==", + "version": "4.59.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.59.0.tgz", + "integrity": "sha512-hZ+Zxj3SySm4A/DylsDKZAeVg0mvi++0PYVceVyX7hemkw7OreKdCvW2oQ3T1FMZvCaQXqOTHb8qmBShoqk69Q==", "optional": true }, "@rollup/rollup-darwin-arm64": { - "version": "4.52.3", - "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.52.3.tgz", - "integrity": "sha512-lj9ViATR1SsqycwFkJCtYfQTheBdvlWJqzqxwc9f2qrcVrQaF/gCuBRTiTolkRWS6KvNxSk4KHZWG7tDktLgjg==", + "version": "4.59.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.59.0.tgz", + "integrity": "sha512-W2Psnbh1J8ZJw0xKAd8zdNgF9HRLkdWwwdWqubSVk0pUuQkoHnv7rx4GiF9rT4t5DIZGAsConRE3AxCdJ4m8rg==", "optional": true }, "@rollup/rollup-darwin-x64": { - "version": "4.52.3", - "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.52.3.tgz", - "integrity": "sha512-+Dyo7O1KUmIsbzx1l+4V4tvEVnVQqMOIYtrxK7ncLSknl1xnMHLgn7gddJVrYPNZfEB8CIi3hK8gq8bDhb3h5A==", + "version": "4.59.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.59.0.tgz", + "integrity": "sha512-ZW2KkwlS4lwTv7ZVsYDiARfFCnSGhzYPdiOU4IM2fDbL+QGlyAbjgSFuqNRbSthybLbIJ915UtZBtmuLrQAT/w==", "optional": true }, "@rollup/rollup-freebsd-arm64": { - "version": "4.52.3", - "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.52.3.tgz", - "integrity": "sha512-u9Xg2FavYbD30g3DSfNhxgNrxhi6xVG4Y6i9Ur1C7xUuGDW3banRbXj+qgnIrwRN4KeJ396jchwy9bCIzbyBEQ==", + "version": "4.59.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.59.0.tgz", + "integrity": "sha512-EsKaJ5ytAu9jI3lonzn3BgG8iRBjV4LxZexygcQbpiU0wU0ATxhNVEpXKfUa0pS05gTcSDMKpn3Sx+QB9RlTTA==", "optional": true }, "@rollup/rollup-freebsd-x64": { - "version": "4.52.3", - "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.52.3.tgz", - "integrity": "sha512-5M8kyi/OX96wtD5qJR89a/3x5x8x5inXBZO04JWhkQb2JWavOWfjgkdvUqibGJeNNaz1/Z1PPza5/tAPXICI6A==", + "version": "4.59.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.59.0.tgz", + "integrity": "sha512-d3DuZi2KzTMjImrxoHIAODUZYoUUMsuUiY4SRRcJy6NJoZ6iIqWnJu9IScV9jXysyGMVuW+KNzZvBLOcpdl3Vg==", "optional": true }, "@rollup/rollup-linux-arm-gnueabihf": { - "version": "4.52.3", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.52.3.tgz", - "integrity": "sha512-IoerZJ4l1wRMopEHRKOO16e04iXRDyZFZnNZKrWeNquh5d6bucjezgd+OxG03mOMTnS1x7hilzb3uURPkJ0OfA==", + "version": "4.59.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.59.0.tgz", + "integrity": "sha512-t4ONHboXi/3E0rT6OZl1pKbl2Vgxf9vJfWgmUoCEVQVxhW6Cw/c8I6hbbu7DAvgp82RKiH7TpLwxnJeKv2pbsw==", "optional": true }, "@rollup/rollup-linux-arm-musleabihf": { - "version": "4.52.3", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.52.3.tgz", - "integrity": "sha512-ZYdtqgHTDfvrJHSh3W22TvjWxwOgc3ThK/XjgcNGP2DIwFIPeAPNsQxrJO5XqleSlgDux2VAoWQ5iJrtaC1TbA==", + "version": "4.59.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.59.0.tgz", + "integrity": "sha512-CikFT7aYPA2ufMD086cVORBYGHffBo4K8MQ4uPS/ZnY54GKj36i196u8U+aDVT2LX4eSMbyHtyOh7D7Zvk2VvA==", "optional": true }, "@rollup/rollup-linux-arm64-gnu": { - "version": "4.52.3", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.52.3.tgz", - "integrity": "sha512-NcViG7A0YtuFDA6xWSgmFb6iPFzHlf5vcqb2p0lGEbT+gjrEEz8nC/EeDHvx6mnGXnGCC1SeVV+8u+smj0CeGQ==", + "version": "4.59.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.59.0.tgz", + "integrity": "sha512-jYgUGk5aLd1nUb1CtQ8E+t5JhLc9x5WdBKew9ZgAXg7DBk0ZHErLHdXM24rfX+bKrFe+Xp5YuJo54I5HFjGDAA==", "optional": true }, "@rollup/rollup-linux-arm64-musl": { - "version": "4.52.3", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.52.3.tgz", - "integrity": "sha512-d3pY7LWno6SYNXRm6Ebsq0DJGoiLXTb83AIPCXl9fmtIQs/rXoS8SJxxUNtFbJ5MiOvs+7y34np77+9l4nfFMw==", + "version": "4.59.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.59.0.tgz", + "integrity": "sha512-peZRVEdnFWZ5Bh2KeumKG9ty7aCXzzEsHShOZEFiCQlDEepP1dpUl/SrUNXNg13UmZl+gzVDPsiCwnV1uI0RUA==", "optional": true }, "@rollup/rollup-linux-loong64-gnu": { - "version": "4.52.3", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-gnu/-/rollup-linux-loong64-gnu-4.52.3.tgz", - "integrity": "sha512-3y5GA0JkBuirLqmjwAKwB0keDlI6JfGYduMlJD/Rl7fvb4Ni8iKdQs1eiunMZJhwDWdCvrcqXRY++VEBbvk6Eg==", + "version": "4.59.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-gnu/-/rollup-linux-loong64-gnu-4.59.0.tgz", + "integrity": "sha512-gbUSW/97f7+r4gHy3Jlup8zDG190AuodsWnNiXErp9mT90iCy9NKKU0Xwx5k8VlRAIV2uU9CsMnEFg/xXaOfXg==", + "optional": true + }, + "@rollup/rollup-linux-loong64-musl": { + "version": "4.59.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-musl/-/rollup-linux-loong64-musl-4.59.0.tgz", + "integrity": "sha512-yTRONe79E+o0FWFijasoTjtzG9EBedFXJMl888NBEDCDV9I2wGbFFfJQQe63OijbFCUZqxpHz1GzpbtSFikJ4Q==", "optional": true }, "@rollup/rollup-linux-ppc64-gnu": { - "version": "4.52.3", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.52.3.tgz", - "integrity": "sha512-AUUH65a0p3Q0Yfm5oD2KVgzTKgwPyp9DSXc3UA7DtxhEb/WSPfbG4wqXeSN62OG5gSo18em4xv6dbfcUGXcagw==", + "version": "4.59.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.59.0.tgz", + "integrity": "sha512-sw1o3tfyk12k3OEpRddF68a1unZ5VCN7zoTNtSn2KndUE+ea3m3ROOKRCZxEpmT9nsGnogpFP9x6mnLTCaoLkA==", + "optional": true + }, + "@rollup/rollup-linux-ppc64-musl": { + "version": "4.59.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-musl/-/rollup-linux-ppc64-musl-4.59.0.tgz", + "integrity": "sha512-+2kLtQ4xT3AiIxkzFVFXfsmlZiG5FXYW7ZyIIvGA7Bdeuh9Z0aN4hVyXS/G1E9bTP/vqszNIN/pUKCk/BTHsKA==", "optional": true }, "@rollup/rollup-linux-riscv64-gnu": { - "version": "4.52.3", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.52.3.tgz", - "integrity": "sha512-1makPhFFVBqZE+XFg3Dkq+IkQ7JvmUrwwqaYBL2CE+ZpxPaqkGaiWFEWVGyvTwZace6WLJHwjVh/+CXbKDGPmg==", + "version": "4.59.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.59.0.tgz", + "integrity": "sha512-NDYMpsXYJJaj+I7UdwIuHHNxXZ/b/N2hR15NyH3m2qAtb/hHPA4g4SuuvrdxetTdndfj9b1WOmy73kcPRoERUg==", "optional": true }, "@rollup/rollup-linux-riscv64-musl": { - "version": "4.52.3", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.52.3.tgz", - "integrity": "sha512-OOFJa28dxfl8kLOPMUOQBCO6z3X2SAfzIE276fwT52uXDWUS178KWq0pL7d6p1kz7pkzA0yQwtqL0dEPoVcRWg==", + "version": "4.59.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.59.0.tgz", + "integrity": "sha512-nLckB8WOqHIf1bhymk+oHxvM9D3tyPndZH8i8+35p/1YiVoVswPid2yLzgX7ZJP0KQvnkhM4H6QZ5m0LzbyIAg==", "optional": true }, "@rollup/rollup-linux-s390x-gnu": { - "version": "4.52.3", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.52.3.tgz", - "integrity": "sha512-jMdsML2VI5l+V7cKfZx3ak+SLlJ8fKvLJ0Eoa4b9/vCUrzXKgoKxvHqvJ/mkWhFiyp88nCkM5S2v6nIwRtPcgg==", + "version": "4.59.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.59.0.tgz", + "integrity": "sha512-oF87Ie3uAIvORFBpwnCvUzdeYUqi2wY6jRFWJAy1qus/udHFYIkplYRW+wo+GRUP4sKzYdmE1Y3+rY5Gc4ZO+w==", "optional": true }, "@rollup/rollup-linux-x64-gnu": { - "version": "4.52.3", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.52.3.tgz", - "integrity": "sha512-tPgGd6bY2M2LJTA1uGq8fkSPK8ZLYjDjY+ZLK9WHncCnfIz29LIXIqUgzCR0hIefzy6Hpbe8Th5WOSwTM8E7LA==", + "version": "4.59.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.59.0.tgz", + "integrity": "sha512-3AHmtQq/ppNuUspKAlvA8HtLybkDflkMuLK4DPo77DfthRb71V84/c4MlWJXixZz4uruIH4uaa07IqoAkG64fg==", "optional": true }, "@rollup/rollup-linux-x64-musl": { - "version": "4.52.3", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.52.3.tgz", - "integrity": "sha512-BCFkJjgk+WFzP+tcSMXq77ymAPIxsX9lFJWs+2JzuZTLtksJ2o5hvgTdIcZ5+oKzUDMwI0PfWzRBYAydAHF2Mw==", + "version": "4.59.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.59.0.tgz", + "integrity": "sha512-2UdiwS/9cTAx7qIUZB/fWtToJwvt0Vbo0zmnYt7ED35KPg13Q0ym1g442THLC7VyI6JfYTP4PiSOWyoMdV2/xg==", + "optional": true + }, + "@rollup/rollup-openbsd-x64": { + "version": "4.59.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-openbsd-x64/-/rollup-openbsd-x64-4.59.0.tgz", + "integrity": "sha512-M3bLRAVk6GOwFlPTIxVBSYKUaqfLrn8l0psKinkCFxl4lQvOSz8ZrKDz2gxcBwHFpci0B6rttydI4IpS4IS/jQ==", "optional": true }, "@rollup/rollup-openharmony-arm64": { - "version": "4.52.3", - "resolved": "https://registry.npmjs.org/@rollup/rollup-openharmony-arm64/-/rollup-openharmony-arm64-4.52.3.tgz", - "integrity": "sha512-KTD/EqjZF3yvRaWUJdD1cW+IQBk4fbQaHYJUmP8N4XoKFZilVL8cobFSTDnjTtxWJQ3JYaMgF4nObY/+nYkumA==", + "version": "4.59.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-openharmony-arm64/-/rollup-openharmony-arm64-4.59.0.tgz", + "integrity": "sha512-tt9KBJqaqp5i5HUZzoafHZX8b5Q2Fe7UjYERADll83O4fGqJ49O1FsL6LpdzVFQcpwvnyd0i+K/VSwu/o/nWlA==", "optional": true }, "@rollup/rollup-win32-arm64-msvc": { - "version": "4.52.3", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.52.3.tgz", - "integrity": "sha512-+zteHZdoUYLkyYKObGHieibUFLbttX2r+58l27XZauq0tcWYYuKUwY2wjeCN9oK1Um2YgH2ibd6cnX/wFD7DuA==", + "version": "4.59.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.59.0.tgz", + "integrity": "sha512-V5B6mG7OrGTwnxaNUzZTDTjDS7F75PO1ae6MJYdiMu60sq0CqN5CVeVsbhPxalupvTX8gXVSU9gq+Rx1/hvu6A==", "optional": true }, "@rollup/rollup-win32-ia32-msvc": { - "version": "4.52.3", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.52.3.tgz", - "integrity": "sha512-of1iHkTQSo3kr6dTIRX6t81uj/c/b15HXVsPcEElN5sS859qHrOepM5p9G41Hah+CTqSh2r8Bm56dL2z9UQQ7g==", + "version": "4.59.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.59.0.tgz", + "integrity": "sha512-UKFMHPuM9R0iBegwzKF4y0C4J9u8C6MEJgFuXTBerMk7EJ92GFVFYBfOZaSGLu6COf7FxpQNqhNS4c4icUPqxA==", "optional": true }, "@rollup/rollup-win32-x64-gnu": { - "version": "4.52.3", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-gnu/-/rollup-win32-x64-gnu-4.52.3.tgz", - "integrity": "sha512-s0hybmlHb56mWVZQj8ra9048/WZTPLILKxcvcq+8awSZmyiSUZjjem1AhU3Tf4ZKpYhK4mg36HtHDOe8QJS5PQ==", + "version": "4.59.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-gnu/-/rollup-win32-x64-gnu-4.59.0.tgz", + "integrity": "sha512-laBkYlSS1n2L8fSo1thDNGrCTQMmxjYY5G0WFWjFFYZkKPjsMBsgJfGf4TLxXrF6RyhI60L8TMOjBMvXiTcxeA==", "optional": true }, "@rollup/rollup-win32-x64-msvc": { - "version": "4.52.3", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.52.3.tgz", - "integrity": "sha512-zGIbEVVXVtauFgl3MRwGWEN36P5ZGenHRMgNw88X5wEhEBpq0XrMEZwOn07+ICrwM17XO5xfMZqh0OldCH5VTA==", + "version": "4.59.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.59.0.tgz", + "integrity": "sha512-2HRCml6OztYXyJXAvdDXPKcawukWY2GpR5/nxKp4iBgiO3wcoEGkAaqctIbZcNB6KlUQBIqt8VYkNSj2397EfA==", "optional": true }, "@schematics/angular": { - "version": "20.3.16", - "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-20.3.16.tgz", - "integrity": "sha512-KeOcsM5piwv/6tUKBmLD1zXTwtJlZBnR2WM/4T9ImaQbmFGe1MMHUABT5SQ3Bifv1YKCw58ImxiaQUY9sdNqEQ==", + "version": "20.3.25", + "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-20.3.25.tgz", + "integrity": "sha512-ezoJpPKhhjXgE3LxuNcJO/ghSXs8f73xrqGvqouag7IbuliJYbHrt22WH3X75XSbD0+iOdiqA2bARvAO/ezyxQ==", "requires": { - "@angular-devkit/core": "20.3.16", - "@angular-devkit/schematics": "20.3.16", + "@angular-devkit/core": "20.3.25", + "@angular-devkit/schematics": "20.3.25", "jsonc-parser": "3.3.1" }, "dependencies": { "@angular-devkit/core": { - "version": "20.3.16", - "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-20.3.16.tgz", - "integrity": "sha512-6L9Lpe3lbkyz32gzqxZGVC8MhXxXht+yV+4LUsb4+6T/mG/V9lW6UTW0dhwVOS3vpWMEwpy75XHT298t7HcKEg==", + "version": "20.3.25", + "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-20.3.25.tgz", + "integrity": "sha512-pSfeWEoS1y9zxqTOw0Etj2NXkRmp/aU52wdnyq3KqVA9cJtgxtlOHlBBNswTil4dReojEy+0K1xJm+mLuWuLxA==", "requires": { - "ajv": "8.17.1", + "ajv": "8.18.0", "ajv-formats": "3.0.1", "jsonc-parser": "3.3.1", - "picomatch": "4.0.3", + "picomatch": "4.0.4", "rxjs": "7.8.2", "source-map": "0.7.6" } }, "ajv": { - "version": "8.17.1", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz", - "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==", + "version": "8.18.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.18.0.tgz", + "integrity": "sha512-PlXPeEWMXMZ7sPYOHqmDyCJzcfNrUr3fGNKtezX14ykXOEIvyK81d+qydx89KY5O71FKMPaQ2vBfBFI5NHR63A==", "requires": { "fast-deep-equal": "^3.1.3", "fast-uri": "^3.0.1", @@ -22088,9 +22843,9 @@ "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==" }, "picomatch": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz", - "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==" + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz", + "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==" }, "readdirp": { "version": "4.1.2", @@ -22216,9 +22971,9 @@ "devOptional": true }, "@standard-schema/spec": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@standard-schema/spec/-/spec-1.0.0.tgz", - "integrity": "sha512-m2bOd0f2RT9k8QJx1JN85cZYyH1RqFBdlwtkSlf4tBDYLCiiZnv1fIIwacK6cqwXavOydf0NPToMQgpKq+dVlA==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@standard-schema/spec/-/spec-1.1.0.tgz", + "integrity": "sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w==", "optional": true }, "@tsconfig/node10": { @@ -22259,12 +23014,25 @@ "minimatch": "^10.1.1" }, "dependencies": { - "minimatch": { - "version": "10.1.1", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.1.1.tgz", - "integrity": "sha512-enIvLvRAFZYXJzkCYG5RKmPfrFArdLv+R+lbQ53BmIMLIry74bjKzX6iHAm8WYamJkhSSEabrWN5D97XnKObjQ==", + "balanced-match": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-4.0.4.tgz", + "integrity": "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==" + }, + "brace-expansion": { + "version": "5.0.5", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.5.tgz", + "integrity": "sha512-VZznLgtwhn+Mact9tfiwx64fA9erHH/MCXEUfB/0bX/6Fz6ny5EGTXYltMocqg4xFAQZtnO3DHWWXi8RiuN7cQ==", "requires": { - "@isaacs/brace-expansion": "^5.0.0" + "balanced-match": "^4.0.2" + } + }, + "minimatch": { + "version": "10.2.3", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.3.tgz", + "integrity": "sha512-Rwi3pnapEqirPSbWbrZaa6N3nmqq4Xer/2XooiOKyV3q12ML06f7MOuc5DVH8ONZIFhwIYQ3yzPH4nt7iWHaTg==", + "requires": { + "brace-expansion": "^5.0.2" } } } @@ -22533,15 +23301,6 @@ "@types/node": "*" } }, - "@types/yauzl": { - "version": "2.10.0", - "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.0.tgz", - "integrity": "sha512-Cn6WYCm0tXv8p6k+A8PvbDG763EDpBoTzHdA+Q/MF6H3sapGjCm9NzoaJncJS9tUKSuCoDs9XHxYYsQDgxR6kw==", - "optional": true, - "requires": { - "@types/node": "*" - } - }, "@typescript-eslint/eslint-plugin": { "version": "8.46.2", "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.46.2.tgz", @@ -22637,22 +23396,28 @@ "ts-api-utils": "^2.1.0" }, "dependencies": { + "balanced-match": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-4.0.4.tgz", + "integrity": "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==", + "dev": true + }, "brace-expansion": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz", - "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==", + "version": "5.0.5", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.5.tgz", + "integrity": "sha512-VZznLgtwhn+Mact9tfiwx64fA9erHH/MCXEUfB/0bX/6Fz6ny5EGTXYltMocqg4xFAQZtnO3DHWWXi8RiuN7cQ==", "dev": true, "requires": { - "balanced-match": "^1.0.0" + "balanced-match": "^4.0.2" } }, "minimatch": { - "version": "9.0.5", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz", - "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==", + "version": "9.0.7", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.7.tgz", + "integrity": "sha512-MOwgjc8tfrpn5QQEvjijjmDVtMw2oL88ugTevzxQnzRLm6l3fVEF2gzU0kYeYYKD8C66+IdGX6peJ4MyUlUnPg==", "dev": true, "requires": { - "brace-expansion": "^2.0.1" + "brace-expansion": "^5.0.2" } } } @@ -22879,20 +23644,10 @@ "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.4.tgz", "integrity": "sha512-MnA+YT8fwfJPgBx3m60MNqakm30XOkyIoH1y6huTQvC0PwZG7ki8NacLBcrPbNoo8vEZy7Jpuk7+jMO+CUovTQ==" }, - "aggregate-error": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz", - "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==", - "optional": true, - "requires": { - "clean-stack": "^2.0.0", - "indent-string": "^4.0.0" - } - }, "ajv": { - "version": "6.12.6", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", - "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", + "version": "6.14.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.14.0.tgz", + "integrity": "sha512-IWrosm/yrn43eiKqkfkHis7QioDleaXQHdDVPKg0FSwwd/DuvyX79TZnFOnYpB7dcsFAMmtFztZuXPDvSePkFw==", "dev": true, "requires": { "fast-deep-equal": "^3.1.1", @@ -22910,9 +23665,9 @@ }, "dependencies": { "ajv": { - "version": "8.17.1", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz", - "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==", + "version": "8.18.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.18.0.tgz", + "integrity": "sha512-PlXPeEWMXMZ7sPYOHqmDyCJzcfNrUr3fGNKtezX14ykXOEIvyK81d+qydx89KY5O71FKMPaQ2vBfBFI5NHR63A==", "requires": { "fast-deep-equal": "^3.1.3", "fast-uri": "^3.0.1", @@ -22954,12 +23709,11 @@ "integrity": "sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==" }, "ansi-escapes": { - "version": "4.3.2", - "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz", - "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==", - "optional": true, + "version": "7.3.0", + "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-7.3.0.tgz", + "integrity": "sha512-BvU8nYgGQBxcmMuEeUEmNTvrMVjJNSH7RgW24vXexN4Ven6qCvy4TntnvlnwnMLTVlcRQQdbRY8NKnaIoeWDNg==", "requires": { - "type-fest": "^0.21.3" + "environment": "^1.0.0" } }, "ansi-html-community": { @@ -23032,12 +23786,6 @@ "integrity": "sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==", "optional": true }, - "astral-regex": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz", - "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==", - "optional": true - }, "async-each-series": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/async-each-series/-/async-each-series-0.1.1.tgz", @@ -23082,20 +23830,20 @@ "optional": true }, "axios": { - "version": "1.13.5", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.13.5.tgz", - "integrity": "sha512-cz4ur7Vb0xS4/KUN0tPWe44eqxrIu31me+fbang3ijiNscE129POzipJJA6zniq2C/Z6sJCjMimjS8Lc/GAs8Q==", + "version": "1.16.0", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.16.0.tgz", + "integrity": "sha512-6hp5CwvTPlN2A31g5dxnwAX0orzM7pmCRDLnZSX772mv8WDqICwFjowHuPs04Mc8deIld1+ejhtaMn5vp6b+1w==", "optional": true, "requires": { - "follow-redirects": "^1.15.11", + "follow-redirects": "^1.16.0", "form-data": "^4.0.5", - "proxy-from-env": "^1.1.0" + "proxy-from-env": "^2.1.0" }, "dependencies": { "proxy-from-env": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", - "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-2.1.0.tgz", + "integrity": "sha512-cJ+oHTW1VAEa8cJslgmUZrc+sjRKgAKl3Zyse6+PV38hZe/V6Z14TbCuXcan9F9ghlz4QrFr2c92TNF82UkYHA==", "optional": true } } @@ -23317,15 +24065,15 @@ "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==" }, "bootstrap": { - "version": "4.6.2", - "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.6.2.tgz", - "integrity": "sha512-51Bbp/Uxr9aTuy6ca/8FbFloBUJZLHwnhTcnjIeRn2suQWsWzcuJhGjKDB5eppVte/8oCdOL3VuwxvZDUggwGQ==", + "version": "5.3.8", + "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.3.8.tgz", + "integrity": "sha512-HP1SZDqaLDPwsNiqRqi5NcP0SSXciX2s9E+RyqJIIqGo+vJeN5AJVM98CXmW/Wux0nQ5L7jeWUdplCEf0Ee+tg==", "requires": {} }, "brace-expansion": { - "version": "1.1.12", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz", - "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==", + "version": "1.1.14", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.14.tgz", + "integrity": "sha512-MWPGfDxnyzKU7rNOW9SP/c50vi3xrmrua/+6hfPbCS2ABNWfx24vPidzvC7krjU/RTo235sV776ymlsMtGKj8g==", "devOptional": true, "requires": { "balanced-match": "^1.0.0", @@ -23513,12 +24261,6 @@ "ieee754": "^1.1.13" } }, - "buffer-crc32": { - "version": "0.2.13", - "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz", - "integrity": "sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==", - "optional": true - }, "buffer-from": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz", @@ -23563,9 +24305,9 @@ } }, "cachedir": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/cachedir/-/cachedir-2.3.0.tgz", - "integrity": "sha512-A+Fezp4zxnit6FanDmv9EqXNAi3vt9DWp51/71UEhXukb7QUuvtv9344h91dyAxuTLoSYJFU299qzR3tzwPAhw==", + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/cachedir/-/cachedir-2.4.0.tgz", + "integrity": "sha512-9EtFOZR8g22CL7BWjJ9BUx1+A/djkofnyW3aOXZORNW2kxoUpx2h+uN2cOqwPmFhnpVmxg+KW2OjOSgChTEvsQ==", "optional": true }, "call-bind-apply-helpers": { @@ -23691,19 +24433,12 @@ "integrity": "sha512-HutrvTNsF48wnxkzERIXOe5/mlcfFcbfCmwcg6CJnizbSue78AbDt+1cgl26zwn61WFxhcPykPfZrbqjGmBb4A==", "optional": true }, - "clean-stack": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz", - "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==", - "optional": true - }, "cli-cursor": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz", - "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==", - "optional": true, + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-5.0.0.tgz", + "integrity": "sha512-aCj4O5wKyszjMmDT4tZj93kxyydN/K5zPWSCe6/0AV/AA1pqe5ZBIw0a2ZfPQV7lL5/yb5HsUreJ6UFAF1tEQw==", "requires": { - "restore-cursor": "^3.1.0" + "restore-cursor": "^5.0.0" } }, "cli-spinners": { @@ -23722,13 +24457,40 @@ } }, "cli-truncate": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-2.1.0.tgz", - "integrity": "sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg==", + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-5.2.0.tgz", + "integrity": "sha512-xRwvIOMGrfOAnM1JYtqQImuaNtDEv9v6oIYAs4LIHwTiKee8uwvIi363igssOC0O5U04i4AlENs79LQLu9tEMw==", "optional": true, "requires": { - "slice-ansi": "^3.0.0", - "string-width": "^4.2.0" + "slice-ansi": "^8.0.0", + "string-width": "^8.2.0" + }, + "dependencies": { + "ansi-regex": { + "version": "6.2.2", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.2.tgz", + "integrity": "sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==", + "optional": true + }, + "string-width": { + "version": "8.2.1", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-8.2.1.tgz", + "integrity": "sha512-IIaP0g3iy9Cyy18w3M9YcaDudujEAVHKt3a3QJg1+sr/oX96TbaGUubG0hJyCjCBThFH+tFpcIyoUHUn1ogaLA==", + "optional": true, + "requires": { + "get-east-asian-width": "^1.5.0", + "strip-ansi": "^7.1.2" + } + }, + "strip-ansi": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.2.0.tgz", + "integrity": "sha512-yDPMNjp4WyfYBkHnjIRLfca1i6KMyGCtsVgoKe/z1+6vukgaENdgGBZt+ZmKPc4gavvEZ5OgHfHdrazhgNyG7w==", + "optional": true, + "requires": { + "ansi-regex": "^6.2.2" + } + } } }, "cli-width": { @@ -23948,14 +24710,14 @@ } }, "copy-webpack-plugin": { - "version": "13.0.1", - "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-13.0.1.tgz", - "integrity": "sha512-J+YV3WfhY6W/Xf9h+J1znYuqTye2xkBUIGyTPWuBAT27qajBa5mR4f8WBmfDY3YjRftT2kqZZiLi1qf0H+UOFw==", + "version": "14.0.0", + "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-14.0.0.tgz", + "integrity": "sha512-3JLW90aBGeaTLpM7mYQKpnVdgsUZRExY55giiZgLuX/xTQRUs1dOCwbBnWnvY6Q6rfZoXMNwzOQJCSZPppfqXA==", "requires": { "glob-parent": "^6.0.1", "normalize-path": "^3.0.0", "schema-utils": "^4.2.0", - "serialize-javascript": "^6.0.2", + "serialize-javascript": "^7.0.3", "tinyglobby": "^0.2.12" }, "dependencies": { @@ -24056,12 +24818,12 @@ "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==" }, "cypress": { - "version": "15.9.0", - "resolved": "https://registry.npmjs.org/cypress/-/cypress-15.9.0.tgz", - "integrity": "sha512-Ks6Bdilz3TtkLZtTQyqYaqtL/WT3X3APKaSLhTV96TmTyudzSjc6EJsJCHmBb7DxO+3R12q3Jkbjgm/iPgmwfg==", + "version": "15.16.0", + "resolved": "https://registry.npmjs.org/cypress/-/cypress-15.16.0.tgz", + "integrity": "sha512-fy0M0c9xDLEp4v9y7LLKFeAQhIdDsobxDSKpD3JcZpqQefjy9TSzEyVV3HA0zu7hUi0bGHlSYlI7ASub8wgR9A==", "optional": true, "requires": { - "@cypress/request": "^3.0.10", + "@cypress/request": "^4.0.0", "@cypress/xvfb": "^1.2.4", "@types/sinonjs__fake-timers": "8.1.1", "@types/sizzle": "^2.3.2", @@ -24070,26 +24832,22 @@ "blob-util": "^2.0.2", "bluebird": "^3.7.2", "buffer": "^5.7.1", - "cachedir": "^2.3.0", + "cachedir": "^2.4.0", "chalk": "^4.1.0", "ci-info": "^4.1.0", - "cli-cursor": "^3.1.0", "cli-table3": "0.6.1", "commander": "^6.2.1", "common-tags": "^1.8.0", "dayjs": "^1.10.4", "debug": "^4.3.4", - "enquirer": "^2.3.6", "eventemitter2": "6.4.7", "execa": "4.1.0", "executable": "^4.1.1", - "extract-zip": "2.0.1", - "figures": "^3.2.0", "fs-extra": "^9.1.0", "hasha": "5.2.2", "is-installed-globally": "~0.4.0", - "listr2": "^3.8.3", - "lodash": "^4.17.21", + "listr2": "^9.0.5", + "lodash": "^4.17.23", "log-symbols": "^4.0.0", "minimist": "^1.2.8", "ospath": "^1.2.2", @@ -24098,11 +24856,12 @@ "proxy-from-env": "1.0.0", "request-progress": "^3.0.0", "supports-color": "^8.1.1", - "systeminformation": "^5.27.14", + "systeminformation": "^5.31.1", "tmp": "~0.2.4", "tree-kill": "1.2.2", + "tslib": "1.14.1", "untildify": "^4.0.0", - "yauzl": "^2.10.0" + "yauzl": "^3.3.1" }, "dependencies": { "commander": { @@ -24163,6 +24922,12 @@ "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.5.tgz", "integrity": "sha512-voyz6MApa1rQGUxT3E+BK7/ROe8itEx7vD8/HEvt4xwXucvQ5G5oeEiHkmHZJuBO21RpOf+YYm9MOivj709jow==", "optional": true + }, + "tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", + "optional": true } } }, @@ -24386,12 +25151,12 @@ } }, "echarts": { - "version": "5.4.3", - "resolved": "https://registry.npmjs.org/echarts/-/echarts-5.4.3.tgz", - "integrity": "sha512-mYKxLxhzy6zyTi/FaEbJMOZU1ULGEQHaeIeuMR5L+JnJTpz+YR03mnnpBhbR4+UYJAgiXgpyTVLffPAjOTLkZA==", + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/echarts/-/echarts-6.1.0.tgz", + "integrity": "sha512-q0yaFPggC9FUdsWH4blavRWFmxdrIodbkoKNAjJudAI6CA9gNPxHtV2RcZNEepZVlk4yvBYkOkbk6HIVpIyHZA==", "requires": { "tslib": "2.3.0", - "zrender": "5.4.4" + "zrender": "6.1.0" }, "dependencies": { "tslib": { @@ -24506,16 +25271,6 @@ "tapable": "^2.3.0" } }, - "enquirer": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.4.1.tgz", - "integrity": "sha512-rRqJg/6gd538VHvR3PSrdRBb/1Vy2YfzHqzvbhGIQpDRKIa4FgV/54b5Q1xYSxOOwKvjXweS26E0Q+nAMwp2pQ==", - "optional": true, - "requires": { - "ansi-colors": "^4.1.1", - "strip-ansi": "^6.0.1" - } - }, "entities": { "version": "4.5.0", "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz", @@ -24589,42 +25344,42 @@ } }, "esbuild": { - "version": "0.25.9", - "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.25.9.tgz", - "integrity": "sha512-CRbODhYyQx3qp7ZEwzxOk4JBqmD/seJrzPa/cGjY1VtIn5E09Oi9/dB4JwctnfZ8Q8iT7rioVv5k/FNT/uf54g==", + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.27.7.tgz", + "integrity": "sha512-IxpibTjyVnmrIQo5aqNpCgoACA/dTKLTlhMHihVHhdkxKyPO1uBBthumT0rdHmcsk9uMonIWS0m4FljWzILh3w==", "requires": { - "@esbuild/aix-ppc64": "0.25.9", - "@esbuild/android-arm": "0.25.9", - "@esbuild/android-arm64": "0.25.9", - "@esbuild/android-x64": "0.25.9", - "@esbuild/darwin-arm64": "0.25.9", - "@esbuild/darwin-x64": "0.25.9", - "@esbuild/freebsd-arm64": "0.25.9", - "@esbuild/freebsd-x64": "0.25.9", - "@esbuild/linux-arm": "0.25.9", - "@esbuild/linux-arm64": "0.25.9", - "@esbuild/linux-ia32": "0.25.9", - "@esbuild/linux-loong64": "0.25.9", - "@esbuild/linux-mips64el": "0.25.9", - "@esbuild/linux-ppc64": "0.25.9", - "@esbuild/linux-riscv64": "0.25.9", - "@esbuild/linux-s390x": "0.25.9", - "@esbuild/linux-x64": "0.25.9", - "@esbuild/netbsd-arm64": "0.25.9", - "@esbuild/netbsd-x64": "0.25.9", - "@esbuild/openbsd-arm64": "0.25.9", - "@esbuild/openbsd-x64": "0.25.9", - "@esbuild/openharmony-arm64": "0.25.9", - "@esbuild/sunos-x64": "0.25.9", - "@esbuild/win32-arm64": "0.25.9", - "@esbuild/win32-ia32": "0.25.9", - "@esbuild/win32-x64": "0.25.9" + "@esbuild/aix-ppc64": "0.27.7", + "@esbuild/android-arm": "0.27.7", + "@esbuild/android-arm64": "0.27.7", + "@esbuild/android-x64": "0.27.7", + "@esbuild/darwin-arm64": "0.27.7", + "@esbuild/darwin-x64": "0.27.7", + "@esbuild/freebsd-arm64": "0.27.7", + "@esbuild/freebsd-x64": "0.27.7", + "@esbuild/linux-arm": "0.27.7", + "@esbuild/linux-arm64": "0.27.7", + "@esbuild/linux-ia32": "0.27.7", + "@esbuild/linux-loong64": "0.27.7", + "@esbuild/linux-mips64el": "0.27.7", + "@esbuild/linux-ppc64": "0.27.7", + "@esbuild/linux-riscv64": "0.27.7", + "@esbuild/linux-s390x": "0.27.7", + "@esbuild/linux-x64": "0.27.7", + "@esbuild/netbsd-arm64": "0.27.7", + "@esbuild/netbsd-x64": "0.27.7", + "@esbuild/openbsd-arm64": "0.27.7", + "@esbuild/openbsd-x64": "0.27.7", + "@esbuild/openharmony-arm64": "0.27.7", + "@esbuild/sunos-x64": "0.27.7", + "@esbuild/win32-arm64": "0.27.7", + "@esbuild/win32-ia32": "0.27.7", + "@esbuild/win32-x64": "0.27.7" } }, "esbuild-wasm": { - "version": "0.25.9", - "resolved": "https://registry.npmjs.org/esbuild-wasm/-/esbuild-wasm-0.25.9.tgz", - "integrity": "sha512-Jpv5tCSwQg18aCqCRD3oHIX/prBhXMDapIoG//A+6+dV0e7KQMGFg85ihJ5T1EeMjbZjON3TqFy0VrGAnIHLDA==" + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/esbuild-wasm/-/esbuild-wasm-0.28.0.tgz", + "integrity": "sha512-5TRVKExcEmeMkccIZMzUq+Az6X2RoMAJyfl6SMMO1dMVhmvt0I2mx7gAb6zYi42n4d1ETcatFXazGKzA+aW7fg==" }, "escalade": { "version": "3.2.0", @@ -24636,12 +25391,6 @@ "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=" }, - "escape-string-regexp": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", - "optional": true - }, "eslint": { "version": "9.39.0", "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.39.0.tgz", @@ -25124,18 +25873,11 @@ } }, "express-rate-limit": { - "version": "8.2.1", - "resolved": "https://registry.npmjs.org/express-rate-limit/-/express-rate-limit-8.2.1.tgz", - "integrity": "sha512-PCZEIEIxqwhzw4KF0n7QF4QqruVTcF73O5kFKUnGOyjbCCgizBBiFaYpd/fnBLUMPw/BWw9OsiN7GgrNYr7j6g==", + "version": "8.4.1", + "resolved": "https://registry.npmjs.org/express-rate-limit/-/express-rate-limit-8.4.1.tgz", + "integrity": "sha512-NGVYwQSAyEQgzxX1iCM978PP9AdO/hW93gMcF6ZwQCm+rFvLsBH6w4xcXWTcliS8La5EPRN3p9wzItqBwJrfNw==", "requires": { - "ip-address": "10.0.1" - }, - "dependencies": { - "ip-address": { - "version": "10.0.1", - "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-10.0.1.tgz", - "integrity": "sha512-NWv9YLW4PoW2B7xtzaS3NCot75m6nK7Icdv0o3lfMceJVRfSoQwqD4wEH5rLwoKJwUiZ/rfpiVBhnaF0FK4HoA==" - } + "ip-address": "10.1.0" } }, "extend": { @@ -25144,29 +25886,6 @@ "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==", "optional": true }, - "extract-zip": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz", - "integrity": "sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==", - "optional": true, - "requires": { - "@types/yauzl": "^2.9.1", - "debug": "^4.1.1", - "get-stream": "^5.1.0", - "yauzl": "^2.10.0" - }, - "dependencies": { - "get-stream": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz", - "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==", - "optional": true, - "requires": { - "pump": "^3.0.0" - } - } - } - }, "extsprintf": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz", @@ -25223,24 +25942,6 @@ "websocket-driver": ">=0.5.1" } }, - "fd-slicer": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz", - "integrity": "sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==", - "optional": true, - "requires": { - "pend": "~1.2.0" - } - }, - "figures": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz", - "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==", - "optional": true, - "requires": { - "escape-string-regexp": "^1.0.5" - } - }, "file-entry-cache": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-8.0.0.tgz", @@ -25329,15 +26030,15 @@ } }, "flatted": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.1.tgz", - "integrity": "sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==", + "version": "3.4.2", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.4.2.tgz", + "integrity": "sha512-PjDse7RzhcPkIJwy5t7KPWQSZ9cAbzQXcafsetQoD7sOJRQlGikNbx7yZp2OotDnJyrDcbyRq3Ttb18iYOqkxA==", "dev": true }, "follow-redirects": { - "version": "1.15.11", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.11.tgz", - "integrity": "sha512-deG2P0JfjrTxl50XGCDyfI97ZGVCxIpfKYmfyrQ54n5FO/0gfIES8C/Psl6kWVDolizcaaxZJnTS0QSMxvnsBQ==" + "version": "1.16.0", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.16.0.tgz", + "integrity": "sha512-y5rN/uOsadFT/JfYwhxRS5R7Qce+g3zG97+JrtFZlC9klX/W5hD7iiLzScI4nZqUS7DNUdhPgw4xI8W2LuXlUw==" }, "forever-agent": { "version": "0.6.1", @@ -25409,9 +26110,9 @@ "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==" }, "get-east-asian-width": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/get-east-asian-width/-/get-east-asian-width-1.4.0.tgz", - "integrity": "sha512-QZjmEOC+IT1uk6Rx0sX22V6uHWVwbdbxf1faPqJ1QhLdGgsRGCZoyaQBm/piRdJy/D2um6hM1UP7ZEeQ4EkP+Q==" + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/get-east-asian-width/-/get-east-asian-width-1.6.0.tgz", + "integrity": "sha512-QRbvDIbx6YklUe6RxeTeleMR0yv3cYH6PsPZHcnVn7xv7zO1BHN8r0XETu8n6Ye3Q+ahtSarc3WgtNWmehIBfA==" }, "get-func-name": { "version": "2.0.2", @@ -25470,12 +26171,25 @@ "path-scurry": "^2.0.0" }, "dependencies": { - "minimatch": { - "version": "10.1.1", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.1.1.tgz", - "integrity": "sha512-enIvLvRAFZYXJzkCYG5RKmPfrFArdLv+R+lbQ53BmIMLIry74bjKzX6iHAm8WYamJkhSSEabrWN5D97XnKObjQ==", + "balanced-match": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-4.0.4.tgz", + "integrity": "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==" + }, + "brace-expansion": { + "version": "5.0.5", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.5.tgz", + "integrity": "sha512-VZznLgtwhn+Mact9tfiwx64fA9erHH/MCXEUfB/0bX/6Fz6ny5EGTXYltMocqg4xFAQZtnO3DHWWXi8RiuN7cQ==", "requires": { - "@isaacs/brace-expansion": "^5.0.0" + "balanced-match": "^4.0.2" + } + }, + "minimatch": { + "version": "10.2.3", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.3.tgz", + "integrity": "sha512-Rwi3pnapEqirPSbWbrZaa6N3nmqq4Xer/2XooiOKyV3q12ML06f7MOuc5DVH8ONZIFhwIYQ3yzPH4nt7iWHaTg==", + "requires": { + "brace-expansion": "^5.0.2" } } } @@ -25597,9 +26311,9 @@ } }, "hono": { - "version": "4.12.0", - "resolved": "https://registry.npmjs.org/hono/-/hono-4.12.0.tgz", - "integrity": "sha512-NekXntS5M94pUfiVZ8oXXK/kkri+5WpX2/Ik+LVsl+uvw+soj4roXIsPqO+XsWrAw20mOzaXOZf3Q7PfB9A/IA==" + "version": "4.12.25", + "resolved": "https://registry.npmjs.org/hono/-/hono-4.12.25.tgz", + "integrity": "sha512-2NFaIyNVgJmBs/ecmtGzlmluTFs5cHEWGTdu0t1HBwYzoGXOL5nUQBRMXsXWla5i4KkG//QMzVP88m1+I3fdAQ==" }, "hosted-git-info": { "version": "9.0.2", @@ -25797,12 +26511,25 @@ "minimatch": "^10.0.3" }, "dependencies": { - "minimatch": { - "version": "10.1.1", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.1.1.tgz", - "integrity": "sha512-enIvLvRAFZYXJzkCYG5RKmPfrFArdLv+R+lbQ53BmIMLIry74bjKzX6iHAm8WYamJkhSSEabrWN5D97XnKObjQ==", + "balanced-match": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-4.0.4.tgz", + "integrity": "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==" + }, + "brace-expansion": { + "version": "5.0.5", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.5.tgz", + "integrity": "sha512-VZznLgtwhn+Mact9tfiwx64fA9erHH/MCXEUfB/0bX/6Fz6ny5EGTXYltMocqg4xFAQZtnO3DHWWXi8RiuN7cQ==", "requires": { - "@isaacs/brace-expansion": "^5.0.0" + "balanced-match": "^4.0.2" + } + }, + "minimatch": { + "version": "10.2.3", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.3.tgz", + "integrity": "sha512-Rwi3pnapEqirPSbWbrZaa6N3nmqq4Xer/2XooiOKyV3q12ML06f7MOuc5DVH8ONZIFhwIYQ3yzPH4nt7iWHaTg==", + "requires": { + "brace-expansion": "^5.0.2" } } } @@ -25814,9 +26541,9 @@ "optional": true }, "immutable": { - "version": "3.8.2", - "resolved": "https://registry.npmjs.org/immutable/-/immutable-3.8.2.tgz", - "integrity": "sha512-15gZoQ38eYjEjxkorfbcgBKBL6R7T459OuK+CpcWt7O3KF4uPCx2tD0uFETlUDIyo+1789crbMhTvQBSR5yBMg==", + "version": "3.8.3", + "resolved": "https://registry.npmjs.org/immutable/-/immutable-3.8.3.tgz", + "integrity": "sha512-AUY/VyX0E5XlibOmWt10uabJzam1zlYjwiEgQSDc5+UIkFNaF9WM0JxXKaNMGf+F/ffUF+7kRKXM9A7C0xXqMg==", "devOptional": true }, "import-fresh": { @@ -25840,12 +26567,6 @@ "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=" }, - "indent-string": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz", - "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==", - "optional": true - }, "inherits": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", @@ -26071,9 +26792,9 @@ "integrity": "sha512-gFqAIbuKyyso/3G2qhiO2OM6shY6EPP/R0+mkDbyspxKazh8BXDC5FiFsUjlczgdNz/vfra0da2y+aHrusLG/Q==" }, "joi": { - "version": "18.0.1", - "resolved": "https://registry.npmjs.org/joi/-/joi-18.0.1.tgz", - "integrity": "sha512-IiQpRyypSnLisQf3PwuN2eIHAsAIGZIrLZkd4zdvIar2bDyhM91ubRjy8a3eYablXsh9BeI/c7dmPYHca5qtoA==", + "version": "18.2.1", + "resolved": "https://registry.npmjs.org/joi/-/joi-18.2.1.tgz", + "integrity": "sha512-2/OKlogiESf2Nh3TFCrRjrr9z1DRHeW0I+KReF67+4J0Ns+8hBtHRmoWAZ2OFU6I5+TWLEe6sVlSdXPjHm5UbQ==", "optional": true, "requires": { "@hapi/address": "^5.1.1", @@ -26082,7 +26803,7 @@ "@hapi/pinpoint": "^2.0.1", "@hapi/tlds": "^1.1.1", "@hapi/topo": "^6.0.2", - "@standard-schema/spec": "^1.0.0" + "@standard-schema/spec": "^1.1.0" } }, "jose": { @@ -26090,21 +26811,15 @@ "resolved": "https://registry.npmjs.org/jose/-/jose-6.1.3.tgz", "integrity": "sha512-0TpaTfihd4QMNwrz/ob2Bp7X04yuxJkjRGi4aKmOqwhov54i6u79oCv7T+C7lo70MKH6BesI3vscD1yb/yzKXQ==" }, - "jquery": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.0.tgz", - "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==", - "peer": true - }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==" }, "js-yaml": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.1.tgz", - "integrity": "sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.2.0.tgz", + "integrity": "sha512-ePWsvanv0DWuDRsW8dnt+R4jQ31SCRCQ7hhNcPXZPsoBZiemuZNYGf7adZdqX2D86j6rvKp3RpCxVTSb8WQlOw==", "requires": { "argparse": "^2.0.1" } @@ -26226,12 +26941,12 @@ "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==" }, "launch-editor": { - "version": "2.12.0", - "resolved": "https://registry.npmjs.org/launch-editor/-/launch-editor-2.12.0.tgz", - "integrity": "sha512-giOHXoOtifjdHqUamwKq6c49GzBdLjvxrd2D+Q4V6uOHopJv7p9VJxikDsQ/CBXZbEITgUqSVHXLTG3VhPP1Dg==", + "version": "2.14.1", + "resolved": "https://registry.npmjs.org/launch-editor/-/launch-editor-2.14.1.tgz", + "integrity": "sha512-QWBrQsMpH7gPr965dsKD/3cKWiNoTjpATQf++Xq63N6sKRGMwlVXz41O1IZTMfZQgBctD/K5Zt06+/I6pP6+HA==", "requires": { "picocolors": "^1.1.1", - "shell-quote": "^1.8.3" + "shell-quote": "^1.8.4" } }, "lazy-ass": { @@ -26301,30 +27016,72 @@ "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==" }, "listr2": { - "version": "3.14.0", - "resolved": "https://registry.npmjs.org/listr2/-/listr2-3.14.0.tgz", - "integrity": "sha512-TyWI8G99GX9GjE54cJ+RrNMcIFBfwMPxc3XTFiAYGN4s10hWROGtOg7+O6u6LE3mNkyld7RSLE6nrKBvTfcs3g==", + "version": "9.0.5", + "resolved": "https://registry.npmjs.org/listr2/-/listr2-9.0.5.tgz", + "integrity": "sha512-ME4Fb83LgEgwNw96RKNvKV4VTLuXfoKudAmm2lP8Kk87KaMK0/Xrx/aAkMWmT8mDb+3MlFDspfbCs7adjRxA2g==", "optional": true, "requires": { - "cli-truncate": "^2.1.0", - "colorette": "^2.0.16", - "log-update": "^4.0.0", - "p-map": "^4.0.0", - "rfdc": "^1.3.0", - "rxjs": "^7.5.1", - "through": "^2.3.8", - "wrap-ansi": "^7.0.0" + "cli-truncate": "^5.0.0", + "colorette": "^2.0.20", + "eventemitter3": "^5.0.1", + "log-update": "^6.1.0", + "rfdc": "^1.4.1", + "wrap-ansi": "^9.0.0" }, "dependencies": { - "wrap-ansi": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", - "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "ansi-regex": { + "version": "6.2.2", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.2.tgz", + "integrity": "sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==", + "optional": true + }, + "ansi-styles": { + "version": "6.2.3", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.3.tgz", + "integrity": "sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==", + "optional": true + }, + "emoji-regex": { + "version": "10.6.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.6.0.tgz", + "integrity": "sha512-toUI84YS5YmxW219erniWD0CIVOo46xGKColeNQRgOzDorgBi1v4D71/OFzgD9GO2UGKIv1C3Sp8DAn0+j5w7A==", + "optional": true + }, + "eventemitter3": { + "version": "5.0.4", + "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-5.0.4.tgz", + "integrity": "sha512-mlsTRyGaPBjPedk6Bvw+aqbsXDtoAyAzm5MO7JgU+yVRyMQ5O8bD4Kcci7BS85f93veegeCPkL8R4GLClnjLFw==", + "optional": true + }, + "string-width": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-7.2.0.tgz", + "integrity": "sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==", "optional": true, "requires": { - "ansi-styles": "^4.0.0", - "string-width": "^4.1.0", - "strip-ansi": "^6.0.0" + "emoji-regex": "^10.3.0", + "get-east-asian-width": "^1.0.0", + "strip-ansi": "^7.1.0" + } + }, + "strip-ansi": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.2.0.tgz", + "integrity": "sha512-yDPMNjp4WyfYBkHnjIRLfca1i6KMyGCtsVgoKe/z1+6vukgaENdgGBZt+ZmKPc4gavvEZ5OgHfHdrazhgNyG7w==", + "optional": true, + "requires": { + "ansi-regex": "^6.2.2" + } + }, + "wrap-ansi": { + "version": "9.0.2", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-9.0.2.tgz", + "integrity": "sha512-42AtmgqjV+X1VpdOfyTGOYRi0/zsoLqtXQckTmqTeybT+BDIbM/Guxo7x3pE2vtpr1ok6xRqM9OpBe+Jyoqyww==", + "optional": true, + "requires": { + "ansi-styles": "^6.2.1", + "string-width": "^7.0.0", + "strip-ansi": "^7.1.0" } } } @@ -26373,9 +27130,9 @@ } }, "lodash": { - "version": "4.17.23", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.23.tgz", - "integrity": "sha512-LgVTMpQtIopCi79SJeDiP0TfWi5CNEc/L/aRdTh3yIvmZXTnheWpKjSZhnvMl8iXbC1tFg9gdHHDMLoV7CnG+w==", + "version": "4.18.1", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.18.1.tgz", + "integrity": "sha512-dMInicTPVE8d1e5otfwmmjlxkZoUpiVLwyeTdUsi/Caj/gfzzblBcCE5sRHV/AsjuCmxWrte2TNGSYuCeCq+0Q==", "devOptional": true }, "lodash.debounce": { @@ -26418,26 +27175,75 @@ } }, "log-update": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/log-update/-/log-update-4.0.0.tgz", - "integrity": "sha512-9fkkDevMefjg0mmzWFBW8YkFP91OrizzkW3diF7CpG+S2EYdy4+TVfGwz1zeF8x7hCx1ovSPTOE9Ngib74qqUg==", - "optional": true, + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/log-update/-/log-update-6.1.0.tgz", + "integrity": "sha512-9ie8ItPR6tjY5uYJh8K/Zrv/RMZ5VOlOWvtZdEHYSTFKZfIBPQa9tOAEeAWhd+AnIneLJ22w5fjOYtoutpWq5w==", "requires": { - "ansi-escapes": "^4.3.0", - "cli-cursor": "^3.1.0", - "slice-ansi": "^4.0.0", - "wrap-ansi": "^6.2.0" + "ansi-escapes": "^7.0.0", + "cli-cursor": "^5.0.0", + "slice-ansi": "^7.1.0", + "strip-ansi": "^7.1.0", + "wrap-ansi": "^9.0.0" }, "dependencies": { - "slice-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz", - "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==", - "optional": true, + "ansi-regex": { + "version": "6.2.2", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.2.tgz", + "integrity": "sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==" + }, + "ansi-styles": { + "version": "6.2.3", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.3.tgz", + "integrity": "sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==" + }, + "emoji-regex": { + "version": "10.6.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.6.0.tgz", + "integrity": "sha512-toUI84YS5YmxW219erniWD0CIVOo46xGKColeNQRgOzDorgBi1v4D71/OFzgD9GO2UGKIv1C3Sp8DAn0+j5w7A==" + }, + "is-fullwidth-code-point": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-5.1.0.tgz", + "integrity": "sha512-5XHYaSyiqADb4RnZ1Bdad6cPp8Toise4TzEjcOYDHZkTCbKgiUl7WTUCpNWHuxmDt91wnsZBc9xinNzopv3JMQ==", "requires": { - "ansi-styles": "^4.0.0", - "astral-regex": "^2.0.0", - "is-fullwidth-code-point": "^3.0.0" + "get-east-asian-width": "^1.3.1" + } + }, + "slice-ansi": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-7.1.2.tgz", + "integrity": "sha512-iOBWFgUX7caIZiuutICxVgX1SdxwAVFFKwt1EvMYYec/NWO5meOJ6K5uQxhrYBdQJne4KxiqZc+KptFOWFSI9w==", + "requires": { + "ansi-styles": "^6.2.1", + "is-fullwidth-code-point": "^5.0.0" + } + }, + "string-width": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-7.2.0.tgz", + "integrity": "sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==", + "requires": { + "emoji-regex": "^10.3.0", + "get-east-asian-width": "^1.0.0", + "strip-ansi": "^7.1.0" + } + }, + "strip-ansi": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.2.0.tgz", + "integrity": "sha512-yDPMNjp4WyfYBkHnjIRLfca1i6KMyGCtsVgoKe/z1+6vukgaENdgGBZt+ZmKPc4gavvEZ5OgHfHdrazhgNyG7w==", + "requires": { + "ansi-regex": "^6.2.2" + } + }, + "wrap-ansi": { + "version": "9.0.2", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-9.0.2.tgz", + "integrity": "sha512-42AtmgqjV+X1VpdOfyTGOYRi0/zsoLqtXQckTmqTeybT+BDIbM/Guxo7x3pE2vtpr1ok6xRqM9OpBe+Jyoqyww==", + "requires": { + "ansi-styles": "^6.2.1", + "string-width": "^7.0.0", + "strip-ansi": "^7.1.0" } } } @@ -26629,9 +27435,9 @@ "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==" }, "minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "version": "3.1.4", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.4.tgz", + "integrity": "sha512-twmL+S8+7yIsE9wsqgzU3E8/LumN3M3QELrBZ20OdmQ9jB2JvW5oZtBEmft84k/Gs5CG9mqtWc6Y9vW+JEzGxw==", "devOptional": true, "requires": { "brace-expansion": "^1.1.7" @@ -26928,9 +27734,9 @@ "optional": true }, "node-forge": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.3.tgz", - "integrity": "sha512-rLvcdSyRCyouf6jcOIPe/BgwG/d7hKjzMKOas33/pHEr6gbq18IK9zV7DiPvzsz0oBJPme6qr6H6kGZuI9/DZg==" + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.4.0.tgz", + "integrity": "sha512-LarFH0+6VfriEhqMMcLX2F7SwSXeWwnEAJEsYm5QKWchiVYVvJyV9v7UDvUv+w5HO23ZpQTXDv/GxdDdMyOuoQ==" }, "node-gyp": { "version": "12.2.0", @@ -27213,14 +28019,6 @@ "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.6.2.tgz", "integrity": "sha512-7NzBL0rN6fMUW+f7A6Io4h40qQlG+xGmtMxfbnH/K7TAtt8JQWVQK+6g0UXKMeVJoyV5EkkNsErQ8pVD3bLHbA==" }, - "cli-cursor": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-5.0.0.tgz", - "integrity": "sha512-aCj4O5wKyszjMmDT4tZj93kxyydN/K5zPWSCe6/0AV/AA1pqe5ZBIw0a2ZfPQV7lL5/yb5HsUreJ6UFAF1tEQw==", - "requires": { - "restore-cursor": "^5.0.0" - } - }, "emoji-regex": { "version": "10.6.0", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.6.0.tgz", @@ -27247,28 +28045,6 @@ } } }, - "onetime": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/onetime/-/onetime-7.0.0.tgz", - "integrity": "sha512-VXJjc87FScF88uafS3JllDgvAm+c/Slfz06lorj2uAY34rlUu0Nt+v8wreiImcrgAjjIHp1rXpTDlLOGw29WwQ==", - "requires": { - "mimic-function": "^5.0.0" - } - }, - "restore-cursor": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-5.1.0.tgz", - "integrity": "sha512-oMA2dcrw6u0YfxJQXm342bFKX/E4sG9rbTzO9ptUcR/e8A33cHuvStiYOwH7fszkZlZ1z/ta9AAoPk2F4qIOHA==", - "requires": { - "onetime": "^7.0.0", - "signal-exit": "^4.1.0" - } - }, - "signal-exit": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", - "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==" - }, "string-width": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/string-width/-/string-width-7.2.0.tgz", @@ -27327,15 +28103,6 @@ } } }, - "p-map": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz", - "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==", - "optional": true, - "requires": { - "aggregate-error": "^3.0.0" - } - }, "p-retry": { "version": "6.2.1", "resolved": "https://registry.npmjs.org/p-retry/-/p-retry-6.2.1.tgz", @@ -27483,9 +28250,9 @@ } }, "path-to-regexp": { - "version": "8.3.0", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-8.3.0.tgz", - "integrity": "sha512-7jdwVIRtsP8MYpdXSwOS0YdD0Du+qOoF/AEPIt88PcCFrZCzx41oxku1jD88hZBwbNUIEfpqvuhjFaMAqMTWnA==" + "version": "8.4.2", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-8.4.2.tgz", + "integrity": "sha512-qRcuIdP69NPm4qbACK+aDogI5CBDMi1jKe0ry5rSQJz8JVLsC7jV8XpiJjGRLLol3N+R5ihGYcrPLTno6pAdBA==" }, "pathval": { "version": "1.1.1", @@ -27520,9 +28287,9 @@ "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==" }, "picomatch": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", - "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==" + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.2.tgz", + "integrity": "sha512-V7+vQEJ06Z+c5tSye8S+nHUfI51xoXIXjHQ99cQtKUkQqqO1kO/KCJUfZXuB47h/YBlDhah2H3hdUGXn8ie0oA==" }, "pify": { "version": "2.3.0", @@ -27548,12 +28315,6 @@ "resolved": "https://registry.npmjs.org/pngjs/-/pngjs-5.0.0.tgz", "integrity": "sha512-40QW5YalBNfQo5yRYmiw7Yz6TKKVr3h6970B2YE+3fQpsWcrbj1PzJgxeJ19DRQjhMbKPIuMY8rFaXc8moolVw==" }, - "popper.js": { - "version": "1.16.1", - "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1.tgz", - "integrity": "sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ==", - "peer": true - }, "portscanner": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/portscanner/-/portscanner-2.2.0.tgz", @@ -27576,9 +28337,9 @@ } }, "postcss": { - "version": "8.5.6", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.6.tgz", - "integrity": "sha512-3Ybi1tAuwAP9s0r1UQ2J4n5Y0G05bJkpUIO0/bI9MhwmD70S5aTWbXGBwxHrelT+XM1k6dM0pk+SwNkpTRN7Pg==", + "version": "8.5.12", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.12.tgz", + "integrity": "sha512-W62t/Se6rA0Az3DfCL0AqJwXuKwBeYg6nOaIgzP+xZ7N5BFCI7DYi1qs6ygUYT6rvfi6t9k65UMLJC+PHZpDAA==", "requires": { "nanoid": "^3.3.11", "picocolors": "^1.1.1", @@ -27779,14 +28540,6 @@ "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==" }, - "randombytes": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz", - "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==", - "requires": { - "safe-buffer": "^5.1.0" - } - }, "range-parser": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz", @@ -27968,13 +28721,27 @@ } }, "restore-cursor": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz", - "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==", - "optional": true, + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-5.1.0.tgz", + "integrity": "sha512-oMA2dcrw6u0YfxJQXm342bFKX/E4sG9rbTzO9ptUcR/e8A33cHuvStiYOwH7fszkZlZ1z/ta9AAoPk2F4qIOHA==", "requires": { - "onetime": "^5.1.0", - "signal-exit": "^3.0.2" + "onetime": "^7.0.0", + "signal-exit": "^4.1.0" + }, + "dependencies": { + "onetime": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-7.0.0.tgz", + "integrity": "sha512-VXJjc87FScF88uafS3JllDgvAm+c/Slfz06lorj2uAY34rlUu0Nt+v8wreiImcrgAjjIHp1rXpTDlLOGw29WwQ==", + "requires": { + "mimic-function": "^5.0.0" + } + }, + "signal-exit": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", + "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==" + } } }, "retry": { @@ -27993,32 +28760,35 @@ "integrity": "sha512-q1b3N5QkRUWUl7iyylaaj3kOpIT0N2i9MqIEQXP73GVsN9cw3fdx8X63cEmWhJGi2PPCF23Ijp7ktmd39rawIA==" }, "rollup": { - "version": "4.52.3", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.52.3.tgz", - "integrity": "sha512-RIDh866U8agLgiIcdpB+COKnlCreHJLfIhWC3LVflku5YHfpnsIKigRZeFfMfCc4dVcqNVfQQ5gO/afOck064A==", + "version": "4.59.0", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.59.0.tgz", + "integrity": "sha512-2oMpl67a3zCH9H79LeMcbDhXW/UmWG/y2zuqnF2jQq5uq9TbM9TVyXvA4+t+ne2IIkBdrLpAaRQAvo7YI/Yyeg==", "requires": { - "@rollup/rollup-android-arm-eabi": "4.52.3", - "@rollup/rollup-android-arm64": "4.52.3", - "@rollup/rollup-darwin-arm64": "4.52.3", - "@rollup/rollup-darwin-x64": "4.52.3", - "@rollup/rollup-freebsd-arm64": "4.52.3", - "@rollup/rollup-freebsd-x64": "4.52.3", - "@rollup/rollup-linux-arm-gnueabihf": "4.52.3", - "@rollup/rollup-linux-arm-musleabihf": "4.52.3", - "@rollup/rollup-linux-arm64-gnu": "4.52.3", - "@rollup/rollup-linux-arm64-musl": "4.52.3", - "@rollup/rollup-linux-loong64-gnu": "4.52.3", - "@rollup/rollup-linux-ppc64-gnu": "4.52.3", - "@rollup/rollup-linux-riscv64-gnu": "4.52.3", - "@rollup/rollup-linux-riscv64-musl": "4.52.3", - "@rollup/rollup-linux-s390x-gnu": "4.52.3", - "@rollup/rollup-linux-x64-gnu": "4.52.3", - "@rollup/rollup-linux-x64-musl": "4.52.3", - "@rollup/rollup-openharmony-arm64": "4.52.3", - "@rollup/rollup-win32-arm64-msvc": "4.52.3", - "@rollup/rollup-win32-ia32-msvc": "4.52.3", - "@rollup/rollup-win32-x64-gnu": "4.52.3", - "@rollup/rollup-win32-x64-msvc": "4.52.3", + "@rollup/rollup-android-arm-eabi": "4.59.0", + "@rollup/rollup-android-arm64": "4.59.0", + "@rollup/rollup-darwin-arm64": "4.59.0", + "@rollup/rollup-darwin-x64": "4.59.0", + "@rollup/rollup-freebsd-arm64": "4.59.0", + "@rollup/rollup-freebsd-x64": "4.59.0", + "@rollup/rollup-linux-arm-gnueabihf": "4.59.0", + "@rollup/rollup-linux-arm-musleabihf": "4.59.0", + "@rollup/rollup-linux-arm64-gnu": "4.59.0", + "@rollup/rollup-linux-arm64-musl": "4.59.0", + "@rollup/rollup-linux-loong64-gnu": "4.59.0", + "@rollup/rollup-linux-loong64-musl": "4.59.0", + "@rollup/rollup-linux-ppc64-gnu": "4.59.0", + "@rollup/rollup-linux-ppc64-musl": "4.59.0", + "@rollup/rollup-linux-riscv64-gnu": "4.59.0", + "@rollup/rollup-linux-riscv64-musl": "4.59.0", + "@rollup/rollup-linux-s390x-gnu": "4.59.0", + "@rollup/rollup-linux-x64-gnu": "4.59.0", + "@rollup/rollup-linux-x64-musl": "4.59.0", + "@rollup/rollup-openbsd-x64": "4.59.0", + "@rollup/rollup-openharmony-arm64": "4.59.0", + "@rollup/rollup-win32-arm64-msvc": "4.59.0", + "@rollup/rollup-win32-ia32-msvc": "4.59.0", + "@rollup/rollup-win32-x64-gnu": "4.59.0", + "@rollup/rollup-win32-x64-msvc": "4.59.0", "@types/estree": "1.0.8", "fsevents": "~2.3.2" } @@ -28107,9 +28877,9 @@ } }, "immutable": { - "version": "5.1.4", - "resolved": "https://registry.npmjs.org/immutable/-/immutable-5.1.4.tgz", - "integrity": "sha512-p6u1bG3YSnINT5RQmx/yRZBpenIl30kVxkTLDyHLIMk0gict704Q9n+thfDI7lTRm9vXdDYutVzXhzcThxTnXA==" + "version": "5.1.5", + "resolved": "https://registry.npmjs.org/immutable/-/immutable-5.1.5.tgz", + "integrity": "sha512-t7xcm2siw+hlUM68I+UEOK+z84RzmN59as9DZ7P1l0994DKUWV7UXBMQZVxaoMSRQ+PBZbHCOoBt7a2wxOMt+A==" }, "readdirp": { "version": "4.1.2", @@ -28144,9 +28914,9 @@ }, "dependencies": { "ajv": { - "version": "8.17.1", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz", - "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==", + "version": "8.18.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.18.0.tgz", + "integrity": "sha512-PlXPeEWMXMZ7sPYOHqmDyCJzcfNrUr3fGNKtezX14ykXOEIvyK81d+qydx89KY5O71FKMPaQ2vBfBFI5NHR63A==", "requires": { "fast-deep-equal": "^3.1.3", "fast-uri": "^3.0.1", @@ -28254,12 +29024,9 @@ } }, "serialize-javascript": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz", - "integrity": "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==", - "requires": { - "randombytes": "^2.1.0" - } + "version": "7.0.5", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-7.0.5.tgz", + "integrity": "sha512-F4LcB0UqUl1zErq+1nYEEzSHJnIwb3AF2XWB94b+afhrekOUijwooAYqFyRbjYkm2PAKBabx6oYv/xDxNi8IBw==" }, "serve-index": { "version": "1.9.1", @@ -28372,9 +29139,9 @@ "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==" }, "shell-quote": { - "version": "1.8.3", - "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.3.tgz", - "integrity": "sha512-ObmnIF4hXNg1BqhnHmgbDETF8dLPCggZWBjkQfhZpbszZnYur5DUljTcCHii5LC3J5E0yeO/1LIMyH+UvHQgyw==" + "version": "1.8.4", + "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.4.tgz", + "integrity": "sha512-VsC6n6vz1ihYYyZZwX7YZSF5l5x36ca17OC+a69h94YqB7X6XLwf+5MOgynYir2SLFUbl8gIYvBo8K8RoNQ6bQ==" }, "side-channel": { "version": "1.1.0", @@ -28469,14 +29236,30 @@ "requires": {} }, "slice-ansi": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-3.0.0.tgz", - "integrity": "sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==", + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-8.0.0.tgz", + "integrity": "sha512-stxByr12oeeOyY2BlviTNQlYV5xOj47GirPr4yA1hE9JCtxfQN0+tVbkxwCtYDQWhEKWFHsEK48ORg5jrouCAg==", "optional": true, "requires": { - "ansi-styles": "^4.0.0", - "astral-regex": "^2.0.0", - "is-fullwidth-code-point": "^3.0.0" + "ansi-styles": "^6.2.3", + "is-fullwidth-code-point": "^5.1.0" + }, + "dependencies": { + "ansi-styles": { + "version": "6.2.3", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.3.tgz", + "integrity": "sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==", + "optional": true + }, + "is-fullwidth-code-point": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-5.1.0.tgz", + "integrity": "sha512-5XHYaSyiqADb4RnZ1Bdad6cPp8Toise4TzEjcOYDHZkTCbKgiUl7WTUCpNWHuxmDt91wnsZBc9xinNzopv3JMQ==", + "optional": true, + "requires": { + "get-east-asian-width": "^1.3.1" + } + } } }, "smart-buffer": { @@ -28522,13 +29305,30 @@ } }, "socket.io-parser": { - "version": "4.2.4", - "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.2.4.tgz", - "integrity": "sha512-/GbIKmo8ioc+NIWIhwdecY0ge+qVBSMdgxGygevmdHj24bsfgtCmcUUcQ5ZzcylGFHsN3k4HB4Cgkl96KVnuew==", + "version": "4.2.6", + "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.2.6.tgz", + "integrity": "sha512-asJqbVBDsBCJx0pTqw3WfesSY0iRX+2xzWEWzrpcH7L6fLzrhyF8WPI8UaeM4YCuDfpwA/cgsdugMsmtz8EJeg==", "devOptional": true, "requires": { "@socket.io/component-emitter": "~3.1.0", - "debug": "~4.3.1" + "debug": "~4.4.1" + }, + "dependencies": { + "debug": { + "version": "4.4.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz", + "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==", + "devOptional": true, + "requires": { + "ms": "^2.1.3" + } + }, + "ms": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", + "devOptional": true + } } }, "sockjs": { @@ -28808,9 +29608,9 @@ "integrity": "sha512-g9ljZiwki/LfxmQADO3dEY1CbpmXT5Hm2fJ+QaGKwSXUylMybePR7/67YW7jOrrvjEgL1Fmz5kzyAjWVWLlucg==" }, "tar": { - "version": "7.5.9", - "resolved": "https://registry.npmjs.org/tar/-/tar-7.5.9.tgz", - "integrity": "sha512-BTLcK0xsDh2+PUe9F6c2TlRp4zOOBMTkoQHQIWSIzI0R7KG46uEwq4OPk2W7bZcprBMsuaeFsqwYr7pjh6CuHg==", + "version": "7.5.16", + "resolved": "https://registry.npmjs.org/tar/-/tar-7.5.16.tgz", + "integrity": "sha512-56adEpPMouktRlBLXiaYFFzZ/3+JXa8P9n7WbR+ibIjtviN55mEaOkiysCnPnWm+7kkui1Dn8J9l+g6zV8731w==", "requires": { "@isaacs/fs-minipass": "^4.0.0", "chownr": "^3.0.0", @@ -28831,14 +29631,13 @@ } }, "terser-webpack-plugin": { - "version": "5.3.16", - "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.16.tgz", - "integrity": "sha512-h9oBFCWrq78NyWWVcSwZarJkZ01c2AyGrzs1crmHZO3QUg9D61Wu4NPjBy69n7JqylFF5y+CsUZYmYEIZ3mR+Q==", + "version": "5.4.0", + "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.4.0.tgz", + "integrity": "sha512-Bn5vxm48flOIfkdl5CaD2+1CiUVbonWQ3KQPyP7/EuIl9Gbzq/gQFOzaMFUEgVjB1396tcK0SG8XcNJ/2kDH8g==", "requires": { "@jridgewell/trace-mapping": "^0.3.25", "jest-worker": "^27.4.5", "schema-utils": "^4.3.0", - "serialize-javascript": "^6.0.2", "terser": "^5.31.1" }, "dependencies": { @@ -28897,9 +29696,9 @@ "requires": {} }, "picomatch": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz", - "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==" + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz", + "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==" } } }, @@ -29047,12 +29846,6 @@ "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==", "optional": true }, - "type-fest": { - "version": "0.21.3", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz", - "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==", - "optional": true - }, "type-is": { "version": "1.6.18", "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz", @@ -29204,11 +29997,11 @@ } }, "vite": { - "version": "7.1.11", - "resolved": "https://registry.npmjs.org/vite/-/vite-7.1.11.tgz", - "integrity": "sha512-uzcxnSDVjAopEUjljkWh8EIrg6tlzrjFUfMcR1EVsRDGwf/ccef0qQPRyOrROwhrTDaApueq+ja+KLPlzR/zdg==", + "version": "7.3.2", + "resolved": "https://registry.npmjs.org/vite/-/vite-7.3.2.tgz", + "integrity": "sha512-Bby3NOsna2jsjfLVOHKes8sGwgl4TT0E6vvpYgnAYDIF/tie7MRaFthmKuHx1NSXjiTueXH3do80FMQgvEktRg==", "requires": { - "esbuild": "^0.25.0", + "esbuild": "^0.27.0", "fdir": "^6.5.0", "fsevents": "~2.3.3", "picomatch": "^4.0.3", @@ -29224,9 +30017,9 @@ "requires": {} }, "picomatch": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz", - "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==" + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz", + "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==" }, "tinyglobby": { "version": "0.2.15", @@ -29489,9 +30282,9 @@ } }, "path-to-regexp": { - "version": "0.1.12", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.12.tgz", - "integrity": "sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ==" + "version": "0.1.13", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.13.tgz", + "integrity": "sha512-A/AGNMFN3c8bOlvV9RreMdrv7jsmF9XIfDeCd87+I8RNg6s78BhJxMu69NEMHBSJFxKidViTEdruRwEk/WIKqA==" }, "statuses": { "version": "2.0.2", @@ -29619,6 +30412,84 @@ "resolved": "https://registry.npmjs.org/yallist/-/yallist-5.0.0.tgz", "integrity": "sha512-YgvUTfwqyc7UXVMrB+SImsVYSmTS8X/tSrtdNZMImM+n7+QTriRXyXim0mBrTXNeqzVF0KWGgHPeiyViFFrNDw==" }, + "yargs": { + "version": "18.0.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-18.0.0.tgz", + "integrity": "sha512-4UEqdc2RYGHZc7Doyqkrqiln3p9X2DZVxaGbwhn2pi7MrRagKaOcIKe8L3OxYcbhXLgLFUS3zAYuQjKBQgmuNg==", + "requires": { + "cliui": "^9.0.1", + "escalade": "^3.1.1", + "get-caller-file": "^2.0.5", + "string-width": "^7.2.0", + "y18n": "^5.0.5", + "yargs-parser": "^22.0.0" + }, + "dependencies": { + "ansi-regex": { + "version": "6.2.2", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.2.tgz", + "integrity": "sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==" + }, + "ansi-styles": { + "version": "6.2.3", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.3.tgz", + "integrity": "sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==" + }, + "cliui": { + "version": "9.0.1", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-9.0.1.tgz", + "integrity": "sha512-k7ndgKhwoQveBL+/1tqGJYNz097I7WOvwbmmU2AR5+magtbjPWQTS1C5vzGkBC8Ym8UWRzfKUzUUqFLypY4Q+w==", + "requires": { + "string-width": "^7.2.0", + "strip-ansi": "^7.1.0", + "wrap-ansi": "^9.0.0" + } + }, + "emoji-regex": { + "version": "10.6.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.6.0.tgz", + "integrity": "sha512-toUI84YS5YmxW219erniWD0CIVOo46xGKColeNQRgOzDorgBi1v4D71/OFzgD9GO2UGKIv1C3Sp8DAn0+j5w7A==" + }, + "string-width": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-7.2.0.tgz", + "integrity": "sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==", + "requires": { + "emoji-regex": "^10.3.0", + "get-east-asian-width": "^1.0.0", + "strip-ansi": "^7.1.0" + } + }, + "strip-ansi": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.2.0.tgz", + "integrity": "sha512-yDPMNjp4WyfYBkHnjIRLfca1i6KMyGCtsVgoKe/z1+6vukgaENdgGBZt+ZmKPc4gavvEZ5OgHfHdrazhgNyG7w==", + "requires": { + "ansi-regex": "^6.2.2" + } + }, + "wrap-ansi": { + "version": "9.0.2", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-9.0.2.tgz", + "integrity": "sha512-42AtmgqjV+X1VpdOfyTGOYRi0/zsoLqtXQckTmqTeybT+BDIbM/Guxo7x3pE2vtpr1ok6xRqM9OpBe+Jyoqyww==", + "requires": { + "ansi-styles": "^6.2.1", + "string-width": "^7.0.0", + "strip-ansi": "^7.1.0" + } + }, + "y18n": { + "version": "5.0.8", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", + "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==" + }, + "yargs-parser": { + "version": "22.0.0", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-22.0.0.tgz", + "integrity": "sha512-rwu/ClNdSMpkSrUb+d6BRsSkLUq1fmfsY6TOpYzTwvwkg1/NRG85KBy3kq++A8LKQwX6lsu+aWad+2khvuXrqw==" + } + } + }, "yargs-parser": { "version": "18.1.3", "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz", @@ -29629,13 +30500,12 @@ } }, "yauzl": { - "version": "2.10.0", - "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz", - "integrity": "sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==", + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-3.4.0.tgz", + "integrity": "sha512-jIH9yLR9wqr0wOS0TpBvo/g/2UgZH5qePVbjgRliiF0BYvOZyaBknKsF+x9Iht0O6sqgnB93rCICdOZFecJuDw==", "optional": true, "requires": { - "buffer-crc32": "~0.2.3", - "fd-slicer": "~1.1.0" + "pend": "~1.2.0" } }, "yn": { @@ -29671,9 +30541,9 @@ "integrity": "sha512-XE96n56IQpJM7NAoXswY3XRLcWFW83xe0BiAOeMD7K5k5xecOeul3Qcpx6GqEeeHNkW5DWL5zOyTbEfB4eti8w==" }, "zrender": { - "version": "5.4.4", - "resolved": "https://registry.npmjs.org/zrender/-/zrender-5.4.4.tgz", - "integrity": "sha512-0VxCNJ7AGOMCWeHVyTrGzUgrK4asT4ml9PEkeGirAkKNYXYzoPJCLvmyfdoOXcjTHPs10OZVMfD1Rwg16AZyYw==", + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/zrender/-/zrender-6.1.0.tgz", + "integrity": "sha512-oEGMDB6pOP2S6OwRR4PdVv610zrjnA3Bh+JnSG12fYJlBKjtNAoEb5fSUoCOOINlH96I2fU38/A2UpRKs67xYQ==", "requires": { "tslib": "2.3.0" }, diff --git a/frontend/package.json b/frontend/package.json index d35526378..9fe8f89ef 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -1,6 +1,6 @@ { "name": "mempool-frontend", - "version": "3.3-dev", + "version": "3.4-dev", "description": "Bitcoin mempool visualizer and blockchain explorer backend", "license": "GNU Affero General Public License v3.0", "homepage": "https://mempool.space", @@ -59,30 +59,30 @@ "cypress:run:ci:parameterized": "node update-config.js TESTNET_ENABLED=true TESTNET4_ENABLED=true SIGNET_ENABLED=true LIQUID_ENABLED=true ITEMS_PER_PAGE=25 && npm run generate-config && start-server-and-test serve:parameterized 4200 cypress:run:record" }, "dependencies": { - "@angular-devkit/build-angular": "^20.3.16", - "@angular/animations": "^20.3.16", - "@angular/cli": "^20.3.16", - "@angular/common": "^20.3.16", - "@angular/compiler": "^20.3.16", - "@angular/core": "^20.3.16", - "@angular/forms": "^20.3.16", - "@angular/localize": "^20.3.16", - "@angular/platform-browser": "^20.3.16", - "@angular/platform-browser-dynamic": "^20.3.16", - "@angular/platform-server": "^20.3.16", - "@angular/router": "^20.3.16", - "@angular/ssr": "^20.3.16", + "@angular-devkit/build-angular": "^20.3.25", + "@angular/animations": "^20.3.25", + "@angular/cli": "^20.3.25", + "@angular/common": "^20.3.25", + "@angular/compiler": "^20.3.25", + "@angular/core": "^20.3.25", + "@angular/forms": "^20.3.25", + "@angular/localize": "^20.3.25", + "@angular/platform-browser": "^20.3.25", + "@angular/platform-browser-dynamic": "^20.3.25", + "@angular/platform-server": "^20.3.25", + "@angular/router": "^20.3.25", + "@angular/ssr": "^20.3.25", "@fortawesome/angular-fontawesome": "^3.0.0", "@fortawesome/fontawesome-common-types": "~6.7.2", "@fortawesome/fontawesome-svg-core": "~6.7.2", "@fortawesome/free-solid-svg-icons": "~6.7.2", "@ng-bootstrap/ng-bootstrap": "^19.0.0", "@types/qrcode": "~1.5.0", - "@noble/secp256k1": "^3.0.0", - "bootstrap": "~4.6.2", + "@noble/secp256k1": "^3.1.0", + "bootstrap": "~5.3.8", "clipboard": "^2.0.11", "domino": "^2.1.6", - "echarts": "~5.4.0", + "echarts": "~6.1.0", "ngx-echarts": "~20.0.2", "ngx-infinite-scroll": "^20.0.0", "qrcode": "1.5.1", @@ -91,8 +91,8 @@ "zone.js": "~0.15.1" }, "devDependencies": { - "@angular/compiler-cli": "^20.3.16", - "@angular/language-service": "^20.3.16", + "@angular/compiler-cli": "^20.3.25", + "@angular/language-service": "^20.3.25", "@types/node": "^24.9.2", "@typescript-eslint/eslint-plugin": "^8.46.2", "@typescript-eslint/parser": "^8.46.2", @@ -106,7 +106,7 @@ }, "optionalDependencies": { "@cypress/schematic": "^2.5.0", - "cypress": "^15.9.0", + "cypress": "^15.16.0", "cypress-fail-on-console-error": "~5.1.1", "cypress-wait-until": "^3.0.1", "mock-socket": "~9.3.1", diff --git a/frontend/src/app/app-routing.module.ts b/frontend/src/app/app-routing.module.ts index 98301adcc..80efc5d6f 100644 --- a/frontend/src/app/app-routing.module.ts +++ b/frontend/src/app/app-routing.module.ts @@ -9,11 +9,10 @@ import { StatusViewComponent } from '@components/status-view/status-view.compone import { AddressGroupComponent } from '@components/address-group/address-group.component'; import { TrackerGuard } from '@app/route-guards'; -const browserWindow = window || {}; -// @ts-ignore +const browserWindow = window as typeof window & { __env?: any }; const browserWindowEnv = browserWindow.__env || {}; -let routes: Routes = [ +const testnetRoutes: Routes = browserWindowEnv.TESTNET_ENABLED ? [ { path: 'testnet', children: [ @@ -52,6 +51,9 @@ let routes: Routes = [ }, ] }, +] : []; + +const testnet4Routes: Routes = browserWindowEnv.TESTNET4_ENABLED ? [ { path: 'testnet4', children: [ @@ -90,6 +92,9 @@ let routes: Routes = [ }, ] }, +] : []; + +const signetRoutes: Routes = browserWindowEnv.SIGNET_ENABLED ? [ { path: 'signet', children: [ @@ -133,6 +138,9 @@ let routes: Routes = [ }, ] }, +] : []; + +const regtestRoutes: Routes = browserWindowEnv.REGTEST_ENABLED ? [ { path: 'regtest', children: [ @@ -176,6 +184,13 @@ let routes: Routes = [ }, ] }, +] : []; + +let routes: Routes = [ + ...testnetRoutes, + ...testnet4Routes, + ...signetRoutes, + ...regtestRoutes, { path: '', pathMatch: 'full', @@ -262,46 +277,50 @@ let routes: Routes = [ }, ]; +const liquidTestnetRoutes: Routes = browserWindowEnv.LIQUID_TESTNET_ENABLED ? [ + { + path: 'testnet', + children: [ + { + path: '', + pathMatch: 'full', + loadChildren: () => import('@app/liquid/liquid-graphs.module').then(m => m.LiquidGraphsModule), + data: { preload: true }, + }, + { + path: '', + loadChildren: () => import ('@app/liquid/liquid-master-page.module').then(m => m.LiquidMasterPageModule), + data: { preload: true }, + }, + { + path: 'widget/wallet', + children: [], + component: AddressGroupComponent, + data: { + networkSpecific: true, + } + }, + { + path: 'status', + data: { networks: ['bitcoin', 'liquid'] }, + component: StatusViewComponent + }, + { + path: '', + loadChildren: () => import('@app/liquid/liquid-graphs.module').then(m => m.LiquidGraphsModule), + data: { preload: true }, + }, + { + path: '**', + redirectTo: '/testnet' + }, + ] + }, +] : []; + if (browserWindowEnv && browserWindowEnv.BASE_MODULE === 'liquid') { routes = [ - { - path: 'testnet', - children: [ - { - path: '', - pathMatch: 'full', - loadChildren: () => import('@app/liquid/liquid-graphs.module').then(m => m.LiquidGraphsModule), - data: { preload: true }, - }, - { - path: '', - loadChildren: () => import ('@app/liquid/liquid-master-page.module').then(m => m.LiquidMasterPageModule), - data: { preload: true }, - }, - { - path: 'widget/wallet', - children: [], - component: AddressGroupComponent, - data: { - networkSpecific: true, - } - }, - { - path: 'status', - data: { networks: ['bitcoin', 'liquid'] }, - component: StatusViewComponent - }, - { - path: '', - loadChildren: () => import('@app/liquid/liquid-graphs.module').then(m => m.LiquidGraphsModule), - data: { preload: true }, - }, - { - path: '**', - redirectTo: '/signet' - }, - ] - }, + ...liquidTestnetRoutes, { path: '', pathMatch: 'full', @@ -357,7 +376,7 @@ if (!window['isMempoolSpaceBuild']) { @NgModule({ imports: [RouterModule.forRoot(routes, { initialNavigation: 'enabledBlocking', - scrollPositionRestoration: 'enabled', + scrollPositionRestoration: 'disabled', anchorScrolling: 'disabled', preloadingStrategy: AppPreloadingStrategy })], diff --git a/frontend/src/app/app.constants.ts b/frontend/src/app/app.constants.ts index 730da5a81..8bf6b73a2 100644 --- a/frontend/src/app/app.constants.ts +++ b/frontend/src/app/app.constants.ts @@ -82,6 +82,48 @@ export const contrastMempoolFeeColors = [ 'ffb700', ]; + export const lightMempoolFeeColors = [ + '49c284', + '99c246', + 'a0c343', + 'a7c240', + 'b0c13c', + 'b8c03b', + 'bebe3a', + 'beb238', + 'bcac37', + 'bba336', + 'b99e35', + 'b79334', + 'b68f33', + 'b68a32', + 'b48430', + 'b17f30', + 'b07b2f', + 'ae722e', + 'ad6b2d', + 'ab652b', + 'aa5b2a', + 'a95629', + 'a74c28', + 'a34126', + 'a13a25', + 'a02d24', + '9e2423', + '9c222a', + '9c2132', + '9b203a', + '99203e', + '972043', + '951f45', + '931e48', + '921d49', + '921c4e', + '901b50', + '8e1a53', + '8b1954', +]; + export const chartColors = [ '#A81524', '#D81B60', diff --git a/frontend/src/app/components/about/about-sponsors.component.html b/frontend/src/app/components/about/about-sponsors.component.html index 9471fc78f..02189acb6 100644 --- a/frontend/src/app/components/about/about-sponsors.component.html +++ b/frontend/src/app/components/about/about-sponsors.component.html @@ -1,14 +1,14 @@

If you're an individual...

- Become a Community Sponsor + Become a Community Sponsor

If you're a business...

- Become an Enterprise Sponsor + Become an Enterprise Sponsor diff --git a/frontend/src/app/components/about/about-sponsors.component.ts b/frontend/src/app/components/about/about-sponsors.component.ts index be86a9d93..673bb207c 100644 --- a/frontend/src/app/components/about/about-sponsors.component.ts +++ b/frontend/src/app/components/about/about-sponsors.component.ts @@ -1,5 +1,4 @@ import { Component, Input } from '@angular/core'; -import { EnterpriseService } from '@app/services/enterprise.service'; @Component({ selector: 'app-about-sponsors', @@ -10,17 +9,4 @@ import { EnterpriseService } from '@app/services/enterprise.service'; export class AboutSponsorsComponent { @Input() host = 'https://mempool.space'; @Input() context = 'about'; - - constructor(private enterpriseService: EnterpriseService) { - } - - onSponsorClick(e): boolean { - this.enterpriseService.goal(5); - return true; - } - - onEnterpriseClick(e): boolean { - this.enterpriseService.goal(6); - return true; - } } diff --git a/frontend/src/app/components/about/about.component.html b/frontend/src/app/components/about/about.component.html index e52cb5f63..1012d6823 100644 --- a/frontend/src/app/components/about/about.component.html +++ b/frontend/src/app/components/about/about.component.html @@ -2,7 +2,11 @@
® - + @if (isLightMode) { + + } @else { + + }
v{{ packetJsonVersion }} [{{ frontendGitCommitHash }}] [{{ stateService.env.GIT_COMMIT_HASH_MEMPOOL_SPACE }}] @@ -41,15 +45,289 @@

Enterprise Sponsors 🚀

- + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - Spiral @@ -126,13 +404,23 @@ Blockstream - + @if (isLightMode) { + + + + } @else { + + } Unchained - + @if (isLightMode) { + + } @else { + + } Bitkey @@ -212,11 +500,19 @@ Onramp Bitcoin - + @if (isLightMode) { + + } @else { + + } Cake Wallet - + @if (isLightMode) { + + } @else { + + } Leather @@ -294,7 +590,11 @@ NixOS - + @if (isLightMode) { + + } @else { + + } StartOS @@ -382,17 +682,42 @@ @@ -471,7 +804,7 @@ Trademark Notice

- The Mempool Open Source Project®, Mempool Accelerator®, Mempool Enterprise®, Mempool Wallet™, mempool.space®, Be your own explorer™, Explore the full Bitcoin ecosystem®, Mempool Goggles™, the mempool Logo, the mempool Square Logo, the mempool block visualization Logo, the mempool Blocks Logo, the mempool transaction Logo, the mempool Blocks 3 | 2 Logo, the mempool research Logo, the mempool.space Vertical Logo, and the mempool.space Horizontal Logo are either registered trademarks or trademarks of Mempool Holdings S.A. de C.V. in Japan, the United States, and/or other countries. + The Mempool Open Source Project®, Mempool Accelerator®, Mempool Enterprise®, Mempool Wallet™, mempool.space®, Be your own explorer™, Explore the full Bitcoin ecosystem®, Mempool Goggles®, the mempool Logo, the mempool Square Logo, the mempool block visualization Logo, the mempool Blocks Logo, the mempool transaction Logo, the mempool Blocks 3 | 2 Logo, the mempool research Logo, the mempool.space Vertical Logo, and the mempool.space Horizontal Logo are either registered trademarks or trademarks of Mempool Holdings S.A. de C.V. in Japan, the United States, and/or other countries.

While our software is available under an open source software license, the copyright license does not include an implied right or license to use our trademarks. See our Trademark Policy and Guidelines for more details, published on <https://mempool.space/trademark-policy>. diff --git a/frontend/src/app/components/about/about.component.scss b/frontend/src/app/components/about/about.component.scss index cb0babd61..471cf828d 100644 --- a/frontend/src/app/components/about/about.component.scss +++ b/frontend/src/app/components/about/about.component.scss @@ -101,42 +101,30 @@ } } - .alliances { - margin-bottom: 100px; - a { - &:nth-child(3) { - position: relative; - top: 10px; - } + .alliances-logos { + align-items: center; + margin-bottom: 80px; + justify-content: center; + } + .alliance-logo { + height: 80px; + display: flex; + justify-content: center; + margin-top: 25px; + @media (min-width: 768px) { + margin-top: 45px; } - img { - display: inline-block; - margin: 15px auto; - height: 62px; - @media (min-width: 425px) { - margin: 15px 60px; - } - @media (min-width: 576px) { - margin: 15px 120px; - } - @media (min-width: 850px) { - margin: 50px 30px 0px; - } - } - .liquid { - top: 7px; - position: relative; - } - .copa { - height: auto; - top: 23px; - position: relative; + } + .stratum-v2-logo { + object-fit: contain; + @media (max-width: 767px) { width: 300px; } - .sv { - height: 85px; - width: auto; + } + .copa { + @media (min-width: 992px) { position: relative; + top: 15px; } } @@ -147,6 +135,7 @@ .community-integrations-sponsor, .maintainers { scroll-margin: 30px; + scroll-margin-top: 65px; .wrapper { display: inline-block; a { @@ -198,7 +187,7 @@ margin: auto; line-height: 1.8; font-size: 87.5%; - color: #e83e8c; + color: var(--pink); word-wrap: break-word; font-family: SFMono-Regular,Menlo,Monaco,Consolas,Liberation Mono,Courier New,monospace; ul { diff --git a/frontend/src/app/components/about/about.component.ts b/frontend/src/app/components/about/about.component.ts index 8b5a21bd2..211f21622 100644 --- a/frontend/src/app/components/about/about.component.ts +++ b/frontend/src/app/components/about/about.component.ts @@ -1,16 +1,16 @@ -import { ChangeDetectionStrategy, Component, ElementRef, Inject, LOCALE_ID, OnInit, ViewChild } from '@angular/core'; +import { ChangeDetectionStrategy, ChangeDetectorRef, Component, ElementRef, Inject, LOCALE_ID, OnInit, ViewChild } from '@angular/core'; import { WebsocketService } from '@app/services/websocket.service'; import { SeoService } from '@app/services/seo.service'; import { OpenGraphService } from '@app/services/opengraph.service'; import { StateService } from '@app/services/state.service'; -import { Observable } from 'rxjs'; +import { Observable, Subscription } from 'rxjs'; import { ApiService } from '@app/services/api.service'; import { IBackendInfo } from '@interfaces/websocket.interface'; import { Router, ActivatedRoute } from '@angular/router'; import { map, share, tap } from 'rxjs/operators'; import { ITranslators } from '@interfaces/node-api.interface'; import { DOCUMENT } from '@angular/common'; -import { EnterpriseService } from '@app/services/enterprise.service'; +import { ThemeService } from '../../services/theme.service'; @Component({ selector: 'app-about', @@ -26,6 +26,8 @@ export class AboutComponent implements OnInit { packetJsonVersion = this.stateService.env.PACKAGE_JSON_VERSION; officialMempoolSpace = this.stateService.env.OFFICIAL_MEMPOOL_SPACE; showNavigateToSponsor = false; + themeStateSubscription: Subscription; + loadedTheme = 'default'; profiles$: Observable; translators$: Observable; @@ -37,10 +39,11 @@ export class AboutComponent implements OnInit { private seoService: SeoService, private ogService: OpenGraphService, public stateService: StateService, - private enterpriseService: EnterpriseService, private apiService: ApiService, private router: Router, private route: ActivatedRoute, + private themeService: ThemeService, + private cd: ChangeDetectorRef, @Inject(LOCALE_ID) public locale: string, @Inject(DOCUMENT) private document: Document, ) { } @@ -88,6 +91,14 @@ export class AboutComponent implements OnInit { }), tap(() => this.goToAnchor()) ); + + this.themeStateSubscription = this.themeService.themeState$.subscribe((state) => { + if (state.loading) { + return; + } + this.loadedTheme = state.theme; + this.cd.markForCheck(); + }); } ngAfterViewInit() { @@ -128,13 +139,11 @@ export class AboutComponent implements OnInit { this.promoVideo.nativeElement.muted = false; } - onSponsorClick(e): boolean { - this.enterpriseService.goal(5); - return true; + get isLightMode(): boolean { + return this.loadedTheme === 'nymkappa'; } - onEnterpriseClick(e): boolean { - this.enterpriseService.goal(6); - return true; + ngOnDestroy(): void { + this.themeStateSubscription?.unsubscribe(); } } diff --git a/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.html b/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.html index 339a0a196..54fe158db 100644 --- a/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.html +++ b/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.html @@ -32,7 +32,6 @@

-
+
@@ -112,7 +111,7 @@ - @if (hasAccessToBalanceMode) { + @if (estimate.isProUser) { Next block market rate @@ -129,7 +128,7 @@ sats - + } @@ -151,7 +150,7 @@ sats - + } @@ -169,7 +168,7 @@ sats - + @@ -181,25 +180,25 @@ sats - + - + - Estimated acceleration cost ~{{ estimate.targetFeeRate | number : '1.0-0' }} sat/vB + Estimated acceleration cost ~{{ estimate.targetFeeRate | number : '1.0-0' }} sat/vB - + {{ estimate.cost + estimate.mempoolBaseFee + estimate.vsizeFee | number }} sats - + @@ -208,28 +207,28 @@ - @if (hasAccessToBalanceMode) { - Maximum acceleration cost + @if (estimate.isProUser) { + Maximum acceleration cost } @else { - Acceleration cost + Acceleration cost } - + {{ cost | number }} sats - - + + - + Available balance @@ -237,15 +236,19 @@ sats - + - - + + + @if (partnerCode) { + + } +
@@ -287,10 +290,10 @@
-
+
-
+