Merge pull request #29 from GalaxySciTech/cursor/tokencore-multichain-optimize-5cc6

Tokencore 2.0.1, monolith Docker/CI, external signing, DB token catalog

Author: GalaxySciTech

.env.example

@@ -1,25 +1,30 @@
-# Database
+# Database (Spring Boot reads DB_URL / DB_USERNAME / DB_PASSWORD)
 DB_URL=jdbc:mysql://127.0.0.1:3306/wallet_db?allowMultiQueries=true&useSSL=false&characterEncoding=UTF-8&autoReconnect=true
 DB_USERNAME=root
 DB_PASSWORD=your_secure_password
 
-# RabbitMQ
-RABBITMQ_HOST=127.0.0.1
-RABBITMQ_PORT=5672
-RABBITMQ_USERNAME=guest
-RABBITMQ_PASSWORD=guest
+# Server
+SERVER_PORT=8080
 
-# XXL-Job
-XXL_JOB_ADMIN_ADDRESSES=http://127.0.0.1:8099/xxl-job-admin
-XXL_JOB_PORT=9999
-XXL_JOB_ACCESS_TOKEN=your_access_token
-
-# HSM Keystore
+# Keystore (tokencore / WalletManager)
 KEYSTORE_DIR=/data/keystores
-KEYSTORE_PASSWORD=your_keystore_password
+WALLET_KEYSTORE_PASSWORD=your_keystore_password
 
-# Encryption
-WALLET_CRYPTO_PUSH_KEY=your_32_char_encryption_key_here
+# Optional: EOS deposit address for EOS flows
+EOS_DEPOSIT_ADDRESS=
+
+# Tokencore signing chain ids (H2 testnet example: ETH_SIGN_CHAIN_ID=11155111, BTC_SIGN_CHAIN_ID=1)
+ETH_SIGN_CHAIN_ID=1
+BTC_SIGN_CHAIN_ID=0
+
+# External signer (when wallet_chain_config.signing_backend = EXTERNAL)
+EXTERNAL_SIGNER_BASE_URL=
+
+# Optional ETH gas price HTTP fallback (JSON shape must match ETH_GAS_LEVEL keys)
+ETH_GAS_FALLBACK_URL=
 
 # Logging
 LOG_LEVEL=INFO
+
+# Encryption (if used by your deployment)
+WALLET_CRYPTO_PUSH_KEY=your_32_char_encryption_key_here

.github/workflows/ci.yml

@@ -13,63 +13,57 @@ jobs:
   build:
     name: Build & Test
     runs-on: ubuntu-latest
-    
+
     steps:
       - uses: actions/checkout@v4
-      
+
       - name: Set up JDK 17
         uses: actions/setup-java@v4
         with:
           java-version: '17'
           distribution: 'temurin'
-      
+
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v3
         with:
           cache-read-only: ${{ github.ref != 'refs/heads/master' }}
-      
+
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
-      
+
       - name: Build
         run: ./gradlew build -x test --no-daemon
-      
+
       - name: Run tests
         run: ./gradlew test --no-daemon
         continue-on-error: true
-      
+
       - name: Upload build artifacts
         uses: actions/upload-artifact@v4
         with:
           name: build-artifacts
           path: |
