From 4283a369aeb29e5caf849590c009820e66a6c6ab Mon Sep 17 00:00:00 2001 From: hailin Date: Wed, 28 Jan 2026 18:16:38 -0800 Subject: [PATCH] =?UTF-8?q?fix(mining-blockchain-service):=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8DRedis=20DB=E9=85=8D=E7=BD=AE=E8=B6=85=E5=87=BA?= =?UTF-8?q?=E8=8C=83=E5=9B=B4=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将 REDIS_DB 从 16 改为 8(Redis 仅支持 0-15) - 更新 .env.example 添加做市商钱包配置说明 - 添加 eUSDT/fUSDT 合约地址配置 - 添加区块扫描配置项 Co-Authored-By: Claude Opus 4.5 --- backend/services/docker-compose.2.0.yml | 4 +-- .../mining-blockchain-service/.env.example | 28 ++++++++++++++++++- .../docker-compose.yml | 2 +- .../src/config/redis.config.ts | 2 +- 4 files changed, 31 insertions(+), 5 deletions(-) diff --git a/backend/services/docker-compose.2.0.yml b/backend/services/docker-compose.2.0.yml index ba5ed04d..fe41ae27 100644 --- a/backend/services/docker-compose.2.0.yml +++ b/backend/services/docker-compose.2.0.yml @@ -256,11 +256,11 @@ services: PORT: 3026 # PostgreSQL - 使用独立的数据库 DATABASE_URL: postgresql://${POSTGRES_USER:-postgres}:${POSTGRES_PASSWORD:-postgres}@postgres:5432/rwa_blockchain?schema=public - # Redis - 使用 DB 16 隔离 + # Redis - 使用 DB 8 隔离 (0-15 有效范围) REDIS_HOST: redis REDIS_PORT: 6379 REDIS_PASSWORD: ${REDIS_PASSWORD:-} - REDIS_DB: 16 + REDIS_DB: 8 # Kafka - 用于 MPC 签名通信和事件发布 KAFKA_BROKERS: kafka:29092 # JWT 配置 diff --git a/backend/services/mining-blockchain-service/.env.example b/backend/services/mining-blockchain-service/.env.example index e6bfe6fc..1f28385e 100644 --- a/backend/services/mining-blockchain-service/.env.example +++ b/backend/services/mining-blockchain-service/.env.example @@ -31,7 +31,7 @@ DATABASE_URL=postgresql://rwa_user:your_password@localhost:5432/rwa_mining_block # ============================================================================= REDIS_HOST=localhost REDIS_PORT=6379 -REDIS_DB=15 +REDIS_DB=8 REDIS_PASSWORD= # ============================================================================= @@ -51,6 +51,12 @@ KAVA_CHAIN_ID=2222 # 合约链接: https://kavascan.com/address/0xA9F3A35dBa8699c8C681D8db03F0c1A8CEB9D7c3 KAVA_USDT_CONTRACT=0xA9F3A35dBa8699c8C681D8db03F0c1A8CEB9D7c3 +# eUSDT (积分股) 合约地址 - Energy USDT +KAVA_EUSDT_CONTRACT=0x7C3275D808eFbAE90C06C7E3A9AfDdcAa8563931 + +# fUSDT (积分值) 合约地址 - Future USDT +KAVA_FUSDT_CONTRACT=0x14dc4f7d3E4197438d058C3D156dd9826A161134 + # ============================================================================= # dUSDT Transfer Configuration # ============================================================================= @@ -70,6 +76,26 @@ HOT_WALLET_USERNAME=c2c-bot-wallet # 在 MPC keygen 完成后,从公钥计算得出 HOT_WALLET_ADDRESS= +# ============================================================================= +# 做市商 MPC 钱包(用于充值监控和提现转账) +# ============================================================================= +# 做市商钱包地址(用于监控充值) +# 必须配置,否则做市商充值监控功能不可用 +MARKET_MAKER_WALLET_ADDRESS= + +# 做市商 MPC 用户名(用于签名提现交易) +# 必须配置,否则做市商提现功能不可用 +MARKET_MAKER_MPC_USERNAME= + +# ============================================================================= +# 区块扫描配置 +# ============================================================================= +# 扫描间隔(毫秒) +BLOCK_SCAN_INTERVAL_MS=5000 + +# 需要的区块确认数 +BLOCK_CONFIRMATIONS_REQUIRED=12 + # ============================================================================= # Logging # ============================================================================= diff --git a/backend/services/mining-blockchain-service/docker-compose.yml b/backend/services/mining-blockchain-service/docker-compose.yml index d593ad13..27d83605 100644 --- a/backend/services/mining-blockchain-service/docker-compose.yml +++ b/backend/services/mining-blockchain-service/docker-compose.yml @@ -26,7 +26,7 @@ services: # Redis (shared) REDIS_HOST: rwa-redis REDIS_PORT: 6379 - REDIS_DB: 11 + REDIS_DB: 8 # Kafka (shared) KAFKA_BROKERS: rwa-kafka:29092 KAFKA_CLIENT_ID: blockchain-service diff --git a/backend/services/mining-blockchain-service/src/config/redis.config.ts b/backend/services/mining-blockchain-service/src/config/redis.config.ts index b3b8a1b0..1a70578b 100644 --- a/backend/services/mining-blockchain-service/src/config/redis.config.ts +++ b/backend/services/mining-blockchain-service/src/config/redis.config.ts @@ -3,6 +3,6 @@ import { registerAs } from '@nestjs/config'; export default registerAs('redis', () => ({ host: process.env.REDIS_HOST || 'localhost', port: parseInt(process.env.REDIS_PORT || '6379', 10), - db: parseInt(process.env.REDIS_DB || '11', 10), + db: parseInt(process.env.REDIS_DB || '8', 10), password: process.env.REDIS_PASSWORD || undefined, }));