From ec34bb5fb0b2cc8112353d2d67ed9a08f7db571c Mon Sep 17 00:00:00 2001 From: signature18632 Date: Sat, 23 Aug 2025 20:42:38 +0700 Subject: [PATCH 1/2] alert sent --- packages/bridge-monitor/src/service/job.service.ts | 1 + packages/shared/src/db/bridgeTransaction.ts | 3 +++ packages/shared/src/types/bridgeTransaction.ts | 7 ++++++- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/packages/bridge-monitor/src/service/job.service.ts b/packages/bridge-monitor/src/service/job.service.ts index 7ba7d25..42ac51c 100644 --- a/packages/bridge-monitor/src/service/job.service.ts +++ b/packages/bridge-monitor/src/service/job.service.ts @@ -20,6 +20,7 @@ export const performJob = async () => { BridgeTransactionStatus.VERIFIED, BridgeTransactionStatus.BLOCKED, ], + alertSent: false, }); const sortedTransactions = bridgeTransactions.sort((a, b) => a.nonce - b.nonce); diff --git a/packages/shared/src/db/bridgeTransaction.ts b/packages/shared/src/db/bridgeTransaction.ts index 61bff76..4359612 100644 --- a/packages/shared/src/db/bridgeTransaction.ts +++ b/packages/shared/src/db/bridgeTransaction.ts @@ -145,6 +145,9 @@ export class BridgeTransaction { if (filter?.statuses && filter.statuses.length > 0) { modified = modified.where("status", "in", filter.statuses); } + if (filter?.alertSent !== undefined) { + modified = modified.where("alertSent", "==", filter.alertSent); + } return modified; }); } diff --git a/packages/shared/src/types/bridgeTransaction.ts b/packages/shared/src/types/bridgeTransaction.ts index 89d7d96..4fa8068 100644 --- a/packages/shared/src/types/bridgeTransaction.ts +++ b/packages/shared/src/types/bridgeTransaction.ts @@ -3,6 +3,8 @@ export interface BridgeTransactionData { status: BridgeTransactionStatus; nonce: number; verifiedAt?: FirebaseFirestore.Timestamp; + alertSent?: boolean; + lastAlertAt?: FirebaseFirestore.Timestamp; updatedAt: FirebaseFirestore.Timestamp; createdAt: FirebaseFirestore.Timestamp; } @@ -16,10 +18,13 @@ export interface BridgeTransactionInput { export interface BridgeTransactionUpdateInput { status: BridgeTransactionStatus; + alertSent?: boolean; + lastAlertAt?: FirebaseFirestore.Timestamp; } export interface BridgeTransactionFilter { - statuses: BridgeTransactionStatus[]; + statuses?: BridgeTransactionStatus[]; + alertSent?: boolean; } export enum BridgeTransactionStatus { From 807db6fe1276bf9da745e062d3b222aceb21963a Mon Sep 17 00:00:00 2001 From: signature18632 Date: Sun, 24 Aug 2025 06:57:30 +0700 Subject: [PATCH 2/2] module update --- .dockerignore | 26 +++++++- .github/workflows/ci-coverage.yml | 4 +- .github/workflows/ci.yml | 4 +- docker/Dockerfile | 12 ++-- package.json | 8 +-- packages/shared/src/blockchain/wallet.ts | 2 +- yarn.lock | 76 ++++++++++++------------ 7 files changed, 78 insertions(+), 54 deletions(-) diff --git a/.dockerignore b/.dockerignore index e40416c..55add34 100644 --- a/.dockerignore +++ b/.dockerignore @@ -12,12 +12,36 @@ out .vscode .idea *.md -!README.md +README.md *.log *.local .nvmrc +.npmrc biome.json coverage +.yarn +scripts + +# Testing files +test +tests +vite.config.mts +**/test +**/tests +__tests__ +**/__tests__ +*.test.ts +*.spec.ts +vitest.config.* + +# Documentation +docs +**/docs +*.md +CONTRIBUTING.md +CODE_OF_CONDUCT.md +SECURITY.md +LICENSE # Environment files .env diff --git a/.github/workflows/ci-coverage.yml b/.github/workflows/ci-coverage.yml index e8fd73b..25de9ad 100644 --- a/.github/workflows/ci-coverage.yml +++ b/.github/workflows/ci-coverage.yml @@ -10,8 +10,8 @@ permissions: contents: read env: - NODE_VERSION: 24.5.0 - YARN_VERSION: 4.9.2 + NODE_VERSION: 24.6.0 + YARN_VERSION: 4.9.3 concurrency: group: ${{ github.workflow }}-${{ github.ref }} diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e25b18b..b23d63e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,8 +10,8 @@ permissions: contents: read env: - NODE_VERSION: 24.5.0 - YARN_VERSION: 4.9.2 + NODE_VERSION: 24.6.0 + YARN_VERSION: 4.9.3 concurrency: group: ${{ github.workflow }}-${{ github.ref }} diff --git a/docker/Dockerfile b/docker/Dockerfile index a16a84a..65ecd2c 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,8 +1,8 @@ -FROM node:24.5.0-bookworm-slim AS builder +FROM node:24.6.0-bookworm-slim AS builder RUN corepack enable && \ - corepack prepare yarn@4.9.2 --activate && \ - yarn set version 4.9.2 + corepack prepare yarn@4.9.3 --activate && \ + yarn set version 4.9.3 RUN apt-get update && apt-get install -y \ python3 \ @@ -36,7 +36,7 @@ RUN mkdir -p /tmp/packages && \ find /tmp/packages/$pkg_name -type d -empty -delete; \ done -FROM node:24.5.0-bookworm-slim AS production +FROM node:24.6.0-bookworm-slim AS production ENV NODE_ENV=production ENV NODE_OPTIONS="\ @@ -46,8 +46,8 @@ ENV NODE_OPTIONS="\ --zero-fill-buffers" RUN corepack enable && \ - corepack prepare yarn@4.9.2 --activate && \ - yarn set version 4.9.2 + corepack prepare yarn@4.9.3 --activate && \ + yarn set version 4.9.3 RUN apt-get update && \ apt-get install -y --no-install-recommends \ diff --git a/package.json b/package.json index 9fafd10..da1df65 100644 --- a/package.json +++ b/package.json @@ -39,14 +39,14 @@ "coverage": "vitest run --coverage" }, "devDependencies": { - "@biomejs/biome": "2.2.0", + "@biomejs/biome": "2.2.2", "@vitest/coverage-v8": "^3.2.4", "typescript": "^5.9.2", "vitest": "^3.2.4" }, - "packageManager": "yarn@4.9.2", + "packageManager": "yarn@4.9.3", "volta": { - "node": "24.5.0", - "yarn": "4.9.2" + "node": "24.6.0", + "yarn": "4.9.3" } } diff --git a/packages/shared/src/blockchain/wallet.ts b/packages/shared/src/blockchain/wallet.ts index 149c2d5..c5cb34f 100644 --- a/packages/shared/src/blockchain/wallet.ts +++ b/packages/shared/src/blockchain/wallet.ts @@ -1,7 +1,7 @@ import { createWalletClient, fallback } from "viem"; import { mnemonicToAccount, privateKeyToAccount } from "viem/accounts"; import { config } from "../config"; -import type { NetworkLayer } from "./../types/blockchain"; +import type { NetworkLayer } from "./../types"; import { getClientConfig } from "./client"; type MockWalletType = "mockMessenger"; diff --git a/yarn.lock b/yarn.lock index f677d3b..3ac0e50 100644 --- a/yarn.lock +++ b/yarn.lock @@ -78,18 +78,18 @@ __metadata: languageName: node linkType: hard -"@biomejs/biome@npm:2.2.0": - version: 2.2.0 - resolution: "@biomejs/biome@npm:2.2.0" - dependencies: - "@biomejs/cli-darwin-arm64": "npm:2.2.0" - "@biomejs/cli-darwin-x64": "npm:2.2.0" - "@biomejs/cli-linux-arm64": "npm:2.2.0" - "@biomejs/cli-linux-arm64-musl": "npm:2.2.0" - "@biomejs/cli-linux-x64": "npm:2.2.0" - "@biomejs/cli-linux-x64-musl": "npm:2.2.0" - "@biomejs/cli-win32-arm64": "npm:2.2.0" - "@biomejs/cli-win32-x64": "npm:2.2.0" +"@biomejs/biome@npm:2.2.2": + version: 2.2.2 + resolution: "@biomejs/biome@npm:2.2.2" + dependencies: + "@biomejs/cli-darwin-arm64": "npm:2.2.2" + "@biomejs/cli-darwin-x64": "npm:2.2.2" + "@biomejs/cli-linux-arm64": "npm:2.2.2" + "@biomejs/cli-linux-arm64-musl": "npm:2.2.2" + "@biomejs/cli-linux-x64": "npm:2.2.2" + "@biomejs/cli-linux-x64-musl": "npm:2.2.2" + "@biomejs/cli-win32-arm64": "npm:2.2.2" + "@biomejs/cli-win32-x64": "npm:2.2.2" dependenciesMeta: "@biomejs/cli-darwin-arm64": optional: true @@ -109,62 +109,62 @@ __metadata: optional: true bin: biome: bin/biome - checksum: 10c0/092ee79cad7f253427499aa193374e4c1fe5935be916d426f96fd1b8864b9c95f623d447c096894a4f864a15618c965f71863987c7afdcf77e5cdb79ec28fecd + checksum: 10c0/108690efd8c3a5fcee9faf89371319b2d066208e8adbb05855650032a1cc9afc98ec4206b73b0be2c49cdf64ef765cf5a24785456b814d5846ab65b293791daf languageName: node linkType: hard -"@biomejs/cli-darwin-arm64@npm:2.2.0": - version: 2.2.0 - resolution: "@biomejs/cli-darwin-arm64@npm:2.2.0" +"@biomejs/cli-darwin-arm64@npm:2.2.2": + version: 2.2.2 + resolution: "@biomejs/cli-darwin-arm64@npm:2.2.2" conditions: os=darwin & cpu=arm64 languageName: node linkType: hard -"@biomejs/cli-darwin-x64@npm:2.2.0": - version: 2.2.0 - resolution: "@biomejs/cli-darwin-x64@npm:2.2.0" +"@biomejs/cli-darwin-x64@npm:2.2.2": + version: 2.2.2 + resolution: "@biomejs/cli-darwin-x64@npm:2.2.2" conditions: os=darwin & cpu=x64 languageName: node linkType: hard -"@biomejs/cli-linux-arm64-musl@npm:2.2.0": - version: 2.2.0 - resolution: "@biomejs/cli-linux-arm64-musl@npm:2.2.0" +"@biomejs/cli-linux-arm64-musl@npm:2.2.2": + version: 2.2.2 + resolution: "@biomejs/cli-linux-arm64-musl@npm:2.2.2" conditions: os=linux & cpu=arm64 & libc=musl languageName: node linkType: hard -"@biomejs/cli-linux-arm64@npm:2.2.0": - version: 2.2.0 - resolution: "@biomejs/cli-linux-arm64@npm:2.2.0" +"@biomejs/cli-linux-arm64@npm:2.2.2": + version: 2.2.2 + resolution: "@biomejs/cli-linux-arm64@npm:2.2.2" conditions: os=linux & cpu=arm64 & libc=glibc languageName: node linkType: hard -"@biomejs/cli-linux-x64-musl@npm:2.2.0": - version: 2.2.0 - resolution: "@biomejs/cli-linux-x64-musl@npm:2.2.0" +"@biomejs/cli-linux-x64-musl@npm:2.2.2": + version: 2.2.2 + resolution: "@biomejs/cli-linux-x64-musl@npm:2.2.2" conditions: os=linux & cpu=x64 & libc=musl languageName: node linkType: hard -"@biomejs/cli-linux-x64@npm:2.2.0": - version: 2.2.0 - resolution: "@biomejs/cli-linux-x64@npm:2.2.0" +"@biomejs/cli-linux-x64@npm:2.2.2": + version: 2.2.2 + resolution: "@biomejs/cli-linux-x64@npm:2.2.2" conditions: os=linux & cpu=x64 & libc=glibc languageName: node linkType: hard -"@biomejs/cli-win32-arm64@npm:2.2.0": - version: 2.2.0 - resolution: "@biomejs/cli-win32-arm64@npm:2.2.0" +"@biomejs/cli-win32-arm64@npm:2.2.2": + version: 2.2.2 + resolution: "@biomejs/cli-win32-arm64@npm:2.2.2" conditions: os=win32 & cpu=arm64 languageName: node linkType: hard -"@biomejs/cli-win32-x64@npm:2.2.0": - version: 2.2.0 - resolution: "@biomejs/cli-win32-x64@npm:2.2.0" +"@biomejs/cli-win32-x64@npm:2.2.2": + version: 2.2.2 + resolution: "@biomejs/cli-win32-x64@npm:2.2.2" conditions: os=win32 & cpu=x64 languageName: node linkType: hard @@ -3294,7 +3294,7 @@ __metadata: version: 0.0.0-use.local resolution: "intmax2-function@workspace:." dependencies: - "@biomejs/biome": "npm:2.2.0" + "@biomejs/biome": "npm:2.2.2" "@vitest/coverage-v8": "npm:^3.2.4" typescript: "npm:^5.9.2" vitest: "npm:^3.2.4"