-            wallet-webapi/build/libs/*.jar
-            wallet-task/build/libs/*.jar
-            wallet-hsm/build/libs/*.jar
+            build/libs/*.jar
           retention-days: 7
 
   docker:
     name: Docker Build
     runs-on: ubuntu-latest
     needs: build
     if: github.ref == 'refs/heads/master'
-    
-    strategy:
-      matrix:
-        service: [wallet-webapi, wallet-task, wallet-hsm]
-    
+
     steps:
       - uses: actions/checkout@v4
-      
+
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
-      
+
       - name: Build Docker image
         uses: docker/build-push-action@v5
         with:
           context: .
-          file: ./${{ matrix.service }}/Dockerfile
+          file: ./Dockerfile
           push: false
-          tags: ${{ matrix.service }}:${{ github.sha }}
+          tags: wallet-app:${{ github.sha }}
           cache-from: type=gha
           cache-to: type=gha,mode=max

.gitlab-ci.yml

@@ -19,75 +19,25 @@ build:
   stage: build
   script:
     - chmod +x ./gradlew
-    - ./gradlew wallet-webapi:bootJar --no-daemon -x test
-    - ./gradlew wallet-task:bootJar --no-daemon -x test
-    - ./gradlew wallet-hsm:bootJar --no-daemon -x test
+    - ./gradlew bootJar --no-daemon -x test
   artifacts:
     paths:
-      - wallet-webapi/build/libs/*.jar
-      - wallet-hsm/build/libs/*.jar
-      - wallet-task/build/libs/*.jar
+      - build/libs/*.jar
     expire_in: 1 hour
 
-deploy wallet-webapi:
+deploy wallet-app:
   image: docker:latest
   services:
     - docker:dind
   tags:
     - wallet-dev
   stage: deploy
   script:
-    - docker stop wallet-webapi || true
-    - docker rm wallet-webapi || true
-    - docker rmi wallet-webapi || true
-    - docker build -t wallet-webapi -f wallet-webapi/Dockerfile .
-    - docker run -d --name wallet-webapi
-      --restart unless-stopped
-      -p 10001:10001
-      -v /etc/localtime:/etc/localtime:ro
-      --env-file /etc/wallet/webapi.env
-      wallet-webapi
-  when: manual
-
-deploy wallet-task:
-  image: docker:latest
-  services:
-    - docker:dind
-  tags:
-    - wallet-dev
-  stage: deploy
-  script:
-    - docker stop wallet-task || true
-    - docker rm wallet-task || true
-    - docker rmi wallet-task || true
-    - docker build -t wallet-task -f wallet-task/Dockerfile .
-    - docker run -d --name wallet-task
-      --restart unless-stopped
-      -p 10033:10033
-      -v /etc/localtime:/etc/localtime:ro
-      --env-file /etc/wallet/task.env
-      wallet-task
-  when: manual
-
-deploy wallet-hsm:
-  image: docker:latest
-  services:
-    - docker:dind
-  tags:
-    - wallet-dev
-  stage: deploy
-  script:
-    - docker stop wallet-hsm || true
-    - docker rm wallet-hsm || true
-    - docker rmi wallet-hsm || true
-    - docker build -t wallet-hsm -f wallet-hsm/Dockerfile .
-    - docker run -d --name wallet-hsm
-      --restart unless-stopped
-      -p 10888:10888
-      -v /etc/localtime:/etc/localtime:ro
-      -v /mnt/wallets:/data/keystores
-      --env-file /etc/wallet/hsm.env
-      wallet-hsm
+    - docker stop wallet-app || true
+    - docker rm wallet-app || true
+    - docker rmi wallet-app || true
+    - docker build -t wallet-app -f Dockerfile .
+    - docker run -d --name wallet-app --restart unless-stopped -p 8080:8080 -v /etc/localtime:/etc/localtime:ro -v /mnt/wallets:/data/keystores --env-file /etc/wallet/wallet.env wallet-app
   when: manual
 
 after_script:

Dockerfile

@@ -0,0 +1,16 @@
+# Single-module Spring Boot app (sources under ./src)
+FROM eclipse-temurin:17-jdk-alpine AS builder
+WORKDIR /app
+COPY gradlew gradlew.bat settings.gradle build.gradle gradle.properties ./
+COPY gradle ./gradle
+COPY src ./src
+RUN chmod +x gradlew && ./gradlew bootJar --no-daemon -x test
+
+FROM eclipse-temurin:17-jre-alpine
+WORKDIR /app
+RUN addgroup -S wallet && adduser -S wallet -G wallet
+COPY --from=builder /app/build/libs/*.jar /app/app.jar
+USER wallet
+EXPOSE 8080
+ENV SERVER_PORT=8080
+ENTRYPOINT ["java","-XX:+UseContainerSupport","-XX:MaxRAMPercentage=75.0","-jar","/app/app.jar"]

README.md

@@ -9,11 +9,11 @@ It provides unified wallet management, blockchain synchronization, deposit detec
 
 This repository is converging to a **single-service architecture** to make deployment and operations simpler:
 
-- One startup service (`wallet-webapi` runtime)
+- One Spring Boot service (sources under [`src/`](src/); root Gradle module)
 - No RabbitMQ dependency
 - No xxl-job dependency
-- HSM capabilities invoked in-process
-- Unified tokencore dependency: `com.github.galaxyscitech:tokencore:2.0.0`
+- HSM / signing invoked in-process via [tokencore](https://github.com/GalaxySciTech/tokencore) `com.github.galaxyscitech:tokencore:2.0.1`
+- Optional **external HTTP signer** when `wallet_chain_config.signing_backend` = `EXTERNAL` (see `wallet.external-signer` in [`application.yml`](src/main/resources/application.yml))
 
 This means fewer moving parts, easier troubleshooting, and faster onboarding for developers and DevOps teams.
 
@@ -67,9 +67,27 @@ Services:
 ### Option B: Run locally with Gradle
 
 ```bash
-./gradlew :wallet-webapi:bootRun
+./gradlew bootRun
 ```
 
+Initialize the database from [`db/wallet_db.sql`](db/wallet_db.sql). If you already have `wallet_chain_config`, apply [`db/002_wallet_chain_signing_backend.sql`](db/002_wallet_chain_signing_backend.sql) for the `signing_backend` column.
+
+### Configuration highlights
+
+| Area | Notes |
+|------|--------|
+| JDBC | `DB_URL`, `DB_USERNAME`, `DB_PASSWORD` (see [`.env.example`](.env.example)) |
+| Keystore | `KEYSTORE_DIR`, `WALLET_KEYSTORE_PASSWORD` |
+| Testnet signing | `ETH_SIGN_CHAIN_ID` (e.g. `11155111` for Sepolia), `BTC_SIGN_CHAIN_ID` (`0` mainnet / `1` testnet) |
+| Metrics | Actuator: `/actuator/health`, `/actuator/prometheus` |
+| Gas fallback | Optional `ETH_GAS_FALLBACK_URL` in `sys_config` if the node does not expose `eth_gasPrice` |
+
+### H2 (testnet on-chain smoke)
+
+1. Point `ETH_RPC_URL` in `config` (or env) to a **Sepolia** (or other testnet) HTTP endpoint.
+2. Set `ETH_SIGN_CHAIN_ID=11155111` and fund a test hot wallet.
+3. Run `./gradlew bootRun` and exercise withdraw/collect paths from Swagger or your integration client.
+
 ---
 
 ## First-time user path (10-minute onboarding)

README_CN.md

@@ -3,11 +3,10 @@
 项目正在收敛为**单体 Spring Boot 钱包服务**。
 
 ## 当前变化
-- 统一单服务启动（以 `wallet-webapi` 作为应用运行时）
-- 不再依赖 RabbitMQ
-- 不再依赖 xxl-job
-- HSM 能力改为进程内调用
-- tokencore 统一为 `com.github.galaxyscitech:tokencore:2.0.0`
+- **单模块**：源码仅在仓库根目录 [`src/`](src/)，Gradle 在根目录 [`build.gradle`](build.gradle)
+- 不再依赖 RabbitMQ / xxl-job
+- 签名与地址：**tokencore** `com.github.galaxyscitech:tokencore:2.0.1`（进程内）
+- 可选 **外部 HTTP 签名**：表 `wallet_chain_config.signing_backend = EXTERNAL`，配置 `wallet.external-signer.base-url`
 
 ## 快速开始
 ### 1）Docker Compose 启动
@@ -21,9 +20,13 @@ docker compose up -d --build
 
 ### 2）手动启动
 ```bash
-./gradlew :wallet-webapi:bootRun
+./gradlew bootRun
 ```
 
+数据库初始化见 [`db/wallet_db.sql`](db/wallet_db.sql)。若已有库，需增加 `signing_backend` 列时执行 [`db/002_wallet_chain_signing_backend.sql`](db/002_wallet_chain_signing_backend.sql)。
+
+环境变量示例：[`.env.example`](.env.example)。测试网链上冒烟：配置 Sepolia 等 `ETH_RPC_URL`，设置 `ETH_SIGN_CHAIN_ID=11155111`，准备测试资金后走 Swagger 提现/归集相关接口。
+
 ## 接口
 - 钱包接口：`/wallet/v1`
 - 链接口：`/block_chain/v1`

build.gradle

@@ -30,7 +30,9 @@ dependencies {
   implementation 'wf.bitcoin:bitcoin-rpc-client:1.2.4'
   implementation 'com.github.ben-manes.caffeine:caffeine:3.1.8'
   implementation 'com.github.sealedtx:bitcoin-cash-converter:1.0'
-  implementation 'com.github.galaxyscitech:tokencore:2.0.0'
+  implementation 'com.github.galaxyscitech:tokencore:2.0.1'
+  implementation 'org.springframework.boot:spring-boot-starter-actuator'
+  implementation 'io.micrometer:micrometer-registry-prometheus'
   implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0'
   implementation 'commons-codec:commons-codec:1.16.0'
   implementation 'org.bitcoinj:bitcoinj-core:0.14.7'

build.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
-./gradlew bootRepackage
-rm -rf build/*
-mv wallet-webapi/build/libs/*.jar build/
-mv wallet-task/build/libs/*.jar build/
-mv wallet-hsm/build/libs/*.jar build/
+set -e
+./gradlew bootJar --no-daemon -x test
+rm -rf build/dist
+mkdir -p build/dist
+cp build/libs/*.jar build/dist/

db/002_wallet_chain_signing_backend.sql

@@ -0,0 +1,5 @@
+-- Optional migration: per-chain signing backend (TOKENCORE | EXTERNAL)
+ALTER TABLE `wallet_chain_config`
+  ADD COLUMN `signing_backend` varchar(32) NOT NULL DEFAULT 'TOKENCORE'
+  COMMENT 'TOKENCORE=in-process tokencore; EXTERNAL=wallet.external-signer HTTP'
+  AFTER `withdraw_enabled`;

db/wallet_db.sql

@@ -331,6 +331,7 @@ CREATE TABLE `wallet_chain_config` (
   `enabled` tinyint(1) DEFAULT 1,
   `deposit_scan_enabled` tinyint(1) DEFAULT 1,
   `withdraw_enabled` tinyint(1) DEFAULT 0,
+  `signing_backend` varchar(32) NOT NULL DEFAULT 'TOKENCORE' COMMENT 'TOKENCORE|EXTERNAL',
   `confirmations` int(11) DEFAULT 12,
   `start_block` bigint(20) DEFAULT 0,
   `current_block` bigint(20) DEFAULT 0,