Skip to content

[pull] master from mempool:master #307

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 14 commits into from
Jun 6, 2026
Merged

[pull] master from mempool:master #307

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
fe0806a
refactor redis
mononaut Jun 2, 2026
46f5406
make adding transactions to cluster mempool idempotent
mononaut Jun 3, 2026
2d7a7d5
add cluster mempool idempotency test
mononaut Jun 3, 2026
cea125c
fix cluster mempool tx eviction bug
mononaut Jun 4, 2026
d6638c1
don't retain cluster mempool parentMap longer than necessary
mononaut Jun 4, 2026
f7d975a
pin github workflow actions
mononaut Jun 5, 2026
aab2a93
enforce check-install-scripts in ci workflows
mononaut Jun 5, 2026
db281ca
bump dependabot cooldowns
mononaut Jun 5, 2026
e53892f
add .npmrc
mononaut Jun 5, 2026
4de9851
Merge pull request #6538 from mempool/mononaut/refactor-redis
wiz Jun 6, 2026
83afdbd
Merge pull request #6540 from mempool/mononaut/cm-misc-fixes
wiz Jun 6, 2026
063e341
Merge pull request #6543 from mempool/mononaut/ci-checks
wiz Jun 6, 2026
98d0d29
Merge pull request #6544 from mempool/mononaut/bump-dependabot-cooldowns
wiz Jun 6, 2026
5ac9caa
Merge pull request #6542 from mempool/mononaut/pin-actions
wiz Jun 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .github/dependabot.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ updates:
default-days: 7
semver-major-days: 30
semver-minor-days: 14
semver-patch-days: 3
semver-patch-days: 7
ignore:
- dependency-name: "*"
update-types:
Expand Down Expand Up @@ -42,7 +42,7 @@ updates:
default-days: 7
semver-major-days: 30
semver-minor-days: 14
semver-patch-days: 3
semver-patch-days: 7
ignore:
- dependency-name: "*"
update-types:
Expand All @@ -55,7 +55,7 @@ updates:
schedule:
interval: weekly
cooldown:
default-days: 3
default-days: 7
ignore:
- dependency-name: "*"
update-types:
Expand All @@ -66,7 +66,7 @@ updates:
schedule:
interval: weekly
cooldown:
default-days: 3
default-days: 7
ignore:
- dependency-name: "*"
update-types:
Expand All @@ -77,7 +77,7 @@ updates:
schedule:
interval: weekly
cooldown:
default-days: 3
default-days: 7
ignore:
- dependency-name: "*"
update-types:
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/backend-integration.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,20 +23,20 @@ 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"
cache: 'npm'
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') }}
Expand All @@ -50,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/
Expand All @@ -69,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
Expand Down
72 changes: 36 additions & 36 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@ 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@v4
uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
with:
node-version: ${{ matrix.node }}
registry-url: "https://registry.npmjs.org"
Expand All @@ -39,7 +39,7 @@ jobs:
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') }}
Expand All @@ -53,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/
Expand All @@ -75,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
Expand All @@ -106,12 +106,12 @@ 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@v4
uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
with:
node-version: ${{ matrix.node }}
registry-url: "https://registry.npmjs.org"
Expand All @@ -122,7 +122,7 @@ jobs:
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') }}
Expand All @@ -131,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
Expand All @@ -146,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
Expand Down Expand Up @@ -179,28 +179,28 @@ 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
key: mining-pool-assets-cache

- 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
Expand All @@ -219,12 +219,12 @@ 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@v4
uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
with:
node-version: ${{ matrix.node }}
registry-url: "https://registry.npmjs.org"
Expand All @@ -235,7 +235,7 @@ jobs:
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') }}
Expand All @@ -244,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
Expand All @@ -264,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
Expand All @@ -273,22 +273,22 @@ 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

- name: Unzip assets before building (src/resources)
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

Expand Down Expand Up @@ -322,12 +322,12 @@ 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@v4
uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
with:
node-version: ${{ matrix.node }}
cache: "npm"
Expand All @@ -337,7 +337,7 @@ jobs:
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') }}
Expand All @@ -348,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
Expand All @@ -357,22 +357,22 @@ 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

- name: Unzip assets before building (src/resources)
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

Expand All @@ -382,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
Expand All @@ -407,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
Expand All @@ -432,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
Expand Down Expand Up @@ -460,7 +460,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3
with:
path: docker

Expand Down
Loading
Loading