Merge pull request #87 from GMWalletApp/dev

feat: add runtime log level settings
feat: support TON and USDT Jetton payments
2026-07-07 10:16:15 +00:00 · 2026-06-12 00:50:10 +08:00 · 2026-06-12 00:49:18 +08:00 · 2026-06-11 14:47:46 +08:00 · 2026-06-10 00:19:38 +08:00 · 2026-06-10 00:18:24 +08:00
411 changed files with 15280 additions and 1598 deletions
@@ -1,11 +1,7 @@
 name: docker-alpine-epusdt

 on:
-  workflow_dispatch:
  push:
-    branches:
-      - "main"
-      - "master"
    tags:
      - "v*"

@@ -34,7 +30,6 @@ jobs:
          tags: |
            type=raw,value=alpine
            type=raw,value=latest
-            type=ref,event=branch,suffix=-alpine
            type=ref,event=tag
            type=sha,prefix=sha-,suffix=-alpine

@@ -53,5 +48,6 @@ jobs:
          platforms: linux/amd64,linux/arm64
          build-args: |
            API_RATE_URL=${{ vars.API_RATE_URL }}
+            BUILD_VERSION=${{ github.ref_name }}
          tags: ${{ steps.meta.outputs.tags }}
          labels: ${{ steps.meta.outputs.labels }}
@@ -8,8 +8,9 @@ WORKDIR /app
 COPY . /app

 WORKDIR /app/src
+ARG BUILD_VERSION=0.0.0-dev
 RUN go mod download
-RUN go build -o /app/epusdt .
+RUN go build -trimpath -ldflags="-s -w -X github.com/GMWalletApp/epusdt/config.BuildVersion=${BUILD_VERSION}" -o /app/epusdt .

 FROM alpine:latest AS runner
 ENV TZ=Asia/Shanghai
@@ -17,8 +18,6 @@ RUN apk --no-cache add ca-certificates tzdata
 ARG API_RATE_URL=""

 WORKDIR /app
-COPY --from=builder /app/src/static /app/static
-COPY --from=builder /app/src/static /static
 COPY --from=builder /app/src/.env.example /app/.env
 RUN if [ -n "$API_RATE_URL" ]; then \
      sed -i "s|^api_rate_url=.*$|api_rate_url=${API_RATE_URL}|" /app/.env; \
@@ -0,0 +1,176 @@
+# Epusdt — Easy Payment USDT
+
+<p align="center">
+  <img src="https://gmwallet.app/favicon.png" alt="Epusdt Logo - Multi-chain Crypto Payment Gateway" width="120">
+</p>
+
+<p align="center">
+  <strong>Open-source multi-chain crypto payment gateway · Top real-world adoption</strong>
+</p>
+
+<p align="center">
+  <a href="./README.en.md">English</a> |
+  <a href="./README.zh-CN.md">简体中文</a>
+</p>
+
+<p align="center">
+  <a href="https://epusdt.com"><img src="https://img.shields.io/badge/Docs-epusdt.com-blue?style=for-the-badge" alt="Official Docs"></a>
+  <a href="https://t.me/epusdt"><img src="https://img.shields.io/badge/Telegram-Channel-26A5E4?style=for-the-badge&logo=telegram&logoColor=white" alt="Telegram Channel"></a>
+  <a href="https://t.me/epusdt_group"><img src="https://img.shields.io/badge/Telegram-Group-26A5E4?style=for-the-badge&logo=telegram&logoColor=white" alt="Telegram Group"></a>
+</p>
+
+<p align="center">
+  <a href="https://github.com/GMWalletApp/epusdt/stargazers"><img src="https://img.shields.io/github/stars/GMWalletApp/epusdt?style=flat-square&color=f5c542" alt="GitHub Stars 3000+"></a>
+  <a href="https://www.gnu.org/licenses/gpl-3.0.html"><img src="https://img.shields.io/badge/License-GPLv3-blue?style=flat-square" alt="GPLv3 License"></a>
+  <a href="https://golang.org"><img src="https://img.shields.io/badge/Go-1.16+-00ADD8?style=flat-square&logo=go&logoColor=white" alt="Go 1.16+"></a>
+  <a href="https://github.com/GMWalletApp/epusdt/releases"><img src="https://img.shields.io/github/v/release/GMWalletApp/epusdt?style=flat-square&color=green" alt="Latest Release"></a>
+</p>
+
+---
+
+## What is Epusdt?
+
+**Epusdt** (Easy Payment USDT) is a self-hosted **multi-chain, multi-token crypto payment gateway** built with Go. It started as a TRC20-only solution and evolved into a broader **multi-chain receiving platform**, allowing websites and applications to accept crypto payments across multiple networks and token types. No third-party custody, no platform fees — funds go directly into your wallet.
+
+> **GitHub Star 3000+** · **10+ supported platform integrations** · **Top real-world adoption among crypto payment tools**
+
+Deploy it privately, integrate with the HTTP API, and start receiving crypto payments in minutes.
+
+### Supported Networks and Tokens
+
+| Network | Tokens |
+|---------|--------|
+| **TRC20** (Tron) | USDT, TRX |
+| **ERC20** (Ethereum) | USDT, USDC, ETH |
+| **Solana** | USDT, USDC |
+| **BEP20** (BSC) | USDT, USDC, BNB |
+| **Polygon** | USDT, USDC |
+| **More** | Expanding continuously |
+
+> Actual support depends on the [latest release](https://github.com/GMWalletApp/epusdt/releases) and the [official docs](https://epusdt.com).
+
+---
+
+## Broad Compatibility, Plug and Play
+
+No matter what kind of platform you operate, Epusdt can fit into existing payment integration patterns with **minimal or no business logic refactor**, giving you a fast path to crypto payments for global use cases:
+
+| Category | Supported Systems |
+|----------|-------------------|
+| **AI Distribution** | [OneAPI](https://github.com/songquanpeng/one-api), [NewAPI](https://github.com/QuantumNous/new-api) |
+| **Card/Voucher Platforms** | [Dujiaoka](https://dujiao-next.com/), [ACG Faka](https://github.com/lizhipay/acg-faka) |
+| **Proxy Panels** | [V2Board](https://github.com/v2board/v2board), [XBoard](https://github.com/cedar2025/Xboard), [xiaoV2board](https://github.com/wyx2685/v2board/), [SSPanel](https://github.com/anankke/sspanel-uim) |
+| **Website Ecosystem** | [WordPress](https://wordpress.com/), [WHMCS](https://www.whmcs.com/) |
+| **Epay-Compatible Flow** | Works with platforms already using Epay-style payment interfaces |
+| **More** | Simple HTTP API, often integrated within 10 minutes |
+
+---
+
+## Core Features
+
+- **Multi-chain and multi-token** — TRC20, ERC20, BEP20, Polygon, and more
+- **Self-hosted** — full control of funds and wallet infrastructure
+- **Low-dependency runtime** — a single binary can run the service; low-traffic setups do not require MySQL + Redis
+- **Cross-platform** — supports x86 / ARM on Windows / Linux / Mac
+- **Multi-wallet rotation** — rotates receiving addresses to improve concurrency handling
+- **Async callback queue** — handles merchant notifications efficiently
+- **HTTP API** — easy integration from any language or framework
+- **Telegram Bot** — instant payment notifications and lightweight operations
+
+---
+
+## Documentation and Guides
+
+Full documentation: **[epusdt.com](https://epusdt.com)**
+
+Quick-start links:
+
+| Guide | Description |
+|-------|-------------|
+| [Docker Deployment](https://epusdt.com/guide/installation/docker) | Recommended one-command setup |
+| [aaPanel Deployment](https://epusdt.com/guide/installation/aapanel) | Great for aaPanel users |
+| [Manual Deployment](https://epusdt.com/guide/installation/manual.html) | Full manual control |
+| [Developer API Docs](https://epusdt.com) | Integration reference |
+
+---
+
+## Project Structure
+
+```text
+Epusdt
+├── src/        Core project source code
+└── wiki/       Documentation assets and knowledge base
+```
+
+---
+
+## How It Works
+
+Epusdt listens to supported blockchain APIs or RPC nodes across multiple networks such as TRC20, ERC20, BEP20, and Polygon. It captures incoming token transfers in real time and matches ownership using **amount differentiation** and **time-bounded locks**:
+
+```text
+Workflow:
+1. A customer initiates payment and needs to send 20.05 USDT
+2. The system searches for an available wallet-address + amount combination
+3. If address_1:20.05 is free -> lock it for 10 minutes and return it
+4. If already occupied -> add 0.0001 and try the next amount combination
+5. Background listeners keep watching wallet deposits and mark the order paid once the amount matches
+```
+
+![Epusdt Payment Flow](wiki/img/implementation_principle.jpg)
+
+---
+
+## Community and Support
+
+If you hit an issue, please open a [GitHub Issue](https://github.com/GMWalletApp/epusdt/issues) first. That is the best way to get attention and help.
+
+| Channel | Link |
+|---------|------|
+| Telegram Channel | [https://t.me/epusdt](https://t.me/epusdt) |
+| Telegram Group | [https://t.me/epusdt_group](https://t.me/epusdt_group) |
+| Official Docs | [https://epusdt.com](https://epusdt.com) |
+
+---
+
+## Star History
+
+<a href="https://www.star-history.com/?type=date&repos=gmwalletapp%2Fepusdt">
+ <picture>
+   <source media="(prefers-color-scheme: dark)" srcset="https://api.star-history.com/chart?repos=gmwalletapp/epusdt&type=date&theme=dark&legend=top-left" />
+   <source media="(prefers-color-scheme: light)" srcset="https://api.star-history.com/chart?repos=gmwalletapp/epusdt&type=date&legend=top-left" />
+   <img alt="Star History Chart" src="https://api.star-history.com/chart?repos=gmwalletapp/epusdt&type=date&legend=top-left" />
+ </picture>
+</a>
+
+---
+
+## License
+
+Epusdt is released under the [GPLv3](https://www.gnu.org/licenses/gpl-3.0.html) license.
+
+---
+
+## Disclaimer and Terms of Use
+
+EPusdt is developed and published by Good Morning Technology, LLC as free, open-source, non-profit, and non-custodial software for learning, research, and technical communication. Nothing in this project constitutes investment, financial, legal, tax, compliance, or any other professional advice, nor should it be interpreted as a guarantee regarding any asset, transaction outcome, revenue, fund safety, technical availability, or fitness for a particular purpose.
+
+Good Morning Technology, LLC is an entity organized under United States law and will comply with applicable legal and regulatory obligations as required. Under U.S. regulatory frameworks, whether virtual currencies, digital assets, or related technical services constitute money transmission, a money services business (MSB), or another regulated activity generally depends on the specific business model, including whether the operator receives, holds, controls, or transmits funds or value, provides custody on behalf of users, or engages in exchange, payment, clearing, settlement, or other intermediary financial services.
+
+As a free, open-source, non-profit, and non-custodial software project, the source code, documentation, technical communication, and related development activities of EPusdt should not be interpreted as authorization, endorsement, control, participation, warranty, or commitment by Good Morning Technology, LLC or its contributors regarding any user's downstream use, modification, deployment, integration, distribution, or secondary development.
+
+Users independently determine how they use this project, for what purpose, and in what context. Good Morning Technology, LLC and its contributors cannot control, review, or restrict such conduct. Users are solely responsible for ensuring that their use, modification, deployment, integration, distribution, or derivative development complies with applicable laws, regulations, sanctions rules, and third-party rights in the relevant jurisdictions, and they bear all resulting risks, liabilities, and consequences.
+
+Crypto assets are a high-risk emerging asset class. Stablecoins and other digital assets may experience sharp volatility, de-pegging, insufficient liquidity, technical failures, regulatory changes, or total loss of value. All code, documentation, and related materials in this project are provided on an "as is" and "as available" basis. Except where mandatory law provides otherwise, Good Morning Technology, LLC and its contributors are not liable for any direct or indirect loss resulting from use, inability to use, misuse, unlawful use, modification, deployment, integration, distribution, derivative development, or reliance on this project.
+
+---
+
+<p align="center">
+  <sub>
+    <b>Keywords:</b> USDT Payment Gateway · Crypto Payment · Multi-chain Payment · TRC20 Payment · ERC20 Payment · BEP20 Payment ·
+    Self-hosted Crypto Gateway · OneAPI Payment · NewAPI Payment · Dujiaoka Payment · ACG Faka Payment ·
+    V2Board Payment · XBoard Payment · SSPanel Payment Interface ·
+    WordPress Crypto Payment · WHMCS USDT Payment · Polygon USDT ·
+    Epusdt · Easy Payment USDT · Open Source Payment Gateway · Multi-chain Collection
+  </sub>
+</p>
@@ -1,13 +1,18 @@
 # Epusdt — Easy Payment USDT

 <p align="center">
-  <img src="wiki/img/usdtlogo.png" alt="Epusdt Logo - Multi-chain Crypto Payment Gateway" width="120">
+  <img src="https://gmwallet.app/favicon.png" alt="Epusdt Logo - Multi-chain Crypto Payment Gateway" width="120">
 </p>

 <p align="center">
  <strong>开源多链多币种 Crypto 支付网关 · 实际采用率 Top 1</strong>
 </p>

+<p align="center">
+  <a href="./README.en.md">English</a> |
+  <a href="./README.md">简体中文</a>
+</p>
+
 <p align="center">
  <a href="https://epusdt.com"><img src="https://img.shields.io/badge/官网文档-epusdt.com-blue?style=for-the-badge" alt="Official Docs"></a>
  <a href="https://t.me/epusdt"><img src="https://img.shields.io/badge/Telegram-频道-26A5E4?style=for-the-badge&logo=telegram&logoColor=white" alt="Telegram Channel"></a>
@@ -23,62 +28,66 @@

 ---

-## 🌍 What is Epusdt?
+## What is Epusdt?

-**Epusdt** (Easy Payment USDT) is a self-hosted **multi-chain, multi-token crypto payment gateway** built with Go. It has evolved from a TRC20-only solution into a comprehensive **multi-chain receiving platform**, enabling any website or application to accept crypto payments across multiple blockchain networks and token types. No third-party fees, no custodial risk — funds go directly into your wallet.
+**Epusdt** (Easy Payment USDT) 是一个基于 Go 构建、支持私有化部署的 **多链多币种 Crypto 支付网关**。它从最初的 TRC20 单链方案逐步演进为完整的 **多链收款平台**，让任意网站或应用都能快速接入多条链、多种代币的加密支付能力。没有第三方托管，没有平台抽成，资金直接进入你的钱包。

-> **⭐ GitHub Star 3000+** · **🔌 已支持站点解决方案 10+** · **🏆 Crypto 支付工具实际采用率 Top 1**
+> **GitHub Star 3000+** · **已支持站点解决方案 10+** · **Crypto 支付工具实际采用率 Top 1**

-Deploy it privately, integrate via HTTP API, and start receiving **crypto payments** in minutes. That's it. 🎉
+私有部署，按 HTTP API 接入，几分钟内就可以开始接收 **Crypto Payments**。

-### 🔗 已支持网络与代币
+### 已支持网络与代币

 | 网络 | 代币 |
 |------|------|
-| **TRC20** (Tron) | USDT、TRX|
+| **TRC20** (Tron) | USDT、TRX |
 | **ERC20** (Ethereum) | USDT、USDC、ETH |
 | **Solana** | USDT、USDC |
 | **BEP20** (BSC) | USDT、USDC、BNB |
 | **Polygon** | USDT、USDC |
 | **更多** | 持续扩展中… |

-> 💡 具体支持的链与代币以 [最新版本](https://github.com/GMWalletApp/epusdt/releases) 及 [官方文档](https://epusdt.com) 为准。
+> 具体支持的链与代币以 [最新版本](https://github.com/GMWalletApp/epusdt/releases) 及 [官方文档](https://epusdt.com) 为准。

 ---

-## 🔌 广泛兼容，即插即用
+## 安全审计
+Epusdt 已完成第三方安全审计。
+[查看安全审计报告](https://github.com/VectorBits/audit/blob/main/epusdt-secure-audit-report-2026-05-14.pdf)
+
+---
+
+## 广泛兼容，即插即用

 无论你运营的是哪类系统，Epusdt 均可基于现有接口方案，**无需重构业务逻辑**，快速接入，立即获得 Crypto 收款能力，低成本扩展全球支付场景：

 | 领域 | 已支持系统 |
 |------|-----------|
-| **AI 分发** | [OneAPI](https://github.com/songquanpeng/one-api)、[NewAPI](https://github.com/QuantumNous/new-api) |
+| **AI 分发** | [Sub2API](https://github.com/Wei-Shaw/sub2api)、[NewAPI](https://github.com/QuantumNous/new-api) |
 | **发卡系统** | [独角数卡（Dujiaoka）](https://dujiao-next.com/)、[异次元发卡](https://github.com/lizhipay/acg-faka) |
 | **代理面板** | [V2Board](https://github.com/v2board/v2board)、[XBoard](https://github.com/cedar2025/Xboard)、[xiaoV2board](https://github.com/wyx2685/v2board/)、[SSPanel](https://github.com/anankke/sspanel-uim) |
 | **建站生态** | [WordPress](https://wordpress.com/)、[WHMCS](https://www.whmcs.com/) |
-| **Epay兼容** | 兼容各类支持Epay易支付接口的平台 |
-| **更多** | 简易HTTP API 10分钟内接入 |
- 
-👉 查看更多集成列表与插件：[plugins/](plugins/)
+| **Epay 兼容** | 兼容各类支持 Epay 易支付接口的平台 |
+| **更多** | 简易 HTTP API，10 分钟内接入 |

 ---

-## ✨ 核心特性
+## 核心特性

- **多链多币种** — 支持 TRC20、ERC20、BEP20、Polygon 等主流网络，不再局限于单一链
- **私有化部署** — 无需担心钱包被篡改、吞单，资金完全自主掌控
- **零依赖运行** — 单个二进制文件即可启动，低并发场景无需安装 MySQL + Redis,一键部署零成本维护
- **跨平台** — 支持 x86 / ARM 架构的 Windows / Linux / Mac 设备
- **多钱包轮询** — 自动轮换收款地址，提高订单并发处理能力
- **异步队列** — 高性能消息回调，优雅处理高并发场景
- **HTTP API** — 标准化接口，任何语言 / 框架均可10min内集成
+- **多链多币种** — 支持 TRC20、ERC20、BEP20、Polygon 等主流网络
+- **私有化部署** — 资金完全自主掌控
+- **零依赖运行** — 单个二进制即可启动，低并发场景无需 MySQL + Redis
+- **跨平台** — 支持 x86 / ARM 架构的 Windows / Linux / Mac
+- **多钱包轮询** — 自动轮换收款地址，提高并发处理能力
+- **异步队列** — 高性能消息回调，适配高并发场景
+- **HTTP API** — 标准化接口，任何语言 / 框架都能快速集成
 - **Telegram Bot** — 实时支付通知，快捷管理与监控

 ---

-## 📖 文档与教程
+## 文档与教程

-完整文档请访问 👉 **[epusdt.com](https://epusdt.com)**
+完整文档请访问：**[epusdt.com](https://epusdt.com)**

 快速入门：

@@ -91,29 +100,51 @@ Deploy it privately, integrate via HTTP API, and start receiving **crypto paymen

 ---

-## 🏗️ 项目结构
+## 项目结构

-```
+```text
 Epusdt
-├── plugins/    → 已集成的系统插件（独角数卡等）
-├── src/        → 项目核心代码
-├── sdk/        → 接入 SDK
-├── sql/        → 数据库安装 / 升级脚本
-└── wiki/       → 文档与知识库
+├── src/        项目核心代码
+└── wiki/       文档与知识库
 ```

 ---

-## 🔧 实现原理
+## 程序截图

-Epusdt 通过监听多条区块链网络（TRC20、ERC20、BEP20、Polygon 等）的 API 或RPC节点，实时捕获钱包地址的代币入账事件，利用**金额差异**与**时效性**精确匹配交易归属：
+<table>
+  <tr>
+    <td align="center" valign="top">
+      <img src="wiki/img/web2.png" alt="Epusdt 管理面板首页" height="260"><br>
+      <sub>管理面板首页</sub>
+    </td>
+    <td align="center" valign="top">
+      <img src="wiki/img/web1.png" alt="Epusdt 管理面板" height="260"><br>
+      <sub>管理面板</sub>
+    </td>
+    <td align="center" valign="top">
+      <img src="wiki/img/pay1.jpeg" alt="Epusdt 收银台" height="260"><br>
+      <sub>收银台</sub>
+    </td>
+    <td align="center" valign="top">
+      <img src="wiki/img/pay2.jpeg" alt="Epusdt 支付页面" height="260"><br>
+      <sub>支付页面</sub>
+    </td>
+  </tr>
+</table>

-```
+---
+
+## 实现原理
+
+Epusdt 通过监听多条区块链网络（TRC20、ERC20、BEP20、Polygon 等）的 API 或 RPC 节点，实时捕获钱包地址的代币入账事件，利用**金额差异**与**时效性**精确匹配交易归属：
+
+```text
 工作流程：
 1. 客户发起支付，需支付 20.05 USDT
-2. 系统在哈希表中查找可用的 钱包地址 + 金额 组合
-3. 若 address_1:20.05 未被占用 → 锁定该组合（有效期 10 分钟），返回给客户
-4. 若已被占用 → 自动累加 0.0001 尝试下一个金额组合（最多 100 次）
+2. 系统在哈希表中查找可用的钱包地址 + 金额组合
+3. 若 address_1:20.05 未被占用 -> 锁定该组合（有效期 10 分钟），返回给客户
+4. 若已被占用 -> 自动累加 0.0001 尝试下一个金额组合（最多 100 次）
 5. 后台线程持续监听所有钱包的入账事件，金额匹配则确认支付成功
 ```

@@ -121,17 +152,15 @@ Epusdt 通过监听多条区块链网络（TRC20、ERC20、BEP20、Polygon 等

 ---

-## 💬 社区与支持
+## 社区与支持

-**遇到问题？** 请优先在 GitHub 提交 [Issue](https://github.com/GMWalletApp/epusdt/issues)，我们会**优先处理** Issue 中的反馈。
-
-加入 Telegram 社区，获取最新开发动态，参与需求调研，与超过5000名活跃用户交流使用经验，对接商业资源：
+**遇到问题？** 请优先在 GitHub 提交 [Issue](https://github.com/GMWalletApp/epusdt/issues)，我们会优先处理反馈。

 | 渠道 | 链接 |
 |------|------|
-| 📢 **Epusdt 频道** | [https://t.me/epusdt](https://t.me/epusdt) |
-| 💬 **Epusdt 交流群** | [https://t.me/epusdt_group](https://t.me/epusdt_group) |
-| 📚 **官方文档站** | [https://epusdt.com](https://epusdt.com) |
+| Epusdt 频道 | [https://t.me/epusdt](https://t.me/epusdt) |
+| Epusdt 交流群 | [https://t.me/epusdt_group](https://t.me/epusdt_group) |
+| 官方文档站 | [https://epusdt.com](https://epusdt.com) |

 ---

@@ -147,24 +176,32 @@ Epusdt 通过监听多条区块链网络（TRC20、ERC20、BEP20、Polygon 等

 ---

-## 📜 开源协议
+## 开源协议

 Epusdt 遵守 [GPLv3](https://www.gnu.org/licenses/gpl-3.0.html) 开源协议。

 ---

-## ⚠️ 免责声明
+## 免责声明及使用条款

-本项目仅供学习与技术交流使用，用户在使用过程中需自行遵守所在地法律法规。由于涉及加密资产及资金安全，用户应自行审查相关代码与风险。加密资产属于高风险新兴资产（包括稳定币），其价值可能波动甚至归零，GMwallet 不对任何资产或使用结果作出保证。本内容不构成任何投资、税务、法律或金融建议，仅供教育用途，相关决策请咨询专业人士。
+EPusdt 由 Good Morning Technology, LLC 以免费、开源、非盈利及非托管性质开发和披露，仅供学习、研究与技术交流使用。项目本身不构成投资、金融、法律、税务、合规或任何其他专业建议，也不应被视为对任何资产、交易结果、收益、资金安全、技术可用性或特定用途作出任何保证。
+
+Good Morning Technology, LLC 为依据美国法律设立的主体，并将在适用法律法规范围内履行相应合规义务。就美国监管框架而言，虚拟货币、数字资产及相关技术服务是否构成 money transmission、money services business（MSB）或其他受监管活动，通常取决于具体业务模式，包括项目方是否接收、持有、控制或传输资金或价值，是否代表用户托管资产，以及是否从事兑换、支付、清算、结算或其他中介性金融服务。
+
+作为免费、开源、非盈利、非托管的软件项目，EPusdt 的代码披露、文档说明、技术交流及相关开发活动，本身不应被理解为 Good Morning Technology, LLC 或其贡献者对任何用户后续使用、修改、部署、集成、分发或二次开发行为的授权、背书、控制、参与、保证或承诺。
+
+用户对本项目的实际使用方式、使用目的及后续行为由其自行决定，Good Morning Technology, LLC 及其贡献者无法控制、审查或限制该等行为。用户应自行确保其使用、修改、部署、集成、分发或二次开发行为符合所在地适用法律法规、监管要求、制裁规则及第三方权利，并独立承担由此产生的全部风险、责任与后果。
+
+加密资产属于高风险新兴资产类别，包括稳定币在内的数字资产均可能发生剧烈波动、脱锚、流动性不足、技术故障、监管变化或价值归零等风险。本项目所有代码、文档及相关材料均按“现状”和“可用状态”提供。除适用法律另有强制规定外，Good Morning Technology, LLC 及其贡献者不因用户使用、无法使用、错误使用、违法使用、修改、部署、集成、分发、二次开发或依赖本项目而产生的任何直接或间接损失承担责任。

 ---

 <p align="center">
  <sub>
-    <b>Keywords:</b> USDT Payment Gateway · Crypto Payment · Multi-chain Payment · TRC20 Payment · ERC20 Payment · BEP20 Payment · 
-    Self-hosted Crypto Gateway · OneAPI Payment · NewAPI Payment · 独角数卡支付 · 异次元发卡支付方式 · 
-    V2Board Payment · XBoard Payment · SSPanel 支付接口 · 
-    WordPress Crypto Payment · WHMCS USDT Payment · Polygon USDT · 
+    <b>Keywords:</b> USDT Payment Gateway · Crypto Payment · Multi-chain Payment · TRC20 Payment · ERC20 Payment · BEP20 Payment ·
+    Self-hosted Crypto Gateway · OneAPI Payment · NewAPI Payment · 独角数卡支付 · 异次元发卡支付方式 ·
+    V2Board Payment · XBoard Payment · SSPanel 支付接口 ·
+    WordPress Crypto Payment · WHMCS USDT Payment · Polygon USDT ·
    Epusdt · Easy Payment USDT · Open Source Payment Gateway · 多链收款
  </sub>
 </p>
@@ -1,12 +0,0 @@
-## 使用方法
-### 注意此插件仅适用于独角数卡2.0.4版本以下，2.0.4版本或以上的独角数卡已经内置此插件，无需配置
-
-1.将`app`和`routes`目录覆盖到网站根目录。      
-2.在独角数卡后台添加一个支付方式。      
-
-| 支付选项 | 商户id | 商户key | 商户密钥 | 备注 |     
-| :-----| :----- | :----- | :----- |:-----|       
-| Epusdt | api接口认证token	 | 空 | epusdt收银台地址+/api/v1/order/create-transaction| 如果独角数卡和epusdt在同一服务器则填写`127.0.0.1`不要填域名，例如`http://127.0.0.1:8000/api/v1/order/create-transaction` |             
-
-示例：     
-![示例配置](../../wiki/img/dujiaoka_epusdt.png)
@@ -1,101 +0,0 @@
-<?php
-/**
- * The file was created by Assimon.
- *
- * @author    GMWalletApp<ashang@utf8.hk>
- * @copyright GMWalletApp<ashang@utf8.hk>
- * @link      http://utf8.hk/
- */
-
-namespace App\Http\Controllers\Pay;
-
-
-use App\Exceptions\RuleValidationException;
-use App\Http\Controllers\PayController;
-use GuzzleHttp\Client;
-use GuzzleHttp\Exception\GuzzleException;
-use Illuminate\Http\Request;
-
-class EpusdtController extends PayController
-{
-    public function gateway(string $payway, string $orderSN)
-    {
-        try {
-            // 加载网关
-            $this->loadGateWay($orderSN, $payway);
-            //构造要请求的参数数组，无需改动
-            $parameter = [
-                "amount" => (float)$this->order->actual_price,//原价
-                "order_id" => $this->order->order_sn, //可以是用户ID,站内商户订单号,用户名
-                'redirect_url' => route('epusdt-return', ['order_id' => $this->order->order_sn]),
-                'notify_url' => url($this->payGateway->pay_handleroute . '/notify_url'),
-            ];
-            $parameter['signature'] = $this->epusdtSign($parameter, $this->payGateway->merchant_id);
-            $client = new Client([
-                'headers' => [ 'Content-Type' => 'application/json' ]
-            ]);
-            $response = $client->post($this->payGateway->merchant_pem, ['body' => json_encode($parameter)]);
-            $body = json_decode($response->getBody()->getContents(), true);
-            if (!isset($body['status_code']) || $body['status_code'] != 200) {
-                return $this->err(__('dujiaoka.prompt.abnormal_payment_channel') . $body['message']);
-            }
-            return redirect()->away($body['data']['payment_url']);
-        } catch (RuleValidationException $exception) {
-        } catch (GuzzleException $exception) {
-            return $this->err($exception->getMessage());
-        }
-    }
-
-
-    private function epusdtSign(array $parameter, string $signKey)
-    {
-        ksort($parameter);
-        reset($parameter); //内部指针指向数组中的第一个元素
-        $sign = '';
-        $urls = '';
-        foreach ($parameter as $key => $val) {
-            if ($val == '') continue;
-            if ($key != 'signature') {
-                if ($sign != '') {
-                    $sign .= "&";
-                    $urls .= "&";
-                }
-                $sign .= "$key=$val"; //拼接为url参数形式
-                $urls .= "$key=" . urlencode($val); //拼接为url参数形式
-            }
-        }
-        $sign = md5($sign . $signKey);//密码追加进入开始MD5签名
-        return $sign;
-    }
-
-    public function notifyUrl(Request $request)
-    {
-        $data = $request->all();
-        $order = $this->orderService->detailOrderSN($data['order_id']);
-        if (!$order) {
-            return 'fail';
-        }
-        $payGateway = $this->payService->detail($order->pay_id);
-        if (!$payGateway) {
-            return 'fail';
-        }
-        $signature = $this->epusdtSign($data, $payGateway->merchant_id);
-        if ($data['signature'] != $signature) { //不合法的数据
-            return 'fail';  //返回失败 继续补单
-        } else {
-            //合法的数据
-            //业务处理
-            $this->orderProcessService->completedOrder($data['order_id'], $data['amount'], $data['trade_id']);
-            return 'ok';
-        }
-    }
-
-    public function returnUrl(Request $request)
-    {
-        $oid = $request->get('order_id');
-        // 异步通知还没到就跳转了，所以这里休眠2秒
-        sleep(2);
-        return redirect(url('detail-order-sn', ['orderSN' => $oid]));
-    }
-
-}
@@ -1,56 +0,0 @@
-<?php
-/**
- * The file was created by Assimon.
- *
- * @author    GMWalletApp<ashang@utf8.hk>
- * @copyright GMWalletApp<ashang@utf8.hk>
- * @link      http://utf8.hk/
- */
-use Illuminate\Support\Facades\Route;
-
-Route::get('pay-gateway/{handle}/{payway}/{orderSN}', 'PayController@redirectGateway');
-
-// 支付相关
-Route::group(['prefix' => 'pay', 'namespace' => 'Pay', 'middleware' => ['dujiaoka.pay_gate_way']], function () {
-    // 支付宝
-    Route::get('alipay/{payway}/{orderSN}', 'AlipayController@gateway');
-    Route::post('alipay/notify_url', 'AlipayController@notifyUrl');
-    // 微信
-    Route::get('wepay/{payway}/{orderSN}', 'WepayController@gateway');
-    Route::post('wepay/notify_url', 'WepayController@notifyUrl');
-    // 码支付
-    Route::get('mapay/{payway}/{orderSN}', 'MapayController@gateway');
-    Route::post('mapay/notify_url', 'MapayController@notifyUrl');
-    // Paysapi
-    Route::get('paysapi/{payway}/{orderSN}', 'PaysapiController@gateway');
-    Route::post('paysapi/notify_url', 'PaysapiController@notifyUrl');
-    Route::get('paysapi/return_url', 'PaysapiController@returnUrl')->name('paysapi-return');
-    // payjs
-    Route::get('payjs/{payway}/{orderSN}', 'PayjsController@gateway');
-    Route::post('payjs/notify_url', 'PayjsController@notifyUrl');
-    // 易支付
-    Route::get('yipay/{payway}/{orderSN}', 'YipayController@gateway');
-    Route::get('yipay/notify_url', 'YipayController@notifyUrl');
-    Route::get('yipay/return_url', 'YipayController@returnUrl')->name('yipay-return');
-    // paypal
-    Route::get('paypal/{payway}/{orderSN}', 'PaypalPayController@gateway');
-    Route::get('paypal/return_url', 'PaypalPayController@returnUrl')->name('paypal-return');
-    Route::any('paypal/notify_url', 'PaypalPayController@notifyUrl');
-    // V免签
-    Route::get('vpay/{payway}/{orderSN}', 'VpayController@gateway');
-    Route::get('vpay/notify_url', 'VpayController@notifyUrl');
-    Route::get('vpay/return_url', 'VpayController@returnUrl')->name('vpay-return');
-    // stripe
-    Route::get('stripe/{payway}/{oid}','StripeController@gateway');
-    Route::get('stripe/return_url','StripeController@returnUrl');
-    Route::get('stripe/check','StripeController@check');
-    Route::get('stripe/charge','StripeController@charge');
-    // Coinbase
-    Route::get('coinbase/{payway}/{orderSN}', 'CoinbaseController@gateway');
-    Route::post('coinbase/notify_url', 'CoinbaseController@notifyUrl');
-    // epusdt
-    Route::get('epusdt/{payway}/{orderSN}', 'EpusdtController@gateway');
-    Route::post('epusdt/notify_url', 'EpusdtController@notifyUrl');
-    Route::get('epusdt/return_url', 'EpusdtController@returnUrl')->name('epusdt-return');
-
-});
@@ -1,44 +0,0 @@
-- auto-generated definition
-create table orders
-(
-    id                   int auto_increment
-        primary key,
-    trade_id             varchar(32)    not null comment 'epusdt订单号',
-    order_id             varchar(32)    not null comment '客户交易id',
-    block_transaction_id varchar(128)   null comment '区块唯一编号',
-    actual_amount        decimal(19, 4) not null comment '订单实际需要支付的金额，保留4位小数',
-    amount               decimal(19, 4) not null comment '订单金额，保留4位小数',
-    token                varchar(50)    not null comment '所属钱包地址',
-    status               int default 1  not null comment '1：等待支付，2：支付成功，3：已过期',
-    notify_url           varchar(128)   not null comment '异步回调地址',
-    redirect_url         varchar(128)   null comment '同步回调地址',
-    callback_num         int default 0  null comment '回调次数',
-    callback_confirm     int default 2  null comment '回调是否已确认？ 1是 2否',
-    created_at           timestamp      null,
-    updated_at           timestamp      null,
-    deleted_at           timestamp      null,
-    constraint orders_order_id_uindex
-        unique (order_id),
-    constraint orders_trade_id_uindex
-        unique (trade_id)
-);
-
-create index orders_block_transaction_id_index
-    on orders (block_transaction_id);
-
-- auto-generated definition
-create table wallet_address
-(
-    id         int auto_increment
-        primary key,
-    token      varchar(50)   not null comment '钱包token',
-    status     int default 1 not null comment '1:启用 2:禁用',
-    created_at timestamp     null,
-    updated_at timestamp     null,
-    deleted_at timestamp     null
-)
-    comment '钱包表';
-
-create index wallet_address_token_index
-    on wallet_address (token);
-
@@ -20,27 +20,6 @@ db_type=sqlite
 sqlite_database_filename=
 sqlite_table_prefix=

-# postgres config
-postgres_host=127.0.0.1
-postgres_port=3306
-postgres_user=mysql_user
-postgres_passwd=mysql_password
-postgres_database=database_name
-postgres_table_prefix=
-postgres_max_idle_conns=10
-postgres_max_open_conns=100
-postgres_max_life_time=6
-
-# mysql config
-mysql_host=127.0.0.1
-mysql_port=3306
-mysql_user=mysql_user
-mysql_passwd=mysql_password
-mysql_database=database_name
-mysql_table_prefix=
-mysql_max_idle_conns=10
-mysql_max_open_conns=100
-mysql_max_life_time=6

 # sqlite runtime store config
 runtime_sqlite_filename=epusdt-runtime.db
@@ -15,7 +15,7 @@ builds:
    flags:
      - -trimpath
    ldflags:
-      - -s -w -X github.com/assimon/luuu/config.BuildVersion={{ .Version }} -X github.com/assimon/luuu/config.BuildCommit={{ .Commit }} -X github.com/assimon/luuu/config.BuildDate={{ .Date }}
+      - -s -w -X github.com/GMWalletApp/epusdt/config.BuildVersion={{ .Tag }} -X github.com/GMWalletApp/epusdt/config.BuildCommit={{ .Commit }} -X github.com/GMWalletApp/epusdt/config.BuildDate={{ .Date }}
    goos:
      - linux
      - darwin
@@ -6,6 +6,7 @@ import (
 	"github.com/GMWalletApp/epusdt/config"
 	"github.com/GMWalletApp/epusdt/model/dao"
 	"github.com/GMWalletApp/epusdt/model/data"
+	"github.com/GMWalletApp/epusdt/model/mdb"
 	"github.com/GMWalletApp/epusdt/mq"
 	"github.com/GMWalletApp/epusdt/task"
 	"github.com/GMWalletApp/epusdt/telegram"
@@ -21,6 +22,13 @@ func InitApp() {
 		config.Init()
 		log.Init()
 		dao.Init()
+		logLevel := data.GetSettingString(mdb.SettingKeySystemLogLevel, mdb.SettingDefaultSystemLogLevel)
+		if err := log.SetLevel(logLevel); err != nil {
+			color.Red.Printf("[bootstrap] apply log level setting %q err=%s; fallback=%s\n", logLevel, err, mdb.SettingDefaultSystemLogLevel)
+			if fallbackErr := log.SetLevel(mdb.SettingDefaultSystemLogLevel); fallbackErr != nil {
+				color.Red.Printf("[bootstrap] apply fallback log level err=%s\n", fallbackErr)
+			}
+		}
 		// Wire settings-table lookups into the config package so
 		// GetRateApiUrl / GetUsdtRate can consult admin-configured values.
 		config.SettingsGetString = func(key string) string {
@@ -38,14 +46,16 @@ func InitApp() {
 		}
 		// Seed admin account and JWT secret so the management console is
 		// immediately usable on a fresh install. Both are idempotent.
-		_, isNew, err := data.EnsureDefaultAdmin()
+		initialPassword, isNew, err := data.EnsureDefaultAdmin()
 		if err != nil {
 			color.Red.Printf("[bootstrap] ensure default admin err=%s\n", err)
 		}
 		if isNew {
 			color.Yellow.Println("╔════════════════════════════════════════════════════════════════════════╗")
-			color.Yellow.Println("║  Default admin account created. Fetch one-time password via API first!║")
-			color.Yellow.Printf("║  Username: admin                                                       ║\n")
+			color.Yellow.Println("║  Default admin account created. Save these credentials now.           ║")
+			color.Yellow.Printf("║  Username: %-54s║\n", "admin")
+			color.Yellow.Printf("║  Password: %-54s║\n", initialPassword)
+			color.Yellow.Println("║  The one-time password API remains available until first fetch.       ║")
 			color.Yellow.Println("║  GET /admin/api/v1/auth/init-password (one-time)                      ║")
 			color.Yellow.Println("╚════════════════════════════════════════════════════════════════════════╝")
 		}
@@ -8,7 +8,6 @@ import (
 	"net/url"
 	"os"
 	"path/filepath"
-	"strconv"
 	"strings"
 	"time"

@@ -17,12 +16,6 @@ import (
 	"github.com/tidwall/gjson"
 )

-// parseFloat is the minimal helper used by the settings bridge; kept
-// here so settings_bridge.go stays import-free.
-func parseFloat(s string) (float64, error) {
-	return strconv.ParseFloat(strings.TrimSpace(s), 64)
-}
-
 var (
 	HTTPAccessLog      bool
 	SQLDebug           bool
@@ -353,19 +346,29 @@ func GetRateForCoin(coin string, base string) float64 {
 	if coin == base {
 		return 1
 	}
-	if coin == "usdt" {
-		switch base {
-		case "usd":
-			return 1
-		case "cny":
-			usdtRate := GetUsdtRate()
-			if usdtRate > 0 {
-				return 1 / usdtRate
-			}
-			return 0
+	if forcedRate := getForcedRateForCoin(coin, base); forcedRate > 0 {
+		return forcedRate
+	}
+	if coin == "usdt" && base == "usd" {
+		return 1
+	}
+	if rate := getRateForCoinFromAPI(coin, base); rate > 0 {
+		return rate
+	}
+	if coin == "ton" {
+		return getRateForCoinFromAPI("toncoin", base)
+	}
+	return 0
+}
+
+func getForcedRateForCoin(coin string, base string) float64 {
+	raw := strings.TrimSpace(settingsForcedRateList())
+	if raw != "" {
+		if rate := gjson.Get(raw, base+"."+coin).Float(); rate > 0 {
+			return rate
 		}
 	}
-	return getRateForCoinFromAPI(coin, base)
+	return 0
 }

 func getRateForCoinFromAPI(coin string, base string) float64 {
@@ -401,17 +404,17 @@ func getRateForCoinFromAPI(coin string, base string) float64 {
 }

 func GetUsdtRate() float64 {
-	// Only the admin setting can force the USDT/CNY rate. When the
-	// setting is unset, zero, or negative, fall back to the rate API.
-	if forced := settingsForcedUsdtRate(); forced > 0 {
-		return forced
+	// rate.forced_rate_list stores token amount per one base currency unit.
+	// GetUsdtRate returns the inverse display value: CNY per USDT.
+	if forcedRate := getForcedRateForCoin("usdt", "cny"); forcedRate > 0 {
+		return 1 / forcedRate
 	}

 	apiRate := getRateForCoinFromAPI("usdt", "cny")
 	if apiRate > 0 {
 		return 1 / apiRate
 	}
-	log.Printf("usdt/cny rate unavailable: rate.forced_usdt_rate <= 0 and rate api returned no data")
+	log.Printf("usdt/cny rate unavailable: rate.forced_rate_list has no positive cny.usdt entry and rate api returned no data")
 	return 0
 }

@@ -231,7 +231,7 @@ func TestCopyMissingStaticFilesCopiesAssetsWithoutOverwriting(t *testing.T) {
 	}
 }

-func TestGetUsdtRatePrefersPositiveAdminOverride(t *testing.T) {
+func TestGetUsdtRatePrefersForcedRateList(t *testing.T) {
 	viper.Reset()
 	t.Cleanup(viper.Reset)
 	t.Setenv("API_RATE_URL", "")
@@ -249,16 +249,19 @@ func TestGetUsdtRatePrefersPositiveAdminOverride(t *testing.T) {
 	})

 	installSettingsGetter(t, map[string]string{
-		"rate.forced_usdt_rate": "7.25",
+		"rate.forced_rate_list": `{"cny":{"usdt":0.13793103448275862},"usd":{"trx":123.45}}`,
 		"rate.api_url":          "https://rate.example.test",
 	})

 	got := GetUsdtRate()
-	if got != 7.25 {
+	if math.Abs(got-7.25) > 1e-9 {
 		t.Fatalf("GetUsdtRate() = %v, want 7.25", got)
 	}
+	if rate := GetRateForCoin("trx", "usd"); rate != 123.45 {
+		t.Fatalf("GetRateForCoin(trx, usd) = %v, want 123.45", rate)
+	}
 	if apiCalled {
-		t.Fatalf("rate API should not be called when rate.forced_usdt_rate > 0")
+		t.Fatalf("rate API should not be called when rate.forced_rate_list has positive rate")
 	}
 }

@@ -281,7 +284,7 @@ func TestGetUsdtRateUsesAPIWhenAdminOverrideIsNotPositive(t *testing.T) {
 	})

 	installSettingsGetter(t, map[string]string{
-		"rate.forced_usdt_rate": "-1",
+		"rate.forced_rate_list": `{"cny":{"usdt":0}}`,
 		"rate.api_url":          "https://rate.example.test",
 	})

@@ -297,6 +300,64 @@ func TestGetUsdtRateUsesAPIWhenAdminOverrideIsNotPositive(t *testing.T) {
 	}
 }

+func TestGetRateForCoinUsesAPIWhenForcedPairMissing(t *testing.T) {
+	viper.Reset()
+	t.Cleanup(viper.Reset)
+	t.Setenv("API_RATE_URL", "")
+
+	installMockHTTPClient(t, func(r *http.Request) (*http.Response, error) {
+		if r.URL.Path != "/cny.json" {
+			t.Fatalf("rate api path = %s, want /cny.json", r.URL.Path)
+		}
+		return &http.Response{
+			StatusCode: http.StatusOK,
+			Status:     "200 OK",
+			Header:     http.Header{"Content-Type": []string{"application/json"}},
+			Body:       io.NopCloser(strings.NewReader(`{"cny":{"usdt":0.14635}}`)),
+			Request:    r,
+		}, nil
+	})
+
+	installSettingsGetter(t, map[string]string{
+		"rate.forced_rate_list": `{"usd":{"trx":123.45}}`,
+		"rate.api_url":          "https://rate.example.test",
+	})
+
+	rate := GetRateForCoin("usdt", "cny")
+	if math.Abs(rate-0.14635) > 1e-9 {
+		t.Fatalf("GetRateForCoin(usdt, cny) = %v, want 0.14635", rate)
+	}
+}
+
+func TestGetRateForCoinUsesToncoinAPIFallbackForTon(t *testing.T) {
+	viper.Reset()
+	t.Cleanup(viper.Reset)
+	t.Setenv("API_RATE_URL", "")
+
+	installMockHTTPClient(t, func(r *http.Request) (*http.Response, error) {
+		if r.URL.Path != "/cny.json" {
+			t.Fatalf("rate api path = %s, want /cny.json", r.URL.Path)
+		}
+		return &http.Response{
+			StatusCode: http.StatusOK,
+			Status:     "200 OK",
+			Header:     http.Header{"Content-Type": []string{"application/json"}},
+			Body:       io.NopCloser(strings.NewReader(`{"cny":{"toncoin":1.82}}`)),
+			Request:    r,
+		}, nil
+	})
+
+	installSettingsGetter(t, map[string]string{
+		"rate.forced_rate_list": `{"cny":{"ton":0}}`,
+		"rate.api_url":          "https://rate.example.test",
+	})
+
+	rate := GetRateForCoin("ton", "cny")
+	if math.Abs(rate-1.82) > 1e-9 {
+		t.Fatalf("GetRateForCoin(ton, cny) = %v, want 1.82", rate)
+	}
+}
+
 func TestGetUsdtRateReturnsZeroWhenAPIUnavailableWithoutAdminOverride(t *testing.T) {
 	viper.Reset()
 	t.Cleanup(viper.Reset)
@@ -313,7 +374,7 @@ func TestGetUsdtRateReturnsZeroWhenAPIUnavailableWithoutAdminOverride(t *testing
 	})

 	installSettingsGetter(t, map[string]string{
-		"rate.forced_usdt_rate": "0",
+		"rate.forced_rate_list": `{"cny":{"usdt":0}}`,
 		"rate.api_url":          "https://rate.example.test",
 	})

@@ -343,7 +404,7 @@ func TestGetRateForCoinCallsRateAPIOnceForUsdtCnyFailure(t *testing.T) {
 	})

 	installSettingsGetter(t, map[string]string{
-		"rate.forced_usdt_rate": "0",
+		"rate.forced_rate_list": `{"cny":{"usdt":0}}`,
 		"rate.api_url":          "https://rate.example.test",
 	})

@@ -18,17 +18,9 @@ func settingsRateApiUrl() string {
 	return SettingsGetString("rate.api_url")
 }

-func settingsForcedUsdtRate() float64 {
+func settingsForcedRateList() string {
 	if SettingsGetString == nil {
-		return 0
+		return ""
 	}
-	raw := SettingsGetString("rate.forced_usdt_rate")
-	if raw == "" {
-		return 0
-	}
-	f, err := parseFloat(raw)
-	if err != nil {
-		return 0
-	}
-	return f
+	return SettingsGetString("rate.forced_rate_list")
 }
@@ -3,12 +3,12 @@ package admin
 import (
 	"crypto/rand"
 	"encoding/hex"
-	"errors"
 	"strconv"
 	"strings"

 	"github.com/GMWalletApp/epusdt/model/data"
 	"github.com/GMWalletApp/epusdt/model/mdb"
+	"github.com/GMWalletApp/epusdt/util/constant"
 	"github.com/labstack/echo/v4"
 )

@@ -79,7 +79,7 @@ func (c *BaseAdminController) ListApiKeys(ctx echo.Context) error {
 func (c *BaseAdminController) CreateApiKey(ctx echo.Context) error {
 	req := new(CreateApiKeyRequest)
 	if err := ctx.Bind(req); err != nil {
-		return c.FailJson(ctx, err)
+		return c.FailJson(ctx, constant.ParamsMarshalErr)
 	}
 	if err := c.ValidateStruct(ctx, req); err != nil {
 		return c.FailJson(ctx, err)
@@ -150,11 +150,11 @@ func isUniqueViolation(err error) bool {
 func (c *BaseAdminController) UpdateApiKey(ctx echo.Context) error {
 	id, err := strconv.ParseUint(ctx.Param("id"), 10, 64)
 	if err != nil {
-		return c.FailJson(ctx, err)
+		return c.FailJson(ctx, constant.ParamsMarshalErr)
 	}
 	req := new(UpdateApiKeyRequest)
 	if err := ctx.Bind(req); err != nil {
-		return c.FailJson(ctx, err)
+		return c.FailJson(ctx, constant.ParamsMarshalErr)
 	}
 	fields := map[string]interface{}{}
 	if req.Name != nil {
@@ -187,11 +187,11 @@ func (c *BaseAdminController) UpdateApiKey(ctx echo.Context) error {
 func (c *BaseAdminController) ChangeApiKeyStatus(ctx echo.Context) error {
 	id, err := strconv.ParseUint(ctx.Param("id"), 10, 64)
 	if err != nil {
-		return c.FailJson(ctx, err)
+		return c.FailJson(ctx, constant.ParamsMarshalErr)
 	}
 	req := new(ChangeApiKeyStatusRequest)
 	if err := ctx.Bind(req); err != nil {
-		return c.FailJson(ctx, err)
+		return c.FailJson(ctx, constant.ParamsMarshalErr)
 	}
 	if err := c.ValidateStruct(ctx, req); err != nil {
 		return c.FailJson(ctx, err)
@@ -215,7 +215,7 @@ func (c *BaseAdminController) ChangeApiKeyStatus(ctx echo.Context) error {
 func (c *BaseAdminController) RotateApiKeySecret(ctx echo.Context) error {
 	id, err := strconv.ParseUint(ctx.Param("id"), 10, 64)
 	if err != nil {
-		return c.FailJson(ctx, err)
+		return c.FailJson(ctx, constant.ParamsMarshalErr)
 	}
 	secret := randomHex(32)
 	if err := data.UpdateApiKeyFields(id, map[string]interface{}{"secret_key": secret}); err != nil {
@@ -239,7 +239,7 @@ func (c *BaseAdminController) RotateApiKeySecret(ctx echo.Context) error {
 func (c *BaseAdminController) DeleteApiKey(ctx echo.Context) error {
 	id, err := strconv.ParseUint(ctx.Param("id"), 10, 64)
 	if err != nil {
-		return c.FailJson(ctx, err)
+		return c.FailJson(ctx, constant.ParamsMarshalErr)
 	}
 	if err := data.DeleteApiKeyByID(id); err != nil {
 		return c.FailJson(ctx, err)
@@ -262,14 +262,14 @@ func (c *BaseAdminController) DeleteApiKey(ctx echo.Context) error {
 func (c *BaseAdminController) GetApiKeyStats(ctx echo.Context) error {
 	id, err := strconv.ParseUint(ctx.Param("id"), 10, 64)
 	if err != nil {
-		return c.FailJson(ctx, err)
+		return c.FailJson(ctx, constant.ParamsMarshalErr)
 	}
 	row, err := data.GetApiKeyByID(id)
 	if err != nil {
 		return c.FailJson(ctx, err)
 	}
 	if row.ID == 0 {
-		return c.FailJson(ctx, errors.New("api key not found"))
+		return c.FailJson(ctx, constant.ApiKeyNotFoundErr)
 	}
 	return c.SucJson(ctx, map[string]interface{}{
 		"call_count":   row.CallCount,
@@ -291,14 +291,14 @@ func (c *BaseAdminController) GetApiKeyStats(ctx echo.Context) error {
 func (c *BaseAdminController) GetApiKeySecret(ctx echo.Context) error {
 	id, err := strconv.ParseUint(ctx.Param("id"), 10, 64)
 	if err != nil {
-		return c.FailJson(ctx, err)
+		return c.FailJson(ctx, constant.ParamsMarshalErr)
 	}
 	row, err := data.GetApiKeyByID(id)
 	if err != nil {
 		return c.FailJson(ctx, err)
 	}
 	if row.ID == 0 {
-		return c.FailJson(ctx, errors.New("api key not found"))
+		return c.FailJson(ctx, constant.ApiKeyNotFoundErr)
 	}
 	return c.SucJson(ctx, map[string]string{"secret_key": row.SecretKey})
 }
@@ -5,6 +5,7 @@ import (

 	"github.com/GMWalletApp/epusdt/model/data"
 	"github.com/GMWalletApp/epusdt/model/mdb"
+	"github.com/GMWalletApp/epusdt/util/constant"
 	appjwt "github.com/GMWalletApp/epusdt/util/jwt"
 	"github.com/labstack/echo/v4"
 )
@@ -53,7 +54,7 @@ type InitialPasswordResponse struct {
 func (c *BaseAdminController) Login(ctx echo.Context) error {
 	req := new(LoginRequest)
 	if err := ctx.Bind(req); err != nil {
-		return c.FailJson(ctx, err)
+		return c.FailJson(ctx, constant.ParamsMarshalErr)
 	}
 	if err := c.ValidateStruct(ctx, req); err != nil {
 		return c.FailJson(ctx, err)
@@ -63,10 +64,10 @@ func (c *BaseAdminController) Login(ctx echo.Context) error {
 		return c.FailJson(ctx, err)
 	}
 	if user.ID == 0 || !data.VerifyPassword(user.PasswordHash, req.Password) {
-		return c.FailJson(ctx, errors.New("invalid username or password"))
+		return c.FailJson(ctx, constant.AdminInvalidCredentialErr)
 	}
 	if user.Status != mdb.AdminUserStatusEnable {
-		return c.FailJson(ctx, errors.New("user disabled"))
+		return c.FailJson(ctx, constant.AdminUserDisabledErr)
 	}
 	token, err := appjwt.Sign(user.ID, user.Username)
 	if err != nil {
@@ -94,6 +95,9 @@ func (c *BaseAdminController) Login(ctx echo.Context) error {
 func (c *BaseAdminController) GetInitialPassword(ctx echo.Context) error {
 	password, err := data.ConsumeInitialAdminPassword()
 	if err != nil {
+		if errors.Is(err, data.ErrInitAdminPasswordAlreadyFetched) || errors.Is(err, data.ErrInitAdminPasswordUnavailable) {
+			return c.FailJson(ctx, constant.InitialAdminPasswordErr)
+		}
 		return c.FailJson(ctx, err)
 	}
 	return c.SucJson(ctx, InitialPasswordResponse{
@@ -144,14 +148,14 @@ func (c *BaseAdminController) Logout(ctx echo.Context) error {
 func (c *BaseAdminController) Me(ctx echo.Context) error {
 	uid := currentAdminUserID(ctx)
 	if uid == 0 {
-		return c.FailJson(ctx, errors.New("unauthorized"))
+		return c.FailJson(ctx, constant.AdminUnauthorizedErr)
 	}
 	user, err := data.GetAdminUserByID(uid)
 	if err != nil {
 		return c.FailJson(ctx, err)
 	}
 	if user.ID == 0 {
-		return c.FailJson(ctx, errors.New("user not found"))
+		return c.FailJson(ctx, constant.AdminUserNotFoundErr)
 	}
 	// Warn the frontend when the operator hasn't changed the seeded
 	// initial password.
@@ -176,11 +180,11 @@ func (c *BaseAdminController) Me(ctx echo.Context) error {
 func (c *BaseAdminController) ChangePassword(ctx echo.Context) error {
 	uid := currentAdminUserID(ctx)
 	if uid == 0 {
-		return c.FailJson(ctx, errors.New("unauthorized"))
+		return c.FailJson(ctx, constant.AdminUnauthorizedErr)
 	}
 	req := new(ChangePasswordRequest)
 	if err := ctx.Bind(req); err != nil {
-		return c.FailJson(ctx, err)
+		return c.FailJson(ctx, constant.ParamsMarshalErr)
 	}
 	if err := c.ValidateStruct(ctx, req); err != nil {
 		return c.FailJson(ctx, err)
@@ -190,7 +194,7 @@ func (c *BaseAdminController) ChangePassword(ctx echo.Context) error {
 		return c.FailJson(ctx, err)
 	}
 	if user.ID == 0 || !data.VerifyPassword(user.PasswordHash, req.OldPassword) {
-		return c.FailJson(ctx, errors.New("old password incorrect"))
+		return c.FailJson(ctx, constant.AdminOldPasswordErr)
 	}
 	if err := data.UpdateAdminUserPassword(uid, req.NewPassword); err != nil {
 		return c.FailJson(ctx, err)
@@ -2,6 +2,7 @@ package admin

 import (
 	"github.com/GMWalletApp/epusdt/model/data"
+	"github.com/GMWalletApp/epusdt/util/constant"
 	"github.com/labstack/echo/v4"
 )

@@ -13,8 +14,7 @@ type UpdateChainRequest struct {
 	DisplayName      *string `json:"display_name" example:"Tron"`
 }

-// ListChains returns the chains table (tron/ethereum/solana seeded; new
-// networks like bsc/polygon inserted manually once supported).
+// ListChains returns the chains table for all seeded supported networks.
 // @Summary      List chains
 // @Description  Returns all supported blockchain networks
 // @Tags         Admin Chains
@@ -40,7 +40,7 @@ func (c *BaseAdminController) ListChains(ctx echo.Context) error {
 // @Security     AdminJWT
 // @Accept       json
 // @Produce      json
-// @Param        network path string true "Network name (e.g. tron, ethereum, solana)"
+// @Param        network path string true "Network name (e.g. ton, tron, ethereum, solana)"
 // @Param        request body admin.UpdateChainRequest true "Chain settings"
 // @Success      200 {object} response.ApiResponse
 // @Failure      400 {object} response.ApiResponse
@@ -49,7 +49,7 @@ func (c *BaseAdminController) UpdateChain(ctx echo.Context) error {
 	network := ctx.Param("network")
 	req := new(UpdateChainRequest)
 	if err := ctx.Bind(req); err != nil {
-		return c.FailJson(ctx, err)
+		return c.FailJson(ctx, constant.ParamsMarshalErr)
 	}
 	fields := map[string]interface{}{}
 	if req.Enabled != nil {
@@ -6,6 +6,7 @@ import (

 	"github.com/GMWalletApp/epusdt/model/data"
 	"github.com/GMWalletApp/epusdt/model/mdb"
+	"github.com/GMWalletApp/epusdt/util/constant"
 	"github.com/labstack/echo/v4"
 )

@@ -65,7 +66,7 @@ func (c *BaseAdminController) ListChainTokens(ctx echo.Context) error {
 func (c *BaseAdminController) CreateChainToken(ctx echo.Context) error {
 	req := new(CreateChainTokenRequest)
 	if err := ctx.Bind(req); err != nil {
-		return c.FailJson(ctx, err)
+		return c.FailJson(ctx, constant.ParamsMarshalErr)
 	}
 	if err := c.ValidateStruct(ctx, req); err != nil {
 		return c.FailJson(ctx, err)
@@ -107,11 +108,11 @@ func (c *BaseAdminController) CreateChainToken(ctx echo.Context) error {
 func (c *BaseAdminController) UpdateChainToken(ctx echo.Context) error {
 	id, err := strconv.ParseUint(ctx.Param("id"), 10, 64)
 	if err != nil {
-		return c.FailJson(ctx, err)
+		return c.FailJson(ctx, constant.ParamsMarshalErr)
 	}
 	req := new(UpdateChainTokenRequest)
 	if err := ctx.Bind(req); err != nil {
-		return c.FailJson(ctx, err)
+		return c.FailJson(ctx, constant.ParamsMarshalErr)
 	}
 	fields := map[string]interface{}{}
 	if req.ContractAddress != nil {
@@ -147,11 +148,11 @@ func (c *BaseAdminController) UpdateChainToken(ctx echo.Context) error {
 func (c *BaseAdminController) ChangeChainTokenStatus(ctx echo.Context) error {
 	id, err := strconv.ParseUint(ctx.Param("id"), 10, 64)
 	if err != nil {
-		return c.FailJson(ctx, err)
+		return c.FailJson(ctx, constant.ParamsMarshalErr)
 	}
 	req := new(ChangeChainTokenStatusRequest)
 	if err := ctx.Bind(req); err != nil {
-		return c.FailJson(ctx, err)
+		return c.FailJson(ctx, constant.ParamsMarshalErr)
 	}
 	if err := data.UpdateChainTokenFields(id, map[string]interface{}{"enabled": req.Enabled}); err != nil {
 		return c.FailJson(ctx, err)
@@ -172,7 +173,7 @@ func (c *BaseAdminController) ChangeChainTokenStatus(ctx echo.Context) error {
 func (c *BaseAdminController) DeleteChainToken(ctx echo.Context) error {
 	id, err := strconv.ParseUint(ctx.Param("id"), 10, 64)
 	if err != nil {
-		return c.FailJson(ctx, err)
+		return c.FailJson(ctx, constant.ParamsMarshalErr)
 	}
 	if err := data.DeleteChainTokenByID(id); err != nil {
 		return c.FailJson(ctx, err)
@@ -1,6 +1,9 @@
 package admin

 import (
+	"encoding/json"
+	"fmt"
+	"net/http"
 	"strconv"
 	"strings"
 	"time"
@@ -29,6 +32,49 @@ type OrderStatsResponse struct {
 	ExpiredUnpaidCount int64   `json:"expired_unpaid_count" example:"10"`
 }

+// RpcStatsDashboardResponse is the RPC runtime stats payload.
+type RpcStatsDashboardResponse struct {
+	GeneratedAt string                  `json:"generated_at" example:"2026-06-09T12:00:00+08:00"`
+	Summary     RpcStatsSummaryResponse `json:"summary"`
+	Chains      []RpcStatsChainResponse `json:"chains"`
+}
+
+// RpcStatsSummaryResponse is the overall RPC runtime summary.
+type RpcStatsSummaryResponse struct {
+	TotalChains    int     `json:"total_chains" example:"6"`
+	EnabledChains  int     `json:"enabled_chains" example:"5"`
+	ActiveChains   int     `json:"active_chains" example:"4"`
+	OkChains       int     `json:"ok_chains" example:"3"`
+	WarningChains  int     `json:"warning_chains" example:"1"`
+	DownChains     int     `json:"down_chains" example:"0"`
+	UnknownChains  int     `json:"unknown_chains" example:"1"`
+	DisabledChains int     `json:"disabled_chains" example:"1"`
+	SuccessCount   int64   `json:"success_count" example:"123"`
+	FailureCount   int64   `json:"failure_count" example:"2"`
+	SuccessRate    float64 `json:"success_rate" example:"0.984"`
+}
+
+// RpcStatsChainResponse is one chain's in-process RPC runtime stats.
+type RpcStatsChainResponse struct {
+	Network           string  `json:"network" example:"tron"`
+	DisplayName       string  `json:"display_name" example:"TRON"`
+	Enabled           bool    `json:"enabled" example:"true"`
+	HasData           bool    `json:"has_data" example:"true"`
+	Status            string  `json:"status" example:"ok" enums:"ok,warning,down,unknown,disabled"`
+	SuccessCount      int64   `json:"success_count" example:"123"`
+	FailureCount      int64   `json:"failure_count" example:"2"`
+	SuccessRate       float64 `json:"success_rate" example:"0.984"`
+	LatestBlockHeight int64   `json:"latest_block_height" example:"64532100"`
+	LastSyncAt        string  `json:"last_sync_at" example:"2026-06-09T12:00:00+08:00"`
+}
+
+type rpcStatsStreamEnvelope struct {
+	StatusCode int                       `json:"status_code"`
+	Message    string                    `json:"message"`
+	Data       RpcStatsDashboardResponse `json:"data"`
+	RequestID  string                    `json:"request_id"`
+}
+
 // RpcHealthCheckResponse is the response for a health check probe.
 type RpcHealthCheckResponse struct {
 	// 健康状态 unknown=未知 ok=正常 down=异常
@@ -49,16 +95,18 @@ type RotateSecretResponse struct {

 // BatchImportResult is one row in the batch import response.
 type BatchImportResult struct {
-	Address string `json:"address" example:"TTestTronAddress001"`
-	OK      bool   `json:"ok" example:"true"`
-	Error   string `json:"error,omitempty" example:""`
+	Address   string `json:"address" example:"TTestTronAddress001"`
+	OK        bool   `json:"ok" example:"true"`
+	ErrorCode int    `json:"error_code,omitempty" example:"10001"`
+	Error     string `json:"error,omitempty" example:"wallet address already exists"`
 }

 // SettingsUpsertResult is one row in the settings upsert response.
 type SettingsUpsertResult struct {
-	Key   string `json:"key" example:"rate.api_url"`
-	OK    bool   `json:"ok" example:"true"`
-	Error string `json:"error,omitempty" example:""`
+	Key       string `json:"key" example:"rate.api_url"`
+	OK        bool   `json:"ok" example:"true"`
+	ErrorCode int    `json:"error_code,omitempty" example:"10043"`
+	Error     string `json:"error,omitempty" example:"invalid setting item"`
 }

 // Overview returns the top-card numbers for the dashboard landing page.
@@ -228,6 +276,174 @@ func (c *BaseAdminController) OrderStats(ctx echo.Context) error {
 	})
 }

+// RpcStats returns process-local RPC runtime counters grouped by chain.
+// Values reset on process restart and are not persisted to the database.
+// @Summary      RPC runtime statistics
+// @Description  Streams in-process RPC success/failure counts, success rate, latest block height and last sync time by chain over one authenticated SSE connection.
+// @Tags         Admin Dashboard
+// @Security     AdminJWT
+// @Produce      text/event-stream
+// @Success      200 {object} response.ApiResponse{data=admin.RpcStatsDashboardResponse}
+// @Failure      400 {object} response.ApiResponse
+// @Router       /admin/api/v1/dashboard/rpc-stats [get]
+func (c *BaseAdminController) RpcStats(ctx echo.Context) error {
+	return c.streamRpcStats(ctx)
+}
+
+func buildRpcStatsResponse() (RpcStatsDashboardResponse, error) {
+	chains, err := data.ListChains()
+	if err != nil {
+		return RpcStatsDashboardResponse{}, err
+	}
+	stats := data.SnapshotRpcRuntimeStats()
+	now := time.Now()
+	resp := RpcStatsDashboardResponse{
+		GeneratedAt: now.Format(time.RFC3339),
+		Chains:      make([]RpcStatsChainResponse, 0, len(chains)),
+	}
+	for _, chain := range chains {
+		network := strings.ToLower(strings.TrimSpace(chain.Network))
+		stat := stats[network]
+		successRate := rpcStatsSuccessRate(stat.SuccessCount, stat.FailureCount)
+		hasData := stat.SuccessCount+stat.FailureCount > 0
+		status := rpcStatsStatus(chain.Enabled, stat.SuccessCount, stat.FailureCount)
+		lastSyncAt := ""
+		if !stat.LastSyncAt.IsZero() {
+			lastSyncAt = stat.LastSyncAt.Format(time.RFC3339)
+		}
+
+		resp.Summary.TotalChains++
+		if chain.Enabled {
+			resp.Summary.EnabledChains++
+		}
+		if hasData {
+			resp.Summary.ActiveChains++
+		}
+		switch status {
+		case "ok":
+			resp.Summary.OkChains++
+		case "warning":
+			resp.Summary.WarningChains++
+		case "down":
+			resp.Summary.DownChains++
+		case "disabled":
+			resp.Summary.DisabledChains++
+		default:
+			resp.Summary.UnknownChains++
+		}
+		resp.Summary.SuccessCount += stat.SuccessCount
+		resp.Summary.FailureCount += stat.FailureCount
+
+		resp.Chains = append(resp.Chains, RpcStatsChainResponse{
+			Network:           chain.Network,
+			DisplayName:       rpcStatsDisplayName(chain.Network, chain.DisplayName),
+			Enabled:           chain.Enabled,
+			HasData:           hasData,
+			Status:            status,
+			SuccessCount:      stat.SuccessCount,
+			FailureCount:      stat.FailureCount,
+			SuccessRate:       successRate,
+			LatestBlockHeight: stat.LatestBlockHeight,
+			LastSyncAt:        lastSyncAt,
+		})
+	}
+	resp.Summary.SuccessRate = rpcStatsSuccessRate(resp.Summary.SuccessCount, resp.Summary.FailureCount)
+	return resp, nil
+}
+
+func (c *BaseAdminController) streamRpcStats(ctx echo.Context) error {
+	initial, err := buildRpcStatsResponse()
+	if err != nil {
+		return c.FailJson(ctx, err)
+	}
+
+	resp := ctx.Response()
+	resp.Header().Set(echo.HeaderContentType, "text/event-stream; charset=utf-8")
+	resp.Header().Set("Cache-Control", "no-cache")
+	resp.Header().Set("Connection", "keep-alive")
+	resp.Header().Set("X-Accel-Buffering", "no")
+
+	flusher, ok := resp.Writer.(http.Flusher)
+	if !ok {
+		return echo.NewHTTPError(http.StatusInternalServerError, "streaming unsupported")
+	}
+
+	resp.WriteHeader(http.StatusOK)
+	if _, err := fmt.Fprint(resp.Writer, "retry: 5000\n\n"); err != nil {
+		return err
+	}
+	if err := writeRpcStatsSSE(ctx, flusher, initial); err != nil {
+		return err
+	}
+
+	ticker := time.NewTicker(5 * time.Second)
+	defer ticker.Stop()
+
+	for {
+		select {
+		case <-ctx.Request().Context().Done():
+			return nil
+		case <-ticker.C:
+			payload, err := buildRpcStatsResponse()
+			if err != nil {
+				return err
+			}
+			if err := writeRpcStatsSSE(ctx, flusher, payload); err != nil {
+				return err
+			}
+		}
+	}
+}
+
+func writeRpcStatsSSE(ctx echo.Context, flusher http.Flusher, payload RpcStatsDashboardResponse) error {
+	envelope := rpcStatsStreamEnvelope{
+		StatusCode: http.StatusOK,
+		Message:    "success",
+		Data:       payload,
+		RequestID:  ctx.Request().Header.Get(echo.HeaderXRequestID),
+	}
+	b, err := json.Marshal(envelope)
+	if err != nil {
+		return err
+	}
+	if _, err := fmt.Fprintf(ctx.Response().Writer, "event: rpc_stats\ndata: %s\n\n", b); err != nil {
+		return err
+	}
+	flusher.Flush()
+	return nil
+}
+
+func rpcStatsDisplayName(network string, displayName string) string {
+	if name := strings.TrimSpace(displayName); name != "" {
+		return name
+	}
+	return strings.TrimSpace(network)
+}
+
+func rpcStatsSuccessRate(successCount, failureCount int64) float64 {
+	total := successCount + failureCount
+	if total <= 0 {
+		return 0
+	}
+	return float64(successCount) / float64(total)
+}
+
+func rpcStatsStatus(enabled bool, successCount, failureCount int64) string {
+	if !enabled {
+		return "disabled"
+	}
+	if successCount+failureCount == 0 {
+		return "unknown"
+	}
+	if successCount == 0 {
+		return "down"
+	}
+	if failureCount > 0 {
+		return "warning"
+	}
+	return "ok"
+}
+
 // RecentOrders returns the last N orders for the dashboard list card.
 // @Summary      Recent orders
 // @Description  Returns the last N orders for the dashboard
@@ -2,7 +2,6 @@ package admin

 import (
 	"encoding/json"
-	"errors"
 	"strconv"
 	"strings"

@@ -10,6 +9,7 @@ import (
 	"github.com/GMWalletApp/epusdt/model/mdb"
 	"github.com/GMWalletApp/epusdt/notify"
 	"github.com/GMWalletApp/epusdt/telegram"
+	"github.com/GMWalletApp/epusdt/util/constant"
 	"github.com/labstack/echo/v4"
 )

@@ -69,7 +69,7 @@ func (c *BaseAdminController) ListNotificationChannels(ctx echo.Context) error {
 func (c *BaseAdminController) CreateNotificationChannel(ctx echo.Context) error {
 	req := new(CreateNotificationChannelRequest)
 	if err := ctx.Bind(req); err != nil {
-		return c.FailJson(ctx, err)
+		return c.FailJson(ctx, constant.ParamsMarshalErr)
 	}
 	req.Type = strings.ToLower(strings.TrimSpace(req.Type))
 	if err := c.ValidateStruct(ctx, req); err != nil {
@@ -120,7 +120,7 @@ func (c *BaseAdminController) CreateNotificationChannel(ctx echo.Context) error
 func (c *BaseAdminController) UpdateNotificationChannel(ctx echo.Context) error {
 	id, err := strconv.ParseUint(ctx.Param("id"), 10, 64)
 	if err != nil {
-		return c.FailJson(ctx, err)
+		return c.FailJson(ctx, constant.ParamsMarshalErr)
 	}
 	existing, err := data.GetNotificationChannelByID(id)
 	if err != nil {
@@ -130,7 +130,7 @@ func (c *BaseAdminController) UpdateNotificationChannel(ctx echo.Context) error

 	req := new(UpdateNotificationChannelRequest)
 	if err := ctx.Bind(req); err != nil {
-		return c.FailJson(ctx, err)
+		return c.FailJson(ctx, constant.ParamsMarshalErr)
 	}
 	fields := map[string]interface{}{}
 	if req.Name != nil {
@@ -175,7 +175,7 @@ func (c *BaseAdminController) UpdateNotificationChannel(ctx echo.Context) error
 func (c *BaseAdminController) ChangeNotificationChannelStatus(ctx echo.Context) error {
 	id, err := strconv.ParseUint(ctx.Param("id"), 10, 64)
 	if err != nil {
-		return c.FailJson(ctx, err)
+		return c.FailJson(ctx, constant.ParamsMarshalErr)
 	}
 	existing, err := data.GetNotificationChannelByID(id)
 	if err != nil {
@@ -185,7 +185,7 @@ func (c *BaseAdminController) ChangeNotificationChannelStatus(ctx echo.Context)

 	req := new(ChangeChannelStatusRequest)
 	if err := ctx.Bind(req); err != nil {
-		return c.FailJson(ctx, err)
+		return c.FailJson(ctx, constant.ParamsMarshalErr)
 	}
 	if err := data.UpdateNotificationChannelFields(id, map[string]interface{}{"enabled": req.Enabled}); err != nil {
 		return c.FailJson(ctx, err)
@@ -209,7 +209,7 @@ func (c *BaseAdminController) ChangeNotificationChannelStatus(ctx echo.Context)
 func (c *BaseAdminController) DeleteNotificationChannel(ctx echo.Context) error {
 	id, err := strconv.ParseUint(ctx.Param("id"), 10, 64)
 	if err != nil {
-		return c.FailJson(ctx, err)
+		return c.FailJson(ctx, constant.ParamsMarshalErr)
 	}
 	existing, err := data.GetNotificationChannelByID(id)
 	if err != nil {
@@ -230,12 +230,12 @@ func (c *BaseAdminController) DeleteNotificationChannel(ctx echo.Context) error
 // + chat_id; webhook/email kept loose until those senders exist.
 func validateChannelConfig(channelType string, cfg map[string]interface{}) error {
 	if cfg == nil {
-		return errors.New("config required")
+		return constant.NotificationConfigErr
 	}
 	if channelType == mdb.NotificationTypeTelegram {
 		configJSON, _ := json.Marshal(cfg)
 		if _, err := notify.ParseTelegramConfig(string(configJSON)); err != nil {
-			return err
+			return constant.NotificationConfigErr
 		}
 	}
 	return nil
@@ -260,10 +260,10 @@ func normalizeChannelEvents(raw interface{}) (map[string]bool, error) {
 			case "1", "true", "on", "yes":
 				return true, nil
 			default:
-				return false, errors.New("invalid boolean string")
+				return false, constant.NotificationEventsErr
 			}
 		default:
-			return false, errors.New("invalid event value type")
+			return false, constant.NotificationEventsErr
 		}
 	}

@@ -299,7 +299,7 @@ func normalizeChannelEvents(raw interface{}) (map[string]bool, error) {
 		for _, v := range t {
 			s, ok := v.(string)
 			if !ok {
-				return nil, errors.New("events array must contain strings")
+				return nil, constant.NotificationEventsErr
 			}
 			s = trimKey(s)
 			if s == "" {
@@ -309,6 +309,6 @@ func normalizeChannelEvents(raw interface{}) (map[string]bool, error) {
 		}
 		return out, nil
 	default:
-		return nil, errors.New("events must be object or string array")
+		return nil, constant.NotificationEventsErr
 	}
 }
@@ -2,7 +2,6 @@ package admin

 import (
 	"encoding/csv"
-	"errors"
 	"fmt"
 	"net/http"
 	"strconv"
@@ -13,14 +12,11 @@ import (
 	"github.com/GMWalletApp/epusdt/model/mdb"
 	"github.com/GMWalletApp/epusdt/model/request"
 	"github.com/GMWalletApp/epusdt/model/service"
+	"github.com/GMWalletApp/epusdt/util/constant"
+	"github.com/GMWalletApp/epusdt/util/log"
 	"github.com/labstack/echo/v4"
 )

-// MarkPaidRequest is the payload for manually marking an order as paid.
-type MarkPaidRequest struct {
-	BlockTransactionId string `json:"block_transaction_id" validate:"required" example:"0xabc123def456..."`
-}
-
 // OrderListResponse wraps the paginated order list.
 type OrderListResponse struct {
 	List     []mdb.Orders `json:"list"`
@@ -92,7 +88,7 @@ func (c *BaseAdminController) GetOrder(ctx echo.Context) error {
 		return c.FailJson(ctx, err)
 	}
 	if order.ID == 0 {
-		return c.FailJson(ctx, errors.New("order not found"))
+		return c.FailJson(ctx, constant.OrderNotExists)
 	}
 	return c.SucJson(ctx, order)
 }
@@ -114,17 +110,17 @@ func (c *BaseAdminController) CloseOrder(ctx echo.Context) error {
 		return c.FailJson(ctx, err)
 	}
 	if order.ID == 0 {
-		return c.FailJson(ctx, errors.New("order not found"))
+		return c.FailJson(ctx, constant.OrderNotExists)
 	}
 	if order.Status != mdb.StatusWaitPay {
-		return c.FailJson(ctx, errors.New("order is not waiting payment"))
+		return c.FailJson(ctx, constant.OrderNotWaitPay)
 	}
 	ok, err := data.CloseOrderManually(tradeID)
 	if err != nil {
 		return c.FailJson(ctx, err)
 	}
 	if !ok {
-		return c.FailJson(ctx, errors.New("close failed (concurrent state change)"))
+		return c.FailJson(ctx, constant.OrderStatusConflict)
 	}
 	// Release the transaction lock so the amount slot becomes reusable.
 	_ = data.UnLockTransaction(order.Network, order.ReceiveAddress, order.Token, order.ActualAmount)
@@ -136,46 +132,35 @@ func (c *BaseAdminController) CloseOrder(ctx echo.Context) error {
 // callback + notification fire normally.
 // @Summary      Mark order paid
 // @Description  Manually mark a waiting order as paid (operator补单)
+// @Description  TON accepts canonical ton:<receive_raw>:<lt>:<hash>, lt:hash, or a unique recent hash-only reference for the order receive address.
 // @Tags         Admin Orders
 // @Security     AdminJWT
 // @Accept       json
 // @Produce      json
 // @Param        trade_id path string true "Trade ID"
-// @Param        request body admin.MarkPaidRequest true "Block transaction ID"
+// @Param        request body request.ManualPaymentRequest true "Block transaction ID"
 // @Success      200 {object} response.ApiResponse
 // @Failure      400 {object} response.ApiResponse
 // @Router       /admin/api/v1/orders/{trade_id}/mark-paid [post]
 func (c *BaseAdminController) MarkOrderPaid(ctx echo.Context) error {
 	tradeID := ctx.Param("trade_id")
-	req := new(MarkPaidRequest)
+	adminUserID := currentAdminUserID(ctx)
+	req := new(request.ManualPaymentRequest)
 	if err := ctx.Bind(req); err != nil {
-		return c.FailJson(ctx, err)
+		log.Sugar.Warnf("[admin-order] mark-paid bind failed admin_user_id=%d trade_id=%s err=%v", adminUserID, tradeID, err)
+		return c.FailJson(ctx, constant.ParamsMarshalErr)
 	}
+	req.BlockTransactionId = strings.TrimSpace(req.BlockTransactionId)
 	if err := c.ValidateStruct(ctx, req); err != nil {
+		log.Sugar.Warnf("[admin-order] mark-paid validation failed admin_user_id=%d trade_id=%s block_transaction_id=%s err=%v", adminUserID, tradeID, req.BlockTransactionId, err)
 		return c.FailJson(ctx, err)
 	}
-	order, err := data.GetOrderInfoByTradeId(tradeID)
-	if err != nil {
-		return c.FailJson(ctx, err)
-	}
-	if order.ID == 0 {
-		return c.FailJson(ctx, errors.New("order not found"))
-	}
-	if order.Status != mdb.StatusWaitPay {
-		return c.FailJson(ctx, errors.New("order is not waiting payment"))
-	}
-	err = service.OrderProcessing(&request.OrderProcessingRequest{
-		ReceiveAddress:     order.ReceiveAddress,
-		Currency:           order.Currency,
-		Token:              order.Token,
-		Network:            order.Network,
-		Amount:             order.ActualAmount,
-		TradeId:            order.TradeId,
-		BlockTransactionId: req.BlockTransactionId,
-	})
+	resp, err := service.SubmitManualPayment(tradeID, req.BlockTransactionId)
 	if err != nil {
+		log.Sugar.Warnf("[admin-order] mark-paid failed admin_user_id=%d trade_id=%s block_transaction_id=%s err=%v", adminUserID, tradeID, req.BlockTransactionId, err)
 		return c.FailJson(ctx, err)
 	}
+	log.Sugar.Infof("[admin-order] mark-paid success admin_user_id=%d trade_id=%s block_transaction_id=%s", adminUserID, tradeID, resp.BlockTransactionId)
 	return c.SucJson(ctx, nil)
 }

@@ -193,13 +178,38 @@ func (c *BaseAdminController) MarkOrderPaid(ctx echo.Context) error {
 // @Router       /admin/api/v1/orders/{trade_id}/resend-callback [post]
 func (c *BaseAdminController) ResendCallback(ctx echo.Context) error {
 	tradeID := ctx.Param("trade_id")
+	adminUserID := currentAdminUserID(ctx)
+	order, err := data.GetOrderInfoByTradeId(tradeID)
+	if err != nil {
+		log.Sugar.Warnf("[admin-order] resend-callback load failed admin_user_id=%d trade_id=%s err=%v", adminUserID, tradeID, err)
+		return c.FailJson(ctx, err)
+	}
+	if order.ID == 0 {
+		err = constant.OrderNotExists
+		log.Sugar.Warnf("[admin-order] resend-callback rejected admin_user_id=%d trade_id=%s err=%v", adminUserID, tradeID, err)
+		return c.FailJson(ctx, err)
+	}
+	if order.Status != mdb.StatusPaySuccess {
+		err = constant.OrderCallbackNotApplicable
+		log.Sugar.Warnf("[admin-order] resend-callback rejected admin_user_id=%d trade_id=%s status=%d err=%v", adminUserID, tradeID, order.Status, err)
+		return c.FailJson(ctx, err)
+	}
+	if strings.TrimSpace(order.NotifyUrl) == "" {
+		err = constant.OrderNotifyURLEmptyErr
+		log.Sugar.Warnf("[admin-order] resend-callback rejected admin_user_id=%d trade_id=%s err=%v", adminUserID, tradeID, err)
+		return c.FailJson(ctx, err)
+	}
 	ok, err := data.ReopenOrderCallback(tradeID)
 	if err != nil {
+		log.Sugar.Warnf("[admin-order] resend-callback reopen failed admin_user_id=%d trade_id=%s err=%v", adminUserID, tradeID, err)
 		return c.FailJson(ctx, err)
 	}
 	if !ok {
-		return c.FailJson(ctx, errors.New("order is not paid (callback not applicable)"))
+		err = constant.OrderResendCallbackErr
+		log.Sugar.Warnf("[admin-order] resend-callback rejected admin_user_id=%d trade_id=%s err=%v", adminUserID, tradeID, err)
+		return c.FailJson(ctx, err)
 	}
+	log.Sugar.Infof("[admin-order] resend-callback queued admin_user_id=%d trade_id=%s", adminUserID, tradeID)
 	return c.SucJson(ctx, nil)
 }

@@ -380,7 +390,7 @@ func (c *BaseAdminController) GetOrderWithSub(ctx echo.Context) error {
 		return c.FailJson(ctx, err)
 	}
 	if order.ID == 0 {
-		return c.FailJson(ctx, errors.New("order not found"))
+		return c.FailJson(ctx, constant.OrderNotExists)
 	}
 	subOrders, err := data.GetAllSubOrders(tradeID)
 	if err != nil {
@@ -1,25 +1,28 @@
 package admin

 import (
-	"errors"
+	"net/url"
 	"strconv"
 	"strings"

 	"github.com/GMWalletApp/epusdt/model/data"
 	"github.com/GMWalletApp/epusdt/model/mdb"
 	"github.com/GMWalletApp/epusdt/task"
+	"github.com/GMWalletApp/epusdt/util/constant"
 	"github.com/labstack/echo/v4"
 )

 // CreateRpcNodeRequest is the payload for creating an RPC node.
 type CreateRpcNodeRequest struct {
 	Network string `json:"network" validate:"required" example:"tron"`
-	Url string `json:"url" validate:"required" example:"https://api.trongrid.io"`
-	// 连接类型 http=HTTP请求 ws=WebSocket长连接
-	Type string `json:"type" validate:"required|in:http,ws" enums:"http,ws" example:"http"`
+	Url     string `json:"url" validate:"required" example:"https://api.trongrid.io"`
+	// 连接类型 http=HTTP请求 ws=WebSocket长连接 lite=TON liteserver配置
+	Type    string `json:"type" validate:"required|in:http,ws,lite" enums:"http,ws,lite" example:"http"`
 	Weight  int    `json:"weight" example:"1"`
 	ApiKey  string `json:"api_key" example:""`
 	Enabled *bool  `json:"enabled" example:"true"`
+	// 用途 general=通用 manual_verify=补单专用 both=通用+补单
+	Purpose string `json:"purpose" enums:"general,manual_verify,both" example:"general"`
 }

 // UpdateRpcNodeRequest is the payload for updating an RPC node.
@@ -28,6 +31,7 @@ type UpdateRpcNodeRequest struct {
 	Weight  *int    `json:"weight" example:"1"`
 	ApiKey  *string `json:"api_key" example:"your-api-key"`
 	Enabled *bool   `json:"enabled" example:"true"`
+	Purpose *string `json:"purpose" enums:"general,manual_verify,both" example:"manual_verify"`
 }

 // ListRpcNodes returns rows optionally filtered by network.
@@ -64,7 +68,7 @@ func (c *BaseAdminController) ListRpcNodes(ctx echo.Context) error {
 func (c *BaseAdminController) CreateRpcNode(ctx echo.Context) error {
 	req := new(CreateRpcNodeRequest)
 	if err := ctx.Bind(req); err != nil {
-		return c.FailJson(ctx, err)
+		return c.FailJson(ctx, constant.ParamsMarshalErr)
 	}
 	if err := c.ValidateStruct(ctx, req); err != nil {
 		return c.FailJson(ctx, err)
@@ -77,13 +81,23 @@ func (c *BaseAdminController) CreateRpcNode(ctx echo.Context) error {
 	if req.Enabled != nil {
 		enabled = *req.Enabled
 	}
+	purpose, err := rpcNodePurposeFromRequest(req.Purpose)
+	if err != nil {
+		return c.FailJson(ctx, err)
+	}
+	nodeURL := strings.TrimSpace(req.Url)
+	nodeType := strings.ToLower(strings.TrimSpace(req.Type))
+	if err := validateRpcNodeURLForType(nodeURL, nodeType); err != nil {
+		return c.FailJson(ctx, err)
+	}
 	row := &mdb.RpcNode{
 		Network:       strings.ToLower(strings.TrimSpace(req.Network)),
-		Url:           strings.TrimSpace(req.Url),
-		Type:          strings.ToLower(strings.TrimSpace(req.Type)),
+		Url:           nodeURL,
+		Type:          nodeType,
 		Weight:        weight,
 		ApiKey:        req.ApiKey,
 		Enabled:       enabled,
+		Purpose:       purpose,
 		Status:        mdb.RpcNodeStatusUnknown,
 		LastLatencyMs: -1,
 	}
@@ -93,7 +107,7 @@ func (c *BaseAdminController) CreateRpcNode(ctx echo.Context) error {
 	return c.SucJson(ctx, row)
 }

-// UpdateRpcNode patches url/weight/api_key/enabled.
+// UpdateRpcNode patches url/weight/api_key/enabled/purpose.
 // @Summary      Update RPC node
 // @Description  Patch RPC node fields
 // @Tags         Admin RPC Nodes
@@ -108,15 +122,26 @@ func (c *BaseAdminController) CreateRpcNode(ctx echo.Context) error {
 func (c *BaseAdminController) UpdateRpcNode(ctx echo.Context) error {
 	id, err := strconv.ParseUint(ctx.Param("id"), 10, 64)
 	if err != nil {
-		return c.FailJson(ctx, err)
+		return c.FailJson(ctx, constant.ParamsMarshalErr)
 	}
 	req := new(UpdateRpcNodeRequest)
 	if err := ctx.Bind(req); err != nil {
-		return c.FailJson(ctx, err)
+		return c.FailJson(ctx, constant.ParamsMarshalErr)
 	}
 	fields := map[string]interface{}{}
 	if req.Url != nil {
-		fields["url"] = *req.Url
+		row, err := data.GetRpcNodeByID(id)
+		if err != nil {
+			return c.FailJson(ctx, err)
+		}
+		if row.ID == 0 {
+			return c.FailJson(ctx, constant.RpcNodeNotFoundErr)
+		}
+		nodeURL := strings.TrimSpace(*req.Url)
+		if err := validateRpcNodeURLForType(nodeURL, row.Type); err != nil {
+			return c.FailJson(ctx, err)
+		}
+		fields["url"] = nodeURL
 	}
 	if req.Weight != nil {
 		fields["weight"] = *req.Weight
@@ -127,6 +152,13 @@ func (c *BaseAdminController) UpdateRpcNode(ctx echo.Context) error {
 	if req.Enabled != nil {
 		fields["enabled"] = *req.Enabled
 	}
+	if req.Purpose != nil {
+		purpose, err := rpcNodePurposeFromRequest(*req.Purpose)
+		if err != nil {
+			return c.FailJson(ctx, err)
+		}
+		fields["purpose"] = purpose
+	}
 	if err := data.UpdateRpcNodeFields(id, fields); err != nil {
 		return c.FailJson(ctx, err)
 	}
@@ -146,7 +178,7 @@ func (c *BaseAdminController) UpdateRpcNode(ctx echo.Context) error {
 func (c *BaseAdminController) DeleteRpcNode(ctx echo.Context) error {
 	id, err := strconv.ParseUint(ctx.Param("id"), 10, 64)
 	if err != nil {
-		return c.FailJson(ctx, err)
+		return c.FailJson(ctx, constant.ParamsMarshalErr)
 	}
 	if err := data.DeleteRpcNodeByID(id); err != nil {
 		return c.FailJson(ctx, err)
@@ -155,9 +187,8 @@ func (c *BaseAdminController) DeleteRpcNode(ctx echo.Context) error {
 }

 // HealthCheckRpcNode performs an on-demand probe and writes the result.
-// For HTTP endpoints this is a GET to the URL with a short timeout; for
-// WS we just attempt a TCP-level check via the same HTTP client (the
-// handshake URL resolves the host identically).
+// For HTTP/WS/lite endpoints this is a TCP-level check against the configured
+// URL host. TON lite rows usually point to a global.config.json HTTPS URL.
 // @Summary      Health check RPC node
 // @Description  Perform an on-demand health probe on an RPC node
 // @Tags         Admin RPC Nodes
@@ -170,14 +201,14 @@ func (c *BaseAdminController) DeleteRpcNode(ctx echo.Context) error {
 func (c *BaseAdminController) HealthCheckRpcNode(ctx echo.Context) error {
 	id, err := strconv.ParseUint(ctx.Param("id"), 10, 64)
 	if err != nil {
-		return c.FailJson(ctx, err)
+		return c.FailJson(ctx, constant.ParamsMarshalErr)
 	}
 	row, err := data.GetRpcNodeByID(id)
 	if err != nil {
 		return c.FailJson(ctx, err)
 	}
 	if row.ID == 0 {
-		return c.FailJson(ctx, errors.New("node not found"))
+		return c.FailJson(ctx, constant.RpcNodeNotFoundErr)
 	}
 	status, latency := task.ProbeNode(row.Url)
 	if err := data.UpdateRpcNodeHealth(id, status, latency); err != nil {
@@ -188,3 +219,45 @@ func (c *BaseAdminController) HealthCheckRpcNode(ctx echo.Context) error {
 		"last_latency_ms": latency,
 	})
 }
+
+func rpcNodePurposeFromRequest(raw string) (string, error) {
+	purpose := strings.ToLower(strings.TrimSpace(raw))
+	if purpose == "" {
+		return mdb.RpcNodePurposeGeneral, nil
+	}
+	switch purpose {
+	case mdb.RpcNodePurposeGeneral, mdb.RpcNodePurposeManualVerify, mdb.RpcNodePurposeBoth:
+		return purpose, nil
+	default:
+		return "", constant.RpcNodePurposeErr
+	}
+}
+
+func validateRpcNodeURLForType(rawURL string, nodeType string) error {
+	rawURL = strings.TrimSpace(rawURL)
+	nodeType = strings.ToLower(strings.TrimSpace(nodeType))
+	parsed, err := url.Parse(rawURL)
+	if err != nil || parsed.Scheme == "" || parsed.Host == "" {
+		return constant.RpcNodeURLErr
+	}
+	scheme := strings.ToLower(parsed.Scheme)
+	switch nodeType {
+	case mdb.RpcNodeTypeHttp:
+		if scheme == "http" || scheme == "https" {
+			return nil
+		}
+		return constant.RpcNodeHTTPURLErr
+	case mdb.RpcNodeTypeWs:
+		if scheme == "ws" || scheme == "wss" {
+			return nil
+		}
+		return constant.RpcNodeWebSocketURLErr
+	case mdb.RpcNodeTypeLite:
+		if scheme == "http" || scheme == "https" {
+			return nil
+		}
+		return constant.RpcNodeHTTPURLErr
+	default:
+		return constant.RpcNodeTypeErr
+	}
+}
@@ -1,12 +1,18 @@
 package admin

 import (
+	"encoding/json"
+	"fmt"
+	"strconv"
 	"strings"

 	"github.com/GMWalletApp/epusdt/model/dao"
 	"github.com/GMWalletApp/epusdt/model/data"
 	"github.com/GMWalletApp/epusdt/model/mdb"
 	"github.com/GMWalletApp/epusdt/telegram"
+	"github.com/GMWalletApp/epusdt/util/constant"
+	appLog "github.com/GMWalletApp/epusdt/util/log"
+	"github.com/GMWalletApp/epusdt/util/security"
 	"github.com/labstack/echo/v4"
 )

@@ -14,30 +20,47 @@ import (
 // Supported groups and keys:
 //
 //   - group=rate:
-//     rate.forced_usdt_rate  (float)  — override USDT/CNY when > 0; <= 0 uses rate.api_url
-//     rate.api_url           (string) — external rate API URL used when rate.forced_usdt_rate <= 0
+//     rate.forced_rate_list  (json)   — override rate map, e.g. {"cny":{"usdt":0.14635,"ton":0.5}}; base/coin keys are normalized to lowercase
+//     rate.api_url           (string) — external rate API URL used when no positive forced rate exists
 //     rate.adjust_percent    (float)  — rate adjustment percentage
 //     rate.okx_c2c_enabled   (bool)   — use OKX C2C rate feed
 //
 //   - group=epay:
 //     epay.default_token     (string) — token for EPAY orders, e.g. "usdt" (default)
 //     epay.default_currency  (string) — fiat currency for EPAY orders, e.g. "cny" (default)
-//     epay.default_network   (string) — blockchain network for EPAY orders, e.g. "tron" (default)
+//     epay.default_network   (string) — blockchain network for EPAY orders, e.g. "tron" or "ton" (default "tron")
+//
+//   - group=okpay:
+//     okpay.enabled          (bool)   — enable OkPay as a switch-network payment option
+//     okpay.shop_id          (string) — OkPay merchant/shop identifier
+//     okpay.shop_token       (string) — OkPay signing token
+//     okpay.api_url          (string) — OkPay API base URL
+//     okpay.callback_url     (string) — server callback URL used for OkPay notify
+//     okpay.return_url       (string) — optional default browser return URL after payment
+//     okpay.timeout_seconds  (int)    — outbound OkPay API timeout in seconds
+//     okpay.allow_tokens     (string) — comma-separated allowed tokens, e.g. "USDT,TRX"
 //
 //   - group=brand:
-//     brand.site_name        (string) — site display name
+//     brand.checkout_name    (string) — cashier display name (preferred)
 //     brand.logo_url         (string) — logo image URL
-//     brand.page_title       (string) — payment page title
-//     brand.pay_success_text (string) — text shown on payment success
+//     brand.site_title       (string) — payment page title / website title (preferred)
+//     brand.success_copy     (string) — text shown on payment success (preferred)
 //     brand.support_url      (string) — support / help URL
+//     brand.background_color (string) — checkout background color
+//     brand.background_image_url (string) — checkout background image URL
+//     brand.site_name        (string) — legacy cashier/site display name
+//     brand.page_title       (string) — legacy payment page title
+//     brand.pay_success_text (string) — legacy success text
 //
 //   - group=system:
 //     system.order_expiration_time (int) — order expiry in minutes
+//     system.amount_precision      (int) — payment amount precision, 2-6 decimals (default 2)
+//     system.log_level             (string) — runtime log level: debug, info, warn, error (default error)
 type SettingUpsertItem struct {
-	Group string `json:"group" enums:"brand,rate,system,epay" example:"epay"`
-	Key   string `json:"key" example:"epay.default_network"`
-	Value string `json:"value" example:"tron"`
-	Type  string `json:"type" enums:"string,int,bool,json" example:"string"`
+	Group string      `json:"group" enums:"brand,rate,system,epay,okpay" example:"epay"`
+	Key   string      `json:"key" example:"epay.default_network"`
+	Value interface{} `json:"value"`
+	Type  string      `json:"type" enums:"string,int,bool,json" example:"string"`
 }

 // SettingsUpsertRequest is the payload for batch upserting settings.
@@ -48,12 +71,12 @@ type SettingsUpsertRequest struct {
 // ListSettings returns all rows, optionally filtered by group.
 // @Summary      List settings
 // @Description  Returns all settings, optionally filtered by group.
-// @Description  Available groups: brand, rate, system, epay.
+// @Description  Available groups: brand, rate, system, epay, okpay.
 // @Description  See SettingUpsertItem for the full list of supported keys per group.
 // @Tags         Admin Settings
 // @Security     AdminJWT
 // @Produce      json
-// @Param        group query string false "Group filter (brand|rate|system|epay)"
+// @Param        group query string false "Group filter (brand|rate|system|epay|okpay)"
 // @Success      200 {object} response.ApiResponse{data=[]mdb.Setting}
 // @Failure      400 {object} response.ApiResponse
 // @Router       /admin/api/v1/settings [get]
@@ -70,12 +93,13 @@ func (c *BaseAdminController) ListSettings(ctx echo.Context) error {
 // independently so a malformed row in the middle doesn't drop earlier
 // ones. Errors are returned per-key so the UI can surface them.
 // @Summary      Upsert settings
-// @Description  Batch insert/update settings. Returns per-key status.
-// @Description  Supported groups: brand, rate, system, epay.
-// @Description  epay group keys: epay.default_token (e.g. "usdt"), epay.default_currency (e.g. "cny"), epay.default_network (e.g. "tron").
-// @Description  rate group keys: rate.forced_usdt_rate (>0 overrides USDT/CNY; <=0 uses rate.api_url), rate.api_url, rate.adjust_percent, rate.okx_c2c_enabled.
-// @Description  brand group keys: brand.site_name, brand.logo_url, brand.page_title, brand.pay_success_text, brand.support_url.
-// @Description  system group keys: system.order_expiration_time.
+// @Description  Batch insert/update settings. Returns per-key status; failed items include error_code for frontend i18n.
+// @Description  Supported groups: brand, rate, system, epay, okpay.
+// @Description  epay group keys: epay.default_token (e.g. "usdt" or "ton"), epay.default_currency (e.g. "cny"), epay.default_network (e.g. "tron" or "ton").
+// @Description  okpay group keys: okpay.enabled, okpay.shop_id, okpay.shop_token, okpay.api_url, okpay.callback_url, okpay.return_url, okpay.timeout_seconds, okpay.allow_tokens.
+// @Description  rate group keys: rate.forced_rate_list (JSON map, e.g. {"cny":{"usdt":0.14635,"ton":0.5}}; base/coin keys are normalized to lowercase), rate.api_url, rate.adjust_percent, rate.okx_c2c_enabled.
+// @Description  brand group keys: brand.checkout_name, brand.logo_url, brand.site_title, brand.success_copy, brand.support_url, brand.background_color, brand.background_image_url. Legacy aliases brand.site_name, brand.page_title and brand.pay_success_text are also supported.
+// @Description  system group keys: system.order_expiration_time, system.amount_precision (int, 2-6, default 2), system.log_level (debug|info|warn|error, default error).
 // @Tags         Admin Settings
 // @Security     AdminJWT
 // @Accept       json
@@ -87,27 +111,60 @@ func (c *BaseAdminController) ListSettings(ctx echo.Context) error {
 func (c *BaseAdminController) UpsertSettings(ctx echo.Context) error {
 	req := new(SettingsUpsertRequest)
 	if err := ctx.Bind(req); err != nil {
-		return c.FailJson(ctx, err)
+		return c.FailJson(ctx, constant.ParamsMarshalErr)
 	}
 	if err := c.ValidateStruct(ctx, req); err != nil {
 		return c.FailJson(ctx, err)
 	}
 	type result struct {
-		Key   string `json:"key"`
-		OK    bool   `json:"ok"`
-		Error string `json:"error,omitempty"`
+		Key       string `json:"key"`
+		OK        bool   `json:"ok"`
+		ErrorCode int    `json:"error_code,omitempty"`
+		Error     string `json:"error,omitempty"`
 	}
 	out := make([]result, 0, len(req.Items))
+	errorResult := func(key string, err error) result {
+		code, msg := constant.ResolveErrno(err)
+		return result{Key: key, OK: false, ErrorCode: code, Error: msg}
+	}
 	for _, item := range req.Items {
 		key := strings.TrimSpace(item.Key)
 		if key == "" {
-			out = append(out, result{Key: item.Key, OK: false, Error: "key required"})
+			out = append(out, errorResult(item.Key, constant.SettingItemErr))
 			continue
 		}
-		if err := data.SetSetting(item.Group, key, item.Value, item.Type); err != nil {
-			out = append(out, result{Key: key, OK: false, Error: err.Error()})
+		value, err := normalizeSettingValue(item.Value)
+		if err != nil {
+			out = append(out, errorResult(key, constant.SettingItemErr))
 			continue
 		}
+		value, err = normalizeAndValidateSettingItem(item.Group, key, value)
+		if err != nil {
+			out = append(out, errorResult(key, constant.SettingItemErr))
+			continue
+		}
+		if key == mdb.SettingKeyAmountPrecision {
+			item.Group = mdb.SettingGroupSystem
+			item.Type = mdb.SettingTypeInt
+		}
+		if key == mdb.SettingKeyRateForcedRateList {
+			item.Group = mdb.SettingGroupRate
+			item.Type = mdb.SettingTypeJSON
+		}
+		if key == mdb.SettingKeySystemLogLevel {
+			item.Group = mdb.SettingGroupSystem
+			item.Type = mdb.SettingTypeString
+		}
+		if err := data.SetSetting(item.Group, key, value, item.Type); err != nil {
+			out = append(out, errorResult(key, err))
+			continue
+		}
+		if key == mdb.SettingKeySystemLogLevel {
+			if err := appLog.SetLevel(value); err != nil {
+				out = append(out, errorResult(key, err))
+				continue
+			}
+		}
 		out = append(out, result{Key: key, OK: true})
 	}

@@ -132,10 +189,113 @@ func (c *BaseAdminController) UpsertSettings(ctx echo.Context) error {
 	return c.SucJson(ctx, out)
 }

+func normalizeSettingValue(value interface{}) (string, error) {
+	switch v := value.(type) {
+	case nil:
+		return "", nil
+	case string:
+		return v, nil
+	default:
+		b, err := json.Marshal(v)
+		if err != nil {
+			return "", fmt.Errorf("value must be JSON serializable")
+		}
+		return string(b), nil
+	}
+}
+
+func normalizeAndValidateSettingItem(group, key, value string) (string, error) {
+	switch key {
+	case mdb.SettingKeyAmountPrecision:
+		if strings.ToLower(strings.TrimSpace(group)) != mdb.SettingGroupSystem {
+			return value, fmt.Errorf("%s must use group %s", key, mdb.SettingGroupSystem)
+		}
+		precision, err := strconv.Atoi(strings.TrimSpace(value))
+		if err != nil {
+			return value, fmt.Errorf("%s must be an integer", key)
+		}
+		if precision < data.MinAmountPrecision || precision > data.MaxAmountPrecision {
+			return value, fmt.Errorf("%s must be between %d and %d", key, data.MinAmountPrecision, data.MaxAmountPrecision)
+		}
+	case mdb.SettingKeyRateForcedRateList:
+		normalized, err := normalizeForcedRateListSetting(group, key, value)
+		if err != nil {
+			return value, err
+		}
+		return normalized, nil
+	case mdb.SettingKeyRateApiUrl:
+		if strings.ToLower(strings.TrimSpace(group)) != mdb.SettingGroupRate {
+			return value, fmt.Errorf("%s must use group %s", key, mdb.SettingGroupRate)
+		}
+		if err := security.ValidatePublicHTTPURL(value); err != nil {
+			return value, fmt.Errorf("%s invalid: %w", key, err)
+		}
+	case mdb.SettingKeySystemLogLevel:
+		if strings.ToLower(strings.TrimSpace(group)) != mdb.SettingGroupSystem {
+			return value, fmt.Errorf("%s must use group %s", key, mdb.SettingGroupSystem)
+		}
+		normalized, err := appLog.NormalizeLevel(value)
+		if err != nil {
+			return value, err
+		}
+		return normalized, nil
+	}
+	return value, nil
+}
+
+func normalizeForcedRateListSetting(group, key, value string) (string, error) {
+	if strings.ToLower(strings.TrimSpace(group)) != mdb.SettingGroupRate {
+		return value, fmt.Errorf("%s must use group %s", key, mdb.SettingGroupRate)
+	}
+	if strings.TrimSpace(value) == "" {
+		return "", nil
+	}
+
+	var rates map[string]map[string]float64
+	if err := json.Unmarshal([]byte(value), &rates); err != nil {
+		return value, fmt.Errorf("%s must be valid JSON object", key)
+	}
+
+	normalized := make(map[string]map[string]float64, len(rates))
+	for base, coins := range rates {
+		normalizedBase := strings.ToLower(strings.TrimSpace(base))
+		if normalizedBase == "" {
+			return value, fmt.Errorf("%s base currency must not be empty", key)
+		}
+		if coins == nil {
+			return value, fmt.Errorf("%s.%s must be an object", key, base)
+		}
+		normalizedCoins, ok := normalized[normalizedBase]
+		if !ok {
+			normalizedCoins = make(map[string]float64, len(coins))
+			normalized[normalizedBase] = normalizedCoins
+		}
+		for coin, rate := range coins {
+			normalizedCoin := strings.ToLower(strings.TrimSpace(coin))
+			if normalizedCoin == "" {
+				return value, fmt.Errorf("%s coin must not be empty", key)
+			}
+			if rate < 0 {
+				return value, fmt.Errorf("%s.%s.%s must be >= 0", key, base, coin)
+			}
+			if _, exists := normalizedCoins[normalizedCoin]; exists {
+				return value, fmt.Errorf("%s.%s.%s is duplicated after normalization", key, normalizedBase, normalizedCoin)
+			}
+			normalizedCoins[normalizedCoin] = rate
+		}
+	}
+
+	normalizedValue, err := json.Marshal(normalized)
+	if err != nil {
+		return value, fmt.Errorf("%s must be JSON serializable", key)
+	}
+	return string(normalizedValue), nil
+}
+
 // DeleteSetting removes one row. The next read of that key will fall
 // back to the hardcoded default (see settings_data.GetSetting*).
 // @Summary      Delete setting
-// @Description  Remove a setting by key (falls back to default)
+// @Description  Remove a setting by key (falls back to default). Deleting system.log_level immediately resets runtime logging to error.
 // @Tags         Admin Settings
 // @Security     AdminJWT
 // @Produce      json
@@ -151,9 +311,10 @@ func (c *BaseAdminController) DeleteSetting(ctx echo.Context) error {
 	if err := data.DeleteSetting(key); err != nil {
 		return c.FailJson(ctx, err)
 	}
+	if key == mdb.SettingKeySystemLogLevel {
+		if err := appLog.SetLevel(mdb.SettingDefaultSystemLogLevel); err != nil {
+			return c.FailJson(ctx, err)
+		}
+	}
 	return c.SucJson(ctx, nil)
 }
-
-// Public helper for the rate/usdt overrides — used by config package to
-// read settings-backed values without importing the controller package.
-var _ = mdb.SettingKeyRateForcedUsdt // ensure key constants remain referenced
@@ -1,13 +1,13 @@
 package admin

 import (
-	"errors"
 	"strconv"
 	"strings"

 	"github.com/GMWalletApp/epusdt/model/dao"
 	"github.com/GMWalletApp/epusdt/model/data"
 	"github.com/GMWalletApp/epusdt/model/mdb"
+	"github.com/GMWalletApp/epusdt/util/constant"
 	"github.com/labstack/echo/v4"
 )

@@ -105,7 +105,7 @@ func (c *BaseAdminController) AdminListWallets(ctx echo.Context) error {
 func (c *BaseAdminController) AdminAddWallet(ctx echo.Context) error {
 	req := new(AdminAddWalletRequest)
 	if err := ctx.Bind(req); err != nil {
-		return c.FailJson(ctx, err)
+		return c.FailJson(ctx, constant.ParamsMarshalErr)
 	}
 	if err := c.ValidateStruct(ctx, req); err != nil {
 		return c.FailJson(ctx, err)
@@ -140,14 +140,14 @@ func (c *BaseAdminController) AdminAddWallet(ctx echo.Context) error {
 func (c *BaseAdminController) AdminGetWallet(ctx echo.Context) error {
 	id, err := strconv.ParseUint(ctx.Param("id"), 10, 64)
 	if err != nil {
-		return c.FailJson(ctx, err)
+		return c.FailJson(ctx, constant.ParamsMarshalErr)
 	}
 	wallet, err := data.GetWalletAddressById(id)
 	if err != nil {
 		return c.FailJson(ctx, err)
 	}
 	if wallet.ID == 0 {
-		return c.FailJson(ctx, errors.New("wallet not found"))
+		return c.FailJson(ctx, constant.WalletNotFoundErr)
 	}
 	counts, _ := data.CountOrdersByAddress()
 	return c.SucJson(ctx, WalletListItem{WalletAddress: *wallet, OrderCount: counts[wallet.Address]})
@@ -168,11 +168,11 @@ func (c *BaseAdminController) AdminGetWallet(ctx echo.Context) error {
 func (c *BaseAdminController) AdminUpdateWallet(ctx echo.Context) error {
 	id, err := strconv.ParseUint(ctx.Param("id"), 10, 64)
 	if err != nil {
-		return c.FailJson(ctx, err)
+		return c.FailJson(ctx, constant.ParamsMarshalErr)
 	}
 	req := new(AdminUpdateWalletRequest)
 	if err := ctx.Bind(req); err != nil {
-		return c.FailJson(ctx, err)
+		return c.FailJson(ctx, constant.ParamsMarshalErr)
 	}
 	fields := map[string]interface{}{}
 	if req.Remark != nil {
@@ -202,11 +202,11 @@ func (c *BaseAdminController) AdminUpdateWallet(ctx echo.Context) error {
 func (c *BaseAdminController) AdminChangeWalletStatus(ctx echo.Context) error {
 	id, err := strconv.ParseUint(ctx.Param("id"), 10, 64)
 	if err != nil {
-		return c.FailJson(ctx, err)
+		return c.FailJson(ctx, constant.ParamsMarshalErr)
 	}
 	req := new(AdminChangeWalletStatusRequest)
 	if err := ctx.Bind(req); err != nil {
-		return c.FailJson(ctx, err)
+		return c.FailJson(ctx, constant.ParamsMarshalErr)
 	}
 	if err := c.ValidateStruct(ctx, req); err != nil {
 		return c.FailJson(ctx, err)
@@ -230,7 +230,7 @@ func (c *BaseAdminController) AdminChangeWalletStatus(ctx echo.Context) error {
 func (c *BaseAdminController) AdminDeleteWallet(ctx echo.Context) error {
 	id, err := strconv.ParseUint(ctx.Param("id"), 10, 64)
 	if err != nil {
-		return c.FailJson(ctx, err)
+		return c.FailJson(ctx, constant.ParamsMarshalErr)
 	}
 	if err := data.DeleteWalletAddressById(id); err != nil {
 		return c.FailJson(ctx, err)
@@ -242,7 +242,7 @@ func (c *BaseAdminController) AdminDeleteWallet(ctx echo.Context) error {
 // them all as observation wallets. Per-row failures are collected and
 // returned so the UI can surface which addresses already existed.
 // @Summary      Batch import wallets
-// @Description  Import multiple wallet addresses at once. Per-row status is returned.
+// @Description  Import multiple wallet addresses at once. Per-row status is returned; failed rows include error_code for frontend i18n.
 // @Tags         Admin Wallets
 // @Security     AdminJWT
 // @Accept       json
@@ -254,21 +254,23 @@ func (c *BaseAdminController) AdminDeleteWallet(ctx echo.Context) error {
 func (c *BaseAdminController) AdminBatchImportWallets(ctx echo.Context) error {
 	req := new(AdminBatchImportRequest)
 	if err := ctx.Bind(req); err != nil {
-		return c.FailJson(ctx, err)
+		return c.FailJson(ctx, constant.ParamsMarshalErr)
 	}
 	if err := c.ValidateStruct(ctx, req); err != nil {
 		return c.FailJson(ctx, err)
 	}
 	type result struct {
-		Address string `json:"address"`
-		OK      bool   `json:"ok"`
-		Error   string `json:"error,omitempty"`
+		Address   string `json:"address"`
+		OK        bool   `json:"ok"`
+		ErrorCode int    `json:"error_code,omitempty"`
+		Error     string `json:"error,omitempty"`
 	}
 	out := make([]result, 0, len(req.Addresses))
 	for _, addr := range req.Addresses {
 		row, err := data.AddWalletAddressWithNetwork(req.Network, addr)
 		if err != nil {
-			out = append(out, result{Address: addr, OK: false, Error: err.Error()})
+			code, msg := constant.ResolveErrno(err)
+			out = append(out, result{Address: addr, OK: false, ErrorCode: code, Error: msg})
 			continue
 		}
 		_ = dao.Mdb.Model(&mdb.WalletAddress{}).Where("id = ?", row.ID).
@@ -1,7 +1,7 @@
 package controller

 import (
-	"errors"
+	"github.com/GMWalletApp/epusdt/util/constant"
 	"github.com/GMWalletApp/epusdt/util/http"
 	"github.com/gookit/validate"
 	"github.com/gookit/validate/locales/zhcn"
@@ -46,6 +46,6 @@ func (c *BaseController) ValidateStruct(ctx echo.Context, i interface{}, scene .
 	if v.Validate() {
 		return nil
 	} else {
-		return errors.New(v.Errors.One())
+		return constant.ParamsMarshalErr
 	}
 }
@@ -0,0 +1,154 @@
+package comm
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+	"io"
+	"math"
+	"net/http"
+	"net/url"
+	"strconv"
+	"strings"
+
+	"github.com/GMWalletApp/epusdt/model/service"
+	"github.com/GMWalletApp/epusdt/util/log"
+	"github.com/labstack/echo/v4"
+)
+
+// OkPayNotify receives the server-to-server OkPay payment callback.
+// The handler accepts JSON or form-urlencoded payloads and returns plain-text
+// acknowledgements expected by the upstream provider.
+// @Summary      OkPay notify callback
+// @Description  Receives OkPay deposit callbacks for hosted checkout child orders.
+// @Description  The callback is verified against the configured OkPay shop token and, on success, marks the matching child order as paid.
+// @Tags         Payment
+// @Accept       json
+// @Accept       x-www-form-urlencoded
+// @Produce      plain
+// @Success      200 {string} string "success"
+// @Failure      400 {string} string "fail"
+// @Router       /payments/okpay/v1/notify [post]
+func (c *BaseCommController) OkPayNotify(ctx echo.Context) error {
+	req := ctx.Request()
+	rawBody, err := io.ReadAll(req.Body)
+	if err != nil {
+		log.Sugar.Warnf("[okpay] read notify body failed err=%v", err)
+		return ctx.String(http.StatusBadRequest, "fail")
+	}
+	req.Body = io.NopCloser(bytes.NewReader(rawBody))
+
+	form := make(map[string]string)
+	copyForm := func(values url.Values) {
+		for key, items := range values {
+			if len(items) == 0 {
+				continue
+			}
+			form[key] = items[0]
+		}
+	}
+
+	copyForm(req.URL.Query())
+
+	contentType := strings.ToLower(req.Header.Get(echo.HeaderContentType))
+
+	if strings.Contains(contentType, echo.MIMEApplicationJSON) && len(rawBody) > 0 {
+		if jsonForm, jsonErr := flattenOkPayJSONBody(rawBody); jsonErr == nil {
+			for key, value := range jsonForm {
+				form[key] = value
+			}
+		}
+	}
+
+	// Match the PHP example's $_POST semantics: let Echo/net/http parse both
+	// application/x-www-form-urlencoded and multipart/form-data.
+	if len(form) == 0 {
+		req.Body = io.NopCloser(bytes.NewReader(rawBody))
+		if parsedForm, formErr := ctx.FormParams(); formErr == nil {
+			copyForm(parsedForm)
+		}
+	}
+
+	// Final fallback for raw query-string style bodies.
+	if len(form) == 0 && len(rawBody) > 0 && looksLikeQueryPayload(string(rawBody)) {
+		if parsed, parseErr := url.ParseQuery(string(rawBody)); parseErr == nil && len(parsed) > 0 {
+			copyForm(parsed)
+		}
+	}
+
+	rawFormData := string(rawBody)
+	if rawFormData == "" {
+		rawFormData = req.URL.RawQuery
+	}
+
+	if len(form) == 0 {
+		log.Sugar.Warnf("[okpay] empty notify payload method=%s content_type=%s remote=%s raw_query=%q raw_body=%q", req.Method, req.Header.Get(echo.HeaderContentType), ctx.RealIP(), req.URL.RawQuery, rawFormData)
+		return ctx.String(http.StatusBadRequest, "fail")
+	}
+
+	if err = service.HandleOkPayNotify(form, rawFormData); err != nil {
+		log.Sugar.Warnf("[okpay] notify handle failed method=%s content_type=%s remote=%s form=%v raw_query=%q raw_body=%q err=%v", req.Method, req.Header.Get(echo.HeaderContentType), ctx.RealIP(), form, req.URL.RawQuery, rawFormData, err)
+		return ctx.String(http.StatusBadRequest, "fail")
+	}
+	return ctx.String(http.StatusOK, "success")
+}
+
+func flattenOkPayJSONBody(rawBody []byte) (map[string]string, error) {
+	decoder := json.NewDecoder(bytes.NewReader(rawBody))
+	decoder.UseNumber()
+
+	var payload map[string]interface{}
+	if err := decoder.Decode(&payload); err != nil {
+		return nil, err
+	}
+
+	flat := make(map[string]string)
+	for key, value := range payload {
+		if key == "data" {
+			dataMap, ok := value.(map[string]interface{})
+			if !ok {
+				continue
+			}
+			for dataKey, dataValue := range dataMap {
+				flat["data["+dataKey+"]"] = stringifyOkPayJSONValue(dataValue)
+			}
+			continue
+		}
+		flat[key] = stringifyOkPayJSONValue(value)
+	}
+	return flat, nil
+}
+
+func stringifyOkPayJSONValue(value interface{}) string {
+	switch v := value.(type) {
+	case nil:
+		return ""
+	case string:
+		return strings.TrimSpace(v)
+	case json.Number:
+		return v.String()
+	case float64:
+		if v == math.Trunc(v) {
+			return strconv.FormatInt(int64(v), 10)
+		}
+		return strconv.FormatFloat(v, 'f', -1, 64)
+	case bool:
+		if v {
+			return "true"
+		}
+		return "false"
+	default:
+		return strings.TrimSpace(fmt.Sprint(v))
+	}
+}
+
+func looksLikeQueryPayload(raw string) bool {
+	trimmed := strings.TrimSpace(raw)
+	if trimmed == "" {
+		return false
+	}
+	if strings.HasPrefix(trimmed, "{") || strings.HasPrefix(trimmed, "[") {
+		return false
+	}
+	return strings.Contains(trimmed, "=")
+}
@@ -32,8 +32,8 @@ func apiKeyFromContext(ctx echo.Context) *mdb.ApiKey {
 // @Param        request body request.CreateTransactionRequest false "Transaction payload (JSON)"
 // @Param        order_id formData string false "Merchant order ID"
 // @Param        currency formData string false "Fiat currency (e.g. cny)"
-// @Param        token formData string false "Crypto token (e.g. usdt)"
-// @Param        network formData string false "Network (e.g. tron)"
+// @Param        token formData string false "Crypto token (e.g. TON, USDT)"
+// @Param        network formData string false "Network (e.g. ton, tron)"
 // @Param        amount formData number false "Amount"
 // @Param        notify_url formData string false "Callback URL"
 // @Param        signature formData string false "MD5 signature"
@@ -41,7 +41,7 @@ func apiKeyFromContext(ctx echo.Context) *mdb.ApiKey {
 // @Param        name formData string false "Order name"
 // @Param        payment_type formData string false "Payment type"
 // @Success      200 {object} response.ApiResponse{data=response.CreateTransactionResponse}
-// @Failure      400 {object} response.ApiResponse
+// @Failure      400 {object} response.ApiResponse "Stable errno in status_code: 10009 invalid params, 10041 invalid notify_url, 10004 invalid amount, 10014 chain disabled, 10016 unsupported asset, 10003 no wallet, 10005 no amount channel"
 // @Router       /payments/gmpay/v1/order/create-transaction [post]
 func (c *BaseCommController) CreateTransaction(ctx echo.Context) (err error) {
 	req := new(request.CreateTransactionRequest)
@@ -60,13 +60,15 @@ func (c *BaseCommController) CreateTransaction(ctx echo.Context) (err error) {

 // SwitchNetwork 切换支付网络，创建或返回子订单
 // @Summary      Switch payment network
-// @Description  Switch to a different payment network, creating or returning a sub-order
+// @Description  Switch to a different payment target, creating or returning a sub-order.
+// @Description  Normal values such as ton/tron/solana/ethereum create on-chain child orders.
+// @Description  The special value okpay creates or reuses an OkPay-hosted child order and returns its payment_url.
 // @Tags         Payment
 // @Accept       json
 // @Produce      json
 // @Param        request body request.SwitchNetworkRequest true "Switch network payload"
-// @Success      200 {object} response.ApiResponse
-// @Failure      400 {object} response.ApiResponse
+// @Success      200 {object} response.ApiResponse{data=response.CheckoutCounterResponse}
+// @Failure      400 {object} response.ApiResponse "Stable errno in status_code: 10008 order not found, 10012 cannot switch sub-order, 10013 not waiting payment, 10016 unsupported asset, 10017/10018/10019 provider errors, 10042 provider order creation failed"
 // @Router       /pay/switch-network [post]
 func (c *BaseCommController) SwitchNetwork(ctx echo.Context) (err error) {
 	req := new(request.SwitchNetworkRequest)
@@ -83,7 +85,7 @@ func (c *BaseCommController) SwitchNetwork(ctx echo.Context) (err error) {

 	jsonBytes, err := json.MarshalIndent(resp, "", "  ")
 	if err != nil {
-		return c.FailJson(ctx, err)
+		return c.FailJson(ctx, constant.SystemErr)
 	}

 	log.Sugar.Debugf("switch network response: \n%s", string(jsonBytes))
@@ -119,7 +121,7 @@ func (c *BaseCommController) SwitchNetwork(ctx echo.Context) (err error) {
 // @Param        sign formData string true "MD5 signature"
 // @Param        sign_type formData string false "Signature type (MD5)"
 // @Success      302 "Redirect to checkout counter"
-// @Failure      400 {object} response.ApiResponse
+// @Failure      400 {object} response.ApiResponse "Stable errno in status_code: 10009 invalid params, 10041 invalid notify_url, 10004 invalid amount, 10014 chain disabled, 10016 unsupported asset, 10003 no wallet, 10005 no amount channel"
 // @Router       /payments/epay/v1/order/create-transaction/submit.php [post]
 // @Router       /payments/epay/v1/order/create-transaction/submit.php [get]
 func (c *BaseCommController) CreateTransactionAndRedirect(ctx echo.Context) (err error) {
@@ -1,32 +1,29 @@
 package comm

 import (
-	"net/http"
+	"strings"

+	"github.com/GMWalletApp/epusdt/model/request"
 	"github.com/GMWalletApp/epusdt/model/response"
 	"github.com/GMWalletApp/epusdt/model/service"
+	"github.com/GMWalletApp/epusdt/util/constant"
 	"github.com/labstack/echo/v4"
 )

 // CheckoutCounter 收银台
 // @Summary      Checkout counter page
-// @Description  Render the payment checkout counter JSON response for a given trade
+// @Description  Return checkout initialization data when the order exists. This endpoint only confirms order existence and returns base order data; call /pay/check-status/{trade_id} for the current order status (1=waiting payment, 2=paid, 3=expired).
 // @Tags         Payment
 // @Produce      json
 // @Param        trade_id path string true "Trade ID"
-// @Success      200 {object} response.CheckoutCounterResponse
+// @Success      200 {object} response.ApiResponse{data=response.CheckoutCounterResponse}
+// @Failure      400 {object} response.ApiResponse "Order not found (status_code=10008) or other request error"
 // @Router       /pay/checkout-counter-resp/{trade_id} [get]
 func (c *BaseCommController) CheckoutCounter(ctx echo.Context) (err error) {
 	tradeId := ctx.Param("trade_id")
 	resp, err := service.GetCheckoutCounterByTradeId(tradeId)
 	if err != nil {
-		if err == service.ErrOrder {
-			// Unknown trade id: render the page with empty payload
-			// (client side shows a friendly "order not found" screen).
-			emptyResp := response.CheckoutCounterResponse{}
-			return c.SucJson(ctx, emptyResp)
-		}
-		return ctx.String(http.StatusInternalServerError, err.Error())
+		return c.FailJson(ctx, err)
 	}

 	return c.SucJson(ctx, resp)
@@ -34,12 +31,12 @@ func (c *BaseCommController) CheckoutCounter(ctx echo.Context) (err error) {

 // CheckStatus 支付状态检测
 // @Summary      Check payment status
-// @Description  Check the payment status of an order by trade ID
+// @Description  Return the current order status by trade ID. Status: 1=waiting payment, 2=paid, 3=expired.
 // @Tags         Payment
 // @Produce      json
 // @Param        trade_id path string true "Trade ID"
 // @Success      200 {object} response.ApiResponse{data=response.CheckStatusResponse}
-// @Failure      400 {object} response.ApiResponse
+// @Failure      400 {object} response.ApiResponse "Order not found (status_code=10008) or other request error"
 // @Router       /pay/check-status/{trade_id} [get]
 func (c *BaseCommController) CheckStatus(ctx echo.Context) (err error) {
 	tradeId := ctx.Param("trade_id")
@@ -53,3 +50,33 @@ func (c *BaseCommController) CheckStatus(ctx echo.Context) (err error) {
 	}
 	return c.SucJson(ctx, resp)
 }
+
+// SubmitTxHash 手动提交交易 hash 补单
+// @Summary      Submit transaction hash
+// @Description  Submit an on-chain transaction hash from the cashier. The hash is verified against the order and, when valid, the same manual payment processing path used by admin mark-paid is executed. OkPay/provider orders are not supported.
+// @Description  TON accepts canonical ton:<receive_raw>:<lt>:<hash>, lt:hash, or a unique recent hash-only reference for the order receive address.
+// @Tags         Payment
+// @Accept       json
+// @Produce      json
+// @Param        trade_id path string true "Trade ID"
+// @Param        request body request.ManualPaymentRequest true "Transaction hash payload"
+// @Success      200 {object} response.ApiResponse{data=response.ManualPaymentResponse}
+// @Failure      400 {object} response.ApiResponse "Stable errno in status_code: 10008 order not found, 10009 invalid params, 10013 not waiting payment, 10038 verification failed, 10039 unsupported provider, 10007 hash already processed"
+// @Router       /pay/submit-tx-hash/{trade_id} [post]
+func (c *BaseCommController) SubmitTxHash(ctx echo.Context) (err error) {
+	tradeId := ctx.Param("trade_id")
+	req := new(request.ManualPaymentRequest)
+	if err = ctx.Bind(req); err != nil {
+		return c.FailJson(ctx, constant.ParamsMarshalErr)
+	}
+	req.BlockTransactionId = strings.TrimSpace(req.BlockTransactionId)
+	if err = c.ValidateStruct(ctx, req); err != nil {
+		return c.FailJson(ctx, err)
+	}
+
+	resp, err := service.SubmitCashierManualPayment(tradeId, req.BlockTransactionId)
+	if err != nil {
+		return c.FailJson(ctx, err)
+	}
+	return c.SucJson(ctx, resp)
+}
@@ -5,38 +5,25 @@ import (
 	"strconv"
 	"strings"

+	"github.com/GMWalletApp/epusdt/config"
+	"github.com/GMWalletApp/epusdt/middleware"
 	"github.com/GMWalletApp/epusdt/model/data"
+	"github.com/GMWalletApp/epusdt/model/mdb"
 	"github.com/GMWalletApp/epusdt/model/response"
 	"github.com/GMWalletApp/epusdt/util/constant"
 	"github.com/labstack/echo/v4"
 )

-// GetSupportedAssets 对外公开可用链与 token 列表。数据源是管理后台
-// 的 chains + chain_tokens + wallet_address 三张表的实时查询，admin
-// 启用/禁用链或代币后，这个接口在下次调用时就会反映新状态（无缓存）。
-// 仅返回：链 enabled=true、代币 enabled=true、且该链上至少有一个可用
-// 钱包地址的组合。
-// @Summary      List supported (network, tokens) groupings
-// @Description  Public endpoint, Auth required in /admin/api/v1/supported-assets
-// @Tags         Supported Assets
-// @Produce      json
-// @Success      200 {object} response.ApiResponse{data=response.SupportedAssetsResponse}
-// @Failure      400 {object} response.ApiResponse
-// @Router       /payments/gmpay/v1/supported-assets [get]
-// @Router       /admin/api/v1/supported-assets [get]
-func (c *BaseCommController) GetSupportedAssets(ctx echo.Context) error {
+func buildSupportedAssets() ([]response.NetworkTokenSupport, error) {
 	chains, err := data.ListEnabledChains()
 	if err != nil {
-		return c.FailJson(ctx, err)
+		return nil, err
 	}
 	wallets, err := data.GetAvailableWalletAddress()
 	if err != nil {
-		return c.FailJson(ctx, err)
+		return nil, err
 	}

-	// A chain only qualifies if it has at least one wallet available —
-	// without a recipient address, payments on that chain can't be
-	// processed even if the chain + token config says "enabled".
 	networkHasWallet := make(map[string]struct{})
 	for _, w := range wallets {
 		networkHasWallet[strings.ToLower(w.Network)] = struct{}{}
@@ -50,7 +37,7 @@ func (c *BaseCommController) GetSupportedAssets(ctx echo.Context) error {
 		}
 		tokens, err := data.ListEnabledChainTokensByNetwork(network)
 		if err != nil {
-			return c.FailJson(ctx, err)
+			return nil, err
 		}
 		if len(tokens) == 0 {
 			continue
@@ -67,24 +54,72 @@ func (c *BaseCommController) GetSupportedAssets(ctx echo.Context) error {
 			continue
 		}
 		sort.Strings(symbols)
+		displayName := strings.TrimSpace(ch.DisplayName)
+		if displayName == "" {
+			displayName = network
+		}
 		supports = append(supports, response.NetworkTokenSupport{
-			Network: network,
-			Tokens:  symbols,
+			Network:     network,
+			DisplayName: displayName,
+			Tokens:      symbols,
 		})
 	}

-	return c.SucJson(ctx, response.SupportedAssetsResponse{Supports: supports})
+	return supports, nil
 }

-// ListSupportedAssetRecords 查询支持项明细（无需鉴权）。
-// @Summary      List supported asset records
-// @Description  Public endpoint. Returns enabled chain_tokens, optionally filtered by network.
-// @Tags         Supported Assets
+// GetPublicConfig returns payment/site config consumed by cashier/frontends.
+// The public route returns brand/site display config plus non-sensitive
+// epay/okpay knobs, while the authenticated admin route also includes OkPay
+// credentials and internal URLs.
+// @Summary      Get public payment config
+// @Description  Returns supported_assets plus site, epay and okpay config used by cashier/frontends.
+// @Description  The authenticated admin variant (/admin/api/v1/config) also includes OkPay shop credentials and internal callback settings.
+// @Tags         Payment Config
 // @Produce      json
-// @Param        network query string false "Network filter (e.g. tron, ethereum)"
-// @Success      200 {object} response.ApiResponse{data=[]mdb.ChainToken}
+// @Success      200 {object} response.ApiResponse{data=response.PublicConfigResponse}
 // @Failure      400 {object} response.ApiResponse
-// @Router       /payments/gmpay/v1/supported-assets/records [get]
+// @Router       /payments/gmpay/v1/config [get]
+// @Router       /admin/api/v1/config [get]
+func (c *BaseCommController) GetPublicConfig(ctx echo.Context) error {
+	supports, err := buildSupportedAssets()
+	if err != nil {
+		return c.FailJson(ctx, err)
+	}
+	okpay := response.OkPayPublicConfig{
+		Enabled:     data.GetOkPayEnabled(),
+		AllowTokens: data.GetOkPayAllowTokens(),
+	}
+	if ctx.Get(middleware.AdminUserIDKey) != nil {
+		okpay.ShopID = data.GetOkPayShopID()
+		okpay.ShopToken = data.GetOkPayShopToken()
+		okpay.APIURL = data.GetOkPayAPIURL()
+		okpay.CallbackURL = data.GetOkPayCallbackURL()
+		okpay.ReturnURL = data.GetOkPayReturnURL()
+		okpay.TimeoutSeconds = data.GetOkPayTimeoutSeconds()
+	}
+	return c.SucJson(ctx, response.PublicConfigResponse{
+		SupportedAssets: supports,
+		Site: response.SitePublicConfig{
+			CashierName:        data.GetBrandCashierName(),
+			LogoURL:            data.GetBrandLogoURL(),
+			WebsiteTitle:       data.GetBrandWebsiteTitle(),
+			SupportLink:        data.GetBrandSupportURL(),
+			BackgroundColor:    data.GetBrandBackgroundColor(),
+			BackgroundImageURL: data.GetBrandBackgroundImageURL(),
+		},
+		Epay: response.EpayPublicConfig{
+			DefaultToken:    data.GetSettingString(mdb.SettingKeyEpayDefaultToken, "usdt"),
+			DefaultCurrency: data.GetSettingString(mdb.SettingKeyEpayDefaultCurrency, "cny"),
+			DefaultNetwork:  data.GetSettingString(mdb.SettingKeyEpayDefaultNetwork, "tron"),
+		},
+		OkPay:   okpay,
+		Version: config.GetAppVersion(),
+	})
+}
+
+// ListSupportedAssetRecords is currently not wired to a public route.
+// Kept as an internal helper candidate for future admin/debug use.
 func (c *BaseCommController) ListSupportedAssetRecords(ctx echo.Context) error {
 	network := ctx.QueryParam("network")
 	list, err := data.ListEnabledChainTokens(network)
@@ -94,15 +129,8 @@ func (c *BaseCommController) ListSupportedAssetRecords(ctx echo.Context) error {
 	return c.SucJson(ctx, list)
 }

-// GetSupportedAsset 查询单条支持项（无需鉴权）。
-// @Summary      Get a supported asset
-// @Description  Public endpoint. Returns one chain_token row by ID. Returns 404 if the token is disabled.
-// @Tags         Supported Assets
-// @Produce      json
-// @Param        id path int true "ChainToken ID"
-// @Success      200 {object} response.ApiResponse{data=mdb.ChainToken}
-// @Failure      400 {object} response.ApiResponse
-// @Router       /payments/gmpay/v1/supported-assets/{id} [get]
+// GetSupportedAsset is currently not wired to a public route.
+// Kept as an internal helper candidate for future admin/debug use.
 func (c *BaseCommController) GetSupportedAsset(ctx echo.Context) error {
 	id, err := strconv.ParseUint(ctx.Param("id"), 10, 64)
 	if err != nil {
@@ -1,7 +1,9 @@
 package crypto

 import (
+	"bytes"
 	"crypto/sha256"
+	"fmt"

 	"github.com/shengdoushi/base58"
 )
@@ -28,3 +30,24 @@ func EncodeCheck(input []byte) string {

 	return Encode(inputCheck)
 }
+
+// DecodeCheck decodes a Base58Check string and validates its 4-byte checksum.
+func DecodeCheck(input string) ([]byte, error) {
+	raw, err := base58.Decode(input, base58.BitcoinAlphabet)
+	if err != nil {
+		return nil, err
+	}
+	if len(raw) < 4 {
+		return nil, fmt.Errorf("base58check payload too short")
+	}
+
+	payload := raw[:len(raw)-4]
+	checksum := raw[len(raw)-4:]
+
+	h0 := sha256.Sum256(payload)
+	h1 := sha256.Sum256(h0[:])
+	if !bytes.Equal(checksum, h1[:4]) {
+		return nil, fmt.Errorf("base58check checksum mismatch")
+	}
+	return payload, nil
+}
@@ -23,6 +23,7 @@ require (
 	github.com/spf13/cobra v1.9.1
 	github.com/spf13/viper v1.20.1
 	github.com/tidwall/gjson v1.18.0
+	github.com/xssnick/tonutils-go v1.16.0
 	go.uber.org/zap v1.27.0
 	golang.org/x/crypto v0.48.0
 	gopkg.in/telebot.v3 v3.0.0
@@ -348,6 +348,8 @@ github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778 h1:QldyIu/L63oPpyvQmHg
 github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778/go.mod h1:2MuV+tbUrU1zIOPMxZ5EncGwgmMJsa+9ucAQZXxsObs=
 github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 h1:gEOO8jv9F4OT7lGCjxCBTO/36wtF6j2nSip77qHd4x4=
 github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1/go.mod h1:Ohn+xnUBiLI6FVj/9LpzZWtj1/D6lUovWYBkxHVV3aM=
+github.com/xssnick/tonutils-go v1.16.0 h1:MLYVZiiMB0Q+XudLo7WyjOli4gMuenNmJpBqETqa5DE=
+github.com/xssnick/tonutils-go v1.16.0/go.mod h1:CNSM+L0FYufOFhprg8otc9Y/ecFfLrWqFMq00Gh9yk4=
 github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
 go.mongodb.org/mongo-driver v1.17.3 h1:TQyXhnsWfWtgAhMtOgtYHMTkZIfBTpMTsMnd9ZBeHxQ=
@@ -12,6 +12,7 @@ import (
 	"github.com/spf13/viper"
 	"go.uber.org/zap"
 	"gorm.io/gorm"
+	"gorm.io/gorm/clause"
 	"gorm.io/gorm/logger"
 	"gorm.io/gorm/schema"
 )
@@ -37,6 +38,7 @@ func SetupTestDatabases(t testing.TB) func() {

 	mustMigrate(t, mainDB,
 		&mdb.Orders{},
+		&mdb.ProviderOrder{},
 		&mdb.WalletAddress{},
 		&mdb.ApiKey{},
 		&mdb.Setting{},
@@ -64,11 +66,19 @@ func SetupTestDatabases(t testing.TB) func() {
 	// Seed all standard chains as enabled so IsChainEnabled checks pass.
 	for _, network := range []string{
 		mdb.NetworkTron, mdb.NetworkSolana, mdb.NetworkEthereum,
-		mdb.NetworkBsc, mdb.NetworkPolygon, mdb.NetworkPlasma,
+		mdb.NetworkBsc, mdb.NetworkPolygon, mdb.NetworkPlasma, mdb.NetworkTon,
 	} {
 		mainDB.Create(&mdb.Chain{Network: network, Enabled: true})
 	}

+	mainDB.Clauses(clause.OnConflict{DoNothing: true}).Create(&[]mdb.ChainToken{
+		{Network: mdb.NetworkTron, Symbol: "USDT", ContractAddress: "TR7NHqjeKQxGTCi8q8ZY4pL8otSzgjLj6t", Decimals: 6, Enabled: true},
+		{Network: mdb.NetworkEthereum, Symbol: "USDT", ContractAddress: "0xdAC17F958D2ee523a2206206994597C13D831ec7", Decimals: 6, Enabled: true},
+		{Network: mdb.NetworkBsc, Symbol: "USDT", ContractAddress: "0x55d398326f99059fF775485246999027B3197955", Decimals: 18, Enabled: true},
+		{Network: mdb.NetworkTon, Symbol: "TON", ContractAddress: "", Decimals: 9, Enabled: true},
+		{Network: mdb.NetworkTon, Symbol: "USDT", ContractAddress: "0:b113a994b5024a16719f69139328eb759596c38a25f59028b146fecdc3621dfe", Decimals: 6, Enabled: true},
+	})
+
 	// Seed two universal api_keys rows. Both usable for EPAY/GMPAY
 	// flows; the numeric PID 1001 row lets legacy tests that submit
 	// `pid=1001` still match.
@@ -84,11 +94,11 @@ func SetupTestDatabases(t testing.TB) func() {
 	})
 	if err := dao.Mdb.Create(&mdb.Setting{
 		Group: "rate",
-		Key:   "rate.forced_usdt_rate",
-		Value: "1.0",
-		Type:  "string",
+		Key:   "rate.forced_rate_list",
+		Value: `{"cny":{"usdt":1}}`,
+		Type:  "json",
 	}).Error; err != nil {
-		t.Fatalf("seed rate.forced_usdt_rate: %v", err)
+		t.Fatalf("seed rate.forced_rate_list: %v", err)
 	}

 	return func() {
@@ -27,16 +27,9 @@ const (
 func CheckAdminJWT() echo.MiddlewareFunc {
 	return func(next echo.HandlerFunc) echo.HandlerFunc {
 		return func(ctx echo.Context) error {
-			raw := strings.TrimSpace(ctx.Request().Header.Get("Authorization"))
-			if raw == "" {
-				return echo.NewHTTPError(http.StatusUnauthorized, "missing authorization header")
-			}
-			if !strings.HasPrefix(raw, "Bearer ") {
-				return echo.NewHTTPError(http.StatusUnauthorized, "authorization header must use Bearer scheme")
-			}
-			token := strings.TrimSpace(raw[len("Bearer "):])
-			if token == "" {
-				return echo.NewHTTPError(http.StatusUnauthorized, "empty token")
+			token, err := adminTokenFromAuthorization(ctx.Request().Header.Get("Authorization"))
+			if err != nil {
+				return err
 			}
 			claims, err := appjwt.Parse(token)
 			if err != nil {
@@ -48,3 +41,23 @@ func CheckAdminJWT() echo.MiddlewareFunc {
 		}
 	}
 }
+
+func adminTokenFromAuthorization(header string) (string, error) {
+	raw := strings.TrimSpace(header)
+	if raw == "" {
+		return "", echo.NewHTTPError(http.StatusUnauthorized, "missing authorization header")
+	}
+
+	const bearerPrefix = "Bearer "
+	token := raw
+	if strings.HasPrefix(raw, bearerPrefix) {
+		token = strings.TrimSpace(raw[len(bearerPrefix):])
+	} else if raw == strings.TrimSpace(bearerPrefix) {
+		token = ""
+	}
+
+	if token == "" {
+		return "", echo.NewHTTPError(http.StatusUnauthorized, "empty token")
+	}
+	return token, nil
+}
@@ -0,0 +1,118 @@
+package middleware
+
+import (
+	"net/http"
+	"net/http/httptest"
+	"testing"
+
+	"github.com/GMWalletApp/epusdt/internal/testutil"
+	"github.com/GMWalletApp/epusdt/model/data"
+	"github.com/GMWalletApp/epusdt/model/mdb"
+	appjwt "github.com/GMWalletApp/epusdt/util/jwt"
+	"github.com/labstack/echo/v4"
+)
+
+func TestAdminTokenFromAuthorization(t *testing.T) {
+	tests := []struct {
+		name    string
+		header  string
+		want    string
+		wantErr bool
+	}{
+		{
+			name:   "bearer token",
+			header: "Bearer jwt-token",
+			want:   "jwt-token",
+		},
+		{
+			name:   "bare token",
+			header: "jwt-token",
+			want:   "jwt-token",
+		},
+		{
+			name:   "trimmed bare token",
+			header: "  jwt-token  ",
+			want:   "jwt-token",
+		},
+		{
+			name:    "missing header",
+			header:  "",
+			wantErr: true,
+		},
+		{
+			name:    "empty bearer token",
+			header:  "Bearer ",
+			wantErr: true,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			got, err := adminTokenFromAuthorization(tt.header)
+			if tt.wantErr {
+				if err == nil {
+					t.Fatal("expected error")
+				}
+				return
+			}
+			if err != nil {
+				t.Fatalf("unexpected error: %v", err)
+			}
+			if got != tt.want {
+				t.Fatalf("token = %q, want %q", got, tt.want)
+			}
+		})
+	}
+}
+
+func TestCheckAdminJWTAcceptsBearerAndBareTokens(t *testing.T) {
+	cleanup := testutil.SetupTestDatabases(t)
+	defer cleanup()
+
+	if err := data.SetSetting(mdb.SettingGroupSystem, mdb.SettingKeyJwtSecret, "test-jwt-secret", mdb.SettingTypeString); err != nil {
+		t.Fatalf("seed jwt secret: %v", err)
+	}
+	token, err := appjwt.Sign(42, "admin")
+	if err != nil {
+		t.Fatalf("sign jwt: %v", err)
+	}
+
+	tests := []struct {
+		name   string
+		header string
+	}{
+		{
+			name:   "bearer token",
+			header: "Bearer " + token,
+		},
+		{
+			name:   "bare token",
+			header: token,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			e := echo.New()
+			e.Use(CheckAdminJWT())
+			e.GET("/", func(ctx echo.Context) error {
+				if got := ctx.Get(AdminUserIDKey); got != uint64(42) {
+					t.Fatalf("%s = %v, want 42", AdminUserIDKey, got)
+				}
+				if got := ctx.Get(AdminUsernameKey); got != "admin" {
+					t.Fatalf("%s = %v, want admin", AdminUsernameKey, got)
+				}
+				return ctx.NoContent(http.StatusNoContent)
+			})
+
+			req := httptest.NewRequest(http.MethodGet, "/", nil)
+			req.Header.Set(echo.HeaderAuthorization, tt.header)
+			rec := httptest.NewRecorder()
+			e.ServeHTTP(rec, req)
+
+			if rec.Code != http.StatusNoContent {
+				t.Fatalf("status = %d, want %d; body=%s", rec.Code, http.StatusNoContent, rec.Body.String())
+			}
+		})
+	}
+}
@@ -6,6 +6,7 @@ import (
 	"strings"
 	"sync"

+	"github.com/GMWalletApp/epusdt/config"
 	"github.com/GMWalletApp/epusdt/model/mdb"
 	"github.com/gookit/color"
 	"gorm.io/gorm/clause"
@@ -35,6 +36,7 @@ func MdbTableInit() {
 			{"Chain", &mdb.Chain{}},
 			{"ChainToken", &mdb.ChainToken{}},
 			{"RpcNode", &mdb.RpcNode{}},
+			{"ProviderOrder", &mdb.ProviderOrder{}},
 		}
 		for _, m := range migrations {
 			if err := Mdb.AutoMigrate(m.model); err != nil {
@@ -44,6 +46,7 @@ func MdbTableInit() {
 		}

 		seedChains()
+		backfillRpcNodePurpose()
 		seedRpcNodes()
 		seedChainTokens()
 		seedDefaultSettings()
@@ -61,6 +64,7 @@ func seedChains() {
 		{Network: mdb.NetworkBsc, DisplayName: "BSC", Enabled: true, MinConfirmations: 3, ScanIntervalSec: 5},
 		{Network: mdb.NetworkPolygon, DisplayName: "Polygon", Enabled: true, MinConfirmations: 3, ScanIntervalSec: 5},
 		{Network: mdb.NetworkPlasma, DisplayName: "Plasma", Enabled: true, MinConfirmations: 1, ScanIntervalSec: 5},
+		{Network: mdb.NetworkTon, DisplayName: "TON", Enabled: true, MinConfirmations: 1, ScanIntervalSec: 5},
 	}
 	if err := Mdb.Clauses(clause.OnConflict{DoNothing: true}).Create(&defaults).Error; err != nil {
 		color.Red.Printf("[store_db] seed chains err=%s\n", err)
@@ -95,6 +99,9 @@ func seedChainTokens() {
 		{Network: mdb.NetworkPolygon, Symbol: "USDC.e", ContractAddress: "0x2791Bca1f2de4661ED88A30C99A7a9449Aa84174", Decimals: 6, Enabled: true},
 		// Plasma
 		{Network: mdb.NetworkPlasma, Symbol: "USDT", ContractAddress: "0xB8CE59FC3717ada4C02eaDF9682A9e934F625ebb", Decimals: 6, Enabled: true},
+		// TON
+		{Network: mdb.NetworkTon, Symbol: "TON", ContractAddress: "", Decimals: 9, Enabled: true},
+		{Network: mdb.NetworkTon, Symbol: "USDT", ContractAddress: "0:b113a994b5024a16719f69139328eb759596c38a25f59028b146fecdc3621dfe", Decimals: 6, Enabled: true},
 	}
 	if err := Mdb.Clauses(clause.OnConflict{DoNothing: true}).Create(&defaults).Error; err != nil {
 		color.Red.Printf("[store_db] seed chain_tokens err=%s\n", err)
@@ -104,14 +111,7 @@ func seedChainTokens() {
 // seedRpcNodes inserts default RPC endpoints for each chain. Checks per
 // (network, url) so re-runs are idempotent and admin edits persist.
 func seedRpcNodes() {
-	defaults := []mdb.RpcNode{
-		{Network: mdb.NetworkTron, Url: "https://api.trongrid.io", Type: mdb.RpcNodeTypeHttp, Weight: 1, Enabled: true, Status: mdb.RpcNodeStatusUnknown},
-		{Network: mdb.NetworkEthereum, Url: "wss://ethereum.publicnode.com", Type: mdb.RpcNodeTypeWs, Weight: 1, Enabled: true, Status: mdb.RpcNodeStatusUnknown},
-		{Network: mdb.NetworkSolana, Url: "https://api.mainnet-beta.solana.com", Type: mdb.RpcNodeTypeHttp, Weight: 1, Enabled: true, Status: mdb.RpcNodeStatusUnknown},
-		{Network: mdb.NetworkBsc, Url: "wss://bsc.drpc.org", Type: mdb.RpcNodeTypeWs, Weight: 1, Enabled: true, Status: mdb.RpcNodeStatusUnknown},
-		{Network: mdb.NetworkPolygon, Url: "wss://polygon-bor-rpc.publicnode.com", Type: mdb.RpcNodeTypeWs, Weight: 1, Enabled: true, Status: mdb.RpcNodeStatusUnknown},
-		{Network: mdb.NetworkPlasma, Url: "wss://rpc.plasma.to", Type: mdb.RpcNodeTypeWs, Weight: 1, Enabled: true, Status: mdb.RpcNodeStatusUnknown},
-	}
+	defaults := defaultRpcNodes()
 	for _, d := range defaults {
 		var count int64
 		if err := Mdb.Model(&mdb.RpcNode{}).
@@ -129,13 +129,48 @@ func seedRpcNodes() {
 	}
 }

+func defaultRpcNodes() []mdb.RpcNode {
+	defaults := []mdb.RpcNode{
+		{Network: mdb.NetworkTron, Url: "https://api.trongrid.io", Type: mdb.RpcNodeTypeHttp, Weight: 1, Enabled: true, Purpose: mdb.RpcNodePurposeGeneral, Status: mdb.RpcNodeStatusUnknown},
+		{Network: mdb.NetworkEthereum, Url: "wss://ethereum.publicnode.com", Type: mdb.RpcNodeTypeWs, Weight: 1, Enabled: true, Purpose: mdb.RpcNodePurposeGeneral, Status: mdb.RpcNodeStatusUnknown},
+		{Network: mdb.NetworkSolana, Url: "https://api.mainnet-beta.solana.com", Type: mdb.RpcNodeTypeHttp, Weight: 1, Enabled: true, Purpose: mdb.RpcNodePurposeGeneral, Status: mdb.RpcNodeStatusUnknown},
+		{Network: mdb.NetworkBsc, Url: "wss://bsc.drpc.org", Type: mdb.RpcNodeTypeWs, Weight: 1, Enabled: true, Purpose: mdb.RpcNodePurposeGeneral, Status: mdb.RpcNodeStatusUnknown},
+		{Network: mdb.NetworkPolygon, Url: "wss://polygon-bor-rpc.publicnode.com", Type: mdb.RpcNodeTypeWs, Weight: 1, Enabled: true, Purpose: mdb.RpcNodePurposeGeneral, Status: mdb.RpcNodeStatusUnknown},
+		{Network: mdb.NetworkPlasma, Url: "wss://rpc.plasma.to", Type: mdb.RpcNodeTypeWs, Weight: 1, Enabled: true, Purpose: mdb.RpcNodePurposeGeneral, Status: mdb.RpcNodeStatusUnknown},
+		{Network: mdb.NetworkTon, Url: "https://ton-blockchain.github.io/global.config.json", Type: mdb.RpcNodeTypeLite, Weight: 1, Enabled: true, Purpose: mdb.RpcNodePurposeGeneral, Status: mdb.RpcNodeStatusUnknown},
+		{Network: mdb.NetworkEthereum, Url: "https://rpc.epusdt.com/ethereum", Type: mdb.RpcNodeTypeHttp, Weight: 1, Enabled: true, Purpose: mdb.RpcNodePurposeManualVerify, Status: mdb.RpcNodeStatusUnknown},
+		{Network: mdb.NetworkBsc, Url: "https://rpc.epusdt.com/binance", Type: mdb.RpcNodeTypeHttp, Weight: 1, Enabled: true, Purpose: mdb.RpcNodePurposeManualVerify, Status: mdb.RpcNodeStatusUnknown},
+		{Network: mdb.NetworkPolygon, Url: "https://rpc.epusdt.com/polygon", Type: mdb.RpcNodeTypeHttp, Weight: 1, Enabled: true, Purpose: mdb.RpcNodePurposeManualVerify, Status: mdb.RpcNodeStatusUnknown},
+	}
+	return defaults
+}
+
+func backfillRpcNodePurpose() {
+	if err := Mdb.Model(&mdb.RpcNode{}).
+		Where("purpose = '' OR purpose IS NULL").
+		Update("purpose", mdb.RpcNodePurposeGeneral).Error; err != nil {
+		color.Red.Printf("[store_db] backfill rpc_nodes purpose err=%s\n", err)
+	}
+}
+
 // seedDefaultSettings inserts built-in default settings.
 // Uses ON CONFLICT DO NOTHING so admin edits persist across restarts.
 func seedDefaultSettings() {
+	okPayCallbackURL := strings.TrimRight(strings.TrimSpace(config.GetAppUri()), "/")
+	if okPayCallbackURL != "" {
+		okPayCallbackURL += "/payments/okpay/v1/notify"
+	}
 	defaults := []mdb.Setting{
+		{Group: mdb.SettingGroupSystem, Key: mdb.SettingKeyAmountPrecision, Value: "2", Type: mdb.SettingTypeInt},
+		{Group: mdb.SettingGroupSystem, Key: mdb.SettingKeySystemLogLevel, Value: mdb.SettingDefaultSystemLogLevel, Type: mdb.SettingTypeString},
 		{Group: mdb.SettingGroupEpay, Key: mdb.SettingKeyEpayDefaultToken, Value: "usdt", Type: mdb.SettingTypeString},
 		{Group: mdb.SettingGroupEpay, Key: mdb.SettingKeyEpayDefaultCurrency, Value: "cny", Type: mdb.SettingTypeString},
 		{Group: mdb.SettingGroupEpay, Key: mdb.SettingKeyEpayDefaultNetwork, Value: "tron", Type: mdb.SettingTypeString},
+		{Group: mdb.SettingGroupOkPay, Key: mdb.SettingKeyOkPayEnabled, Value: "false", Type: mdb.SettingTypeBool},
+		{Group: mdb.SettingGroupOkPay, Key: mdb.SettingKeyOkPayAPIURL, Value: "https://api.okaypay.me/shop/", Type: mdb.SettingTypeString},
+		{Group: mdb.SettingGroupOkPay, Key: mdb.SettingKeyOkPayCallbackURL, Value: okPayCallbackURL, Type: mdb.SettingTypeString},
+		{Group: mdb.SettingGroupOkPay, Key: mdb.SettingKeyOkPayTimeoutSeconds, Value: "10", Type: mdb.SettingTypeInt},
+		{Group: mdb.SettingGroupOkPay, Key: mdb.SettingKeyOkPayAllowTokens, Value: "USDT,TRX", Type: mdb.SettingTypeString},
 	}
 	if err := Mdb.Clauses(clause.OnConflict{DoNothing: true}).Create(&defaults).Error; err != nil {
 		color.Red.Printf("[store_db] seed default settings err=%s\n", err)
@@ -0,0 +1,139 @@
+package dao
+
+import (
+	"path/filepath"
+	"testing"
+
+	"github.com/GMWalletApp/epusdt/model/mdb"
+	"github.com/libtnb/sqlite"
+	"github.com/spf13/viper"
+	"gorm.io/gorm"
+)
+
+func TestDefaultRpcNodesIncludesManualVerifyEpusdtEvmNodes(t *testing.T) {
+	want := map[string]string{
+		mdb.NetworkEthereum: "https://rpc.epusdt.com/ethereum",
+		mdb.NetworkBsc:      "https://rpc.epusdt.com/binance",
+		mdb.NetworkPolygon:  "https://rpc.epusdt.com/polygon",
+	}
+	got := make(map[string]mdb.RpcNode)
+	for _, node := range defaultRpcNodes() {
+		if node.Purpose != mdb.RpcNodePurposeManualVerify {
+			continue
+		}
+		if _, ok := want[node.Network]; ok {
+			got[node.Network] = node
+		}
+	}
+
+	for network, url := range want {
+		node, ok := got[network]
+		if !ok {
+			t.Fatalf("missing manual_verify seed rpc node for %s", network)
+		}
+		if node.Url != url {
+			t.Fatalf("%s manual_verify seed url = %q, want %q", network, node.Url, url)
+		}
+		if node.Type != mdb.RpcNodeTypeHttp {
+			t.Fatalf("%s manual_verify seed type = %q, want %q", network, node.Type, mdb.RpcNodeTypeHttp)
+		}
+		if !node.Enabled {
+			t.Fatalf("%s manual_verify seed enabled = false, want true", network)
+		}
+		if node.Status != mdb.RpcNodeStatusUnknown {
+			t.Fatalf("%s manual_verify seed status = %q, want %q", network, node.Status, mdb.RpcNodeStatusUnknown)
+		}
+	}
+}
+
+func TestDefaultRpcNodesIncludesTonLiteGeneralNode(t *testing.T) {
+	var got *mdb.RpcNode
+	nodes := defaultRpcNodes()
+	for i := range nodes {
+		node := nodes[i]
+		if node.Network == mdb.NetworkTon && node.Type == mdb.RpcNodeTypeLite {
+			got = &node
+			break
+		}
+	}
+
+	if got == nil {
+		t.Fatal("missing TON lite seed rpc node")
+	}
+	if got.Url != "https://ton-blockchain.github.io/global.config.json" {
+		t.Fatalf("TON lite seed url = %q", got.Url)
+	}
+	if got.Purpose != mdb.RpcNodePurposeGeneral {
+		t.Fatalf("TON lite seed purpose = %q, want %q", got.Purpose, mdb.RpcNodePurposeGeneral)
+	}
+	if !got.Enabled {
+		t.Fatal("TON lite seed enabled = false, want true")
+	}
+	if got.Status != mdb.RpcNodeStatusUnknown {
+		t.Fatalf("TON lite seed status = %q, want %q", got.Status, mdb.RpcNodeStatusUnknown)
+	}
+}
+
+func TestSeedDefaultSettingsIncludesSystemLogLevel(t *testing.T) {
+	db := setupSeedSettingsTestDB(t)
+	Mdb = db
+
+	seedDefaultSettings()
+
+	var row mdb.Setting
+	if err := Mdb.Where("`key` = ?", mdb.SettingKeySystemLogLevel).Take(&row).Error; err != nil {
+		t.Fatalf("load system.log_level seed: %v", err)
+	}
+	if row.Group != mdb.SettingGroupSystem {
+		t.Fatalf("system.log_level group = %q, want %q", row.Group, mdb.SettingGroupSystem)
+	}
+	if row.Value != mdb.SettingDefaultSystemLogLevel {
+		t.Fatalf("system.log_level value = %q, want %q", row.Value, mdb.SettingDefaultSystemLogLevel)
+	}
+	if row.Type != mdb.SettingTypeString {
+		t.Fatalf("system.log_level type = %q, want %q", row.Type, mdb.SettingTypeString)
+	}
+}
+
+func TestSeedDefaultSettingsDoesNotOverwriteSystemLogLevel(t *testing.T) {
+	db := setupSeedSettingsTestDB(t)
+	Mdb = db
+	if err := Mdb.Create(&mdb.Setting{
+		Group: mdb.SettingGroupSystem,
+		Key:   mdb.SettingKeySystemLogLevel,
+		Value: "debug",
+		Type:  mdb.SettingTypeString,
+	}).Error; err != nil {
+		t.Fatalf("precreate system.log_level: %v", err)
+	}
+
+	seedDefaultSettings()
+
+	var row mdb.Setting
+	if err := Mdb.Where("`key` = ?", mdb.SettingKeySystemLogLevel).Take(&row).Error; err != nil {
+		t.Fatalf("load system.log_level seed: %v", err)
+	}
+	if row.Value != "debug" {
+		t.Fatalf("system.log_level value = %q, want existing debug", row.Value)
+	}
+}
+
+func setupSeedSettingsTestDB(t *testing.T) *gorm.DB {
+	t.Helper()
+	oldDB := Mdb
+	viper.Reset()
+	viper.Set("app_uri", "https://example.com")
+	t.Cleanup(func() {
+		Mdb = oldDB
+		viper.Reset()
+	})
+
+	db, err := gorm.Open(sqlite.Open(filepath.Join(t.TempDir(), "seed-settings.db")), &gorm.Config{})
+	if err != nil {
+		t.Fatalf("open sqlite: %v", err)
+	}
+	if err := db.AutoMigrate(&mdb.Setting{}); err != nil {
+		t.Fatalf("migrate settings: %v", err)
+	}
+	return db
+}
@@ -44,6 +44,9 @@ func RuntimeInit() error {
 	if err = RuntimeDB.Exec("DROP INDEX IF EXISTS transaction_lock_address_token_amount_uindex").Error; err != nil {
 		return err
 	}
+	if err = RuntimeDB.Exec("DROP INDEX IF EXISTS transaction_lock_network_address_token_amount_uindex").Error; err != nil {
+		return err
+	}
 	if err = RuntimeDB.AutoMigrate(&mdb.TransactionLock{}); err != nil {
 		color.Red.Printf("[runtime_db] sqlite migrate DB(TransactionLock),err=%s\n", err)
 		return err
@@ -40,6 +40,9 @@ type InitialAdminPasswordHashInfo struct {
 // can print it to the console. Idempotent — subsequent calls return
 // ("", false, nil).
 func EnsureDefaultAdmin() (password string, created bool, err error) {
+	if err := purgeDeletedInitialAdminPasswordPlain(); err != nil {
+		return "", false, err
+	}
 	var count int64
 	if err := dao.Mdb.Model(&mdb.AdminUser{}).Count(&count).Error; err != nil {
 		return "", false, err
@@ -68,6 +71,12 @@ func EnsureDefaultAdmin() (password string, created bool, err error) {
 	return password, true, nil
 }

+func purgeDeletedInitialAdminPasswordPlain() error {
+	return dao.Mdb.Unscoped().
+		Where("`key` = ? AND deleted_at IS NOT NULL", mdb.SettingKeyInitAdminPasswordPlain).
+		Delete(&mdb.Setting{}).Error
+}
+
 func randomAdminPassword() string {
 	b := make([]byte, 16)
 	_, _ = rand.Read(b)
@@ -121,9 +130,11 @@ func initAdminPasswordState(plain string) error {
 }

 func upsertSettingRow(tx *gorm.DB, row mdb.Setting) error {
+	updates := clause.AssignmentColumns([]string{"group", "value", "type", "description", "updated_at"})
+	updates = append(updates, clause.Assignment{Column: clause.Column{Name: "deleted_at"}, Value: nil})
 	return tx.Clauses(clause.OnConflict{
 		Columns:   []clause.Column{{Name: "key"}},
-		DoUpdates: clause.AssignmentColumns([]string{"group", "value", "type", "description", "updated_at"}),
+		DoUpdates: updates,
 	}).Create(&row).Error
 }

@@ -154,7 +165,7 @@ func ConsumeInitialAdminPassword() (string, error) {
 			return ErrInitAdminPasswordUnavailable
 		}
 		password = row.Value
-		res := tx.Where("`key` = ?", mdb.SettingKeyInitAdminPasswordPlain).Delete(&mdb.Setting{})
+		res := tx.Unscoped().Where("`key` = ?", mdb.SettingKeyInitAdminPasswordPlain).Delete(&mdb.Setting{})
 		if res.Error != nil {
 			return res.Error
 		}
@@ -0,0 +1,122 @@
+package data
+
+import (
+	"testing"
+
+	"github.com/GMWalletApp/epusdt/internal/testutil"
+	"github.com/GMWalletApp/epusdt/model/dao"
+	"github.com/GMWalletApp/epusdt/model/mdb"
+)
+
+func TestUpsertSettingRowRestoresSoftDeletedSetting(t *testing.T) {
+	cleanup := testutil.SetupTestDatabases(t)
+	defer cleanup()
+
+	row := mdb.Setting{
+		Group: mdb.SettingGroupSystem,
+		Key:   mdb.SettingKeyInitAdminPasswordChanged,
+		Value: "false",
+		Type:  mdb.SettingTypeBool,
+	}
+	if err := upsertSettingRow(dao.Mdb, row); err != nil {
+		t.Fatalf("seed setting: %v", err)
+	}
+	if err := dao.Mdb.Where("`key` = ?", row.Key).Delete(&mdb.Setting{}).Error; err != nil {
+		t.Fatalf("delete setting: %v", err)
+	}
+
+	row.Value = "true"
+	if err := upsertSettingRow(dao.Mdb, row); err != nil {
+		t.Fatalf("restore setting: %v", err)
+	}
+
+	var restored mdb.Setting
+	if err := dao.Mdb.Where("`key` = ?", row.Key).Take(&restored).Error; err != nil {
+		t.Fatalf("load restored setting: %v", err)
+	}
+	if restored.Value != "true" {
+		t.Fatalf("restored value = %q, want true", restored.Value)
+	}
+	if restored.DeletedAt.Valid {
+		t.Fatalf("restored setting still has deleted_at=%v", restored.DeletedAt)
+	}
+}
+
+func TestConsumeInitialAdminPasswordHardDeletesPlaintext(t *testing.T) {
+	cleanup := testutil.SetupTestDatabases(t)
+	defer cleanup()
+
+	const password = "init-pass-plain"
+	if err := initAdminPasswordState(password); err != nil {
+		t.Fatalf("seed initial password state: %v", err)
+	}
+
+	got, err := ConsumeInitialAdminPassword()
+	if err != nil {
+		t.Fatalf("consume initial password: %v", err)
+	}
+	if got != password {
+		t.Fatalf("password = %q, want %q", got, password)
+	}
+
+	var count int64
+	if err := dao.Mdb.Unscoped().
+		Model(&mdb.Setting{}).
+		Where("`key` = ?", mdb.SettingKeyInitAdminPasswordPlain).
+		Count(&count).Error; err != nil {
+		t.Fatalf("count plaintext setting: %v", err)
+	}
+	if count != 0 {
+		t.Fatalf("plaintext setting rows after consume = %d, want 0", count)
+	}
+	if !GetSettingBool(mdb.SettingKeyInitAdminPasswordFetched, false) {
+		t.Fatal("expected fetched flag to be true")
+	}
+}
+
+func TestEnsureDefaultAdminPurgesLegacySoftDeletedPlaintext(t *testing.T) {
+	cleanup := testutil.SetupTestDatabases(t)
+	defer cleanup()
+
+	hash, err := HashPassword("existing-password")
+	if err != nil {
+		t.Fatalf("hash password: %v", err)
+	}
+	if err := dao.Mdb.Create(&mdb.AdminUser{
+		Username:     defaultAdminUsername,
+		PasswordHash: hash,
+		Status:       mdb.AdminUserStatusEnable,
+	}).Error; err != nil {
+		t.Fatalf("seed admin: %v", err)
+	}
+	if err := dao.Mdb.Create(&mdb.Setting{
+		Group: mdb.SettingGroupSystem,
+		Key:   mdb.SettingKeyInitAdminPasswordPlain,
+		Value: "legacy-soft-deleted-plain",
+		Type:  mdb.SettingTypeString,
+	}).Error; err != nil {
+		t.Fatalf("seed plaintext setting: %v", err)
+	}
+	if err := dao.Mdb.Where("`key` = ?", mdb.SettingKeyInitAdminPasswordPlain).Delete(&mdb.Setting{}).Error; err != nil {
+		t.Fatalf("soft delete plaintext setting: %v", err)
+	}
+
+	password, created, err := EnsureDefaultAdmin()
+	if err != nil {
+		t.Fatalf("ensure default admin: %v", err)
+	}
+	if created || password != "" {
+		t.Fatalf("created=%v password=%q, want existing admin unchanged", created, password)
+	}
+
+	var count int64
+	if err := dao.Mdb.Unscoped().
+		Model(&mdb.Setting{}).
+		Where("`key` = ?", mdb.SettingKeyInitAdminPasswordPlain).
+		Count(&count).Error; err != nil {
+		t.Fatalf("count plaintext setting: %v", err)
+	}
+	if count != 0 {
+		t.Fatalf("legacy plaintext rows after ensure = %d, want 0", count)
+	}
+}
@@ -8,6 +8,7 @@ import (
 	"github.com/GMWalletApp/epusdt/model/dao"
 	"github.com/GMWalletApp/epusdt/model/mdb"
 	"github.com/GMWalletApp/epusdt/model/request"
+	addressutil "github.com/GMWalletApp/epusdt/util/address"
 	"github.com/dromara/carbon/v2"
 	"github.com/shopspring/decimal"
 	"gorm.io/gorm"
@@ -23,9 +24,14 @@ type PendingCallbackOrder struct {
 	UpdatedAt       carbon.Time `gorm:"column:updated_at"`
 }

+func normalizeAmount(amount float64, precision int) (int64, string) {
+	precision = NormalizeAmountPrecision(precision)
+	value := decimal.NewFromFloat(amount).Round(int32(precision))
+	return value.Shift(int32(precision)).IntPart(), value.StringFixed(int32(precision))
+}
+
 func normalizeLockAmount(amount float64) (int64, string) {
-	value := decimal.NewFromFloat(amount).Round(2)
-	return value.Shift(2).IntPart(), value.StringFixed(2)
+	return normalizeAmount(amount, GetAmountPrecision())
 }

 func normalizeLockNetwork(network string) string {
@@ -34,9 +40,15 @@ func normalizeLockNetwork(network string) string {

 func normalizeLockAddress(network, address string) string {
 	address = strings.TrimSpace(address)
-	if isEVMNetwork(normalizeLockNetwork(network)) {
+	network = normalizeLockNetwork(network)
+	if isEVMNetwork(network) {
 		return strings.ToLower(address)
 	}
+	if network == mdb.NetworkTon {
+		if raw, err := addressutil.TonRawAddressKey(address); err == nil {
+			return raw
+		}
+	}
 	return address
 }

@@ -53,6 +65,30 @@ func applyLockAddressFilter(tx *gorm.DB, network, address string) *gorm.DB {
 	return tx.Where("address = ?", address)
 }

+func activeLocksForAddress(tx *gorm.DB, network, address, token string, now time.Time) *gorm.DB {
+	query := tx.Model(&mdb.TransactionLock{}).
+		Where("network = ?", normalizeLockNetwork(network)).
+		Where("token = ?", normalizeLockToken(token)).
+		Where("expires_at > ?", now)
+	return applyLockAddressFilter(query, network, address)
+}
+
+func lockMatchesAmount(lock mdb.TransactionLock, amount float64) bool {
+	precision := NormalizeAmountPrecision(lock.AmountPrecision)
+	scaledAmount, _ := normalizeAmount(amount, precision)
+	return lock.AmountScaled == scaledAmount
+}
+
+func lockAmountDecimal(lock mdb.TransactionLock) decimal.Decimal {
+	if strings.TrimSpace(lock.AmountText) != "" {
+		if value, err := decimal.NewFromString(lock.AmountText); err == nil {
+			return value
+		}
+	}
+	precision := NormalizeAmountPrecision(lock.AmountPrecision)
+	return decimal.NewFromInt(lock.AmountScaled).Shift(int32(-precision))
+}
+
 // GetOrderInfoByOrderId fetches an order by merchant order id.
 func GetOrderInfoByOrderId(orderId string) (*mdb.Orders, error) {
 	order := new(mdb.Orders)
@@ -79,6 +115,56 @@ func GetOrderByBlockIdWithTransaction(tx *gorm.DB, blockID string) (*mdb.Orders,
 	return order, err
 }

+// GetOrderByBlockTransactionIDs fetches the first order whose stored tx id
+// matches any equivalent spelling supplied by the caller.
+func GetOrderByBlockTransactionIDs(blockIDs []string) (*mdb.Orders, error) {
+	order := new(mdb.Orders)
+	seen := make(map[string]struct{}, len(blockIDs))
+	candidates := make([]string, 0, len(blockIDs))
+	for _, blockID := range blockIDs {
+		blockID = strings.TrimSpace(blockID)
+		if blockID == "" {
+			continue
+		}
+		if _, ok := seen[blockID]; ok {
+			continue
+		}
+		seen[blockID] = struct{}{}
+		candidates = append(candidates, blockID)
+	}
+	if len(candidates) == 0 {
+		return order, nil
+	}
+	err := dao.Mdb.Model(order).Where("block_transaction_id IN ?", candidates).Limit(1).Find(order).Error
+	return order, err
+}
+
+// GetOrderByBlockTransactionIDsCaseInsensitive fetches the first order whose
+// stored tx id matches any candidate after ASCII case folding. This is used
+// only for hex-based chain tx ids; case-sensitive signatures must keep using
+// GetOrderByBlockTransactionIDs.
+func GetOrderByBlockTransactionIDsCaseInsensitive(blockIDs []string) (*mdb.Orders, error) {
+	order := new(mdb.Orders)
+	seen := make(map[string]struct{}, len(blockIDs))
+	candidates := make([]string, 0, len(blockIDs))
+	for _, blockID := range blockIDs {
+		blockID = strings.ToLower(strings.TrimSpace(blockID))
+		if blockID == "" {
+			continue
+		}
+		if _, ok := seen[blockID]; ok {
+			continue
+		}
+		seen[blockID] = struct{}{}
+		candidates = append(candidates, blockID)
+	}
+	if len(candidates) == 0 {
+		return order, nil
+	}
+	err := dao.Mdb.Model(order).Where("LOWER(block_transaction_id) IN ?", candidates).Limit(1).Find(order).Error
+	return order, err
+}
+
 // OrderSuccessWithTransaction marks an order as paid only if it is still waiting for payment.
 func OrderSuccessWithTransaction(tx *gorm.DB, req *request.OrderProcessingRequest) (bool, error) {
 	result := tx.Model(&mdb.Orders{}).
@@ -202,6 +288,18 @@ func MarkOrderSelected(tradeId string) error {
 		Update("is_selected", true).Error
 }

+// ExpireOrderByTradeID marks a waiting order as expired. Used to retire failed
+// child-order attempts that should not remain selectable/reusable.
+func ExpireOrderByTradeID(tradeId string) error {
+	return dao.Mdb.Model(&mdb.Orders{}).
+		Where("trade_id = ?", tradeId).
+		Where("status = ?", mdb.StatusWaitPay).
+		Updates(map[string]interface{}{
+			"status":      mdb.StatusExpired,
+			"is_selected": false,
+		}).Error
+}
+
 // RefreshOrderExpiration resets created_at to now so the expiration timer restarts.
 // Called on the parent order when a sub-order is created or returned.
 func RefreshOrderExpiration(tradeId string) error {
@@ -266,45 +364,43 @@ func ExpireOrderByTradeId(tradeId string) error {
 func GetTradeIdByWalletAddressAndAmountAndToken(network string, address string, token string, amount float64) (string, error) {
 	network = normalizeLockNetwork(network)
 	address = normalizeLockAddress(network, address)
-	scaledAmount, _ := normalizeLockAmount(amount)
-	var lock mdb.TransactionLock
-	query := dao.RuntimeDB.Model(&mdb.TransactionLock{}).
-		Where("network = ?", network).
-		Where("token = ?", normalizeLockToken(token)).
-		Where("amount_scaled = ?", scaledAmount).
-		Where("expires_at > ?", time.Now())
-	query = applyLockAddressFilter(query, network, address)
-	err := query.Limit(1).Find(&lock).Error
+	var locks []mdb.TransactionLock
+	err := activeLocksForAddress(dao.RuntimeDB, network, address, token, time.Now()).
+		Order("created_at ASC").
+		Find(&locks).Error
 	if err != nil {
 		return "", err
 	}
-	if lock.ID <= 0 {
-		return "", nil
+	for _, lock := range locks {
+		if lockMatchesAmount(lock, amount) {
+			return lock.TradeId, nil
+		}
 	}
-	return lock.TradeId, nil
+	return "", nil
 }

 // LockTransaction reserves a network+address+token+amount pair in sqlite until expiration.
 func LockTransaction(network, address, token, tradeID string, amount float64, expirationTime time.Duration) error {
 	network = normalizeLockNetwork(network)
 	address = normalizeLockAddress(network, address)
-	scaledAmount, amountText := normalizeLockAmount(amount)
+	precision := GetAmountPrecision()
+	scaledAmount, amountText := normalizeAmount(amount, precision)
 	normalizedToken := normalizeLockToken(token)
 	now := time.Now()
 	lock := &mdb.TransactionLock{
-		Network:      network,
-		Address:      address,
-		Token:        normalizedToken,
-		AmountScaled: scaledAmount,
-		AmountText:   amountText,
-		TradeId:      tradeID,
-		ExpiresAt:    now.Add(expirationTime),
+		Network:         network,
+		Address:         address,
+		Token:           normalizedToken,
+		AmountScaled:    scaledAmount,
+		AmountText:      amountText,
+		AmountPrecision: precision,
+		TradeId:         tradeID,
+		ExpiresAt:       now.Add(expirationTime),
 	}

 	return dao.RuntimeDB.Transaction(func(tx *gorm.DB) error {
 		expiredQuery := tx.Where("network = ?", network).
 			Where("token = ?", normalizedToken).
-			Where("amount_scaled = ?", scaledAmount).
 			Where("expires_at <= ?", now)
 		expiredQuery = applyLockAddressFilter(expiredQuery, network, address)
 		if err := expiredQuery.Delete(&mdb.TransactionLock{}).Error; err != nil {
@@ -314,6 +410,18 @@ func LockTransaction(network, address, token, tradeID string, amount float64, ex
 			return err
 		}

+		var existing []mdb.TransactionLock
+		if err := activeLocksForAddress(tx, network, address, normalizedToken, now).
+			Find(&existing).Error; err != nil {
+			return err
+		}
+		candidateAmount := lockAmountDecimal(*lock)
+		for _, item := range existing {
+			if lockAmountDecimal(item).Equal(candidateAmount) {
+				return ErrTransactionLocked
+			}
+		}
+
 		result := tx.Clauses(clause.OnConflict{DoNothing: true}).Create(lock)
 		if result.Error != nil {
 			return result.Error
@@ -329,13 +437,21 @@ func LockTransaction(network, address, token, tradeID string, amount float64, ex
 func UnLockTransaction(network string, address string, token string, amount float64) error {
 	network = normalizeLockNetwork(network)
 	address = normalizeLockAddress(network, address)
-	scaledAmount, _ := normalizeLockAmount(amount)
-	query := dao.RuntimeDB.
-		Where("network = ?", network).
-		Where("token = ?", normalizeLockToken(token)).
-		Where("amount_scaled = ?", scaledAmount)
-	query = applyLockAddressFilter(query, network, address)
-	return query.Delete(&mdb.TransactionLock{}).Error
+	var locks []mdb.TransactionLock
+	if err := activeLocksForAddress(dao.RuntimeDB, network, address, token, time.Now()).
+		Find(&locks).Error; err != nil {
+		return err
+	}
+	ids := make([]uint64, 0, len(locks))
+	for _, lock := range locks {
+		if lockMatchesAmount(lock, amount) {
+			ids = append(ids, lock.ID)
+		}
+	}
+	if len(ids) == 0 {
+		return nil
+	}
+	return dao.RuntimeDB.Where("id IN ?", ids).Delete(&mdb.TransactionLock{}).Error
 }

 func UnLockTransactionByTradeId(tradeID string) error {
@@ -1,6 +1,7 @@
 package data

 import (
+	"fmt"
 	"time"

 	"github.com/GMWalletApp/epusdt/model/dao"
@@ -28,25 +29,40 @@ type AddressDailyStat struct {
 	ActualAmount float64 `json:"actual_amount"`
 }

+func statsBucketExpr(column string, hourly bool) (string, error) {
+	dialect := "sqlite"
+	if dao.Mdb != nil && dao.Mdb.Dialector != nil {
+		dialect = dao.Mdb.Dialector.Name()
+	}
+	return statsBucketExprForDialect(dialect, column, hourly)
+}
+
+func statsBucketExprForDialect(dialect, column string, hourly bool) (string, error) {
+	switch dialect {
+	case "sqlite", "":
+		// modernc SQLite stores time.Time as Go's time.String() by default.
+		// Prefix buckets work for that format and SQLite datetime text.
+		if hourly {
+			return fmt.Sprintf("replace(substr(%s, 1, 13), 'T', ' ') || ':00'", column), nil
+		}
+		return fmt.Sprintf("substr(%s, 1, 10)", column), nil
+	case "postgres":
+		if hourly {
+			return fmt.Sprintf("TO_CHAR(%s, 'YYYY-MM-DD HH24:00')", column), nil
+		}
+		return fmt.Sprintf("TO_CHAR(%s, 'YYYY-MM-DD')", column), nil
+	default:
+		return "", fmt.Errorf("unsupported database dialect for dashboard stats: %s", dialect)
+	}
+}
+
 // DailyOrderStats returns per-day counts/amounts within [start, end],
 // zero-filling any days in the range that have no orders.
 // Only orders in StatusPaySuccess contribute to Amount sums — that's
 // what the user means by "流水". Pending orders count toward OrderCount
 // to keep成交率 computable.
 func DailyOrderStats(start, end time.Time) ([]DailyStat, error) {
-	var rows []DailyStat
-	err := dao.Mdb.Model(&mdb.Orders{}).
-		Select(`DATE(created_at) AS day,
-            COUNT(*) AS order_count,
-            SUM(CASE WHEN status = ? THEN 1 ELSE 0 END) AS success_count,
-            SUM(CASE WHEN status = ? THEN amount ELSE 0 END) AS total_amount,
-            SUM(CASE WHEN status = ? THEN actual_amount ELSE 0 END) AS actual_amount`,
-			mdb.StatusPaySuccess, mdb.StatusPaySuccess, mdb.StatusPaySuccess).
-		Where("created_at >= ?", start).
-		Where("created_at <= ?", end).
-		Group("DATE(created_at)").
-		Order("day ASC").
-		Scan(&rows).Error
+	rows, err := queryOrderStats(start, end, false)
 	if err != nil {
 		return nil, err
 	}
@@ -56,25 +72,34 @@ func DailyOrderStats(start, end time.Time) ([]DailyStat, error) {
 // HourlyOrderStats returns per-hour counts/amounts within [start, end],
 // zero-filling any hours that have no orders.
 func HourlyOrderStats(start, end time.Time) ([]DailyStat, error) {
-	var rows []DailyStat
-	err := dao.Mdb.Model(&mdb.Orders{}).
-		Select(`strftime('%Y-%m-%d %H:00', created_at) AS day,
-            COUNT(*) AS order_count,
-            SUM(CASE WHEN status = ? THEN 1 ELSE 0 END) AS success_count,
-            SUM(CASE WHEN status = ? THEN amount ELSE 0 END) AS total_amount,
-            SUM(CASE WHEN status = ? THEN actual_amount ELSE 0 END) AS actual_amount`,
-			mdb.StatusPaySuccess, mdb.StatusPaySuccess, mdb.StatusPaySuccess).
-		Where("created_at >= ?", start).
-		Where("created_at <= ?", end).
-		Group("strftime('%Y-%m-%d %H:00', created_at)").
-		Order("day ASC").
-		Scan(&rows).Error
+	rows, err := queryOrderStats(start, end, true)
 	if err != nil {
 		return nil, err
 	}
 	return fillHourlyStats(start, end, rows), nil
 }

+func queryOrderStats(start, end time.Time, hourly bool) ([]DailyStat, error) {
+	var rows []DailyStat
+	bucket, err := statsBucketExpr("created_at", hourly)
+	if err != nil {
+		return nil, err
+	}
+	err = dao.Mdb.Model(&mdb.Orders{}).
+		Select(fmt.Sprintf(`%s AS day,
+            COUNT(*) AS order_count,
+            SUM(CASE WHEN status = ? THEN 1 ELSE 0 END) AS success_count,
+            SUM(CASE WHEN status = ? THEN amount ELSE 0 END) AS total_amount,
+            SUM(CASE WHEN status = ? THEN actual_amount ELSE 0 END) AS actual_amount`, bucket),
+			mdb.StatusPaySuccess, mdb.StatusPaySuccess, mdb.StatusPaySuccess).
+		Where("created_at >= ?", start).
+		Where("created_at <= ?", end).
+		Group(bucket).
+		Order("day ASC").
+		Scan(&rows).Error
+	return rows, err
+}
+
 // fillDailyStats generates a zero-filled slice covering every calendar
 // day in [start, end]. Days present in rows overwrite the zero entries.
 func fillDailyStats(start, end time.Time, rows []DailyStat) []DailyStat {
@@ -122,15 +147,7 @@ func fillHourlyStats(start, end time.Time, rows []DailyStat) []DailyStat {
 // DailyAssetByAddress groups paid actual_amount by (day, receive_address)
 // for the per-address stacked chart, zero-filling missing days.
 func DailyAssetByAddress(start, end time.Time) ([]AddressDailyStat, error) {
-	var rows []AddressDailyStat
-	err := dao.Mdb.Model(&mdb.Orders{}).
-		Select("DATE(created_at) AS day, receive_address AS address, SUM(actual_amount) AS actual_amount").
-		Where("status = ?", mdb.StatusPaySuccess).
-		Where("created_at >= ?", start).
-		Where("created_at <= ?", end).
-		Group("DATE(created_at), receive_address").
-		Order("day ASC").
-		Scan(&rows).Error
+	rows, err := queryAssetByAddress(start, end, false)
 	if err != nil {
 		return nil, err
 	}
@@ -140,21 +157,33 @@ func DailyAssetByAddress(start, end time.Time) ([]AddressDailyStat, error) {
 // HourlyAssetByAddress groups paid actual_amount by (hour, receive_address)
 // for the per-address stacked chart, zero-filling missing hours.
 func HourlyAssetByAddress(start, end time.Time) ([]AddressDailyStat, error) {
-	var rows []AddressDailyStat
-	err := dao.Mdb.Model(&mdb.Orders{}).
-		Select("strftime('%Y-%m-%d %H:00', created_at) AS day, receive_address AS address, SUM(actual_amount) AS actual_amount").
-		Where("status = ?", mdb.StatusPaySuccess).
-		Where("created_at >= ?", start).
-		Where("created_at <= ?", end).
-		Group("strftime('%Y-%m-%d %H:00', created_at), receive_address").
-		Order("day ASC").
-		Scan(&rows).Error
+	rows, err := queryAssetByAddress(start, end, true)
 	if err != nil {
 		return nil, err
 	}
 	return fillAddressHourlyStats(start, end, rows), nil
 }

+func queryAssetByAddress(start, end time.Time, hourly bool) ([]AddressDailyStat, error) {
+	var rows []AddressDailyStat
+	bucket, err := statsBucketExpr("created_at", hourly)
+	if err != nil {
+		return nil, err
+	}
+	err = dao.Mdb.Model(&mdb.Orders{}).
+		Select(fmt.Sprintf(`%s AS day,
+            receive_address AS address,
+            SUM(actual_amount) AS actual_amount`, bucket)).
+		Where("status = ?", mdb.StatusPaySuccess).
+		Where("created_at >= ?", start).
+		Where("created_at <= ?", end).
+		Group(bucket).
+		Group("receive_address").
+		Order("day ASC, address ASC").
+		Scan(&rows).Error
+	return rows, err
+}
+
 // fillAddressDailyStats zero-fills missing day×address combinations.
 // All addresses that appear in rows are represented for every day in range.
 func fillAddressDailyStats(start, end time.Time, rows []AddressDailyStat) []AddressDailyStat {
@@ -1,12 +1,14 @@
 package data

 import (
+	"errors"
 	"strings"
 	"testing"
 	"time"

 	"github.com/GMWalletApp/epusdt/internal/testutil"
 	"github.com/GMWalletApp/epusdt/model/mdb"
+	"github.com/xssnick/tonutils-go/address"
 )

 func TestEvmTransactionLockAddressIsCaseInsensitive(t *testing.T) {
@@ -41,6 +43,101 @@ func TestEvmTransactionLockAddressIsCaseInsensitive(t *testing.T) {
 	}
 }

+func TestStatsBucketExprForDialect(t *testing.T) {
+	tests := []struct {
+		name    string
+		dialect string
+		hourly  bool
+		want    string
+	}{
+		{
+			name:    "sqlite daily",
+			dialect: "sqlite",
+			want:    "substr(created_at, 1, 10)",
+		},
+		{
+			name:    "sqlite hourly",
+			dialect: "sqlite",
+			hourly:  true,
+			want:    "replace(substr(created_at, 1, 13), 'T', ' ') || ':00'",
+		},
+		{
+			name:    "postgres daily",
+			dialect: "postgres",
+			want:    "TO_CHAR(created_at, 'YYYY-MM-DD')",
+		},
+		{
+			name:    "postgres hourly",
+			dialect: "postgres",
+			hourly:  true,
+			want:    "TO_CHAR(created_at, 'YYYY-MM-DD HH24:00')",
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			got, err := statsBucketExprForDialect(tt.dialect, "created_at", tt.hourly)
+			if err != nil {
+				t.Fatalf("statsBucketExprForDialect error: %v", err)
+			}
+			if got != tt.want {
+				t.Fatalf("bucket expr = %q, want %q", got, tt.want)
+			}
+		})
+	}
+}
+
+func TestStatsBucketExprRejectsUnsupportedDialect(t *testing.T) {
+	if _, err := statsBucketExprForDialect("mysql", "created_at", false); err == nil {
+		t.Fatal("expected unsupported mysql dialect error")
+	}
+}
+
+func TestTransactionLockPrecisionPreventsEquivalentAmountsOnly(t *testing.T) {
+	cleanup := testutil.SetupTestDatabases(t)
+	defer cleanup()
+
+	if err := SetSetting(mdb.SettingGroupSystem, mdb.SettingKeyAmountPrecision, "2", mdb.SettingTypeInt); err != nil {
+		t.Fatalf("set precision 2: %v", err)
+	}
+	if err := LockTransaction(mdb.NetworkTron, "TPrecisionAddress001", "USDT", "trade-old", 1.23, time.Hour); err != nil {
+		t.Fatalf("lock old transaction: %v", err)
+	}
+
+	if err := SetSetting(mdb.SettingGroupSystem, mdb.SettingKeyAmountPrecision, "4", mdb.SettingTypeInt); err != nil {
+		t.Fatalf("set precision 4: %v", err)
+	}
+	if err := LockTransaction(mdb.NetworkTron, "TPrecisionAddress001", "USDT", "trade-equivalent", 1.2300, time.Hour); !errors.Is(err, ErrTransactionLocked) {
+		t.Fatalf("equivalent lock error = %v, want %v", err, ErrTransactionLocked)
+	}
+	if err := LockTransaction(mdb.NetworkTron, "TPrecisionAddress001", "USDT", "trade-new", 1.2301, time.Hour); err != nil {
+		t.Fatalf("distinct precision lock: %v", err)
+	}
+}
+
+func TestTransactionLockLookupUsesStoredPrecision(t *testing.T) {
+	cleanup := testutil.SetupTestDatabases(t)
+	defer cleanup()
+
+	if err := SetSetting(mdb.SettingGroupSystem, mdb.SettingKeyAmountPrecision, "4", mdb.SettingTypeInt); err != nil {
+		t.Fatalf("set precision 4: %v", err)
+	}
+	if err := LockTransaction(mdb.NetworkTron, "TPrecisionAddress002", "USDT", "trade-precise", 1.2345, time.Hour); err != nil {
+		t.Fatalf("lock precise transaction: %v", err)
+	}
+	if err := SetSetting(mdb.SettingGroupSystem, mdb.SettingKeyAmountPrecision, "2", mdb.SettingTypeInt); err != nil {
+		t.Fatalf("set precision 2: %v", err)
+	}
+
+	gotTradeID, err := GetTradeIdByWalletAddressAndAmountAndToken(mdb.NetworkTron, "TPrecisionAddress002", "USDT", 1.2345)
+	if err != nil {
+		t.Fatalf("lookup transaction lock: %v", err)
+	}
+	if gotTradeID != "trade-precise" {
+		t.Fatalf("trade id = %q, want trade-precise", gotTradeID)
+	}
+}
+
 func TestNonEvmTransactionLockAddressRemainsCaseSensitive(t *testing.T) {
 	cleanup := testutil.SetupTestDatabases(t)
 	defer cleanup()
@@ -60,3 +157,30 @@ func TestNonEvmTransactionLockAddressRemainsCaseSensitive(t *testing.T) {
 		t.Fatalf("tron address lookup should remain case-sensitive, got trade id %q", gotTradeID)
 	}
 }
+
+func TestTonTransactionLockAddressUsesRawKey(t *testing.T) {
+	cleanup := testutil.SetupTestDatabases(t)
+	defer cleanup()
+
+	bounceable := "EQC6KV4zs8TJtSZapOrRFmqSkxzpq-oSCoxekQRKElf4nC1I"
+	addr := address.MustParseAddr(bounceable)
+	nonBounce := addr.Bounce(false).String()
+
+	if err := LockTransaction(mdb.NetworkTon, bounceable, "TON", "trade-ton", 1.23, time.Hour); err != nil {
+		t.Fatalf("lock ton transaction: %v", err)
+	}
+	gotTradeID, err := GetTradeIdByWalletAddressAndAmountAndToken(mdb.NetworkTon, nonBounce, "TON", 1.23)
+	if err != nil {
+		t.Fatalf("lookup ton lock: %v", err)
+	}
+	if gotTradeID != "trade-ton" {
+		t.Fatalf("ton lock lookup = %q, want trade-ton", gotTradeID)
+	}
+	gotTradeID, err = GetTradeIdByWalletAddressAndAmountAndToken(mdb.NetworkTon, addr.StringRaw(), "TON", 1.23)
+	if err != nil {
+		t.Fatalf("lookup ton raw lock: %v", err)
+	}
+	if gotTradeID != "trade-ton" {
+		t.Fatalf("ton raw lock lookup = %q, want trade-ton", gotTradeID)
+	}
+}
@@ -0,0 +1,76 @@
+package data
+
+import (
+	"github.com/GMWalletApp/epusdt/model/dao"
+	"github.com/GMWalletApp/epusdt/model/mdb"
+	"gorm.io/gorm"
+)
+
+func GetProviderOrderByTradeIDAndProvider(tradeID string, provider string) (*mdb.ProviderOrder, error) {
+	row := new(mdb.ProviderOrder)
+	err := dao.Mdb.Model(row).
+		Where("trade_id = ?", tradeID).
+		Where("provider = ?", provider).
+		Limit(1).
+		Find(row).Error
+	return row, err
+}
+
+func CreateProviderOrderWithTransaction(tx *gorm.DB, row *mdb.ProviderOrder) error {
+	return tx.Model(row).Create(row).Error
+}
+
+func UpdateProviderOrderCreated(tradeID string, provider string, providerOrderID string, payURL string) error {
+	return dao.Mdb.Model(&mdb.ProviderOrder{}).
+		Where("trade_id = ?", tradeID).
+		Where("provider = ?", provider).
+		Updates(map[string]interface{}{
+			"provider_order_id": providerOrderID,
+			"pay_url":           payURL,
+			"status":            mdb.ProviderOrderStatusPending,
+		}).Error
+}
+
+func MarkProviderOrderFailed(tradeID string, provider string) error {
+	return dao.Mdb.Model(&mdb.ProviderOrder{}).
+		Where("trade_id = ?", tradeID).
+		Where("provider = ?", provider).
+		Update("status", mdb.ProviderOrderStatusFailed).Error
+}
+
+func SaveProviderOrderNotify(tradeID string, provider string, notifyRaw string) error {
+	return dao.Mdb.Model(&mdb.ProviderOrder{}).
+		Where("trade_id = ?", tradeID).
+		Where("provider = ?", provider).
+		Update("notify_raw", notifyRaw).Error
+}
+
+func MarkProviderOrderPaid(tradeID string, provider string, notifyRaw string) error {
+	return dao.Mdb.Model(&mdb.ProviderOrder{}).
+		Where("trade_id = ?", tradeID).
+		Where("provider = ?", provider).
+		Updates(map[string]interface{}{
+			"status":     mdb.ProviderOrderStatusPaid,
+			"notify_raw": notifyRaw,
+		}).Error
+}
+
+func MarkProviderOrderExpired(tradeID string, provider string) error {
+	return dao.Mdb.Model(&mdb.ProviderOrder{}).
+		Where("trade_id = ?", tradeID).
+		Where("provider = ?", provider).
+		Where("status IN ?", []string{mdb.ProviderOrderStatusCreating, mdb.ProviderOrderStatusPending}).
+		Update("status", mdb.ProviderOrderStatusExpired).Error
+}
+
+func GetSubOrderByTokenPayProvider(parentTradeID string, token string, payProvider string) (*mdb.Orders, error) {
+	order := new(mdb.Orders)
+	err := dao.Mdb.Model(order).
+		Where("parent_trade_id = ?", parentTradeID).
+		Where("token = ?", token).
+		Where("pay_provider = ?", payProvider).
+		Where("status = ?", mdb.StatusWaitPay).
+		Limit(1).
+		Find(order).Error
+	return order, err
+}
@@ -1,14 +1,44 @@
 package data

 import (
+	"fmt"
 	"math/rand"
+	"net/url"
+	"sort"
 	"strings"
+	"sync"
+	"time"

 	"github.com/GMWalletApp/epusdt/model/dao"
 	"github.com/GMWalletApp/epusdt/model/mdb"
 	"github.com/dromara/carbon/v2"
 )

+const (
+	RpcFailoverThreshold = 3
+	RpcFailoverCooldown  = 60 * time.Second
+)
+
+var gRpcFailover = struct {
+	sync.Mutex
+	failures      map[uint64]int
+	cooldownUntil map[uint64]time.Time
+}{
+	failures:      make(map[uint64]int),
+	cooldownUntil: make(map[uint64]time.Time),
+}
+
+func NormalizeRpcNodePurpose(purpose string) string {
+	switch strings.ToLower(strings.TrimSpace(purpose)) {
+	case mdb.RpcNodePurposeManualVerify:
+		return mdb.RpcNodePurposeManualVerify
+	case mdb.RpcNodePurposeBoth:
+		return mdb.RpcNodePurposeBoth
+	default:
+		return mdb.RpcNodePurposeGeneral
+	}
+}
+
 // ListRpcNodes returns rows optionally filtered by network.
 func ListRpcNodes(network string) ([]mdb.RpcNode, error) {
 	var rows []mdb.RpcNode
@@ -20,6 +50,84 @@ func ListRpcNodes(network string) ([]mdb.RpcNode, error) {
 	return rows, err
 }

+// ListRpcNodesForHealth returns nodes that should be probed by the periodic
+// health job. Manual verification nodes are intentionally excluded because
+// they may be paid/high-limit endpoints that should only be used on demand.
+func ListRpcNodesForHealth() ([]mdb.RpcNode, error) {
+	var rows []mdb.RpcNode
+	err := dao.Mdb.Model(&mdb.RpcNode{}).
+		Where("(purpose IN ? OR purpose = '' OR purpose IS NULL)", []string{mdb.RpcNodePurposeGeneral, mdb.RpcNodePurposeBoth}).
+		Order("id ASC").
+		Find(&rows).Error
+	return rows, err
+}
+
+// ListGeneralRpcCandidates returns enabled non-manual nodes for ordinary
+// scanners/listeners. Down nodes are skipped; ok nodes are ordered before
+// unknown/bootstrap nodes.
+func ListGeneralRpcCandidates(network, nodeType string) ([]mdb.RpcNode, error) {
+	var rows []mdb.RpcNode
+	err := dao.Mdb.Model(&mdb.RpcNode{}).
+		Where("network = ?", strings.ToLower(strings.TrimSpace(network))).
+		Where("type = ?", strings.ToLower(strings.TrimSpace(nodeType))).
+		Where("enabled = ?", true).
+		Where("(purpose IN ? OR purpose = '' OR purpose IS NULL)", []string{mdb.RpcNodePurposeGeneral, mdb.RpcNodePurposeBoth}).
+		Where("(status IN ? OR status = '' OR status IS NULL)", []string{mdb.RpcNodeStatusOk, mdb.RpcNodeStatusUnknown}).
+		Find(&rows).Error
+	if err != nil {
+		return nil, err
+	}
+
+	buckets := make([][]mdb.RpcNode, 2)
+	for _, row := range rows {
+		row.Purpose = NormalizeRpcNodePurpose(row.Purpose)
+		if row.Status == mdb.RpcNodeStatusOk {
+			buckets[0] = append(buckets[0], row)
+		} else {
+			buckets[1] = append(buckets[1], row)
+		}
+	}
+
+	out := make([]mdb.RpcNode, 0, len(rows))
+	for _, bucket := range buckets {
+		sortRpcNodes(bucket)
+		out = append(out, bucket...)
+	}
+	return out, nil
+}
+
+func SelectGeneralRpcNode(network, nodeType string, excludeIDs ...uint64) (*mdb.RpcNode, error) {
+	rows, err := ListGeneralRpcCandidates(network, nodeType)
+	if err != nil {
+		return nil, err
+	}
+	if len(rows) == 0 {
+		return nil, nil
+	}
+
+	excluded := make(map[uint64]struct{}, len(excludeIDs))
+	for _, id := range excludeIDs {
+		if id > 0 {
+			excluded[id] = struct{}{}
+		}
+	}
+	for i := range rows {
+		if _, ok := excluded[rows[i].ID]; ok {
+			continue
+		}
+		if IsRpcNodeCoolingDown(rows[i].ID) {
+			continue
+		}
+		return &rows[i], nil
+	}
+	if len(excluded) == 0 {
+		for i := range rows {
+			return &rows[i], nil
+		}
+	}
+	return nil, nil
+}
+
 // GetRpcNodeByID fetches one row.
 func GetRpcNodeByID(id uint64) (*mdb.RpcNode, error) {
 	row := new(mdb.RpcNode)
@@ -29,6 +137,7 @@ func GetRpcNodeByID(id uint64) (*mdb.RpcNode, error) {

 // CreateRpcNode inserts a row.
 func CreateRpcNode(row *mdb.RpcNode) error {
+	row.Purpose = NormalizeRpcNodePurpose(row.Purpose)
 	return dao.Mdb.Create(row).Error
 }

@@ -37,6 +146,9 @@ func UpdateRpcNodeFields(id uint64, fields map[string]interface{}) error {
 	if len(fields) == 0 {
 		return nil
 	}
+	if purpose, ok := fields["purpose"].(string); ok {
+		fields["purpose"] = NormalizeRpcNodePurpose(purpose)
+	}
 	return dao.Mdb.Model(&mdb.RpcNode{}).Where("id = ?", id).Updates(fields).Error
 }

@@ -48,13 +160,15 @@ func DeleteRpcNodeByID(id uint64) error {
 // SelectRpcNode picks a healthy RPC endpoint for a (network, type) pair.
 // Strategy: weighted random among rows where enabled=true AND status=ok.
 // Falls back to enabled rows with status=unknown when no health check has
-// run yet. Explicitly down rows are not selected.
+// run yet. Explicitly down rows are not selected. Manual verification nodes
+// are excluded so paid/manual-only RPCs are never used by scanners/listeners.
 func SelectRpcNode(network, nodeType string) (*mdb.RpcNode, error) {
 	var rows []mdb.RpcNode
 	err := dao.Mdb.Model(&mdb.RpcNode{}).
 		Where("network = ?", strings.ToLower(network)).
 		Where("type = ?", strings.ToLower(nodeType)).
 		Where("enabled = ?", true).
+		Where("(purpose IN ? OR purpose = '' OR purpose IS NULL)", []string{mdb.RpcNodePurposeGeneral, mdb.RpcNodePurposeBoth}).
 		Find(&rows).Error
 	if err != nil {
 		return nil, err
@@ -82,6 +196,144 @@ func SelectRpcNode(network, nodeType string) (*mdb.RpcNode, error) {
 	return pickWeighted(candidates), nil
 }

+// ListManualPaymentRpcCandidates returns enabled RPC nodes for manual payment
+// verification. Ordinary RPCs are tried first to avoid paid endpoint usage;
+// manual_verify nodes are used only as a fallback.
+func ListManualPaymentRpcCandidates(network, nodeType string) ([]mdb.RpcNode, error) {
+	var rows []mdb.RpcNode
+	err := dao.Mdb.Model(&mdb.RpcNode{}).
+		Where("network = ?", strings.ToLower(strings.TrimSpace(network))).
+		Where("type = ?", strings.ToLower(strings.TrimSpace(nodeType))).
+		Where("enabled = ?", true).
+		Where("(status IN ? OR status = '' OR status IS NULL)", []string{mdb.RpcNodeStatusOk, mdb.RpcNodeStatusUnknown}).
+		Find(&rows).Error
+	if err != nil {
+		return nil, err
+	}
+	if len(rows) == 0 {
+		return nil, nil
+	}
+
+	buckets := make([][]mdb.RpcNode, 4)
+	for _, row := range rows {
+		row.Purpose = NormalizeRpcNodePurpose(row.Purpose)
+		switch row.Purpose {
+		case mdb.RpcNodePurposeGeneral, mdb.RpcNodePurposeBoth:
+			if row.Status == mdb.RpcNodeStatusOk {
+				buckets[0] = append(buckets[0], row)
+			} else {
+				buckets[1] = append(buckets[1], row)
+			}
+		case mdb.RpcNodePurposeManualVerify:
+			if row.Status == mdb.RpcNodeStatusOk {
+				buckets[2] = append(buckets[2], row)
+			} else {
+				buckets[3] = append(buckets[3], row)
+			}
+		}
+	}
+
+	out := make([]mdb.RpcNode, 0, len(rows))
+	for _, bucket := range buckets {
+		sortRpcNodes(bucket)
+		out = append(out, bucket...)
+	}
+	return out, nil
+}
+
+func sortRpcNodes(rows []mdb.RpcNode) {
+	sort.SliceStable(rows, func(i, j int) bool {
+		if rows[i].Weight != rows[j].Weight {
+			return rows[i].Weight > rows[j].Weight
+		}
+		return rows[i].ID < rows[j].ID
+	})
+}
+
+func RecordRpcNodeSuccess(nodeID uint64) {
+	if nodeID == 0 {
+		return
+	}
+	gRpcFailover.Lock()
+	defer gRpcFailover.Unlock()
+	delete(gRpcFailover.failures, nodeID)
+	delete(gRpcFailover.cooldownUntil, nodeID)
+}
+
+func RecordRpcNodeFailure(nodeID uint64) (int, bool) {
+	if nodeID == 0 {
+		return 0, false
+	}
+	now := time.Now()
+	gRpcFailover.Lock()
+	defer gRpcFailover.Unlock()
+	if until, ok := gRpcFailover.cooldownUntil[nodeID]; ok {
+		if now.Before(until) {
+			return gRpcFailover.failures[nodeID], true
+		}
+		delete(gRpcFailover.cooldownUntil, nodeID)
+		delete(gRpcFailover.failures, nodeID)
+	}
+
+	gRpcFailover.failures[nodeID]++
+	failures := gRpcFailover.failures[nodeID]
+	if failures >= RpcFailoverThreshold {
+		gRpcFailover.failures[nodeID] = 0
+		gRpcFailover.cooldownUntil[nodeID] = now.Add(RpcFailoverCooldown)
+		return failures, true
+	}
+	return failures, false
+}
+
+func IsRpcNodeCoolingDown(nodeID uint64) bool {
+	if nodeID == 0 {
+		return false
+	}
+	now := time.Now()
+	gRpcFailover.Lock()
+	defer gRpcFailover.Unlock()
+	until, ok := gRpcFailover.cooldownUntil[nodeID]
+	if !ok {
+		return false
+	}
+	if now.Before(until) {
+		return true
+	}
+	delete(gRpcFailover.cooldownUntil, nodeID)
+	delete(gRpcFailover.failures, nodeID)
+	return false
+}
+
+func RpcNodeLogLabel(node mdb.RpcNode) string {
+	return fmt.Sprintf("id=%d network=%s type=%s endpoint=%s", node.ID, node.Network, node.Type, safeRpcEndpoint(node.Url))
+}
+
+func safeRpcEndpoint(raw string) string {
+	raw = strings.TrimSpace(raw)
+	if raw == "" {
+		return ""
+	}
+	parsed, err := url.Parse(raw)
+	if err == nil && parsed.Host != "" {
+		if parsed.Scheme != "" {
+			return parsed.Scheme + "://" + parsed.Host
+		}
+		return parsed.Host
+	}
+	cut := strings.IndexAny(raw, "/?")
+	if cut >= 0 {
+		return raw[:cut]
+	}
+	return raw
+}
+
+func ResetRpcFailoverForTest() {
+	gRpcFailover.Lock()
+	defer gRpcFailover.Unlock()
+	gRpcFailover.failures = make(map[uint64]int)
+	gRpcFailover.cooldownUntil = make(map[uint64]time.Time)
+}
+
 // pickWeighted chooses one row using the Weight column. Weights < 1 are
 // coerced to 1 so an admin-zeroed row still has a chance (use Enabled=false
 // to truly disable).
@@ -1,6 +1,7 @@
 package data

 import (
+	"strings"
 	"testing"

 	"github.com/GMWalletApp/epusdt/internal/testutil"
@@ -99,3 +100,306 @@ func TestSelectRpcNodeIgnoresDownRows(t *testing.T) {
 		t.Fatalf("SelectRpcNode() = %#v, want nil", got)
 	}
 }
+
+func TestSelectRpcNodeExcludesManualVerifyRows(t *testing.T) {
+	cleanup := testutil.SetupTestDatabases(t)
+	defer cleanup()
+
+	if err := dao.Mdb.Create(&mdb.RpcNode{
+		Network: mdb.NetworkTron,
+		Url:     "https://manual.example.com",
+		Type:    mdb.RpcNodeTypeHttp,
+		Weight:  100,
+		Enabled: true,
+		Purpose: mdb.RpcNodePurposeManualVerify,
+		Status:  mdb.RpcNodeStatusOk,
+	}).Error; err != nil {
+		t.Fatalf("seed manual rpc_node: %v", err)
+	}
+	if err := dao.Mdb.Create(&mdb.RpcNode{
+		Network: mdb.NetworkTron,
+		Url:     "https://general.example.com",
+		Type:    mdb.RpcNodeTypeHttp,
+		Weight:  1,
+		Enabled: true,
+		Purpose: mdb.RpcNodePurposeGeneral,
+		Status:  mdb.RpcNodeStatusUnknown,
+	}).Error; err != nil {
+		t.Fatalf("seed general rpc_node: %v", err)
+	}
+
+	got, err := SelectRpcNode(mdb.NetworkTron, mdb.RpcNodeTypeHttp)
+	if err != nil {
+		t.Fatalf("SelectRpcNode(): %v", err)
+	}
+	if got == nil || got.Url != "https://general.example.com" {
+		t.Fatalf("SelectRpcNode() = %#v, want general row", got)
+	}
+}
+
+func TestSelectRpcNodePurposeFilterAppliesToAnyNodeType(t *testing.T) {
+	cleanup := testutil.SetupTestDatabases(t)
+	defer cleanup()
+
+	const nodeType = "grpc"
+	if err := dao.Mdb.Create(&mdb.RpcNode{
+		Network: mdb.NetworkTron,
+		Url:     "grpc://manual.example.com",
+		Type:    nodeType,
+		Weight:  100,
+		Enabled: true,
+		Purpose: mdb.RpcNodePurposeManualVerify,
+		Status:  mdb.RpcNodeStatusOk,
+	}).Error; err != nil {
+		t.Fatalf("seed manual rpc_node: %v", err)
+	}
+	if err := dao.Mdb.Create(&mdb.RpcNode{
+		Network: mdb.NetworkTron,
+		Url:     "grpc://general.example.com",
+		Type:    nodeType,
+		Weight:  1,
+		Enabled: true,
+		Purpose: mdb.RpcNodePurposeGeneral,
+		Status:  mdb.RpcNodeStatusOk,
+	}).Error; err != nil {
+		t.Fatalf("seed general rpc_node: %v", err)
+	}
+
+	got, err := SelectRpcNode(mdb.NetworkTron, nodeType)
+	if err != nil {
+		t.Fatalf("SelectRpcNode(): %v", err)
+	}
+	if got == nil || got.Url != "grpc://general.example.com" {
+		t.Fatalf("SelectRpcNode() = %#v, want general grpc row", got)
+	}
+}
+
+func TestSelectRpcNodeManualVerifyOnlyReturnsNil(t *testing.T) {
+	cleanup := testutil.SetupTestDatabases(t)
+	defer cleanup()
+
+	if err := dao.Mdb.Create(&mdb.RpcNode{
+		Network: mdb.NetworkTron,
+		Url:     "https://manual-only.example.com",
+		Type:    mdb.RpcNodeTypeHttp,
+		Weight:  1,
+		Enabled: true,
+		Purpose: mdb.RpcNodePurposeManualVerify,
+		Status:  mdb.RpcNodeStatusOk,
+	}).Error; err != nil {
+		t.Fatalf("seed manual rpc_node: %v", err)
+	}
+
+	got, err := SelectRpcNode(mdb.NetworkTron, mdb.RpcNodeTypeHttp)
+	if err != nil {
+		t.Fatalf("SelectRpcNode(): %v", err)
+	}
+	if got != nil {
+		t.Fatalf("SelectRpcNode() = %#v, want nil", got)
+	}
+}
+
+func TestListManualPaymentRpcCandidatesGeneralBeforeManualVerify(t *testing.T) {
+	cleanup := testutil.SetupTestDatabases(t)
+	defer cleanup()
+
+	rows := []mdb.RpcNode{
+		{Network: mdb.NetworkTron, Url: "https://manual-ok.example.com", Type: mdb.RpcNodeTypeHttp, Weight: 1, Enabled: true, Purpose: mdb.RpcNodePurposeManualVerify, Status: mdb.RpcNodeStatusOk},
+		{Network: mdb.NetworkTron, Url: "https://general-unknown.example.com", Type: mdb.RpcNodeTypeHttp, Weight: 1, Enabled: true, Purpose: mdb.RpcNodePurposeGeneral, Status: mdb.RpcNodeStatusUnknown},
+		{Network: mdb.NetworkTron, Url: "https://general-ok.example.com", Type: mdb.RpcNodeTypeHttp, Weight: 1, Enabled: true, Purpose: mdb.RpcNodePurposeGeneral, Status: mdb.RpcNodeStatusOk},
+		{Network: mdb.NetworkTron, Url: "https://manual-unknown.example.com", Type: mdb.RpcNodeTypeHttp, Weight: 1, Enabled: true, Purpose: mdb.RpcNodePurposeManualVerify, Status: mdb.RpcNodeStatusUnknown},
+		{Network: mdb.NetworkTron, Url: "https://down.example.com", Type: mdb.RpcNodeTypeHttp, Weight: 1, Enabled: true, Purpose: mdb.RpcNodePurposeGeneral, Status: mdb.RpcNodeStatusDown},
+	}
+	if err := dao.Mdb.Create(&rows).Error; err != nil {
+		t.Fatalf("seed rpc_nodes: %v", err)
+	}
+
+	got, err := ListManualPaymentRpcCandidates(mdb.NetworkTron, mdb.RpcNodeTypeHttp)
+	if err != nil {
+		t.Fatalf("ListManualPaymentRpcCandidates(): %v", err)
+	}
+	var urls []string
+	for _, row := range got {
+		urls = append(urls, row.Url)
+	}
+	want := []string{
+		"https://general-ok.example.com",
+		"https://general-unknown.example.com",
+		"https://manual-ok.example.com",
+		"https://manual-unknown.example.com",
+	}
+	if len(urls) != len(want) {
+		t.Fatalf("candidate urls = %#v, want %#v", urls, want)
+	}
+	for i := range want {
+		if urls[i] != want[i] {
+			t.Fatalf("candidate urls = %#v, want %#v", urls, want)
+		}
+	}
+}
+
+func TestListManualPaymentRpcCandidatesAllowsManualVerifyFallbackOnly(t *testing.T) {
+	cleanup := testutil.SetupTestDatabases(t)
+	defer cleanup()
+
+	rows := []mdb.RpcNode{
+		{Network: mdb.NetworkTron, Url: "https://manual-ok.example.com", Type: mdb.RpcNodeTypeHttp, Weight: 1, Enabled: true, Purpose: mdb.RpcNodePurposeManualVerify, Status: mdb.RpcNodeStatusOk},
+		{Network: mdb.NetworkTron, Url: "https://manual-down.example.com", Type: mdb.RpcNodeTypeHttp, Weight: 1, Enabled: true, Purpose: mdb.RpcNodePurposeManualVerify, Status: mdb.RpcNodeStatusDown},
+	}
+	if err := dao.Mdb.Create(&rows).Error; err != nil {
+		t.Fatalf("seed rpc_nodes: %v", err)
+	}
+
+	got, err := ListManualPaymentRpcCandidates(mdb.NetworkTron, mdb.RpcNodeTypeHttp)
+	if err != nil {
+		t.Fatalf("ListManualPaymentRpcCandidates(): %v", err)
+	}
+	if len(got) != 1 || got[0].Url != "https://manual-ok.example.com" {
+		t.Fatalf("candidate rows = %#v, want only manual ok fallback", got)
+	}
+}
+
+func TestSelectGeneralRpcNodeSkipsCoolingNode(t *testing.T) {
+	cleanup := testutil.SetupTestDatabases(t)
+	defer cleanup()
+	ResetRpcFailoverForTest()
+	t.Cleanup(ResetRpcFailoverForTest)
+
+	rows := []mdb.RpcNode{
+		{Network: mdb.NetworkTron, Url: "https://primary.example.com", Type: mdb.RpcNodeTypeHttp, Weight: 100, Enabled: true, Purpose: mdb.RpcNodePurposeGeneral, Status: mdb.RpcNodeStatusOk},
+		{Network: mdb.NetworkTron, Url: "https://backup.example.com", Type: mdb.RpcNodeTypeHttp, Weight: 1, Enabled: true, Purpose: mdb.RpcNodePurposeGeneral, Status: mdb.RpcNodeStatusOk},
+	}
+	if err := dao.Mdb.Create(&rows).Error; err != nil {
+		t.Fatalf("seed rpc_nodes: %v", err)
+	}
+
+	first, err := SelectGeneralRpcNode(mdb.NetworkTron, mdb.RpcNodeTypeHttp)
+	if err != nil {
+		t.Fatalf("SelectGeneralRpcNode(): %v", err)
+	}
+	if first == nil || first.Url != "https://primary.example.com" {
+		t.Fatalf("first node = %#v, want primary", first)
+	}
+
+	for i := 0; i < RpcFailoverThreshold; i++ {
+		RecordRpcNodeFailure(first.ID)
+	}
+
+	got, err := SelectGeneralRpcNode(mdb.NetworkTron, mdb.RpcNodeTypeHttp)
+	if err != nil {
+		t.Fatalf("SelectGeneralRpcNode(): %v", err)
+	}
+	if got == nil || got.Url != "https://backup.example.com" {
+		t.Fatalf("node after cooldown = %#v, want backup", got)
+	}
+}
+
+func TestSelectGeneralRpcNodeFallsBackWhenAllNodesCooling(t *testing.T) {
+	cleanup := testutil.SetupTestDatabases(t)
+	defer cleanup()
+	ResetRpcFailoverForTest()
+	t.Cleanup(ResetRpcFailoverForTest)
+
+	rows := []mdb.RpcNode{
+		{Network: mdb.NetworkTron, Url: "https://primary.example.com", Type: mdb.RpcNodeTypeHttp, Weight: 100, Enabled: true, Purpose: mdb.RpcNodePurposeGeneral, Status: mdb.RpcNodeStatusOk},
+		{Network: mdb.NetworkTron, Url: "https://backup.example.com", Type: mdb.RpcNodeTypeHttp, Weight: 1, Enabled: true, Purpose: mdb.RpcNodePurposeGeneral, Status: mdb.RpcNodeStatusOk},
+	}
+	if err := dao.Mdb.Create(&rows).Error; err != nil {
+		t.Fatalf("seed rpc_nodes: %v", err)
+	}
+	for i := range rows {
+		for n := 0; n < RpcFailoverThreshold; n++ {
+			RecordRpcNodeFailure(rows[i].ID)
+		}
+	}
+
+	got, err := SelectGeneralRpcNode(mdb.NetworkTron, mdb.RpcNodeTypeHttp)
+	if err != nil {
+		t.Fatalf("SelectGeneralRpcNode(): %v", err)
+	}
+	if got == nil || got.Url != "https://primary.example.com" {
+		t.Fatalf("SelectGeneralRpcNode() = %#v, want primary when every node is cooling", got)
+	}
+}
+
+func TestSelectGeneralRpcNodeReturnsNilWhenExcludedAlternatesCooling(t *testing.T) {
+	cleanup := testutil.SetupTestDatabases(t)
+	defer cleanup()
+	ResetRpcFailoverForTest()
+	t.Cleanup(ResetRpcFailoverForTest)
+
+	rows := []mdb.RpcNode{
+		{Network: mdb.NetworkTron, Url: "https://primary.example.com", Type: mdb.RpcNodeTypeHttp, Weight: 100, Enabled: true, Purpose: mdb.RpcNodePurposeGeneral, Status: mdb.RpcNodeStatusOk},
+		{Network: mdb.NetworkTron, Url: "https://backup.example.com", Type: mdb.RpcNodeTypeHttp, Weight: 1, Enabled: true, Purpose: mdb.RpcNodePurposeGeneral, Status: mdb.RpcNodeStatusOk},
+	}
+	if err := dao.Mdb.Create(&rows).Error; err != nil {
+		t.Fatalf("seed rpc_nodes: %v", err)
+	}
+	for i := 0; i < RpcFailoverThreshold; i++ {
+		RecordRpcNodeFailure(rows[1].ID)
+	}
+
+	got, err := SelectGeneralRpcNode(mdb.NetworkTron, mdb.RpcNodeTypeHttp, rows[0].ID)
+	if err != nil {
+		t.Fatalf("SelectGeneralRpcNode(): %v", err)
+	}
+	if got != nil {
+		t.Fatalf("SelectGeneralRpcNode() = %#v, want nil when only alternate is cooling", got)
+	}
+}
+
+func TestRecordRpcNodeSuccessClearsCooldown(t *testing.T) {
+	ResetRpcFailoverForTest()
+	t.Cleanup(ResetRpcFailoverForTest)
+
+	const nodeID uint64 = 42
+	for i := 0; i < RpcFailoverThreshold; i++ {
+		RecordRpcNodeFailure(nodeID)
+	}
+	if !IsRpcNodeCoolingDown(nodeID) {
+		t.Fatal("node should be cooling after threshold")
+	}
+	RecordRpcNodeSuccess(nodeID)
+	if IsRpcNodeCoolingDown(nodeID) {
+		t.Fatal("node should not be cooling after success")
+	}
+	failures, cooling := RecordRpcNodeFailure(nodeID)
+	if cooling || failures != 1 {
+		t.Fatalf("failure state after success = failures=%d cooling=%v, want failures=1 cooling=false", failures, cooling)
+	}
+}
+
+func TestRpcNodeLogLabelHidesPathAndQuery(t *testing.T) {
+	label := RpcNodeLogLabel(mdb.RpcNode{
+		BaseModel: mdb.BaseModel{ID: 7},
+		Network:   mdb.NetworkEthereum,
+		Type:      mdb.RpcNodeTypeWs,
+		Url:       "wss://rpc.example.com/v3/secret-key?token=secret",
+	})
+	if strings.Contains(label, "secret") || strings.Contains(label, "/v3/") {
+		t.Fatalf("RpcNodeLogLabel() leaked sensitive URL parts: %s", label)
+	}
+	if !strings.Contains(label, "wss://rpc.example.com") {
+		t.Fatalf("RpcNodeLogLabel() = %s, want host", label)
+	}
+}
+
+func TestListRpcNodesForHealthExcludesManualVerify(t *testing.T) {
+	cleanup := testutil.SetupTestDatabases(t)
+	defer cleanup()
+
+	rows := []mdb.RpcNode{
+		{Network: mdb.NetworkTron, Url: "https://general.example.com", Type: mdb.RpcNodeTypeHttp, Enabled: true, Purpose: mdb.RpcNodePurposeGeneral, Status: mdb.RpcNodeStatusUnknown},
+		{Network: mdb.NetworkTron, Url: "https://manual.example.com", Type: mdb.RpcNodeTypeHttp, Enabled: true, Purpose: mdb.RpcNodePurposeManualVerify, Status: mdb.RpcNodeStatusUnknown},
+	}
+	if err := dao.Mdb.Create(&rows).Error; err != nil {
+		t.Fatalf("seed rpc_nodes: %v", err)
+	}
+	got, err := ListRpcNodesForHealth()
+	if err != nil {
+		t.Fatalf("ListRpcNodesForHealth(): %v", err)
+	}
+	if len(got) != 1 || got[0].Url != "https://general.example.com" {
+		t.Fatalf("ListRpcNodesForHealth() = %#v, want only general row", got)
+	}
+}
@@ -0,0 +1,108 @@
+package data
+
+import (
+	"strings"
+	"sync"
+	"time"
+)
+
+// RpcRuntimeStatsSnapshot is an in-process snapshot of RPC activity for one
+// chain. It is intentionally not persisted; restarting the process resets it.
+type RpcRuntimeStatsSnapshot struct {
+	Network           string
+	SuccessCount      int64
+	FailureCount      int64
+	LatestBlockHeight int64
+	LastSyncAt        time.Time
+}
+
+type rpcRuntimeStatsCounter struct {
+	successCount      int64
+	failureCount      int64
+	latestBlockHeight int64
+	lastSyncAt        time.Time
+}
+
+var gRpcRuntimeStats = struct {
+	sync.RWMutex
+	byNetwork map[string]*rpcRuntimeStatsCounter
+}{
+	byNetwork: make(map[string]*rpcRuntimeStatsCounter),
+}
+
+func normalizeRpcStatsNetwork(network string) string {
+	return strings.ToLower(strings.TrimSpace(network))
+}
+
+func rpcStatsCounterLocked(network string) *rpcRuntimeStatsCounter {
+	counter := gRpcRuntimeStats.byNetwork[network]
+	if counter == nil {
+		counter = &rpcRuntimeStatsCounter{}
+		gRpcRuntimeStats.byNetwork[network] = counter
+	}
+	return counter
+}
+
+// RecordRpcSuccess records one successful application-level RPC operation.
+func RecordRpcSuccess(network string) {
+	network = normalizeRpcStatsNetwork(network)
+	if network == "" {
+		return
+	}
+	gRpcRuntimeStats.Lock()
+	defer gRpcRuntimeStats.Unlock()
+	counter := rpcStatsCounterLocked(network)
+	counter.successCount++
+	counter.lastSyncAt = time.Now()
+}
+
+// RecordRpcFailure records one failed application-level RPC operation.
+func RecordRpcFailure(network string) {
+	network = normalizeRpcStatsNetwork(network)
+	if network == "" {
+		return
+	}
+	gRpcRuntimeStats.Lock()
+	defer gRpcRuntimeStats.Unlock()
+	counter := rpcStatsCounterLocked(network)
+	counter.failureCount++
+}
+
+// RecordRpcBlockHeight records the latest observed chain height.
+func RecordRpcBlockHeight(network string, height int64) {
+	network = normalizeRpcStatsNetwork(network)
+	if network == "" || height <= 0 {
+		return
+	}
+	gRpcRuntimeStats.Lock()
+	defer gRpcRuntimeStats.Unlock()
+	counter := rpcStatsCounterLocked(network)
+	counter.lastSyncAt = time.Now()
+	if height > counter.latestBlockHeight {
+		counter.latestBlockHeight = height
+	}
+}
+
+// SnapshotRpcRuntimeStats returns a copy of the current per-chain counters.
+func SnapshotRpcRuntimeStats() map[string]RpcRuntimeStatsSnapshot {
+	gRpcRuntimeStats.RLock()
+	defer gRpcRuntimeStats.RUnlock()
+	out := make(map[string]RpcRuntimeStatsSnapshot, len(gRpcRuntimeStats.byNetwork))
+	for network, counter := range gRpcRuntimeStats.byNetwork {
+		out[network] = RpcRuntimeStatsSnapshot{
+			Network:           network,
+			SuccessCount:      counter.successCount,
+			FailureCount:      counter.failureCount,
+			LatestBlockHeight: counter.latestBlockHeight,
+			LastSyncAt:        counter.lastSyncAt,
+		}
+	}
+	return out
+}
+
+// ResetRpcRuntimeStatsForTest clears process-local stats for isolated tests.
+func ResetRpcRuntimeStatsForTest() {
+	gRpcRuntimeStats.Lock()
+	defer gRpcRuntimeStats.Unlock()
+	gRpcRuntimeStats.byNetwork = make(map[string]*rpcRuntimeStatsCounter)
+}
@@ -0,0 +1,81 @@
+package data
+
+import (
+	"testing"
+	"time"
+)
+
+func TestRpcRuntimeStatsRecordsCountsAndLatestHeight(t *testing.T) {
+	ResetRpcRuntimeStatsForTest()
+	t.Cleanup(ResetRpcRuntimeStatsForTest)
+
+	start := time.Now()
+	RecordRpcSuccess(" TRON ")
+	RecordRpcSuccess("tron")
+	RecordRpcFailure("TRON")
+	RecordRpcBlockHeight("Tron", 100)
+	RecordRpcBlockHeight("tron", 90)
+
+	stats := SnapshotRpcRuntimeStats()
+	got, ok := stats["tron"]
+	if !ok {
+		t.Fatalf("missing tron stats: %#v", stats)
+	}
+	if got.Network != "tron" {
+		t.Fatalf("network = %q, want tron", got.Network)
+	}
+	if got.SuccessCount != 2 {
+		t.Fatalf("success count = %d, want 2", got.SuccessCount)
+	}
+	if got.FailureCount != 1 {
+		t.Fatalf("failure count = %d, want 1", got.FailureCount)
+	}
+	if got.LatestBlockHeight != 100 {
+		t.Fatalf("latest block height = %d, want 100", got.LatestBlockHeight)
+	}
+	if got.LastSyncAt.Before(start) {
+		t.Fatalf("last sync at = %s, want after %s", got.LastSyncAt, start)
+	}
+}
+
+func TestRpcRuntimeStatsIgnoresEmptyNetworkAndInvalidHeight(t *testing.T) {
+	ResetRpcRuntimeStatsForTest()
+	t.Cleanup(ResetRpcRuntimeStatsForTest)
+
+	RecordRpcSuccess("")
+	RecordRpcFailure(" ")
+	RecordRpcBlockHeight("tron", 0)
+
+	stats := SnapshotRpcRuntimeStats()
+	if len(stats) != 0 {
+		t.Fatalf("stats = %#v, want empty", stats)
+	}
+}
+
+func TestRpcRuntimeStatsBlockHeightUpdatesLastSyncAt(t *testing.T) {
+	ResetRpcRuntimeStatsForTest()
+	t.Cleanup(ResetRpcRuntimeStatsForTest)
+
+	start := time.Now()
+	RecordRpcBlockHeight("ethereum", 123)
+
+	stats := SnapshotRpcRuntimeStats()
+	got := stats["ethereum"]
+	if got.SuccessCount != 0 {
+		t.Fatalf("success count = %d, want 0", got.SuccessCount)
+	}
+	if got.LastSyncAt.Before(start) {
+		t.Fatalf("last sync at = %s, want after %s", got.LastSyncAt, start)
+	}
+}
+
+func TestResetRpcRuntimeStatsForTest(t *testing.T) {
+	ResetRpcRuntimeStatsForTest()
+	RecordRpcSuccess("tron")
+	ResetRpcRuntimeStatsForTest()
+
+	stats := SnapshotRpcRuntimeStats()
+	if len(stats) != 0 {
+		t.Fatalf("stats = %#v, want empty after reset", stats)
+	}
+}
@@ -5,6 +5,7 @@ import (
 	"strings"
 	"sync"

+	"github.com/GMWalletApp/epusdt/config"
 	"github.com/GMWalletApp/epusdt/model/dao"
 	"github.com/GMWalletApp/epusdt/model/mdb"
 	"gorm.io/gorm/clause"
@@ -118,15 +119,36 @@ func GetSettingBool(key string, fallback bool) bool {
 	return b
 }

+const (
+	DefaultAmountPrecision = 2
+	MinAmountPrecision     = 2
+	MaxAmountPrecision     = 6
+)
+
+// NormalizeAmountPrecision clamps external precision values to the supported
+// range used by order creation and transaction matching.
+func NormalizeAmountPrecision(precision int) int {
+	if precision < MinAmountPrecision || precision > MaxAmountPrecision {
+		return DefaultAmountPrecision
+	}
+	return precision
+}
+
+func GetAmountPrecision() int {
+	return NormalizeAmountPrecision(GetSettingInt(mdb.SettingKeyAmountPrecision, DefaultAmountPrecision))
+}
+
 // SetSetting upserts a setting row and refreshes the cache entry.
 func SetSetting(group, key, value, valueType string) error {
 	if valueType == "" {
 		valueType = mdb.SettingTypeString
 	}
 	row := mdb.Setting{Group: group, Key: key, Value: value, Type: valueType}
+	updates := clause.AssignmentColumns([]string{"group", "value", "type", "updated_at"})
+	updates = append(updates, clause.Assignment{Column: clause.Column{Name: "deleted_at"}, Value: nil})
 	err := dao.Mdb.Clauses(clause.OnConflict{
 		Columns:   []clause.Column{{Name: "key"}},
-		DoUpdates: clause.AssignmentColumns([]string{"group", "value", "type", "updated_at"}),
+		DoUpdates: updates,
 	}).Create(&row).Error
 	if err != nil {
 		return err
@@ -157,6 +179,97 @@ var sensitiveSettingKeys = []string{
 	mdb.SettingKeyInitAdminPasswordChanged,
 }

+func getFirstNonEmptySetting(fallback string, keys ...string) string {
+	for _, key := range keys {
+		value := strings.TrimSpace(GetSettingString(key, ""))
+		if value != "" {
+			return value
+		}
+	}
+	return fallback
+}
+
+func GetBrandCashierName() string {
+	return getFirstNonEmptySetting("", mdb.SettingKeyBrandCheckoutName, mdb.SettingKeyBrandSiteName)
+}
+
+func GetBrandLogoURL() string {
+	return strings.TrimSpace(GetSettingString(mdb.SettingKeyBrandLogoUrl, ""))
+}
+
+func GetBrandWebsiteTitle() string {
+	return getFirstNonEmptySetting("", mdb.SettingKeyBrandSiteTitle, mdb.SettingKeyBrandPageTitle)
+}
+
+func GetBrandSupportURL() string {
+	return strings.TrimSpace(GetSettingString(mdb.SettingKeyBrandSupportUrl, ""))
+}
+
+func GetBrandBackgroundColor() string {
+	return strings.TrimSpace(GetSettingString(mdb.SettingKeyBrandBackgroundColor, ""))
+}
+
+func GetBrandBackgroundImageURL() string {
+	return strings.TrimSpace(GetSettingString(mdb.SettingKeyBrandBackgroundImageUrl, ""))
+}
+
+// OkPay settings helpers keep the provider-specific defaults in one place so
+// business logic does not need to repeat raw settings keys.
+func GetOkPayEnabled() bool {
+	return GetSettingBool(mdb.SettingKeyOkPayEnabled, false)
+}
+
+func GetOkPayShopID() string {
+	return strings.TrimSpace(GetSettingString(mdb.SettingKeyOkPayShopID, ""))
+}
+
+func GetOkPayShopToken() string {
+	return strings.TrimSpace(GetSettingString(mdb.SettingKeyOkPayShopToken, ""))
+}
+
+func GetOkPayAPIURL() string {
+	return strings.TrimSpace(GetSettingString(mdb.SettingKeyOkPayAPIURL, "https://api.okaypay.me/shop/"))
+}
+
+func GetOkPayCallbackURL() string {
+	if configured := strings.TrimSpace(GetSettingString(mdb.SettingKeyOkPayCallbackURL, "")); configured != "" {
+		return configured
+	}
+	appURI := strings.TrimSpace(config.GetAppUri())
+	if appURI == "" {
+		return ""
+	}
+	return strings.TrimRight(appURI, "/") + "/payments/okpay/v1/notify"
+}
+
+func GetOkPayReturnURL() string {
+	return strings.TrimSpace(GetSettingString(mdb.SettingKeyOkPayReturnURL, ""))
+}
+
+func GetOkPayTimeoutSeconds() int {
+	return GetSettingInt(mdb.SettingKeyOkPayTimeoutSeconds, 10)
+}
+
+func GetOkPayAllowTokens() []string {
+	raw := GetSettingString(mdb.SettingKeyOkPayAllowTokens, "USDT,TRX")
+	if strings.TrimSpace(raw) == "" {
+		return []string{"USDT", "TRX"}
+	}
+	parts := strings.Split(raw, ",")
+	out := make([]string, 0, len(parts))
+	for _, part := range parts {
+		token := strings.ToUpper(strings.TrimSpace(part))
+		if token == "" {
+			continue
+		}
+		out = append(out, token)
+	}
+	if len(out) == 0 {
+		return []string{"USDT", "TRX"}
+	}
+	return out
+}
+
 // ListSettingsByGroup returns all rows for a given group (empty group = all),
 // excluding any keys in sensitiveSettingKeys.
 func ListSettingsByGroup(group string) ([]mdb.Setting, error) {
@@ -5,6 +5,7 @@ import (

 	"github.com/GMWalletApp/epusdt/model/dao"
 	"github.com/GMWalletApp/epusdt/model/mdb"
+	addressutil "github.com/GMWalletApp/epusdt/util/address"
 	"github.com/GMWalletApp/epusdt/util/constant"
 )

@@ -34,10 +35,23 @@ func normalizeWalletAddressByNetwork(network, address string) string {
 	return address
 }

+func normalizeWalletAddressByNetworkE(network, address string) (string, error) {
+	network = normalizeWalletNetwork(network)
+	address = strings.TrimSpace(address)
+	if network == mdb.NetworkTon {
+		return addressutil.NormalizeTonAddress(address)
+	}
+	return normalizeWalletAddressByNetwork(network, address), nil
+}
+
 // AddWalletAddressWithNetwork 创建指定网络的钱包地址
 func AddWalletAddressWithNetwork(network, address string) (*mdb.WalletAddress, error) {
 	network = normalizeWalletNetwork(network)
-	address = normalizeWalletAddressByNetwork(network, address)
+	var err error
+	address, err = normalizeWalletAddressByNetworkE(network, address)
+	if err != nil {
+		return nil, err
+	}

 	exist, err := GetWalletAddressByNetworkAndAddress(network, address)
 	if err != nil {
@@ -75,9 +89,13 @@ func AddWalletAddressWithNetwork(network, address string) (*mdb.WalletAddress, e
 // GetWalletAddressByNetworkAndAddress 通过网络和地址查询
 func GetWalletAddressByNetworkAndAddress(network, address string) (*mdb.WalletAddress, error) {
 	network = normalizeWalletNetwork(network)
-	address = normalizeWalletAddressByNetwork(network, address)
+	var err error
+	address, err = normalizeWalletAddressByNetworkE(network, address)
+	if err != nil {
+		return nil, err
+	}
 	walletAddress := new(mdb.WalletAddress)
-	err := dao.Mdb.Model(walletAddress).
+	err = dao.Mdb.Model(walletAddress).
 		Where("network = ?", network).
 		Where("address = ?", address).
 		Limit(1).Find(walletAddress).Error
@@ -126,6 +144,12 @@ func GetAvailableWalletAddressByNetwork(network string) ([]mdb.WalletAddress, er
 		for i := range list {
 			list[i].Address = strings.ToLower(strings.TrimSpace(list[i].Address))
 		}
+	} else if network == mdb.NetworkTon {
+		for i := range list {
+			if normalized, err := addressutil.NormalizeTonAddress(list[i].Address); err == nil {
+				list[i].Address = normalized
+			}
+		}
 	}
 	return list, err
 }
@@ -149,6 +173,12 @@ func GetAllWalletAddressByNetwork(network string) ([]mdb.WalletAddress, error) {
 		for i := range list {
 			list[i].Address = strings.ToLower(strings.TrimSpace(list[i].Address))
 		}
+	} else if network == mdb.NetworkTon {
+		for i := range list {
+			if normalized, err := addressutil.NormalizeTonAddress(list[i].Address); err == nil {
+				list[i].Address = normalized
+			}
+		}
 	}
 	return list, err
 }
@@ -7,6 +7,8 @@ import (
 	"github.com/GMWalletApp/epusdt/internal/testutil"
 	"github.com/GMWalletApp/epusdt/model/dao"
 	"github.com/GMWalletApp/epusdt/model/mdb"
+	"github.com/GMWalletApp/epusdt/util/constant"
+	"github.com/xssnick/tonutils-go/address"
 )

 func TestAddWalletAddressWithNetworkNormalizesEvmAddressToLowercase(t *testing.T) {
@@ -81,3 +83,23 @@ func TestAddWalletAddressWithNetworkKeepsOriginalCaseForNonEvm(t *testing.T) {
 		t.Fatalf("solana wallet address = %q, want %q", solRow.Address, solAddress)
 	}
 }
+
+func TestAddWalletAddressWithNetworkNormalizesTonAddressVariants(t *testing.T) {
+	cleanup := testutil.SetupTestDatabases(t)
+	defer cleanup()
+
+	bounceable := "EQC6KV4zs8TJtSZapOrRFmqSkxzpq-oSCoxekQRKElf4nC1I"
+	addr := address.MustParseAddr(bounceable)
+	expected := addr.Bounce(false).String()
+
+	row, err := AddWalletAddressWithNetwork(mdb.NetworkTon, addr.StringRaw())
+	if err != nil {
+		t.Fatalf("add raw ton wallet: %v", err)
+	}
+	if row.Address != expected {
+		t.Fatalf("stored TON address = %q, want %q", row.Address, expected)
+	}
+	if _, err = AddWalletAddressWithNetwork(mdb.NetworkTon, bounceable); err != constant.WalletAddressAlreadyExists {
+		t.Fatalf("add equivalent ton wallet error = %v, want already exists", err)
+	}
+}
@@ -12,8 +12,21 @@ const (
 	PaymentTypeEpay = "Epay"
 )

+const (
+	// PaymentProviderOnChain means this concrete order record is settled by
+	// sending funds to a directly assigned wallet address on a supported chain.
+	PaymentProviderOnChain = "on_chain"
+	// PaymentProviderOkPay means this concrete order record is settled through
+	// the third-party OkayPay/OkPay hosted checkout flow.
+	//
+	// In the current design this is typically used by a switch-network-created
+	// child order, while the parent order keeps its original merchant-facing
+	// semantics and callback behavior.
+	PaymentProviderOkPay = "okpay"
+)
+
 type Orders struct {
-	TradeId            string  `gorm:"column:trade_id;uniqueIndex:orders_trade_id_uindex" json:"trade_id" example:"T2026041612345678"`
+	TradeId            string  `gorm:"column:trade_id;uniqueIndex:orders_trade_id_uindex" json:"trade_id" example:"3nQ9pL2xV7sK1mR8cT4yB_aZ"`
 	OrderId            string  `gorm:"column:order_id;uniqueIndex:orders_order_id_uindex" json:"order_id" example:"ORD20260416001"`
 	ParentTradeId      string  `gorm:"column:parent_trade_id;index:idx_orders_parent_trade_id;default:''" json:"parent_trade_id"`
 	BlockTransactionId string  `gorm:"index:orders_block_transaction_id_index;column:block_transaction_id" json:"block_transaction_id" example:"0xabc123..."`
@@ -33,7 +46,17 @@ type Orders struct {
 	CallBackConfirm int    `gorm:"column:callback_confirm;default:2" json:"callback_confirm" enums:"1,2" example:"2"`
 	IsSelected      bool   `gorm:"column:is_selected;default:false" json:"is_selected" example:"false"`
 	PaymentType     string `gorm:"column:payment_type" json:"payment_type" example:"Epay"`
-	ApiKeyID        uint64 `gorm:"column:api_key_id;default:0;index:orders_api_key_id_index" json:"api_key_id" example:"1"`
+	// PayProvider identifies how this specific order row is collected.
+	//
+	// Semantics:
+	//   - parent orders and regular chain child orders use on_chain
+	//   - third-party hosted checkout child orders use their provider name
+	//     (for example okpay)
+	//
+	// Existing rows default to on_chain for backward compatibility so upgrades
+	// can rely on AutoMigrate without rewriting old orders.
+	PayProvider string `gorm:"column:pay_provider;size:32;default:on_chain;index:orders_pay_provider_index" json:"pay_provider" example:"on_chain"`
+	ApiKeyID    uint64 `gorm:"column:api_key_id;default:0;index:orders_api_key_id_index" json:"api_key_id" example:"1"`
 	// PayBySubId holds the primary-key ID of the sub-order that settled this parent order.
 	// Zero when the parent order was paid directly (no sub-order involved).
 	PayBySubId uint64 `gorm:"column:pay_by_sub_id;default:0" json:"pay_by_sub_id" example:"0"`
@@ -0,0 +1,48 @@
+package mdb
+
+const (
+	ProviderOrderStatusCreating = "creating"
+	ProviderOrderStatusPending  = "pending"
+	ProviderOrderStatusPaid     = "paid"
+	ProviderOrderStatusFailed   = "failed"
+	ProviderOrderStatusExpired  = "expired"
+)
+
+// ProviderOrder stores provider-specific checkout data for one internal order
+// row. For OkPay this is expected to bind to the concrete child order created
+// by switch-network, not to the parent merchant order.
+//
+// Binding rules:
+//   - trade_id always points to orders.trade_id
+//   - the bound orders row should use the same pay_provider value
+//   - provider identifies which downstream checkout created the provider row
+//   - provider_order_id is the provider's own order number (for OkPay this is
+//     the returned order_id from /payLink)
+//   - pay_url is the hosted payment URL returned by the provider
+//
+// The main orders table remains the source of truth for merchant-facing state,
+// while this table keeps provider-specific identifiers and callback payloads.
+type ProviderOrder struct {
+	TradeId string `gorm:"column:trade_id;size:32;not null;uniqueIndex:provider_orders_trade_id_provider_uindex,priority:1;index:provider_orders_trade_id_index" json:"trade_id" example:"3nQ9pL2xV7sK1mR8cT4yB_aZ"`
+	// Provider values should match the bound Orders.PayProvider value.
+	Provider string `gorm:"column:provider;size:32;not null;uniqueIndex:provider_orders_trade_id_provider_uindex,priority:2;index:provider_orders_provider_status_index,priority:1" json:"provider" example:"okpay"`
+	// ProviderOrderID is the downstream provider's own order identifier for the
+	// bound concrete order row.
+	ProviderOrderID string `gorm:"column:provider_order_id;size:128;not null;default:'';index:provider_orders_provider_order_id_index" json:"provider_order_id" example:"ac7b86615fdb137576ae35879f7ed844"`
+	// PayURL is the hosted checkout URL returned by the downstream provider for
+	// the bound concrete order row.
+	PayURL string `gorm:"column:pay_url;size:512;not null;default:''" json:"pay_url" example:"https://pay.example.com/checkout/abc123"`
+	// Amount/Coin mirror the exact payload submitted to the provider, which may
+	// be useful when validating callbacks and troubleshooting mismatches.
+	Amount float64 `gorm:"column:amount" json:"amount" example:"14.2857"`
+	Coin   string  `gorm:"column:coin;size:16;not null;default:''" json:"coin" example:"USDT"`
+	Status string  `gorm:"column:status;size:32;not null;default:pending;index:provider_orders_provider_status_index,priority:2" json:"status" example:"pending"`
+	// NotifyRaw stores the original provider callback payload for auditing and
+	// replay/debug use. It is provider-specific and intentionally opaque here.
+	NotifyRaw string `gorm:"column:notify_raw;type:text" json:"notify_raw"`
+	BaseModel
+}
+
+func (p *ProviderOrder) TableName() string {
+	return "provider_orders"
+}
@@ -5,6 +5,7 @@ import "github.com/dromara/carbon/v2"
 const (
 	RpcNodeTypeHttp = "http"
 	RpcNodeTypeWs   = "ws"
+	RpcNodeTypeLite = "lite"
 )

 const (
@@ -13,19 +14,26 @@ const (
 	RpcNodeStatusDown    = "down"
 )

-// RpcNode records one RPC endpoint for a network. Clients select a node
-// by weight among rows where Enabled=true AND Status=ok. A periodic
-// task/rpc_health_job writes Status/LastLatencyMs/LastCheckedAt.
+const (
+	RpcNodePurposeGeneral      = "general"
+	RpcNodePurposeManualVerify = "manual_verify"
+	RpcNodePurposeBoth         = "both"
+)
+
+// RpcNode records one RPC endpoint for a network. Runtime selection filters by
+// Type, Status and Purpose so paid manual-verification nodes stay isolated.
 type RpcNode struct {
-	Network       string      `gorm:"column:network;size:32;index:rpc_nodes_network_status_index,priority:1" json:"network" example:"tron"`
-	Url string `gorm:"column:url;size:512" json:"url" example:"https://api.trongrid.io"`
-	// 连接类型 http=HTTP请求 ws=WebSocket长连接
-	Type string `gorm:"column:type;size:16" json:"type" enums:"http,ws" example:"http"`
-	Weight        int         `gorm:"column:weight;default:1" json:"weight" example:"1"`
-	ApiKey        string      `gorm:"column:api_key;size:255" json:"api_key" example:"your-api-key"`
-	Enabled bool `gorm:"column:enabled;default:true" json:"enabled" example:"true"`
+	Network string `gorm:"column:network;size:32;index:rpc_nodes_network_status_index,priority:1" json:"network" example:"tron"`
+	Url     string `gorm:"column:url;size:512" json:"url" example:"https://api.trongrid.io"`
+	// 连接类型 http=HTTP请求 ws=WebSocket长连接 lite=TON liteserver配置
+	Type    string `gorm:"column:type;size:16" json:"type" enums:"http,ws,lite" example:"http"`
+	Weight  int    `gorm:"column:weight;default:1" json:"weight" example:"1"`
+	ApiKey  string `gorm:"column:api_key;size:255" json:"api_key" example:"your-api-key"`
+	Enabled bool   `gorm:"column:enabled;default:true" json:"enabled" example:"true"`
+	// 用途 general=通用 manual_verify=补单专用 both=通用+补单
+	Purpose string `gorm:"column:purpose;size:32;default:general;index:rpc_nodes_purpose_index" json:"purpose" enums:"general,manual_verify,both" example:"general"`
 	// 健康状态 unknown=未知 ok=正常 down=异常
-	Status string `gorm:"column:status;size:16;default:unknown;index:rpc_nodes_network_status_index,priority:2" json:"status" enums:"unknown,ok,down" example:"ok"`
+	Status        string      `gorm:"column:status;size:16;default:unknown;index:rpc_nodes_network_status_index,priority:2" json:"status" enums:"unknown,ok,down" example:"ok"`
 	LastLatencyMs int         `gorm:"column:last_latency_ms;default:-1" json:"last_latency_ms" example:"120"`
 	LastCheckedAt carbon.Time `gorm:"column:last_checked_at" json:"last_checked_at" example:"2026-04-16 12:00:00"`
 	BaseModel
@@ -1,17 +1,19 @@
 package mdb

 // Setting stores non-credential runtime configuration as key/value pairs.
-// Groups: brand, rate, system, epay. Merchant credentials (pid + secret_key)
-// live in the api_keys table; notification configs live in NotificationChannel.
-// Default rows for the epay group are seeded on first startup (see
-// model/dao/mdb_table_init.go seedDefaultSettings). All other groups start
-// empty and fall back to hardcoded defaults until an admin sets them.
-// Only exception: system.jwt_secret is auto-generated on first startup.
+// Groups: brand, rate, system, epay, okpay. Merchant credentials (pid +
+// secret_key) live in the api_keys table; notification configs live in
+// NotificationChannel.
+// Default rows for the system/epay/okpay groups are seeded on first startup
+// (see model/dao/mdb_table_init.go seedDefaultSettings). Other groups start
+// empty and fall back to hardcoded defaults until an admin sets them. The
+// system.jwt_secret key is auto-generated on first startup.
 const (
 	SettingGroupBrand  = "brand"
 	SettingGroupRate   = "rate"
 	SettingGroupSystem = "system"
 	SettingGroupEpay   = "epay"
+	SettingGroupOkPay  = "okpay"
 )

 const (
@@ -28,12 +30,19 @@ const (
 	SettingKeyInitAdminPasswordFetched = "system.init_admin_password_fetched"
 	SettingKeyInitAdminPasswordChanged = "system.init_admin_password_changed"
 	SettingKeyOrderExpiration          = "system.order_expiration_time"
+	SettingKeyAmountPrecision          = "system.amount_precision"
+	SettingKeySystemLogLevel           = "system.log_level"
+	SettingKeyBrandCheckoutName        = "brand.checkout_name"
 	SettingKeyBrandSiteName            = "brand.site_name"
 	SettingKeyBrandLogoUrl             = "brand.logo_url"
+	SettingKeyBrandSiteTitle           = "brand.site_title"
 	SettingKeyBrandPageTitle           = "brand.page_title"
+	SettingKeyBrandSuccessCopy         = "brand.success_copy"
 	SettingKeyBrandPaySuccess          = "brand.pay_success_text"
 	SettingKeyBrandSupportUrl          = "brand.support_url"
-	SettingKeyRateForcedUsdt           = "rate.forced_usdt_rate"
+	SettingKeyBrandBackgroundColor     = "brand.background_color"
+	SettingKeyBrandBackgroundImageUrl  = "brand.background_image_url"
+	SettingKeyRateForcedRateList       = "rate.forced_rate_list"
 	SettingKeyRateAdjustPercent        = "rate.adjust_percent"
 	SettingKeyRateOkxC2cEnabled        = "rate.okx_c2c_enabled"
 	SettingKeyRateApiUrl               = "rate.api_url"
@@ -42,14 +51,28 @@ const (
 	SettingKeyEpayDefaultToken    = "epay.default_token"
 	SettingKeyEpayDefaultCurrency = "epay.default_currency"
 	SettingKeyEpayDefaultNetwork  = "epay.default_network"
+
+	// OkPay hosted-checkout settings.
+	SettingKeyOkPayEnabled        = "okpay.enabled"
+	SettingKeyOkPayShopID         = "okpay.shop_id"
+	SettingKeyOkPayShopToken      = "okpay.shop_token"
+	SettingKeyOkPayAPIURL         = "okpay.api_url"
+	SettingKeyOkPayCallbackURL    = "okpay.callback_url"
+	SettingKeyOkPayReturnURL      = "okpay.return_url"
+	SettingKeyOkPayTimeoutSeconds = "okpay.timeout_seconds"
+	SettingKeyOkPayAllowTokens    = "okpay.allow_tokens"
+)
+
+const (
+	SettingDefaultSystemLogLevel = "error"
 )

 type Setting struct {
-	Group       string `gorm:"column:group;size:32;index:settings_group_index" json:"group" enums:"brand,rate,system" example:"rate"`
-	Key         string `gorm:"column:key;uniqueIndex:settings_key_uindex;size:128" json:"key" example:"rate.forced_usdt_rate"`
-	Value       string `gorm:"column:value;type:text" json:"value" example:"7.2"`
-	Type        string `gorm:"column:type;size:16;default:string" json:"type" enums:"string,int,bool,json" example:"string"`
-	Description string `gorm:"column:description;size:255" json:"description" example:"强制USDT汇率"`
+	Group       string `gorm:"column:group;size:32;index:settings_group_index" json:"group" enums:"brand,rate,system,epay,okpay" example:"rate"`
+	Key         string `gorm:"column:key;uniqueIndex:settings_key_uindex;size:128" json:"key" example:"rate.forced_rate_list"`
+	Value       string `gorm:"column:value;type:text" json:"value" example:"{\"cny\":{\"usdt\":0.14635}}"`
+	Type        string `gorm:"column:type;size:16;default:string" json:"type" enums:"string,int,bool,json" example:"json"`
+	Description string `gorm:"column:description;size:255" json:"description" example:"强制汇率列表"`
 	BaseModel
 }

@@ -3,16 +3,17 @@ package mdb
 import "time"

 type TransactionLock struct {
-	ID           uint64    `gorm:"column:id;primaryKey;autoIncrement" json:"id"`
-	Network      string    `gorm:"column:network;uniqueIndex:transaction_lock_network_address_token_amount_uindex,priority:1" json:"network"`
-	Address      string    `gorm:"column:address;uniqueIndex:transaction_lock_network_address_token_amount_uindex,priority:2" json:"address"`
-	Token        string    `gorm:"column:token;uniqueIndex:transaction_lock_network_address_token_amount_uindex,priority:3" json:"token"`
-	AmountScaled int64     `gorm:"column:amount_scaled;uniqueIndex:transaction_lock_network_address_token_amount_uindex,priority:4" json:"amount_scaled"`
-	AmountText   string    `gorm:"column:amount_text" json:"amount_text"`
-	TradeId      string    `gorm:"column:trade_id;index:transaction_lock_trade_id_index" json:"trade_id"`
-	ExpiresAt    time.Time `gorm:"column:expires_at;index:transaction_lock_expires_at_index" json:"expires_at"`
-	CreatedAt    time.Time `gorm:"column:created_at" json:"created_at"`
-	UpdatedAt    time.Time `gorm:"column:updated_at" json:"updated_at"`
+	ID              uint64    `gorm:"column:id;primaryKey;autoIncrement" json:"id"`
+	Network         string    `gorm:"column:network;uniqueIndex:transaction_lock_network_address_token_amount_uindex,priority:1" json:"network"`
+	Address         string    `gorm:"column:address;uniqueIndex:transaction_lock_network_address_token_amount_uindex,priority:2" json:"address"`
+	Token           string    `gorm:"column:token;uniqueIndex:transaction_lock_network_address_token_amount_uindex,priority:3" json:"token"`
+	AmountScaled    int64     `gorm:"column:amount_scaled;uniqueIndex:transaction_lock_network_address_token_amount_uindex,priority:4" json:"amount_scaled"`
+	AmountText      string    `gorm:"column:amount_text" json:"amount_text"`
+	AmountPrecision int       `gorm:"column:amount_precision;default:2;uniqueIndex:transaction_lock_network_address_token_amount_uindex,priority:5" json:"amount_precision"`
+	TradeId         string    `gorm:"column:trade_id;index:transaction_lock_trade_id_index" json:"trade_id"`
+	ExpiresAt       time.Time `gorm:"column:expires_at;index:transaction_lock_expires_at_index" json:"expires_at"`
+	CreatedAt       time.Time `gorm:"column:created_at" json:"created_at"`
+	UpdatedAt       time.Time `gorm:"column:updated_at" json:"updated_at"`
 }

 func (t *TransactionLock) TableName() string {
@@ -9,9 +9,10 @@ const (
 	NetworkTron     = "tron"
 	NetworkSolana   = "solana"
 	NetworkEthereum = "ethereum"
-	NetworkBsc      = "bsc"
+	NetworkBsc      = "binance"
 	NetworkPolygon  = "polygon"
 	NetworkPlasma   = "plasma"
+	NetworkTon      = "ton"
 )

 const (
@@ -6,8 +6,8 @@ import "github.com/gookit/validate"
 type CreateTransactionRequest struct {
 	OrderId     string  `json:"order_id" form:"order_id" validate:"required|maxLen:32" example:"ORD20260416001"`
 	Currency    string  `json:"currency" form:"currency" validate:"required" example:"cny"` // 法币 如：cny
-	Token       string  `json:"token" form:"token" validate:"required" example:"usdt"`      // 币种 如：usdt
-	Network     string  `json:"network" form:"network" validate:"required" example:"tron"`  // 网络 如：tron
+	Token       string  `json:"token" form:"token" validate:"required" example:"usdt"`      // 币种 如：usdt、ton
+	Network     string  `json:"network" form:"network" validate:"required" example:"tron"`  // 网络 如：ton、tron
 	Amount      float64 `json:"amount" form:"amount" validate:"required|isFloat|gt:0.01" example:"100.00"`
 	NotifyUrl   string  `json:"notify_url" form:"notify_url" validate:"required" example:"https://example.com/notify"`
 	Signature   string  `json:"signature" form:"signature" validate:"required" example:"a1b2c3d4e5f6..."`
@@ -39,11 +39,22 @@ type OrderProcessingRequest struct {
 	BlockTransactionId string
 }

+// ManualPaymentRequest 手动提交交易 hash 补单
+type ManualPaymentRequest struct {
+	BlockTransactionId string `json:"block_transaction_id" validate:"required" example:"0xabc123def456..."`
+}
+
+func (r ManualPaymentRequest) Translates() map[string]string {
+	return validate.MS{
+		"BlockTransactionId": "交易哈希",
+	}
+}
+
 // SwitchNetworkRequest 切换支付网络
 type SwitchNetworkRequest struct {
-	TradeId string `json:"trade_id" validate:"required" example:"T2026041612345678"`
+	TradeId string `json:"trade_id" validate:"required" example:"3nQ9pL2xV7sK1mR8cT4yB_aZ"`
 	Token   string `json:"token" validate:"required" example:"USDT"`
-	Network string `json:"network" validate:"required" example:"ethereum"`
+	Network string `json:"network" validate:"required" example:"okpay,tron,solana,ethereum"`
 }

 func (r SwitchNetworkRequest) Translates() map[string]string {
@@ -4,8 +4,11 @@ package response
 // Used for swagger documentation only — the actual response is built
 // by util/http.Resp.
 type ApiResponse struct {
-	StatusCode int         `json:"status_code" example:"200"`
-	Message    string      `json:"message" example:"success"`
-	Data       interface{} `json:"data"`
-	RequestID  string      `json:"request_id" example:"req-123456"`
+	// Stable errno used by the frontend for i18n. Success is 200; failures use codes from util/constant.Errno.
+	StatusCode int `json:"status_code" example:"200"`
+	// Default server-side errno text. Frontend should prefer status_code for display translation.
+	Message string      `json:"message" example:"success"`
+	Data    interface{} `json:"data"`
+	// Request id echoed from X-Request-ID when present.
+	RequestID string `json:"request_id" example:"req-123456"`
 }
@@ -2,41 +2,41 @@ package response

 // CreateTransactionResponse 创建订单成功返回
 type CreateTransactionResponse struct {
-	TradeId        string  `json:"trade_id" example:"T2026041612345678"`        //  epusdt订单号
-	OrderId        string  `json:"order_id" example:"ORD20260416001"`           //  客户交易id
-	Amount         float64 `json:"amount" example:"100.0000"`                   //  订单金额，保留4位小数
-	Currency       string  `json:"currency" example:"CNY"`                      //  订单货币类型 CNY USD......
-	ActualAmount   float64 `json:"actual_amount" example:"14.2857"`             //  订单实际需要支付的金额，保留4位小数
-	ReceiveAddress string  `json:"receive_address" example:"TTestTronAddress001"` //  收款钱包地址
-	Token          string  `json:"token" example:"USDT"`                        // 所属币种 TRX USDT......
-	ExpirationTime int64   `json:"expiration_time" example:"1713264600"`        // 过期时间 时间戳
-	PaymentUrl     string  `json:"payment_url" example:"https://pay.example.com/checkout/T2026041612345678"` // 收银台地址
+	TradeId        string  `json:"trade_id" example:"3nQ9pL2xV7sK1mR8cT4yB_aZ"`                                     //  epusdt订单号
+	OrderId        string  `json:"order_id" example:"ORD20260416001"`                                               //  客户交易id
+	Amount         float64 `json:"amount" example:"100.0000"`                                                       //  订单金额，按 system.amount_precision 保留小数
+	Currency       string  `json:"currency" example:"CNY"`                                                          //  订单货币类型 CNY USD......
+	ActualAmount   float64 `json:"actual_amount" example:"14.2857"`                                                 //  订单实际需要支付的金额，按 system.amount_precision 保留小数
+	ReceiveAddress string  `json:"receive_address" example:"TTestTronAddress001"`                                   //  收款钱包地址
+	Token          string  `json:"token" example:"USDT"`                                                            // 所属币种 TRX USDT......
+	ExpirationTime int64   `json:"expiration_time" example:"1713264600"`                                            // 过期时间 时间戳
+	PaymentUrl     string  `json:"payment_url" example:"https://pay.example.com/checkout/3nQ9pL2xV7sK1mR8cT4yB_aZ"` // 收银台地址
 }

 // OrderNotifyResponse 订单异步回调结构体
 type OrderNotifyResponse struct {
-	Pid                string  `json:"pid" example:"1000"`                               //  签名使用的商户 PID，商户据此查本地 secret 验签
-	TradeId            string  `json:"trade_id" example:"T2026041612345678"`             //  epusdt订单号
-	OrderId            string  `json:"order_id" example:"ORD20260416001"`                //  客户交易id
-	Amount             float64 `json:"amount" example:"100.0000"`                        //  订单金额，保留4位小数
-	ActualAmount       float64 `json:"actual_amount" example:"14.2857"`                  //  订单实际需要支付的金额，保留4位小数
-	ReceiveAddress     string  `json:"receive_address" example:"TTestTronAddress001"`    //  收款钱包地址
-	Token              string  `json:"token" example:"USDT"`                             // 所属币种 TRX USDT......
-	BlockTransactionId string  `json:"block_transaction_id" example:"0xabc123..."`       // 区块id
-	Signature          string  `json:"signature" example:"a1b2c3d4e5f6..."`              // 签名 MD5(sorted_params + secret_key)
+	Pid                string  `json:"pid" example:"1000"`                            //  签名使用的商户 PID，商户据此查本地 secret 验签
+	TradeId            string  `json:"trade_id" example:"3nQ9pL2xV7sK1mR8cT4yB_aZ"`   //  epusdt订单号
+	OrderId            string  `json:"order_id" example:"ORD20260416001"`             //  客户交易id
+	Amount             float64 `json:"amount" example:"100.0000"`                     //  订单金额，按 system.amount_precision 保留小数
+	ActualAmount       float64 `json:"actual_amount" example:"14.2857"`               //  订单实际需要支付的金额，按 system.amount_precision 保留小数
+	ReceiveAddress     string  `json:"receive_address" example:"TTestTronAddress001"` //  收款钱包地址
+	Token              string  `json:"token" example:"USDT"`                          // 所属币种 TRX USDT......
+	BlockTransactionId string  `json:"block_transaction_id" example:"0xabc123..."`    // 区块id
+	Signature          string  `json:"signature" example:"a1b2c3d4e5f6..."`           // 签名 MD5(sorted_params + secret_key)
 	//  订单状态 1=等待支付 2=支付成功 3=已过期
 	Status int `json:"status" enums:"1,2,3" example:"2"`
 }

 // OrderNotifyResponseEpay epay订单异步回调结构体
 type OrderNotifyResponseEpay struct {
-	PID         int    `json:"pid" example:"1001"`                   // 商户ID
-	TradeNo     string `json:"trade_no" example:"T2026041612345678"` // 平台订单号
-	OutTradeNo  string `json:"out_trade_no" example:"ORD20260416001"` // 商户订单号
-	Type        string `json:"type" example:"usdt"`                  // 订单类型
-	Name        string `json:"name" example:"VIP月卡"`                 // 商品名称
-	Money       string `json:"money" example:"100.0000"`             // 订单金额，保留4位小数
-	Sign        string `json:"sign" example:"a1b2c3d4..."`           // 签名
-	SignType    string `json:"sign_type" example:"MD5"`              // 签名类型
-	TradeStatus string `json:"trade_status" example:"TRADE_SUCCESS"` // 订单状态
+	PID         int    `json:"pid" example:"1001"`                          // 商户ID
+	TradeNo     string `json:"trade_no" example:"3nQ9pL2xV7sK1mR8cT4yB_aZ"` // 平台订单号
+	OutTradeNo  string `json:"out_trade_no" example:"ORD20260416001"`       // 商户订单号
+	Type        string `json:"type" example:"usdt"`                         // 订单类型
+	Name        string `json:"name" example:"VIP月卡"`                        // 商品名称
+	Money       string `json:"money" example:"100.0000"`                    // 订单金额，保留4位小数
+	Sign        string `json:"sign" example:"a1b2c3d4..."`                  // 签名
+	SignType    string `json:"sign_type" example:"MD5"`                     // 签名类型
+	TradeStatus string `json:"trade_status" example:"TRADE_SUCCESS"`        // 订单状态
 }
@@ -1,21 +1,28 @@
 package response

 type CheckoutCounterResponse struct {
-	TradeId        string  `json:"trade_id" example:"T2026041612345678"`        //  epusdt订单号
-	Amount         float64 `json:"amount" example:"100.0000"`                   //  订单金额，保留4位小数 法币金额
-	ActualAmount   float64 `json:"actual_amount" example:"14.2857"`             //  订单实际需要支付的金额，保留4位小数 加密货币金额
-	Token          string  `json:"token" example:"USDT"`                        //  所属币种 TRX USDT......
-	Currency       string  `json:"currency" example:"CNY"`                      //  法币币种 CNY USD ...
+	TradeId        string  `json:"trade_id" example:"3nQ9pL2xV7sK1mR8cT4yB_aZ"`   //  epusdt订单号
+	Amount         float64 `json:"amount" example:"100.0000"`                     //  订单金额，按 system.amount_precision 保留小数 法币金额
+	ActualAmount   float64 `json:"actual_amount" example:"14.2857"`               //  订单实际需要支付的金额，按 system.amount_precision 保留小数 加密货币金额
+	Token          string  `json:"token" example:"USDT"`                          //  所属币种 TRX USDT......
+	Currency       string  `json:"currency" example:"CNY"`                        //  法币币种 CNY USD ...
 	ReceiveAddress string  `json:"receive_address" example:"TTestTronAddress001"` //  收款钱包地址
-	Network        string  `json:"network" example:"tron"`                      //  网络 TRON ETH ...
-	ExpirationTime int64   `json:"expiration_time" example:"1713264600"`        // 过期时间 时间戳
+	Network        string  `json:"network" example:"tron"`                        //  网络 TRON ETH ...
+	ExpirationTime int64   `json:"expiration_time" example:"1713264600"`          // 过期时间 时间戳
 	RedirectUrl    string  `json:"redirect_url" example:"https://example.com/success"`
-	CreatedAt      int64   `json:"created_at" example:"1713264000"` // 订单创建时间 时间戳
+	PaymentUrl     string  `json:"payment_url" example:"https://pay.example.com/checkout/3nQ9pL2xV7sK1mR8cT4yB_aZ"` // 支付链接；链上订单通常为本地收银台，OkPay 子订单为第三方 payLink
+	CreatedAt      int64   `json:"created_at" example:"1713264000"`                                                 // 订单创建时间 时间戳
 	IsSelected     bool    `json:"is_selected" example:"false"`
 }

 type CheckStatusResponse struct {
-	TradeId string `json:"trade_id" example:"T2026041612345678"` //  epusdt订单号
+	TradeId string `json:"trade_id" example:"3nQ9pL2xV7sK1mR8cT4yB_aZ"` //  epusdt订单号
 	// 订单状态 1=等待支付 2=支付成功 3=已过期
 	Status int `json:"status" enums:"1,2,3" example:"1"`
 }
+
+type ManualPaymentResponse struct {
+	TradeId            string `json:"trade_id" example:"3nQ9pL2xV7sK1mR8cT4yB_aZ"`      // epusdt订单号
+	Status             int    `json:"status" enums:"1,2,3" example:"2"`                 // 订单状态 1=等待支付 2=支付成功 3=已过期
+	BlockTransactionId string `json:"block_transaction_id" example:"0xabc123def456..."` // 已验证并入账的交易哈希
+}
@@ -1,10 +1,41 @@
 package response

 type NetworkTokenSupport struct {
-	Network string   `json:"network" example:"tron"`
-	Tokens  []string `json:"tokens" example:"USDT,USDC"`
+	Network     string   `json:"network" example:"tron"`
+	DisplayName string   `json:"display_name" example:"TRON"`
+	Tokens      []string `json:"tokens" example:"USDT,USDC"`
 }

-type SupportedAssetsResponse struct {
-	Supports []NetworkTokenSupport `json:"supports"`
+type EpayPublicConfig struct {
+	DefaultToken    string `json:"default_token" example:"usdt"`
+	DefaultCurrency string `json:"default_currency" example:"cny"`
+	DefaultNetwork  string `json:"default_network" example:"tron"`
+}
+
+type SitePublicConfig struct {
+	CashierName        string `json:"cashier_name" example:"Acme Cashier"`
+	LogoURL            string `json:"logo_url" example:"https://cdn.example.com/logo.png"`
+	WebsiteTitle       string `json:"website_title" example:"Acme Payments"`
+	SupportLink        string `json:"support_link" example:"https://example.com/support"`
+	BackgroundColor    string `json:"background_color" example:"#0f172a"`
+	BackgroundImageURL string `json:"background_image_url" example:"https://cdn.example.com/background.png"`
+}
+
+type OkPayPublicConfig struct {
+	Enabled        bool     `json:"enabled" example:"true"`
+	AllowTokens    []string `json:"allow_tokens" example:"USDT,TRX"`
+	ShopID         string   `json:"shop_id,omitempty" example:"okpay-shop-test"`
+	ShopToken      string   `json:"shop_token,omitempty" example:"secret-token"`
+	APIURL         string   `json:"api_url,omitempty" example:"https://api.okaypay.me/shop/"`
+	CallbackURL    string   `json:"callback_url,omitempty" example:"https://pay.example.com/payments/okpay/v1/notify"`
+	ReturnURL      string   `json:"return_url,omitempty" example:"https://pay.example.com/success"`
+	TimeoutSeconds int      `json:"timeout_seconds,omitempty" example:"10"`
+}
+
+type PublicConfigResponse struct {
+	SupportedAssets []NetworkTokenSupport `json:"supported_assets"`
+	Site            SitePublicConfig      `json:"site"`
+	Epay            EpayPublicConfig      `json:"epay"`
+	OkPay           OkPayPublicConfig     `json:"okpay"`
+	Version         string                `json:"version" example:"v1.0.1"`
 }
@@ -0,0 +1,818 @@
+package service
+
+import (
+	"bytes"
+	"context"
+	"encoding/hex"
+	"encoding/json"
+	"errors"
+	"fmt"
+	"math/big"
+	"net/http"
+	"net/http/httptest"
+	"strings"
+	"sync/atomic"
+	"testing"
+	"time"
+
+	"github.com/GMWalletApp/epusdt/internal/testutil"
+	"github.com/GMWalletApp/epusdt/model/dao"
+	"github.com/GMWalletApp/epusdt/model/mdb"
+	addressutil "github.com/GMWalletApp/epusdt/util/address"
+	"github.com/dromara/carbon/v2"
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/xssnick/tonutils-go/address"
+	"github.com/xssnick/tonutils-go/tlb"
+	"github.com/xssnick/tonutils-go/ton"
+	"github.com/xssnick/tonutils-go/ton/jetton"
+	"github.com/xssnick/tonutils-go/tvm/cell"
+	"gorm.io/gorm/clause"
+)
+
+func upsertTestChainToken(t *testing.T, token mdb.ChainToken) {
+	t.Helper()
+	if err := dao.Mdb.Clauses(clause.OnConflict{
+		Columns: []clause.Column{{Name: "network"}, {Name: "symbol"}},
+		DoUpdates: clause.AssignmentColumns([]string{
+			"contract_address",
+			"decimals",
+			"enabled",
+			"min_amount",
+		}),
+	}).Create(&token).Error; err != nil {
+		t.Fatalf("upsert token: %v", err)
+	}
+}
+
+func TestManualVerifyEvmHashAcceptsOptional0x(t *testing.T) {
+	hash := strings.Repeat("a", 64)
+	if !isEvmHash(hash) {
+		t.Fatal("expected bare EVM hash to be valid")
+	}
+	if !isEvmHash("0x" + hash) {
+		t.Fatal("expected 0x-prefixed EVM hash to be valid")
+	}
+	if isEvmHash("0x" + strings.Repeat("a", 63)) {
+		t.Fatal("expected short EVM hash to be invalid")
+	}
+}
+
+func TestManualVerifyNormalizeEvmAddressAcceptsOptional0x(t *testing.T) {
+	addr := "1111111111111111111111111111111111111111"
+	want := common.HexToAddress("0x" + addr)
+	got, err := normalizeEvmAddress(addr)
+	if err != nil {
+		t.Fatalf("normalize bare address: %v", err)
+	}
+	if got != want {
+		t.Fatalf("bare address = %s, want %s", got.Hex(), want.Hex())
+	}
+	got, err = normalizeEvmAddress("0X" + strings.ToUpper(addr))
+	if err != nil {
+		t.Fatalf("normalize prefixed address: %v", err)
+	}
+	if got != want {
+		t.Fatalf("prefixed address = %s, want %s", got.Hex(), want.Hex())
+	}
+}
+
+func TestManualVerifyNormalizeTronAddressHexAcceptsOptionalPrefix(t *testing.T) {
+	body := "a614f803b6fd780986a42c78ec9c7f77e6ded13c"
+	want := "41" + body
+
+	for _, input := range []string{body, "0x" + body, want, "0X" + strings.ToUpper(want)} {
+		got, err := normalizeTronAddressHex(input)
+		if err != nil {
+			t.Fatalf("normalizeTronAddressHex(%q): %v", input, err)
+		}
+		if got != want {
+			t.Fatalf("normalizeTronAddressHex(%q) = %q, want %q", input, got, want)
+		}
+	}
+}
+
+func TestManualVerifyNormalizeTronTxIDAcceptsOptional0x(t *testing.T) {
+	txID := strings.Repeat("a", 64)
+	got, err := normalizeTronTxID(txID)
+	if err != nil {
+		t.Fatalf("normalize bare txid: %v", err)
+	}
+	if got != txID {
+		t.Fatalf("bare txid = %q, want %q", got, txID)
+	}
+	got, err = normalizeTronTxID("0X" + strings.ToUpper(txID))
+	if err != nil {
+		t.Fatalf("normalize prefixed txid: %v", err)
+	}
+	if got != txID {
+		t.Fatalf("prefixed txid = %q, want %q", got, txID)
+	}
+	if _, err = normalizeTronTxID("0x" + strings.Repeat("a", 63)); err == nil {
+		t.Fatal("expected short txid to fail")
+	}
+}
+
+func TestParseManualTonTxRefAcceptsCanonicalLTAndHashOnly(t *testing.T) {
+	receiveRaw := "0:ba295e33b3c4c9b5265aa4ead1166a92931ce9abea120a8c5e91044a1257f89c"
+	hash := strings.Repeat("a", 64)
+
+	ref, err := parseManualTonTxRef("ton:" + receiveRaw + ":123:" + strings.ToUpper(hash))
+	if err != nil {
+		t.Fatalf("parse canonical TON tx ref: %v", err)
+	}
+	if ref.ReceiveRaw != receiveRaw || ref.LT != 123 || ref.HashHex != hash || !ref.HasLT {
+		t.Fatalf("canonical ref = %#v", ref)
+	}
+
+	ref, err = parseManualTonTxRef("456:0X" + strings.ToUpper(hash))
+	if err != nil {
+		t.Fatalf("parse lt:hash TON tx ref: %v", err)
+	}
+	if ref.ReceiveRaw != "" || ref.LT != 456 || ref.HashHex != hash || !ref.HasLT {
+		t.Fatalf("lt:hash ref = %#v", ref)
+	}
+
+	ref, err = parseManualTonTxRef("0X" + strings.ToUpper(hash))
+	if err != nil {
+		t.Fatalf("parse hash-only TON tx ref: %v", err)
+	}
+	if ref.ReceiveRaw != "" || ref.LT != 0 || ref.HashHex != hash || ref.HasLT {
+		t.Fatalf("hash-only ref = %#v", ref)
+	}
+}
+
+type fakeManualTonAPI struct {
+	ton.APIClientWrapped
+	master          *ton.BlockIDExt
+	account         *tlb.Account
+	txs             []*tlb.Transaction
+	getAccountCalls int
+	listCalls       []manualTonListCall
+}
+
+type manualTonListCall struct {
+	limit   uint32
+	lt      uint64
+	hashHex string
+}
+
+func (f *fakeManualTonAPI) CurrentMasterchainInfo(context.Context) (*ton.BlockIDExt, error) {
+	return f.master, nil
+}
+
+func (f *fakeManualTonAPI) WaitForBlock(uint32) ton.APIClientWrapped {
+	return f
+}
+
+func (f *fakeManualTonAPI) GetAccount(context.Context, *ton.BlockIDExt, *address.Address) (*tlb.Account, error) {
+	f.getAccountCalls++
+	if f.account == nil {
+		return &tlb.Account{}, nil
+	}
+	return f.account, nil
+}
+
+func (f *fakeManualTonAPI) ListTransactions(_ context.Context, _ *address.Address, limit uint32, lt uint64, txHash []byte) ([]*tlb.Transaction, error) {
+	f.listCalls = append(f.listCalls, manualTonListCall{
+		limit:   limit,
+		lt:      lt,
+		hashHex: hex.EncodeToString(txHash),
+	})
+	return f.txs, nil
+}
+
+func TestValidateManualTonPaymentWithAPINativeTON(t *testing.T) {
+	cleanup := testutil.SetupTestDatabases(t)
+	defer cleanup()
+
+	if err := dao.Mdb.Model(&mdb.ChainToken{}).
+		Where("network = ? AND symbol = ?", mdb.NetworkTon, "USDT").
+		Update("enabled", false).Error; err != nil {
+		t.Fatalf("disable TON USDT token: %v", err)
+	}
+
+	receive := address.MustParseAddr("EQC6KV4zs8TJtSZapOrRFmqSkxzpq-oSCoxekQRKElf4nC1I")
+	sender := address.NewAddress(0, 0, bytes.Repeat([]byte{0x66}, 32)).Bounce(false).Testnet(false)
+	tx := tonTestInboundTx(t, sender, receive, tlb.MustFromTON("1.23"), nil)
+	order := &mdb.Orders{
+		BaseModel:      mdb.BaseModel{ID: 1, CreatedAt: *carbon.NewTime(carbon.CreateFromTimestampMilli(time.Now().Add(-time.Minute).UnixMilli()))},
+		Network:        mdb.NetworkTon,
+		Token:          "TON",
+		ActualAmount:   1.23,
+		ReceiveAddress: receive.Bounce(false).String(),
+	}
+	api := &fakeManualTonAPI{
+		master: &ton.BlockIDExt{Workchain: address.MasterchainID, Shard: -0x8000000000000000, SeqNo: 9},
+		txs:    []*tlb.Transaction{tx},
+	}
+	ref := manualTonTxRef{LT: tx.LT, HashHex: hex.EncodeToString(tx.Hash), HasLT: true}
+
+	got, err := validateManualTonPaymentWithAPI(context.Background(), api, order, receive, ref)
+	if err != nil {
+		t.Fatalf("validateManualTonPaymentWithAPI(): %v", err)
+	}
+	if api.getAccountCalls != 0 {
+		t.Fatalf("exact TON ref fetched account state %d times, want 0", api.getAccountCalls)
+	}
+	if len(api.listCalls) != 1 {
+		t.Fatalf("ListTransactions calls = %#v, want one exact lookup", api.listCalls)
+	}
+	if call := api.listCalls[0]; call.limit != 1 || call.lt != tx.LT || call.hashHex != hex.EncodeToString(tx.Hash) {
+		t.Fatalf("ListTransactions exact call = %#v, want limit=1 lt/hash from ref", call)
+	}
+	want := TonCanonicalBlockTransactionID(receive.StringRaw(), tx.LT, hex.EncodeToString(tx.Hash))
+	if got != want {
+		t.Fatalf("canonical id = %q, want %q", got, want)
+	}
+}
+
+func TestValidateManualTonPaymentCandidatesUSDTJetton(t *testing.T) {
+	receive := address.MustParseAddr("EQC6KV4zs8TJtSZapOrRFmqSkxzpq-oSCoxekQRKElf4nC1I")
+	sender := address.NewAddress(0, 0, bytes.Repeat([]byte{0x68}, 32)).Bounce(false).Testnet(false)
+	jettonWallet := address.NewAddress(0, 0, bytes.Repeat([]byte{0x69}, 32)).Bounce(false).Testnet(false)
+	body, err := tlb.ToCell(jetton.TransferNotification{
+		QueryID:        7,
+		Amount:         tlb.MustFromNano(big.NewInt(1_000_000), 6),
+		Sender:         sender,
+		ForwardPayload: cell.BeginCell().EndCell(),
+	})
+	if err != nil {
+		t.Fatalf("build jetton notification body: %v", err)
+	}
+	tx := tonTestInboundTx(t, jettonWallet, receive, tlb.FromNanoTONU(1), body)
+	order := &mdb.Orders{
+		BaseModel:      mdb.BaseModel{ID: 1, CreatedAt: *carbon.NewTime(carbon.CreateFromTimestampMilli(time.Now().Add(-time.Minute).UnixMilli()))},
+		Network:        mdb.NetworkTon,
+		Token:          "USDT",
+		ActualAmount:   1,
+		ReceiveAddress: receive.Bounce(false).String(),
+	}
+	state := &manualTonState{
+		jettonWallets: map[string]mdb.ChainToken{
+			addressutil.TonRawAddressObjectKey(jettonWallet): {
+				BaseModel: mdb.BaseModel{ID: 2},
+				Network:   mdb.NetworkTon,
+				Symbol:    "USDT",
+				Decimals:  6,
+				Enabled:   true,
+			},
+		},
+	}
+
+	got, err := validateManualTonPaymentCandidates(order, receive, manualTonTxRef{
+		LT:      tx.LT,
+		HashHex: hex.EncodeToString(tx.Hash),
+		HasLT:   true,
+	}, []*tlb.Transaction{tx}, state)
+	if err != nil {
+		t.Fatalf("validateManualTonPaymentCandidates(): %v", err)
+	}
+	want := TonCanonicalBlockTransactionID(receive.StringRaw(), tx.LT, hex.EncodeToString(tx.Hash))
+	if got != want {
+		t.Fatalf("canonical id = %q, want %q", got, want)
+	}
+}
+
+func TestValidateManualTonPaymentWithAPIRejectsAmbiguousHashOnly(t *testing.T) {
+	cleanup := testutil.SetupTestDatabases(t)
+	defer cleanup()
+
+	if err := dao.Mdb.Model(&mdb.ChainToken{}).
+		Where("network = ? AND symbol = ?", mdb.NetworkTon, "USDT").
+		Update("enabled", false).Error; err != nil {
+		t.Fatalf("disable TON USDT token: %v", err)
+	}
+
+	receive := address.MustParseAddr("EQC6KV4zs8TJtSZapOrRFmqSkxzpq-oSCoxekQRKElf4nC1I")
+	sender := address.NewAddress(0, 0, bytes.Repeat([]byte{0x67}, 32)).Bounce(false).Testnet(false)
+	tx1 := tonTestInboundTx(t, sender, receive, tlb.MustFromTON("1.23"), nil)
+	tx2 := tonTestInboundTx(t, sender, receive, tlb.MustFromTON("1.23"), nil)
+	tx2.LT = tx1.LT + 1
+	order := &mdb.Orders{
+		BaseModel:      mdb.BaseModel{ID: 1, CreatedAt: *carbon.NewTime(carbon.CreateFromTimestampMilli(time.Now().Add(-time.Minute).UnixMilli()))},
+		Network:        mdb.NetworkTon,
+		Token:          "TON",
+		ActualAmount:   1.23,
+		ReceiveAddress: receive.Bounce(false).String(),
+	}
+	api := &fakeManualTonAPI{
+		master: &ton.BlockIDExt{Workchain: address.MasterchainID, Shard: -0x8000000000000000, SeqNo: 9},
+		account: &tlb.Account{
+			LastTxLT:   tx2.LT,
+			LastTxHash: tx2.Hash,
+		},
+		txs: []*tlb.Transaction{tx1, tx2},
+	}
+
+	_, err := validateManualTonPaymentWithAPI(context.Background(), api, order, receive, manualTonTxRef{
+		HashHex: hex.EncodeToString(tx1.Hash),
+	})
+	if err == nil || !strings.Contains(err.Error(), "matched multiple") {
+		t.Fatalf("validate ambiguous hash-only error = %v, want multiple-match error", err)
+	}
+	if api.getAccountCalls != 1 {
+		t.Fatalf("hash-only TON ref fetched account state %d times, want 1", api.getAccountCalls)
+	}
+	if len(api.listCalls) != 1 {
+		t.Fatalf("ListTransactions calls = %#v, want one recent lookup", api.listCalls)
+	}
+	if call := api.listCalls[0]; call.limit != 100 || call.lt != tx2.LT || call.hashHex != hex.EncodeToString(tx2.Hash) {
+		t.Fatalf("ListTransactions recent call = %#v, want account last tx cursor", call)
+	}
+}
+
+func TestManualVerifyDialEvmClientsIncludesHTTPNode(t *testing.T) {
+	cleanup := testutil.SetupTestDatabases(t)
+	defer cleanup()
+
+	if err := dao.Mdb.Create(&mdb.RpcNode{
+		Network: mdb.NetworkEthereum,
+		Type:    mdb.RpcNodeTypeHttp,
+		Url:     "http://127.0.0.1:1",
+		Enabled: true,
+		Status:  mdb.RpcNodeStatusOk,
+	}).Error; err != nil {
+		t.Fatalf("create rpc node: %v", err)
+	}
+
+	ctx, cancel := context.WithTimeout(context.Background(), time.Second)
+	defer cancel()
+	clients, err := dialManualEvmClients(ctx, mdb.NetworkEthereum)
+	if err != nil {
+		t.Fatalf("dialManualEvmClients(): %v", err)
+	}
+	defer closeManualEvmClients(clients)
+	if len(clients) != 1 {
+		t.Fatalf("client count = %d, want 1", len(clients))
+	}
+	if !strings.Contains(clients[0].label, mdb.RpcNodeTypeHttp) {
+		t.Fatalf("client label = %q, want HTTP node", clients[0].label)
+	}
+}
+
+func TestManualVerifyEvmCandidatesPreferGeneralAcrossNodeTypes(t *testing.T) {
+	cleanup := testutil.SetupTestDatabases(t)
+	defer cleanup()
+
+	rows := []mdb.RpcNode{
+		{Network: mdb.NetworkEthereum, Type: mdb.RpcNodeTypeHttp, Url: "http://manual.example.com", Weight: 100, Enabled: true, Purpose: mdb.RpcNodePurposeManualVerify, Status: mdb.RpcNodeStatusOk},
+		{Network: mdb.NetworkEthereum, Type: mdb.RpcNodeTypeWs, Url: "ws://general.example.com", Weight: 1, Enabled: true, Purpose: mdb.RpcNodePurposeGeneral, Status: mdb.RpcNodeStatusOk},
+	}
+	if err := dao.Mdb.Create(&rows).Error; err != nil {
+		t.Fatalf("seed rpc_nodes: %v", err)
+	}
+
+	got, err := listManualEvmRpcCandidates(mdb.NetworkEthereum)
+	if err != nil {
+		t.Fatalf("listManualEvmRpcCandidates(): %v", err)
+	}
+	urls := make([]string, 0, len(got))
+	for _, node := range got {
+		urls = append(urls, node.Url)
+	}
+	want := []string{"ws://general.example.com", "http://manual.example.com"}
+	if len(urls) != len(want) {
+		t.Fatalf("candidate urls = %#v, want %#v", urls, want)
+	}
+	for i := range want {
+		if urls[i] != want[i] {
+			t.Fatalf("candidate urls = %#v, want %#v", urls, want)
+		}
+	}
+}
+
+func TestManualRpcNodeLabelHidesSensitiveURLParts(t *testing.T) {
+	label := manualRpcNodeLabel(mdb.RpcNode{
+		BaseModel: mdb.BaseModel{ID: 9},
+		Network:   mdb.NetworkEthereum,
+		Type:      mdb.RpcNodeTypeHttp,
+		Url:       "https://rpc.example.com/v3/secret-key?token=secret",
+		Purpose:   mdb.RpcNodePurposeManualVerify,
+	})
+	if strings.Contains(label, "secret") || strings.Contains(label, "/v3/") {
+		t.Fatalf("manualRpcNodeLabel() leaked sensitive URL parts: %s", label)
+	}
+	if !strings.Contains(label, "endpoint=https://rpc.example.com") {
+		t.Fatalf("manualRpcNodeLabel() = %s, want sanitized endpoint", label)
+	}
+	if !strings.Contains(label, "purpose=manual_verify") {
+		t.Fatalf("manualRpcNodeLabel() = %s, want purpose", label)
+	}
+}
+
+func TestManualVerifyDialEvmClientDoesNotForwardUserIPHeader(t *testing.T) {
+	var headerCalls int32
+	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		if got := r.Header.Get("X-USER-IP"); got != "" {
+			t.Errorf("X-USER-IP header = %q, want empty", got)
+			http.Error(w, "unexpected user ip header", http.StatusBadRequest)
+			return
+		}
+		atomic.AddInt32(&headerCalls, 1)
+		w.Header().Set("Content-Type", "application/json")
+		_ = json.NewEncoder(w).Encode(map[string]interface{}{
+			"jsonrpc": "2.0",
+			"id":      1,
+			"error": map[string]interface{}{
+				"code":    -32000,
+				"message": "not found",
+			},
+		})
+	}))
+	defer server.Close()
+
+	ctx, cancel := context.WithTimeout(context.Background(), time.Second)
+	defer cancel()
+	client, err := dialManualEvmClient(ctx, mdb.RpcNode{
+		Network: mdb.NetworkEthereum,
+		Type:    mdb.RpcNodeTypeHttp,
+		Url:     server.URL,
+		Purpose: mdb.RpcNodePurposeManualVerify,
+	})
+	if err != nil {
+		t.Fatalf("dialManualEvmClient(): %v", err)
+	}
+	defer client.Close()
+
+	_, _ = client.TransactionReceipt(ctx, common.HexToHash("0x"+strings.Repeat("a", 64)))
+	if got := atomic.LoadInt32(&headerCalls); got == 0 {
+		t.Fatal("manual verify EVM request did not reach test RPC")
+	}
+}
+
+func TestManualVerifyDialEvmClientDoesNotForwardUserIPForGeneralNode(t *testing.T) {
+	var calls int32
+	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		if got := r.Header.Get("X-USER-IP"); got != "" {
+			t.Errorf("X-USER-IP header = %q, want empty", got)
+			http.Error(w, "unexpected user ip header", http.StatusBadRequest)
+			return
+		}
+		atomic.AddInt32(&calls, 1)
+		w.Header().Set("Content-Type", "application/json")
+		_ = json.NewEncoder(w).Encode(map[string]interface{}{
+			"jsonrpc": "2.0",
+			"id":      1,
+			"error": map[string]interface{}{
+				"code":    -32000,
+				"message": "not found",
+			},
+		})
+	}))
+	defer server.Close()
+
+	ctx, cancel := context.WithTimeout(context.Background(), time.Second)
+	defer cancel()
+	client, err := dialManualEvmClient(ctx, mdb.RpcNode{
+		Network: mdb.NetworkEthereum,
+		Type:    mdb.RpcNodeTypeHttp,
+		Url:     server.URL,
+		Purpose: mdb.RpcNodePurposeGeneral,
+	})
+	if err != nil {
+		t.Fatalf("dialManualEvmClient(): %v", err)
+	}
+	defer client.Close()
+
+	_, _ = client.TransactionReceipt(ctx, common.HexToHash("0x"+strings.Repeat("a", 64)))
+	if got := atomic.LoadInt32(&calls); got == 0 {
+		t.Fatal("general EVM request did not reach test RPC")
+	}
+}
+
+func TestTronPostJSONDoesNotForwardUserIPWithoutHeaders(t *testing.T) {
+	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		if got := r.Header.Get("X-USER-IP"); got != "" {
+			t.Errorf("X-USER-IP header = %q, want empty", got)
+			http.Error(w, "unexpected user ip header", http.StatusBadRequest)
+			return
+		}
+		w.Header().Set("Content-Type", "application/json")
+		_, _ = w.Write([]byte(`{"ok":true}`))
+	}))
+	defer server.Close()
+
+	var out map[string]interface{}
+	if err := tronPostJSON(server.URL, "", "/wallet/getnowblock", map[string]interface{}{}, &out); err != nil {
+		t.Fatalf("tronPostJSON(): %v", err)
+	}
+}
+
+func TestManualVerifyEvmRejectsTransactionBeforeOrder(t *testing.T) {
+	order := &mdb.Orders{BaseModel: mdb.BaseModel{CreatedAt: *carbon.NewTime(carbon.CreateFromTimestampMilli(time.Now().UnixMilli()))}}
+	txTime := uint64(time.Now().Add(-time.Hour).Unix())
+	if err := ensureEvmTransactionNotBeforeOrder(txTime, order); err == nil {
+		t.Fatal("expected transaction before order to be rejected")
+	}
+	txTime = uint64(time.Now().Add(time.Minute).Unix())
+	if err := ensureEvmTransactionNotBeforeOrder(txTime, order); err != nil {
+		t.Fatalf("expected transaction after order to pass: %v", err)
+	}
+}
+
+func TestManualVerifyCanonicalEvmHash(t *testing.T) {
+	hash := strings.Repeat("a", 64)
+	_, canonical, err := canonicalEvmHash("0X" + strings.ToUpper(hash))
+	if err != nil {
+		t.Fatalf("canonicalEvmHash(): %v", err)
+	}
+	if canonical != "0x"+hash {
+		t.Fatalf("canonical hash = %q, want %q", canonical, "0x"+hash)
+	}
+}
+
+func TestManualVerifyEquivalentBlockIDsCatchLegacyVariants(t *testing.T) {
+	cleanup := testutil.SetupTestDatabases(t)
+	defer cleanup()
+
+	hash := strings.Repeat("b", 64)
+	mixedHash := "0x" + strings.Repeat("bB", 32)
+	if err := dao.Mdb.Create(&mdb.Orders{
+		TradeId:            "paid-legacy-hash",
+		OrderId:            "paid-legacy-hash",
+		Status:             mdb.StatusPaySuccess,
+		Network:            mdb.NetworkEthereum,
+		BlockTransactionId: mixedHash,
+	}).Error; err != nil {
+		t.Fatalf("create existing order: %v", err)
+	}
+
+	order := &mdb.Orders{BaseModel: mdb.BaseModel{ID: 999}, Network: mdb.NetworkEthereum}
+	if err := ensureManualBlockTransactionUnused(order, "0x"+hash); err == nil {
+		t.Fatal("expected legacy hash variant to be treated as already processed")
+	}
+}
+
+func TestManualVerifyEvmRequestFailureFallsBackToNextClient(t *testing.T) {
+	cleanup := testutil.SetupTestDatabases(t)
+	defer cleanup()
+
+	contract := common.HexToAddress("0x1111111111111111111111111111111111111111")
+	to := common.HexToAddress("0x2222222222222222222222222222222222222222")
+	rawAmount := big.NewInt(1230000)
+	receipt := &types.Receipt{
+		Status:      types.ReceiptStatusSuccessful,
+		BlockNumber: big.NewInt(10),
+		Logs: []*types.Log{{
+			Address: contract,
+			Topics: []common.Hash{
+				erc20TransferEventHash,
+				common.Hash{},
+				common.BytesToHash(to.Bytes()),
+			},
+			Data: common.LeftPadBytes(rawAmount.Bytes(), 32),
+		}},
+	}
+	order := &mdb.Orders{
+		Network:        mdb.NetworkEthereum,
+		Token:          "USDT",
+		ActualAmount:   1.23,
+		ReceiveAddress: to.Hex(),
+		BaseModel:      mdb.BaseModel{CreatedAt: *carbon.NewTime(carbon.CreateFromTimestampMilli(time.Now().Add(-time.Minute).UnixMilli()))},
+	}
+	token := &mdb.ChainToken{Network: mdb.NetworkEthereum, Symbol: "USDT", ContractAddress: contract.Hex(), Decimals: 6}
+
+	err := validateManualEvmPaymentAcrossClients(context.Background(), []manualEvmClient{
+		{label: "ws bad", reader: &fakeEvmReader{receiptErr: errors.New("ws receipt failed")}},
+		{label: "http ok", reader: &fakeEvmReader{
+			receipt: receipt,
+			headers: map[string]*types.Header{
+				"10":     {Number: big.NewInt(10), Time: uint64(time.Now().Unix())},
+				"latest": {Number: big.NewInt(12), Time: uint64(time.Now().Unix())},
+			},
+		}},
+	}, order, common.HexToHash("0x"+strings.Repeat("c", 64)), token)
+	if err != nil {
+		t.Fatalf("validateManualEvmPaymentAcrossClients(): %v", err)
+	}
+}
+
+func TestManualVerifyTronTRC20UsesTransferEvent(t *testing.T) {
+	cleanup := testutil.SetupTestDatabases(t)
+	defer cleanup()
+
+	contractHex := "411111111111111111111111111111111111111111"
+	recipientHex := "41a614f803b6fd780986a42c78ec9c7f77e6ded13c"
+	contractAddress, err := tronHexToAddress(contractHex)
+	if err != nil {
+		t.Fatalf("contract address: %v", err)
+	}
+	recipientAddress, err := tronHexToAddress(recipientHex)
+	if err != nil {
+		t.Fatalf("recipient address: %v", err)
+	}
+	upsertTestChainToken(t, mdb.ChainToken{
+		Network:         mdb.NetworkTron,
+		Symbol:          "USDT",
+		ContractAddress: contractAddress,
+		Decimals:        6,
+		Enabled:         true,
+	})
+
+	rawAmount := big.NewInt(1230000)
+	tx := manualTronTransactionFromCallData(t, contractHex, recipientHex, rawAmount)
+	info := &manualTronTxInfo{Log: []manualTronEventLog{{
+		Address: strings.TrimPrefix(contractHex, "41"),
+		Topics: []string{
+			"0x" + strings.TrimPrefix(erc20TransferEventHash.Hex(), "0x"),
+			strings.Repeat("0", 64),
+			"0x" + strings.Repeat("0", 24) + strings.TrimPrefix(recipientHex, "41"),
+		},
+		Data: "0x" + fmt.Sprintf("%064x", rawAmount),
+	}}}
+	order := &mdb.Orders{ReceiveAddress: recipientAddress, Token: "USDT", ActualAmount: 1.23}
+
+	if err = validateManualTronTRC20Transfer(order, &tx, info); err != nil {
+		t.Fatalf("validateManualTronTRC20Transfer(): %v", err)
+	}
+
+	info.Log[0].Data = "0x" + fmt.Sprintf("%064x", big.NewInt(1240000))
+	if err = validateManualTronTRC20Transfer(order, &tx, info); err == nil {
+		t.Fatal("expected event amount mismatch to fail")
+	}
+}
+
+func TestManualVerifyTronPaymentHTTPFlow(t *testing.T) {
+	cleanup := testutil.SetupTestDatabases(t)
+	defer cleanup()
+
+	txID := strings.Repeat("a", 64)
+	contractHex := "411111111111111111111111111111111111111111"
+	recipientHex := "41a614f803b6fd780986a42c78ec9c7f77e6ded13c"
+	contractAddress, err := tronHexToAddress(contractHex)
+	if err != nil {
+		t.Fatalf("contract address: %v", err)
+	}
+	recipientAddress, err := tronHexToAddress(recipientHex)
+	if err != nil {
+		t.Fatalf("recipient address: %v", err)
+	}
+
+	rawAmount := big.NewInt(1230000)
+	blockTimeMs := time.Now().Add(time.Minute).UnixMilli()
+	requestCalls := 0
+	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		if got := r.Header.Get("X-USER-IP"); got != "" {
+			t.Errorf("X-USER-IP header = %q, want empty", got)
+		}
+		requestCalls++
+		var req map[string]string
+		if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
+			t.Errorf("decode tron request: %v", err)
+			http.Error(w, err.Error(), http.StatusBadRequest)
+			return
+		}
+		if r.URL.Path != "/wallet/getnowblock" && req["value"] != txID {
+			t.Errorf("request tx id = %q, want %q", req["value"], txID)
+			http.Error(w, "bad tx id", http.StatusBadRequest)
+			return
+		}
+
+		w.Header().Set("Content-Type", "application/json")
+		switch r.URL.Path {
+		case "/wallet/gettransactionbyid":
+			_ = json.NewEncoder(w).Encode(map[string]interface{}{
+				"txID": txID,
+				"raw_data": map[string]interface{}{
+					"contract": []map[string]interface{}{{
+						"type": "TriggerSmartContract",
+						"parameter": map[string]interface{}{
+							"value": map[string]interface{}{},
+						},
+					}},
+				},
+				"ret": []map[string]string{{"contractRet": "SUCCESS"}},
+			})
+		case "/wallet/gettransactioninfobyid":
+			_ = json.NewEncoder(w).Encode(map[string]interface{}{
+				"id":             txID,
+				"blockNumber":    100,
+				"blockTimeStamp": blockTimeMs,
+				"receipt":        map[string]string{"result": "SUCCESS"},
+				"log": []map[string]interface{}{{
+					"address": strings.TrimPrefix(contractHex, "41"),
+					"topics": []string{
+						strings.TrimPrefix(erc20TransferEventHash.Hex(), "0x"),
+						strings.Repeat("0", 64),
+						"0X" + strings.ToUpper(strings.Repeat("0", 24)+strings.TrimPrefix(recipientHex, "41")),
+					},
+					"data": fmt.Sprintf("%064x", rawAmount),
+				}},
+			})
+		case "/wallet/getnowblock":
+			_ = json.NewEncoder(w).Encode(map[string]interface{}{
+				"block_header": map[string]interface{}{
+					"raw_data": map[string]interface{}{"number": 110},
+				},
+			})
+		default:
+			http.NotFound(w, r)
+		}
+	}))
+	defer server.Close()
+
+	if err = dao.Mdb.Create(&mdb.RpcNode{
+		Network: mdb.NetworkTron,
+		Type:    mdb.RpcNodeTypeHttp,
+		Url:     server.URL,
+		Enabled: true,
+		Status:  mdb.RpcNodeStatusOk,
+		Purpose: mdb.RpcNodePurposeManualVerify,
+	}).Error; err != nil {
+		t.Fatalf("create tron rpc node: %v", err)
+	}
+	upsertTestChainToken(t, mdb.ChainToken{
+		Network:         mdb.NetworkTron,
+		Symbol:          "USDT",
+		ContractAddress: contractAddress,
+		Decimals:        6,
+		Enabled:         true,
+	})
+	order := &mdb.Orders{
+		TradeId:        "manual-tron-http-flow",
+		OrderId:        "manual-tron-http-flow",
+		ActualAmount:   1.23,
+		ReceiveAddress: recipientAddress,
+		Token:          "USDT",
+		Network:        mdb.NetworkTron,
+		Status:         mdb.StatusWaitPay,
+		PayProvider:    mdb.PaymentProviderOnChain,
+	}
+	if err = dao.Mdb.Create(order).Error; err != nil {
+		t.Fatalf("create order: %v", err)
+	}
+
+	got, err := ValidateManualOrderPayment(order, "0X"+strings.ToUpper(txID))
+	if err != nil {
+		t.Fatalf("ValidateManualOrderPayment(): %v", err)
+	}
+	if got != txID {
+		t.Fatalf("canonical tx id = %q, want %q", got, txID)
+	}
+	if requestCalls != 3 {
+		t.Fatalf("manual verify request calls = %d, want 3", requestCalls)
+	}
+}
+
+func TestManualVerifySolanaRejectsMissingBlockTime(t *testing.T) {
+	order := &mdb.Orders{BaseModel: mdb.BaseModel{CreatedAt: *carbon.NewTime(carbon.CreateFromTimestampMilli(time.Now().UnixMilli()))}}
+	if err := ensureSolanaTransferNotBeforeOrder(0, order); err == nil {
+		t.Fatal("expected missing block time to fail")
+	}
+	if err := ensureSolanaTransferNotBeforeOrder(time.Now().Add(time.Minute).Unix(), order); err != nil {
+		t.Fatalf("expected future block time to pass: %v", err)
+	}
+}
+
+type fakeEvmReader struct {
+	receipt    *types.Receipt
+	receiptErr error
+	headers    map[string]*types.Header
+	headerErr  error
+}
+
+func (f *fakeEvmReader) TransactionReceipt(context.Context, common.Hash) (*types.Receipt, error) {
+	if f.receiptErr != nil {
+		return nil, f.receiptErr
+	}
+	return f.receipt, nil
+}
+
+func (f *fakeEvmReader) HeaderByNumber(_ context.Context, number *big.Int) (*types.Header, error) {
+	if f.headerErr != nil {
+		return nil, f.headerErr
+	}
+	key := "latest"
+	if number != nil {
+		key = number.String()
+	}
+	header := f.headers[key]
+	if header == nil {
+		return nil, fmt.Errorf("missing header %s", key)
+	}
+	return header, nil
+}
+
+func manualTronTransactionFromCallData(t *testing.T, contractHex, recipientHex string, amount *big.Int) manualTronTransaction {
+	t.Helper()
+	body := strings.TrimPrefix(recipientHex, "41")
+	raw := fmt.Sprintf(`{
+		"raw_data": {
+			"contract": [{
+				"type": "TriggerSmartContract",
+				"parameter": {
+					"value": {
+						"contract_address": %q,
+						"data": %q
+					}
+				}
+			}]
+		}
+	}`, contractHex, "a9059cbb"+strings.Repeat("0", 24)+body+fmt.Sprintf("%064x", amount))
+	var tx manualTronTransaction
+	if err := json.Unmarshal([]byte(raw), &tx); err != nil {
+		t.Fatalf("unmarshal tron tx: %v", err)
+	}
+	return tx
+}
@@ -0,0 +1,283 @@
+package service
+
+import (
+	"crypto/md5"
+	"encoding/hex"
+	"fmt"
+	"net/url"
+	"path"
+	"strconv"
+	"strings"
+	"time"
+
+	"github.com/GMWalletApp/epusdt/model/data"
+	"github.com/GMWalletApp/epusdt/model/request"
+	"github.com/GMWalletApp/epusdt/util/constant"
+	"github.com/GMWalletApp/epusdt/util/http_client"
+	"github.com/GMWalletApp/epusdt/util/log"
+)
+
+type okPayCreateDepositResponse struct {
+	Status string `json:"status"`
+	Code   int    `json:"code"`
+	Data   struct {
+		OrderID string `json:"order_id"`
+		PayURL  string `json:"pay_url"`
+	} `json:"data"`
+	Msg string `json:"msg"`
+}
+
+type okPayDepositOrder struct {
+	ProviderOrderID string
+	PayURL          string
+}
+
+type okPayNotifyPayload struct {
+	ID          string `json:"id"`
+	Status      string `json:"status"`
+	Code        string `json:"code"`
+	OrderID     string `json:"order_id"`
+	UniqueID    string `json:"unique_id"`
+	PayUserID   string `json:"pay_user_id"`
+	Amount      string `json:"amount"`
+	Coin        string `json:"coin"`
+	PayStatus   string `json:"pay_status"`
+	NotifyType  string `json:"notify_type"`
+	Sign        string `json:"sign"`
+	RawFormData string `json:"raw_form_data"`
+}
+
+func okPaySign(form map[string]string, shopID string, shopToken string) map[string]string {
+	values := url.Values{}
+	for key, value := range form {
+		if strings.TrimSpace(value) == "" {
+			continue
+		}
+		values.Set(key, value)
+	}
+	values.Set("id", shopID)
+	query, _ := url.QueryUnescape(values.Encode())
+	sum := md5.Sum([]byte(query + "&token=" + shopToken))
+
+	signed := make(map[string]string, len(values)+1)
+	for key, vals := range values {
+		if len(vals) == 0 {
+			continue
+		}
+		signed[key] = vals[0]
+	}
+	signed["sign"] = strings.ToUpper(hex.EncodeToString(sum[:]))
+	return signed
+}
+
+func createOkPayDepositOrder(uniqueID string, amount float64, coin string, returnURL string) (*okPayDepositOrder, error) {
+	shopID := data.GetOkPayShopID()
+	shopToken := data.GetOkPayShopToken()
+	apiURL := strings.TrimSpace(data.GetOkPayAPIURL())
+	callbackURL := data.GetOkPayCallbackURL()
+	if shopID == "" || shopToken == "" || apiURL == "" || callbackURL == "" {
+		return nil, fmt.Errorf("okpay config incomplete")
+	}
+
+	if returnURL == "" {
+		returnURL = data.GetOkPayReturnURL()
+	}
+
+	form := map[string]string{
+		"unique_id":    uniqueID,
+		"name":         uniqueID,
+		"amount":       fmt.Sprintf("%.*f", data.GetAmountPrecision(), amount),
+		"coin":         strings.ToUpper(strings.TrimSpace(coin)),
+		"callback_url": callbackURL,
+		"return_url":   returnURL,
+	}
+	form = okPaySign(form, shopID, shopToken)
+
+	base, err := url.Parse(apiURL)
+	if err != nil {
+		return nil, err
+	}
+	base.Path = path.Join(base.Path, "payLink")
+
+	client := http_client.GetHttpClient()
+	client.SetTimeout(time.Duration(data.GetOkPayTimeoutSeconds()) * time.Second)
+
+	var payload okPayCreateDepositResponse
+	resp, err := client.R().
+		SetFormData(form).
+		SetResult(&payload).
+		Post(base.String())
+	if err != nil {
+		log.Sugar.Warnf("[okpay] create order request failed unique_id=%s api_url=%s callback_url=%s return_url=%s err=%v", uniqueID, base.String(), callbackURL, returnURL, err)
+		return nil, err
+	}
+	if resp.StatusCode() >= 400 {
+		log.Sugar.Warnf("[okpay] create order http error unique_id=%s status=%s api_url=%s callback_url=%s return_url=%s body=%s", uniqueID, resp.Status(), base.String(), callbackURL, returnURL, resp.String())
+		return nil, fmt.Errorf("okpay http status: %s", resp.Status())
+	}
+	if payload.Data.OrderID == "" || payload.Data.PayURL == "" {
+		log.Sugar.Warnf("[okpay] create order rejected unique_id=%s api_url=%s callback_url=%s return_url=%s status=%s code=%d msg=%s", uniqueID, base.String(), callbackURL, returnURL, payload.Status, payload.Code, payload.Msg)
+		if payload.Msg != "" {
+			return nil, fmt.Errorf("okpay create order failed: %s (callback_url=%s)", payload.Msg, callbackURL)
+		}
+		return nil, fmt.Errorf("okpay create order failed (callback_url=%s)", callbackURL)
+	}
+
+	return &okPayDepositOrder{
+		ProviderOrderID: payload.Data.OrderID,
+		PayURL:          payload.Data.PayURL,
+	}, nil
+}
+
+func verifyOkPayNotify(form map[string]string) bool {
+	shopID := data.GetOkPayShopID()
+	shopToken := data.GetOkPayShopToken()
+	signature := strings.TrimSpace(form["sign"])
+	if shopID == "" || shopToken == "" || signature == "" {
+		return false
+	}
+
+	if expected := okPayNotifySign(form, shopToken); expected != "" && strings.EqualFold(expected, signature) {
+		return true
+	}
+
+	unsigned := make(map[string]string, len(form))
+	for key, value := range form {
+		if strings.EqualFold(key, "sign") {
+			continue
+		}
+		unsigned[key] = value
+	}
+	signed := okPaySign(unsigned, shopID, shopToken)
+	return strings.EqualFold(strings.TrimSpace(signed["sign"]), signature)
+}
+
+func okPayNotifySign(form map[string]string, shopToken string) string {
+	orderedKeys := []string{
+		"code",
+		"data[order_id]",
+		"data[unique_id]",
+		"data[pay_user_id]",
+		"data[amount]",
+		"data[coin]",
+		"data[status]",
+		"data[type]",
+		"id",
+		"status",
+	}
+
+	pairs := make([]string, 0, len(orderedKeys))
+	for _, key := range orderedKeys {
+		value := strings.TrimSpace(form[key])
+		if value == "" {
+			continue
+		}
+		pairs = append(pairs, url.QueryEscape(key)+"="+url.QueryEscape(value))
+	}
+	if len(pairs) == 0 {
+		return ""
+	}
+
+	query, err := url.QueryUnescape(strings.Join(pairs, "&"))
+	if err != nil {
+		return ""
+	}
+	sum := md5.Sum([]byte(query + "&token=" + shopToken))
+	return strings.ToUpper(hex.EncodeToString(sum[:]))
+}
+
+func parseOkPayNotify(form map[string]string, rawFormData string) *okPayNotifyPayload {
+	return &okPayNotifyPayload{
+		ID:          strings.TrimSpace(form["id"]),
+		Status:      strings.TrimSpace(form["status"]),
+		Code:        strings.TrimSpace(form["code"]),
+		OrderID:     strings.TrimSpace(form["data[order_id]"]),
+		UniqueID:    strings.TrimSpace(form["data[unique_id]"]),
+		PayUserID:   strings.TrimSpace(form["data[pay_user_id]"]),
+		Amount:      strings.TrimSpace(form["data[amount]"]),
+		Coin:        strings.TrimSpace(form["data[coin]"]),
+		PayStatus:   strings.TrimSpace(form["data[status]"]),
+		NotifyType:  strings.TrimSpace(form["data[type]"]),
+		Sign:        strings.TrimSpace(form["sign"]),
+		RawFormData: rawFormData,
+	}
+}
+
+func HandleOkPayNotify(form map[string]string, rawFormData string) error {
+	if !verifyOkPayNotify(form) {
+		return fmt.Errorf("invalid okpay notify sign")
+	}
+
+	payload := parseOkPayNotify(form, rawFormData)
+
+	if payload.ID == "" || payload.ID != data.GetOkPayShopID() {
+		return fmt.Errorf("okpay notify shop id mismatch: %s", payload.ID)
+	}
+	if payload.UniqueID == "" || payload.OrderID == "" {
+		return fmt.Errorf("missing okpay notify identifiers")
+	}
+
+	order, err := data.GetOrderInfoByTradeId(payload.UniqueID)
+	if err != nil {
+		return err
+	}
+	if order.ID <= 0 {
+		return fmt.Errorf("okpay notify order not found: %s", payload.UniqueID)
+	}
+	if order.PayProvider != "okpay" {
+		return fmt.Errorf("okpay notify order provider mismatch: %s", payload.UniqueID)
+	}
+
+	providerRow, err := data.GetProviderOrderByTradeIDAndProvider(payload.UniqueID, order.PayProvider)
+	if err != nil {
+		return err
+	}
+	if providerRow.ID <= 0 {
+		return fmt.Errorf("okpay provider order not found: %s", payload.UniqueID)
+	}
+
+	_ = data.SaveProviderOrderNotify(payload.UniqueID, order.PayProvider, payload.RawFormData)
+
+	if !strings.EqualFold(payload.Status, "success") || !strings.EqualFold(payload.NotifyType, "deposit") || payload.PayStatus != "1" {
+		log.Sugar.Infof("[okpay] notify ignored trade_id=%s status=%s pay_status=%s type=%s", payload.UniqueID, payload.Status, payload.PayStatus, payload.NotifyType)
+		return nil
+	}
+
+	if providerRow.ProviderOrderID != "" && providerRow.ProviderOrderID != payload.OrderID {
+		return fmt.Errorf("okpay provider order id mismatch: got=%s want=%s", payload.OrderID, providerRow.ProviderOrderID)
+	}
+	if !strings.EqualFold(strings.TrimSpace(order.Token), strings.TrimSpace(payload.Coin)) {
+		return fmt.Errorf("okpay coin mismatch: got=%s want=%s", payload.Coin, order.Token)
+	}
+
+	notifyAmount, err := strconv.ParseFloat(payload.Amount, 64)
+	if err != nil {
+		return fmt.Errorf("invalid okpay amount: %w", err)
+	}
+	precision := data.GetAmountPrecision()
+	if fmt.Sprintf("%.*f", precision, notifyAmount) != fmt.Sprintf("%.*f", precision, order.ActualAmount) {
+		return fmt.Errorf("okpay amount mismatch: got=%.*f want=%.*f", precision, notifyAmount, precision, order.ActualAmount)
+	}
+
+	err = OrderProcessing(&request.OrderProcessingRequest{
+		ReceiveAddress:     order.ReceiveAddress,
+		Currency:           order.Currency,
+		Token:              order.Token,
+		Network:            order.Network,
+		Amount:             order.ActualAmount,
+		TradeId:            order.TradeId,
+		BlockTransactionId: payload.OrderID,
+	})
+	processed := err == nil
+	if err != nil && err != constant.OrderBlockAlreadyProcess {
+		return err
+	}
+
+	if processed {
+		sendPaymentNotification(order)
+	}
+	if err = data.MarkProviderOrderPaid(payload.UniqueID, order.PayProvider, payload.RawFormData); err != nil {
+		return err
+	}
+	return nil
+}
@@ -0,0 +1,120 @@
+package service
+
+import (
+	"strings"
+	"testing"
+	"time"
+
+	"github.com/GMWalletApp/epusdt/internal/testutil"
+	"github.com/GMWalletApp/epusdt/model/dao"
+	"github.com/GMWalletApp/epusdt/model/data"
+	"github.com/GMWalletApp/epusdt/model/mdb"
+	"github.com/GMWalletApp/epusdt/notify"
+)
+
+func TestHandleOkPayNotifySendsPaymentNotificationOnSuccess(t *testing.T) {
+	cleanup := testutil.SetupTestDatabases(t)
+	defer cleanup()
+
+	const (
+		channelType     = "test-okpay-pay-success"
+		shopID          = "okpay-shop-notify"
+		shopToken       = "okpay-shop-token"
+		tradeID         = "okpay-notify-success-001"
+		orderID         = "merchant-okpay-notify-success-001"
+		providerOrderID = "okpay-provider-success-001"
+		rawFormData     = "raw-okpay-form"
+	)
+
+	got := make(chan string, 1)
+	notify.RegisterSender(channelType, func(config, text string) error {
+		got <- text
+		return nil
+	})
+
+	if err := dao.Mdb.Create(&mdb.NotificationChannel{
+		Type:    channelType,
+		Name:    "test okpay pay success",
+		Config:  "{}",
+		Events:  `{"pay_success":true}`,
+		Enabled: true,
+	}).Error; err != nil {
+		t.Fatalf("seed notification channel: %v", err)
+	}
+	if err := data.SetSetting(mdb.SettingGroupOkPay, mdb.SettingKeyOkPayShopID, shopID, mdb.SettingTypeString); err != nil {
+		t.Fatalf("seed okpay shop id: %v", err)
+	}
+	if err := data.SetSetting(mdb.SettingGroupOkPay, mdb.SettingKeyOkPayShopToken, shopToken, mdb.SettingTypeString); err != nil {
+		t.Fatalf("seed okpay shop token: %v", err)
+	}
+
+	order := &mdb.Orders{
+		TradeId:        tradeID,
+		OrderId:        orderID,
+		Amount:         1,
+		Currency:       "CNY",
+		ActualAmount:   0.15,
+		ReceiveAddress: "OKPAY",
+		Token:          "USDT",
+		Network:        mdb.NetworkTron,
+		Status:         mdb.StatusWaitPay,
+		PaymentType:    mdb.PaymentTypeEpay,
+		PayProvider:    mdb.PaymentProviderOkPay,
+	}
+	if err := dao.Mdb.Create(order).Error; err != nil {
+		t.Fatalf("seed order: %v", err)
+	}
+	if err := dao.Mdb.Create(&mdb.ProviderOrder{
+		TradeId:         tradeID,
+		Provider:        mdb.PaymentProviderOkPay,
+		ProviderOrderID: providerOrderID,
+		Amount:          0.15,
+		Coin:            "USDT",
+		Status:          mdb.ProviderOrderStatusPending,
+	}).Error; err != nil {
+		t.Fatalf("seed provider order: %v", err)
+	}
+
+	form := okPayNotifyTestForm(shopID, shopToken, providerOrderID, tradeID, "0.15000000", "USDT")
+	if err := HandleOkPayNotify(form, rawFormData); err != nil {
+		t.Fatalf("handle okpay notify: %v", err)
+	}
+
+	select {
+	case text := <-got:
+		if !strings.Contains(text, tradeID) {
+			t.Fatalf("notification text = %q, want trade id %s", text, tradeID)
+		}
+		if !strings.Contains(text, orderID) {
+			t.Fatalf("notification text = %q, want order id %s", text, orderID)
+		}
+	case <-time.After(2 * time.Second):
+		t.Fatal("timed out waiting for payment notification")
+	}
+
+	if err := HandleOkPayNotify(form, rawFormData); err != nil {
+		t.Fatalf("handle duplicate okpay notify: %v", err)
+	}
+	select {
+	case text := <-got:
+		t.Fatalf("duplicate notification sent: %q", text)
+	case <-time.After(200 * time.Millisecond):
+	}
+}
+
+func okPayNotifyTestForm(shopID, shopToken, providerOrderID, tradeID, amount, coin string) map[string]string {
+	form := map[string]string{
+		"code":              "200",
+		"id":                shopID,
+		"status":            "success",
+		"data[order_id]":    providerOrderID,
+		"data[unique_id]":   tradeID,
+		"data[pay_user_id]": "123456789",
+		"data[amount]":      amount,
+		"data[coin]":        coin,
+		"data[status]":      "1",
+		"data[type]":        "deposit",
+	}
+	form["sign"] = okPayNotifySign(form, shopToken)
+	return form
+}
@@ -1,12 +1,12 @@
 package service

 import (
+	cryptorand "crypto/rand"
+	"encoding/base64"
 	"errors"
 	"fmt"
-	"math/rand"
 	"strings"
 	"sync"
-	"time"

 	"github.com/GMWalletApp/epusdt/config"
 	"github.com/GMWalletApp/epusdt/model/dao"
@@ -14,9 +14,11 @@ import (
 	"github.com/GMWalletApp/epusdt/model/mdb"
 	"github.com/GMWalletApp/epusdt/model/request"
 	"github.com/GMWalletApp/epusdt/model/response"
+	addressutil "github.com/GMWalletApp/epusdt/util/address"
 	"github.com/GMWalletApp/epusdt/util/constant"
 	"github.com/GMWalletApp/epusdt/util/log"
 	"github.com/GMWalletApp/epusdt/util/math"
+	"github.com/GMWalletApp/epusdt/util/security"
 	"github.com/dromara/carbon/v2"
 	"github.com/shopspring/decimal"
 )
@@ -24,7 +26,6 @@ import (
 const (
 	CnyMinimumPaymentAmount  = 0.01
 	UsdtMinimumPaymentAmount = 0.01
-	UsdtAmountPerIncrement   = 0.01
 	IncrementalMaximumNumber = 100
 )

@@ -48,20 +49,57 @@ func normalizeOrderAddressByNetwork(network, address string) string {
 	switch network {
 	case mdb.NetworkEthereum, mdb.NetworkBsc, mdb.NetworkPolygon, mdb.NetworkPlasma:
 		return strings.ToLower(address)
+	case mdb.NetworkTon:
+		if normalized, err := addressutil.NormalizeTonAddress(address); err == nil {
+			return normalized
+		}
+		return address
 	default:
 		return address
 	}
 }

+func ensureEnabledOrderAsset(network, token string) (*mdb.ChainToken, error) {
+	tokenRow, err := data.GetEnabledChainTokenBySymbol(network, token)
+	if err != nil {
+		return nil, err
+	}
+	if tokenRow == nil || tokenRow.ID == 0 {
+		return nil, constant.SupportedAssetNotFound
+	}
+	return tokenRow, nil
+}
+
 // CreateTransaction creates a new payment order.
 func CreateTransaction(req *request.CreateTransactionRequest, apiKey *mdb.ApiKey) (*response.CreateTransactionResponse, error) {
-	gCreateTransactionLock.Lock()
-	defer gCreateTransactionLock.Unlock()
-
 	token := strings.ToUpper(strings.TrimSpace(req.Token))
 	currency := strings.ToUpper(strings.TrimSpace(req.Currency))
 	network := strings.ToLower(strings.TrimSpace(req.Network))
-	payAmount := math.MustParsePrecFloat64(req.Amount, 2)
+	notifyURL := strings.TrimSpace(req.NotifyUrl)
+	if err := security.ValidatePublicHTTPURL(notifyURL); err != nil {
+		return nil, constant.NotifyURLErr
+	}
+
+	gCreateTransactionLock.Lock()
+	defer gCreateTransactionLock.Unlock()
+
+	amountPrecision := data.GetAmountPrecision()
+	payAmount := math.MustParsePrecFloat64(req.Amount, amountPrecision)
+	exist, err := data.GetOrderInfoByOrderId(req.OrderId)
+	if err != nil {
+		return nil, err
+	}
+	if exist.ID > 0 {
+		return nil, constant.OrderAlreadyExists
+	}
+
+	if !data.IsChainEnabled(network) {
+		return nil, constant.ChainNotEnabled
+	}
+	if _, err = ensureEnabledOrderAsset(network, token); err != nil {
+		return nil, err
+	}
+
 	rate := config.GetRateForCoin(strings.ToLower(token), strings.ToLower(currency))
 	if rate <= 0 {
 		return nil, constant.RateAmountErr
@@ -76,17 +114,6 @@ func CreateTransaction(req *request.CreateTransactionRequest, apiKey *mdb.ApiKey
 		return nil, constant.PayAmountErr
 	}

-	exist, err := data.GetOrderInfoByOrderId(req.OrderId)
-	if err != nil {
-		return nil, err
-	}
-	if exist.ID > 0 {
-		return nil, constant.OrderAlreadyExists
-	}
-
-	if !data.IsChainEnabled(network) {
-		return nil, constant.ChainNotEnabled
-	}
 	walletAddress, err := data.GetAvailableWalletAddressByNetwork(network)
 	if err != nil {
 		return nil, err
@@ -96,7 +123,7 @@ func CreateTransaction(req *request.CreateTransactionRequest, apiKey *mdb.ApiKey
 	}

 	tradeID := GenerateCode()
-	amount := math.MustParsePrecFloat64(decimalTokenAmount.InexactFloat64(), 2)
+	amount := math.MustParsePrecFloat64(decimalTokenAmount.InexactFloat64(), amountPrecision)
 	availableAddress, availableAmount, err := ReserveAvailableWalletAndAmount(tradeID, network, token, amount, walletAddress)
 	if err != nil {
 		return nil, err
@@ -109,17 +136,18 @@ func CreateTransaction(req *request.CreateTransactionRequest, apiKey *mdb.ApiKey
 	order := &mdb.Orders{
 		TradeId:        tradeID,
 		OrderId:        req.OrderId,
-		Amount:         req.Amount,
+		Amount:         payAmount,
 		Currency:       currency,
 		ActualAmount:   availableAmount,
 		ReceiveAddress: availableAddress,
 		Token:          token,
 		Network:        network,
 		Status:         mdb.StatusWaitPay,
-		NotifyUrl:      req.NotifyUrl,
+		NotifyUrl:      notifyURL,
 		RedirectUrl:    req.RedirectUrl,
 		Name:           req.Name,
 		PaymentType:    req.PaymentType,
+		PayProvider:    mdb.PaymentProviderOnChain,
 		ApiKeyID:       apiKeyID(apiKey),
 	}
 	if err = data.CreateOrderWithTransaction(tx, order); err != nil {
@@ -199,6 +227,11 @@ func OrderProcessing(req *request.OrderProcessingRequest) error {
 			if err = data.ExpireOrderByTradeId(sub.TradeId); err != nil {
 				log.Sugar.Warnf("[order] expire sub-order failed, trade_id=%s, err=%v", sub.TradeId, err)
 			}
+			if sub.PayProvider != "" && sub.PayProvider != mdb.PaymentProviderOnChain {
+				if err = data.MarkProviderOrderExpired(sub.TradeId, sub.PayProvider); err != nil {
+					log.Sugar.Warnf("[order] expire provider order failed, trade_id=%s, provider=%s, err=%v", sub.TradeId, sub.PayProvider, err)
+				}
+			}
 			if err = data.UnLockTransaction(sub.Network, sub.ReceiveAddress, sub.Token, sub.ActualAmount); err != nil {
 				log.Sugar.Warnf("[order] unlock sub-order transaction failed, trade_id=%s, err=%v", sub.TradeId, err)
 			}
@@ -257,6 +290,11 @@ func OrderProcessing(req *request.OrderProcessingRequest) error {

 	// Release sibling locks after their status transitions commit.
 	for _, sib := range siblings {
+		if sib.PayProvider != "" && sib.PayProvider != mdb.PaymentProviderOnChain {
+			if err = data.MarkProviderOrderExpired(sib.TradeId, sib.PayProvider); err != nil {
+				log.Sugar.Warnf("[order] expire sibling provider order failed, trade_id=%s, provider=%s, err=%v", sib.TradeId, sib.PayProvider, err)
+			}
+		}
 		if err = data.UnLockTransaction(sib.Network, sib.ReceiveAddress, sib.Token, sib.ActualAmount); err != nil {
 			log.Sugar.Warnf("[order] unlock sibling transaction failed, trade_id=%s, err=%v", sib.TradeId, err)
 		}
@@ -269,6 +307,7 @@ func OrderProcessing(req *request.OrderProcessingRequest) error {
 func ReserveAvailableWalletAndAmount(tradeID string, network string, token string, amount float64, walletAddress []mdb.WalletAddress) (string, float64, error) {
 	availableAddress := ""
 	availableAmount := amount
+	amountPrecision := data.GetAmountPrecision()

 	tryLockWalletFunc := func(targetAmount float64) (string, error) {
 		for _, address := range walletAddress {
@@ -292,8 +331,8 @@ func ReserveAvailableWalletAndAmount(tradeID string, network string, token strin
 		}
 		if address == "" {
 			decimalOldAmount := decimal.NewFromFloat(availableAmount)
-			decimalIncr := decimal.NewFromFloat(UsdtAmountPerIncrement)
-			availableAmount = decimalOldAmount.Add(decimalIncr).InexactFloat64()
+			decimalIncr := decimal.New(1, int32(-amountPrecision))
+			availableAmount = math.MustParsePrecFloat64(decimalOldAmount.Add(decimalIncr).InexactFloat64(), amountPrecision)
 			continue
 		}
 		availableAddress = address
@@ -304,9 +343,11 @@ func ReserveAvailableWalletAndAmount(tradeID string, network string, token strin

 // GenerateCode creates a unique trade id.
 func GenerateCode() string {
-	date := time.Now().Format("20060102")
-	r := rand.Intn(1000)
-	return fmt.Sprintf("%s%d%03d", date, time.Now().UnixNano()/1e6, r)
+	buf := make([]byte, 18)
+	if _, err := cryptorand.Read(buf); err != nil {
+		panic(fmt.Sprintf("generate trade id: crypto/rand failed: %v", err))
+	}
+	return base64.RawURLEncoding.EncodeToString(buf)
 }

 // GetOrderInfoByTradeId returns a validated order.
@@ -321,6 +362,92 @@ func GetOrderInfoByTradeId(tradeId string) (*mdb.Orders, error) {
 	return order, nil
 }

+// SubmitManualPayment verifies a submitted transaction hash and marks the
+// matching on-chain order paid using the same path as automatic chain scans.
+func SubmitManualPayment(tradeId, blockTransactionId string) (*response.ManualPaymentResponse, error) {
+	tradeId = strings.TrimSpace(tradeId)
+	blockTransactionId = strings.TrimSpace(blockTransactionId)
+
+	order, err := GetOrderInfoByTradeId(tradeId)
+	if err != nil {
+		return nil, err
+	}
+	return submitManualPaymentForOrder(order, blockTransactionId)
+}
+
+// SubmitCashierManualPayment is the public cashier variant. It rejects hashes
+// already stored on any order before touching RPC so repeated/public probes do
+// not spend RPC quota. Admin mark-paid intentionally keeps using
+// SubmitManualPayment and the existing verification path.
+func SubmitCashierManualPayment(tradeId, blockTransactionId string) (*response.ManualPaymentResponse, error) {
+	tradeId = strings.TrimSpace(tradeId)
+	blockTransactionId = strings.TrimSpace(blockTransactionId)
+
+	order, err := GetOrderInfoByTradeId(tradeId)
+	if err != nil {
+		return nil, err
+	}
+	if err = validateManualPaymentOrder(order); err != nil {
+		return nil, err
+	}
+	if err = ensureManualBlockTransactionUnused(order, blockTransactionId); err != nil {
+		return nil, err
+	}
+	return submitManualPaymentForOrder(order, blockTransactionId)
+}
+
+func submitManualPaymentForOrder(order *mdb.Orders, blockTransactionId string) (*response.ManualPaymentResponse, error) {
+	blockTransactionId = strings.TrimSpace(blockTransactionId)
+	if err := validateManualPaymentOrder(order); err != nil {
+		return nil, err
+	}
+
+	verifiedBlockTransactionID, err := ValidateManualOrderPayment(order, blockTransactionId)
+	if err != nil {
+		var rspErr *constant.RspError
+		if errors.As(err, &rspErr) {
+			return nil, err
+		}
+		return nil, constant.ManualPaymentVerifyErr
+	}
+	if err = OrderProcessing(&request.OrderProcessingRequest{
+		ReceiveAddress:     order.ReceiveAddress,
+		Currency:           order.Currency,
+		Token:              order.Token,
+		Network:            order.Network,
+		Amount:             order.ActualAmount,
+		TradeId:            order.TradeId,
+		BlockTransactionId: verifiedBlockTransactionID,
+	}); err != nil {
+		return nil, err
+	}
+
+	updatedOrder, err := GetOrderInfoByTradeId(order.TradeId)
+	if err != nil {
+		return nil, err
+	}
+	return &response.ManualPaymentResponse{
+		TradeId:            updatedOrder.TradeId,
+		Status:             updatedOrder.Status,
+		BlockTransactionId: updatedOrder.BlockTransactionId,
+	}, nil
+}
+
+func validateManualPaymentOrder(order *mdb.Orders) error {
+	if order.Status != mdb.StatusWaitPay {
+		return constant.OrderNotWaitPay
+	}
+	if !isOnChainOrder(order.PayProvider) {
+		return constant.ManualPaymentProviderErr
+	}
+	return nil
+}
+
+func isOnChainOrder(payProvider string) bool {
+	payProvider = strings.TrimSpace(payProvider)
+	return payProvider == "" || payProvider == mdb.PaymentProviderOnChain
+}
+
 const MaxSubOrders = 2

 // SwitchNetwork creates or returns an existing sub-order for a different token+network.
@@ -346,6 +473,10 @@ func SwitchNetwork(req *request.SwitchNetworkRequest) (*response.CheckoutCounter
 		return nil, constant.OrderNotWaitPay
 	}

+	if network == mdb.PaymentProviderOkPay {
+		return switchToOkPay(parent, token)
+	}
+
 	// 2. Same token+network as parent → mark selected and return
 	if strings.EqualFold(parent.Token, token) && strings.EqualFold(parent.Network, network) {
 		_ = data.MarkOrderSelected(parent.TradeId)
@@ -375,7 +506,16 @@ func SwitchNetwork(req *request.SwitchNetworkRequest) (*response.CheckoutCounter
 		return nil, constant.SubOrderLimitExceeded
 	}

-	// 5. Calculate amount for the new network
+	// 5. Validate the target chain and asset before any rate lookup so
+	// disabled/unknown tokens return the stable unsupported-asset error.
+	if !data.IsChainEnabled(network) {
+		return nil, constant.ChainNotEnabled
+	}
+	if _, err = ensureEnabledOrderAsset(network, token); err != nil {
+		return nil, err
+	}
+
+	// 6. Calculate amount for the new network
 	rate := config.GetRateForCoin(strings.ToLower(token), strings.ToLower(parent.Currency))
 	if rate <= 0 {
 		return nil, constant.RateAmountErr
@@ -386,10 +526,7 @@ func SwitchNetwork(req *request.SwitchNetworkRequest) (*response.CheckoutCounter
 		return nil, constant.PayAmountErr
 	}

-	// 6. Find and lock wallet
-	if !data.IsChainEnabled(network) {
-		return nil, constant.ChainNotEnabled
-	}
+	// 7. Find and lock wallet
 	walletAddress, err := data.GetAvailableWalletAddressByNetwork(network)
 	if err != nil {
 		return nil, err
@@ -399,7 +536,7 @@ func SwitchNetwork(req *request.SwitchNetworkRequest) (*response.CheckoutCounter
 	}

 	subTradeID := GenerateCode()
-	amount := math.MustParsePrecFloat64(decimalTokenAmount.InexactFloat64(), 2)
+	amount := math.MustParsePrecFloat64(decimalTokenAmount.InexactFloat64(), data.GetAmountPrecision())
 	availableAddress, availableAmount, err := ReserveAvailableWalletAndAmount(subTradeID, network, token, amount, walletAddress)
 	if err != nil {
 		return nil, err
@@ -408,7 +545,7 @@ func SwitchNetwork(req *request.SwitchNetworkRequest) (*response.CheckoutCounter
 		return nil, constant.NotAvailableAmountErr
 	}

-	// 7. Create sub-order
+	// 8. Create sub-order
 	tx := dao.Mdb.Begin()
 	subOrder := &mdb.Orders{
 		TradeId:         subTradeID,
@@ -427,6 +564,7 @@ func SwitchNetwork(req *request.SwitchNetworkRequest) (*response.CheckoutCounter
 		Name:            parent.Name,
 		CallBackConfirm: mdb.CallBackConfirmOk, // don't trigger callback on sub-order
 		PaymentType:     parent.PaymentType,
+		PayProvider:     mdb.PaymentProviderOnChain,
 		ApiKeyID:        parent.ApiKeyID, // inherit from parent so resolveOrderApiKey never fails
 	}
 	if err = data.CreateOrderWithTransaction(tx, subOrder); err != nil {
@@ -458,7 +596,140 @@ func buildCheckoutResponse(order *mdb.Orders) *response.CheckoutCounterResponse
 		Network:        order.Network,
 		ExpirationTime: order.CreatedAt.AddMinutes(config.GetOrderExpirationTime()).TimestampMilli(),
 		RedirectUrl:    order.RedirectUrl,
+		PaymentUrl:     fmt.Sprintf("%s/pay/checkout-counter/%s", config.GetAppUri(), order.TradeId),
 		CreatedAt:      order.CreatedAt.TimestampMilli(),
 		IsSelected:     order.IsSelected,
 	}
 }
+
+func switchToOkPay(parent *mdb.Orders, token string) (*response.CheckoutCounterResponse, error) {
+	if !data.GetOkPayEnabled() {
+		return nil, constant.PaymentProviderNotEnabled
+	}
+	if data.GetOkPayShopID() == "" || data.GetOkPayShopToken() == "" || data.GetOkPayAPIURL() == "" || data.GetOkPayCallbackURL() == "" {
+		return nil, constant.PaymentProviderConfigErr
+	}
+	if !okPayTokenAllowed(token) {
+		return nil, constant.PaymentProviderNotSupport
+	}
+
+	existing, err := data.GetSubOrderByTokenPayProvider(parent.TradeId, token, mdb.PaymentProviderOkPay)
+	if err != nil {
+		return nil, err
+	}
+	if existing.ID > 0 {
+		providerRow, err := data.GetProviderOrderByTradeIDAndProvider(existing.TradeId, mdb.PaymentProviderOkPay)
+		if err != nil {
+			return nil, err
+		}
+		if providerRow.ID == 0 || strings.TrimSpace(providerRow.PayURL) == "" {
+			return nil, constant.SystemErr
+		}
+		_ = data.MarkOrderSelected(parent.TradeId)
+		_ = data.MarkOrderSelected(existing.TradeId)
+		_ = data.RefreshOrderExpiration(parent.TradeId)
+		existing.IsSelected = true
+		resp := buildCheckoutResponse(existing)
+		resp.PaymentUrl = providerRow.PayURL
+		return resp, nil
+	}
+
+	count, err := data.CountActiveSubOrders(parent.TradeId)
+	if err != nil {
+		return nil, err
+	}
+	if count >= MaxSubOrders {
+		return nil, constant.SubOrderLimitExceeded
+	}
+
+	rate := config.GetRateForCoin(strings.ToLower(token), strings.ToLower(parent.Currency))
+	if rate <= 0 {
+		return nil, constant.RateAmountErr
+	}
+	decimalPayAmount := decimal.NewFromFloat(parent.Amount)
+	decimalTokenAmount := decimalPayAmount.Mul(decimal.NewFromFloat(rate))
+	if decimalTokenAmount.Cmp(decimal.NewFromFloat(UsdtMinimumPaymentAmount)) == -1 {
+		return nil, constant.PayAmountErr
+	}
+
+	subTradeID := GenerateCode()
+	amount := math.MustParsePrecFloat64(decimalTokenAmount.InexactFloat64(), data.GetAmountPrecision())
+	returnURL := strings.TrimSpace(parent.RedirectUrl)
+	if returnURL == "" {
+		returnURL = data.GetOkPayReturnURL()
+	}
+	if returnURL == "" {
+		returnURL = fmt.Sprintf("%s/pay/checkout-counter/%s", config.GetAppUri(), parent.TradeId)
+	}
+
+	tx := dao.Mdb.Begin()
+	subOrder := &mdb.Orders{
+		TradeId:         subTradeID,
+		OrderId:         subTradeID,
+		ParentTradeId:   parent.TradeId,
+		Amount:          parent.Amount,
+		Currency:        parent.Currency,
+		ActualAmount:    amount,
+		ReceiveAddress:  "OKPAY",
+		Token:           token,
+		Network:         mdb.NetworkTron,
+		Status:          mdb.StatusWaitPay,
+		IsSelected:      true,
+		NotifyUrl:       "",
+		RedirectUrl:     parent.RedirectUrl,
+		Name:            parent.Name,
+		CallBackConfirm: mdb.CallBackConfirmOk,
+		PaymentType:     parent.PaymentType,
+		PayProvider:     mdb.PaymentProviderOkPay,
+		ApiKeyID:        parent.ApiKeyID,
+	}
+	if err = data.CreateOrderWithTransaction(tx, subOrder); err != nil {
+		tx.Rollback()
+		return nil, err
+	}
+	providerRow := &mdb.ProviderOrder{
+		TradeId:         subTradeID,
+		Provider:        mdb.PaymentProviderOkPay,
+		ProviderOrderID: "",
+		PayURL:          "",
+		Amount:          amount,
+		Coin:            token,
+		Status:          mdb.ProviderOrderStatusCreating,
+	}
+	if err = data.CreateProviderOrderWithTransaction(tx, providerRow); err != nil {
+		tx.Rollback()
+		return nil, err
+	}
+	if err = tx.Commit().Error; err != nil {
+		tx.Rollback()
+		return nil, err
+	}
+
+	okpayOrder, err := createOkPayDepositOrder(subTradeID, amount, token, returnURL)
+	if err != nil {
+		_ = data.MarkProviderOrderFailed(subTradeID, mdb.PaymentProviderOkPay)
+		_ = data.ExpireOrderByTradeID(subTradeID)
+		return nil, constant.PaymentProviderCreateErr
+	}
+	if err = data.UpdateProviderOrderCreated(subTradeID, mdb.PaymentProviderOkPay, okpayOrder.ProviderOrderID, okpayOrder.PayURL); err != nil {
+		_ = data.MarkProviderOrderFailed(subTradeID, mdb.PaymentProviderOkPay)
+		_ = data.ExpireOrderByTradeID(subTradeID)
+		return nil, err
+	}
+
+	_ = data.MarkOrderSelected(parent.TradeId)
+	_ = data.RefreshOrderExpiration(parent.TradeId)
+
+	resp := buildCheckoutResponse(subOrder)
+	resp.PaymentUrl = okpayOrder.PayURL
+	return resp, nil
+}
+
+func okPayTokenAllowed(token string) bool {
+	for _, item := range data.GetOkPayAllowTokens() {
+		if strings.EqualFold(item, token) {
+			return true
+		}
+	}
+	return false
+}
@@ -1,8 +1,10 @@
 package service

 import (
+	"encoding/base64"
 	"fmt"
 	"io"
+	"math/big"
 	"net/http"
 	"strings"
 	"sync"
@@ -17,6 +19,7 @@ import (
 	"github.com/GMWalletApp/epusdt/util/constant"
 	"github.com/GMWalletApp/epusdt/util/http_client"
 	"github.com/go-resty/resty/v2"
+	"github.com/xssnick/tonutils-go/address"
 )

 func newCreateTransactionRequest(orderID string, amount float64) *request.CreateTransactionRequest {
@@ -26,7 +29,7 @@ func newCreateTransactionRequest(orderID string, amount float64) *request.Create
 		Token:     "USDT",
 		Network:   "tron",
 		Amount:    amount,
-		NotifyUrl: "https://merchant.example/callback",
+		NotifyUrl: "https://93.184.216.34/callback",
 	}
 }

@@ -36,6 +39,31 @@ func (f roundTripFunc) RoundTrip(req *http.Request) (*http.Response, error) {
 	return f(req)
 }

+func TestGenerateCodeFormat(t *testing.T) {
+	tradeID := GenerateCode()
+
+	if len(tradeID) != 24 {
+		t.Fatalf("trade id length = %d, want 24", len(tradeID))
+	}
+	if strings.Contains(tradeID, "=") {
+		t.Fatalf("trade id = %q, contains padding '='", tradeID)
+	}
+	for _, ch := range tradeID {
+		if (ch >= 'a' && ch <= 'z') || (ch >= 'A' && ch <= 'Z') || (ch >= '0' && ch <= '9') || ch == '-' || ch == '_' {
+			continue
+		}
+		t.Fatalf("trade id = %q, contains non URL-safe character %q", tradeID, ch)
+	}
+
+	decoded, err := base64.RawURLEncoding.DecodeString(tradeID)
+	if err != nil {
+		t.Fatalf("decode trade id %q: %v", tradeID, err)
+	}
+	if len(decoded) != 18 {
+		t.Fatalf("decoded trade id length = %d, want 18", len(decoded))
+	}
+}
+
 func installMockHTTPClient(t *testing.T, handler roundTripFunc) {
 	t.Helper()

@@ -50,6 +78,15 @@ func installMockHTTPClient(t *testing.T, handler roundTripFunc) {
 	})
 }

+func TestCreateTransactionRejectsPrivateNotifyURL(t *testing.T) {
+	req := newCreateTransactionRequest("order_private_notify_url", 1)
+	req.NotifyUrl = "http://127.0.0.1/notify"
+
+	if _, err := CreateTransaction(req, nil); err != constant.NotifyURLErr {
+		t.Fatalf("CreateTransaction error = %v, want %v", err, constant.NotifyURLErr)
+	}
+}
+
 func TestCreateTransactionAssignsIncrementedAmountsAndLocks(t *testing.T) {
 	cleanup := testutil.SetupTestDatabases(t)
 	defer cleanup()
@@ -97,6 +134,59 @@ func TestCreateTransactionAssignsIncrementedAmountsAndLocks(t *testing.T) {
 	}
 }

+func TestCreateTransactionUsesConfiguredAmountPrecision(t *testing.T) {
+	cleanup := testutil.SetupTestDatabases(t)
+	defer cleanup()
+
+	if err := data.SetSetting(mdb.SettingGroupSystem, mdb.SettingKeyAmountPrecision, "4", mdb.SettingTypeInt); err != nil {
+		t.Fatalf("set amount precision: %v", err)
+	}
+	if _, err := data.AddWalletAddress("wallet_precision_1"); err != nil {
+		t.Fatalf("add wallet: %v", err)
+	}
+
+	resp1, err := CreateTransaction(newCreateTransactionRequest("order_precision_1", 1), nil)
+	if err != nil {
+		t.Fatalf("create first transaction: %v", err)
+	}
+	resp2, err := CreateTransaction(newCreateTransactionRequest("order_precision_2", 1), nil)
+	if err != nil {
+		t.Fatalf("create second transaction: %v", err)
+	}
+
+	if got := fmt.Sprintf("%.4f", resp1.ActualAmount); got != "1.0000" {
+		t.Fatalf("first actual amount = %s, want 1.0000", got)
+	}
+	if got := fmt.Sprintf("%.4f", resp2.ActualAmount); got != "1.0001" {
+		t.Fatalf("second actual amount = %s, want 1.0001", got)
+	}
+}
+
+func TestCreateTransactionStoresNormalizedMerchantAmount(t *testing.T) {
+	cleanup := testutil.SetupTestDatabases(t)
+	defer cleanup()
+
+	if _, err := data.AddWalletAddress("wallet_normalized_1"); err != nil {
+		t.Fatalf("add wallet: %v", err)
+	}
+
+	resp, err := CreateTransaction(newCreateTransactionRequest("order_normalized_1", 100.129), nil)
+	if err != nil {
+		t.Fatalf("create transaction: %v", err)
+	}
+	if got := fmt.Sprintf("%.2f", resp.Amount); got != "100.13" {
+		t.Fatalf("response amount = %s, want 100.13", got)
+	}
+
+	order, err := data.GetOrderInfoByTradeId(resp.TradeId)
+	if err != nil {
+		t.Fatalf("load order: %v", err)
+	}
+	if got := fmt.Sprintf("%.2f", order.Amount); got != "100.13" {
+		t.Fatalf("stored amount = %s, want 100.13", got)
+	}
+}
+
 func TestCreateTransactionUsesRateAPIWhenForcedSettingIsNotPositive(t *testing.T) {
 	cleanup := testutil.SetupTestDatabases(t)
 	defer cleanup()
@@ -114,8 +204,8 @@ func TestCreateTransactionUsesRateAPIWhenForcedSettingIsNotPositive(t *testing.T
 		}, nil
 	})

-	if err := data.SetSetting("rate", "rate.forced_usdt_rate", "0", "string"); err != nil {
-		t.Fatalf("set rate.forced_usdt_rate: %v", err)
+	if err := data.SetSetting("rate", "rate.forced_rate_list", `{"cny":{"usdt":0}}`, "json"); err != nil {
+		t.Fatalf("set rate.forced_rate_list: %v", err)
 	}
 	if err := data.SetSetting("rate", "rate.api_url", "https://rate.example.test", "string"); err != nil {
 		t.Fatalf("set rate.api_url: %v", err)
@@ -137,8 +227,8 @@ func TestCreateTransactionFailsWhenRateAPIUnavailableAndForcedSettingIsNotPositi
 	cleanup := testutil.SetupTestDatabases(t)
 	defer cleanup()

-	if err := data.SetSetting("rate", "rate.forced_usdt_rate", "0", "string"); err != nil {
-		t.Fatalf("set rate.forced_usdt_rate: %v", err)
+	if err := data.SetSetting("rate", "rate.forced_rate_list", `{"cny":{"usdt":0}}`, "json"); err != nil {
+		t.Fatalf("set rate.forced_rate_list: %v", err)
 	}
 	if err := data.SetSetting("rate", "rate.api_url", "", "string"); err != nil {
 		t.Fatalf("clear rate.api_url: %v", err)
@@ -193,6 +283,424 @@ func TestCreateTransactionNormalizesEvmReceiveAddressToLowercase(t *testing.T) {
 	}
 }

+func TestCreateTransactionCreatesTonOrderAndRawLock(t *testing.T) {
+	cleanup := testutil.SetupTestDatabases(t)
+	defer cleanup()
+
+	if err := data.SetSetting("rate", "rate.forced_rate_list", `{"cny":{"ton":0.5}}`, "json"); err != nil {
+		t.Fatalf("set forced rate: %v", err)
+	}
+	addr := address.MustParseAddr("EQC6KV4zs8TJtSZapOrRFmqSkxzpq-oSCoxekQRKElf4nC1I")
+	wallet, err := data.AddWalletAddressWithNetwork(mdb.NetworkTon, addr.StringRaw())
+	if err != nil {
+		t.Fatalf("add ton wallet: %v", err)
+	}
+
+	req := newCreateTransactionRequest("order_ton_native_1", 10)
+	req.Network = mdb.NetworkTon
+	req.Token = "TON"
+
+	resp, err := CreateTransaction(req, nil)
+	if err != nil {
+		t.Fatalf("create TON transaction: %v", err)
+	}
+	if resp.ReceiveAddress != wallet.Address {
+		t.Fatalf("receive address = %q, want %q", resp.ReceiveAddress, wallet.Address)
+	}
+	if resp.Token != "TON" {
+		t.Fatalf("token = %q, want TON", resp.Token)
+	}
+	if got := fmt.Sprintf("%.2f", resp.ActualAmount); got != "5.00" {
+		t.Fatalf("actual amount = %s, want 5.00", got)
+	}
+
+	tradeID, err := data.GetTradeIdByWalletAddressAndAmountAndToken(mdb.NetworkTon, addr.StringRaw(), "TON", resp.ActualAmount)
+	if err != nil {
+		t.Fatalf("lookup ton runtime lock: %v", err)
+	}
+	if tradeID != resp.TradeId {
+		t.Fatalf("runtime lock trade_id = %q, want %q", tradeID, resp.TradeId)
+	}
+}
+
+func TestCreateTransactionCreatesTonOrderWithConfiguredPrecision(t *testing.T) {
+	cleanup := testutil.SetupTestDatabases(t)
+	defer cleanup()
+
+	if err := data.SetSetting(mdb.SettingGroupSystem, mdb.SettingKeyAmountPrecision, "4", mdb.SettingTypeInt); err != nil {
+		t.Fatalf("set amount precision: %v", err)
+	}
+	if err := data.SetSetting("rate", "rate.forced_rate_list", `{"cny":{"ton":0.12345}}`, "json"); err != nil {
+		t.Fatalf("set forced rate: %v", err)
+	}
+	addr := address.MustParseAddr("EQC6KV4zs8TJtSZapOrRFmqSkxzpq-oSCoxekQRKElf4nC1I")
+	if _, err := data.AddWalletAddressWithNetwork(mdb.NetworkTon, addr.StringRaw()); err != nil {
+		t.Fatalf("add ton wallet: %v", err)
+	}
+
+	req := newCreateTransactionRequest("order_ton_precision_1", 10)
+	req.Network = mdb.NetworkTon
+	req.Token = "TON"
+	resp, err := CreateTransaction(req, nil)
+	if err != nil {
+		t.Fatalf("create TON transaction: %v", err)
+	}
+	if got := fmt.Sprintf("%.4f", resp.ActualAmount); got != "1.2345" {
+		t.Fatalf("actual amount = %s, want 1.2345", got)
+	}
+	tradeID, err := data.GetTradeIdByWalletAddressAndAmountAndToken(mdb.NetworkTon, addr.Bounce(true).String(), "TON", 1.2345)
+	if err != nil {
+		t.Fatalf("lookup ton runtime lock: %v", err)
+	}
+	if tradeID != resp.TradeId {
+		t.Fatalf("runtime lock trade_id = %q, want %q", tradeID, resp.TradeId)
+	}
+}
+
+func TestCreateTransactionRejectsUnsupportedTonToken(t *testing.T) {
+	cleanup := testutil.SetupTestDatabases(t)
+	defer cleanup()
+
+	req := newCreateTransactionRequest("order_ton_gram_1", 10)
+	req.Network = mdb.NetworkTon
+	req.Token = "GRAM"
+
+	_, err := CreateTransaction(req, nil)
+	if err != constant.SupportedAssetNotFound {
+		t.Fatalf("create unsupported TON token error = %v, want %v", err, constant.SupportedAssetNotFound)
+	}
+}
+
+func TestCreateTransactionRejectsDisabledTonTokenBeforeRate(t *testing.T) {
+	cleanup := testutil.SetupTestDatabases(t)
+	defer cleanup()
+
+	if err := dao.Mdb.Model(&mdb.ChainToken{}).
+		Where("network = ? AND symbol = ?", mdb.NetworkTon, "TON").
+		Update("enabled", false).Error; err != nil {
+		t.Fatalf("disable TON token: %v", err)
+	}
+	req := newCreateTransactionRequest("order_ton_disabled_1", 10)
+	req.Network = mdb.NetworkTon
+	req.Token = "TON"
+
+	_, err := CreateTransaction(req, nil)
+	if err != constant.SupportedAssetNotFound {
+		t.Fatalf("create disabled TON token error = %v, want %v", err, constant.SupportedAssetNotFound)
+	}
+}
+
+func TestCreateTransactionSupportedTonTokenWithoutRateReturnsRateError(t *testing.T) {
+	cleanup := testutil.SetupTestDatabases(t)
+	defer cleanup()
+
+	if err := data.SetSetting("rate", "rate.forced_rate_list", `{"cny":{"ton":0}}`, "json"); err != nil {
+		t.Fatalf("set forced rate: %v", err)
+	}
+	if err := data.SetSetting("rate", "rate.api_url", "", "string"); err != nil {
+		t.Fatalf("clear rate api url: %v", err)
+	}
+	req := newCreateTransactionRequest("order_ton_missing_rate_1", 10)
+	req.Network = mdb.NetworkTon
+	req.Token = "TON"
+
+	_, err := CreateTransaction(req, nil)
+	if err != constant.RateAmountErr {
+		t.Fatalf("create TON without rate error = %v, want %v", err, constant.RateAmountErr)
+	}
+}
+
+func TestSwitchNetworkCreatesTonSubOrderAndRawLock(t *testing.T) {
+	cleanup := testutil.SetupTestDatabases(t)
+	defer cleanup()
+
+	if err := data.SetSetting("rate", "rate.forced_rate_list", `{"cny":{"usdt":0.1,"ton":0.5}}`, "json"); err != nil {
+		t.Fatalf("set forced rate: %v", err)
+	}
+	if _, err := data.AddWalletAddress("TTestTronAddress001"); err != nil {
+		t.Fatalf("add tron wallet: %v", err)
+	}
+	addr := address.MustParseAddr("EQC6KV4zs8TJtSZapOrRFmqSkxzpq-oSCoxekQRKElf4nC1I")
+	wallet, err := data.AddWalletAddressWithNetwork(mdb.NetworkTon, addr.StringRaw())
+	if err != nil {
+		t.Fatalf("add ton wallet: %v", err)
+	}
+
+	parentReq := newCreateTransactionRequest("order_switch_ton_1", 10)
+	parentReq.Network = mdb.NetworkTron
+	parentResp, err := CreateTransaction(parentReq, nil)
+	if err != nil {
+		t.Fatalf("create parent transaction: %v", err)
+	}
+
+	subResp, err := SwitchNetwork(&request.SwitchNetworkRequest{
+		TradeId: parentResp.TradeId,
+		Token:   "TON",
+		Network: mdb.NetworkTon,
+	})
+	if err != nil {
+		t.Fatalf("switch to TON: %v", err)
+	}
+	if subResp.Network != mdb.NetworkTon || subResp.Token != "TON" {
+		t.Fatalf("sub order network/token = %s/%s, want ton/TON", subResp.Network, subResp.Token)
+	}
+	if subResp.ReceiveAddress != wallet.Address {
+		t.Fatalf("sub order receive address = %q, want %q", subResp.ReceiveAddress, wallet.Address)
+	}
+	if got := fmt.Sprintf("%.2f", subResp.ActualAmount); got != "5.00" {
+		t.Fatalf("sub order actual amount = %s, want 5.00", got)
+	}
+	tradeID, err := data.GetTradeIdByWalletAddressAndAmountAndToken(mdb.NetworkTon, addr.StringRaw(), "TON", subResp.ActualAmount)
+	if err != nil {
+		t.Fatalf("lookup TON sub-order lock: %v", err)
+	}
+	if tradeID != subResp.TradeId {
+		t.Fatalf("TON sub-order lock trade_id = %q, want %q", tradeID, subResp.TradeId)
+	}
+}
+
+func TestSwitchNetworkRejectsUnsupportedTonToken(t *testing.T) {
+	cleanup := testutil.SetupTestDatabases(t)
+	defer cleanup()
+
+	if err := data.SetSetting("rate", "rate.forced_rate_list", `{"cny":{"usdt":0.1}}`, "json"); err != nil {
+		t.Fatalf("set forced rate: %v", err)
+	}
+	if _, err := data.AddWalletAddress("TTestTronAddress002"); err != nil {
+		t.Fatalf("add tron wallet: %v", err)
+	}
+	parentResp, err := CreateTransaction(newCreateTransactionRequest("order_switch_gram_1", 10), nil)
+	if err != nil {
+		t.Fatalf("create parent transaction: %v", err)
+	}
+
+	_, err = SwitchNetwork(&request.SwitchNetworkRequest{
+		TradeId: parentResp.TradeId,
+		Token:   "GRAM",
+		Network: mdb.NetworkTon,
+	})
+	if err != constant.SupportedAssetNotFound {
+		t.Fatalf("switch unsupported TON token error = %v, want %v", err, constant.SupportedAssetNotFound)
+	}
+}
+
+func TestTryProcessTonTransferMarksOrderPaidAndReleasesRawLock(t *testing.T) {
+	cleanup := testutil.SetupTestDatabases(t)
+	defer cleanup()
+
+	if err := data.SetSetting("rate", "rate.forced_rate_list", `{"cny":{"ton":0.5}}`, "json"); err != nil {
+		t.Fatalf("set forced rate: %v", err)
+	}
+	addr := address.MustParseAddr("EQC6KV4zs8TJtSZapOrRFmqSkxzpq-oSCoxekQRKElf4nC1I")
+	if _, err := data.AddWalletAddressWithNetwork(mdb.NetworkTon, addr.StringRaw()); err != nil {
+		t.Fatalf("add ton wallet: %v", err)
+	}
+	req := newCreateTransactionRequest("order_ton_process_1", 10)
+	req.Network = mdb.NetworkTon
+	req.Token = "TON"
+	resp, err := CreateTransaction(req, nil)
+	if err != nil {
+		t.Fatalf("create TON transaction: %v", err)
+	}
+
+	transfer := &TonObservedTransfer{
+		ReceiveAddress: resp.ReceiveAddress,
+		Token:          mdb.ChainToken{BaseModel: mdb.BaseModel{ID: 1}, Network: mdb.NetworkTon, Symbol: "TON", Decimals: 9, Enabled: true},
+		RawAmount:      big.NewInt(5_000_000_000),
+		Amount:         resp.ActualAmount,
+		BlockTimeMs:    time.Now().Add(time.Second).UnixMilli(),
+		LT:             100,
+		TxHashHex:      strings.Repeat("1", 64),
+		BlockID:        TonCanonicalBlockTransactionID(addr.StringRaw(), 100, strings.Repeat("1", 64)),
+	}
+	TryProcessTonTransfer(transfer)
+
+	order, err := data.GetOrderInfoByTradeId(resp.TradeId)
+	if err != nil {
+		t.Fatalf("reload order: %v", err)
+	}
+	if order.Status != mdb.StatusPaySuccess {
+		t.Fatalf("order status = %d, want %d", order.Status, mdb.StatusPaySuccess)
+	}
+	if order.BlockTransactionId != transfer.BlockID {
+		t.Fatalf("block transaction id = %q, want %q", order.BlockTransactionId, transfer.BlockID)
+	}
+	lock, err := data.GetTradeIdByWalletAddressAndAmountAndToken(mdb.NetworkTon, addr.StringRaw(), "TON", resp.ActualAmount)
+	if err != nil {
+		t.Fatalf("lookup ton lock: %v", err)
+	}
+	if lock != "" {
+		t.Fatalf("TON lock still exists after payment: %s", lock)
+	}
+}
+
+func TestTryProcessTonJettonTransferMarksUSDTOrderPaid(t *testing.T) {
+	cleanup := testutil.SetupTestDatabases(t)
+	defer cleanup()
+
+	if err := data.SetSetting("rate", "rate.forced_rate_list", `{"cny":{"usdt":0.1}}`, "json"); err != nil {
+		t.Fatalf("set forced rate: %v", err)
+	}
+	addr := address.MustParseAddr("EQC6KV4zs8TJtSZapOrRFmqSkxzpq-oSCoxekQRKElf4nC1I")
+	if _, err := data.AddWalletAddressWithNetwork(mdb.NetworkTon, addr.StringRaw()); err != nil {
+		t.Fatalf("add ton wallet: %v", err)
+	}
+	req := newCreateTransactionRequest("order_ton_usdt_process_1", 10)
+	req.Network = mdb.NetworkTon
+	req.Token = "USDT"
+	resp, err := CreateTransaction(req, nil)
+	if err != nil {
+		t.Fatalf("create TON USDT transaction: %v", err)
+	}
+
+	transfer := &TonObservedTransfer{
+		ReceiveAddress: resp.ReceiveAddress,
+		Token:          mdb.ChainToken{BaseModel: mdb.BaseModel{ID: 2}, Network: mdb.NetworkTon, Symbol: "USDT", Decimals: 6, Enabled: true},
+		RawAmount:      big.NewInt(1_000_000),
+		Amount:         resp.ActualAmount,
+		BlockTimeMs:    time.Now().Add(time.Second).UnixMilli(),
+		LT:             110,
+		TxHashHex:      strings.Repeat("4", 64),
+		BlockID:        TonCanonicalBlockTransactionID(addr.StringRaw(), 110, strings.Repeat("4", 64)),
+	}
+	TryProcessTonTransfer(transfer)
+
+	order, err := data.GetOrderInfoByTradeId(resp.TradeId)
+	if err != nil {
+		t.Fatalf("reload order: %v", err)
+	}
+	if order.Status != mdb.StatusPaySuccess {
+		t.Fatalf("order status = %d, want %d", order.Status, mdb.StatusPaySuccess)
+	}
+	if order.BlockTransactionId != transfer.BlockID {
+		t.Fatalf("block transaction id = %q, want %q", order.BlockTransactionId, transfer.BlockID)
+	}
+	lock, err := data.GetTradeIdByWalletAddressAndAmountAndToken(mdb.NetworkTon, addr.StringRaw(), "USDT", resp.ActualAmount)
+	if err != nil {
+		t.Fatalf("lookup TON USDT lock: %v", err)
+	}
+	if lock != "" {
+		t.Fatalf("TON USDT lock still exists after payment: %s", lock)
+	}
+}
+
+func TestTryProcessTonTransferSkipsTransfersBeforeOrderCreation(t *testing.T) {
+	cleanup := testutil.SetupTestDatabases(t)
+	defer cleanup()
+
+	if err := data.SetSetting("rate", "rate.forced_rate_list", `{"cny":{"ton":0.5}}`, "json"); err != nil {
+		t.Fatalf("set forced rate: %v", err)
+	}
+	addr := address.MustParseAddr("EQC6KV4zs8TJtSZapOrRFmqSkxzpq-oSCoxekQRKElf4nC1I")
+	if _, err := data.AddWalletAddressWithNetwork(mdb.NetworkTon, addr.StringRaw()); err != nil {
+		t.Fatalf("add ton wallet: %v", err)
+	}
+	req := newCreateTransactionRequest("order_ton_old_transfer_1", 10)
+	req.Network = mdb.NetworkTon
+	req.Token = "TON"
+	resp, err := CreateTransaction(req, nil)
+	if err != nil {
+		t.Fatalf("create TON transaction: %v", err)
+	}
+	order, err := data.GetOrderInfoByTradeId(resp.TradeId)
+	if err != nil {
+		t.Fatalf("load order: %v", err)
+	}
+
+	TryProcessTonTransfer(&TonObservedTransfer{
+		ReceiveAddress: resp.ReceiveAddress,
+		Token:          mdb.ChainToken{BaseModel: mdb.BaseModel{ID: 1}, Network: mdb.NetworkTon, Symbol: "TON", Decimals: 9, Enabled: true},
+		RawAmount:      big.NewInt(5_000_000_000),
+		Amount:         resp.ActualAmount,
+		BlockTimeMs:    order.CreatedAt.TimestampMilli() - 1,
+		LT:             101,
+		TxHashHex:      strings.Repeat("2", 64),
+		BlockID:        TonCanonicalBlockTransactionID(addr.StringRaw(), 101, strings.Repeat("2", 64)),
+	})
+
+	order, err = data.GetOrderInfoByTradeId(resp.TradeId)
+	if err != nil {
+		t.Fatalf("reload order: %v", err)
+	}
+	if order.Status != mdb.StatusWaitPay {
+		t.Fatalf("order status = %d, want wait-pay", order.Status)
+	}
+	if order.BlockTransactionId != "" {
+		t.Fatalf("old transfer set block transaction id = %q", order.BlockTransactionId)
+	}
+}
+
+func TestTryProcessTonSubOrderPaysParentAndReleasesLocks(t *testing.T) {
+	cleanup := testutil.SetupTestDatabases(t)
+	defer cleanup()
+
+	if err := data.SetSetting("rate", "rate.forced_rate_list", `{"cny":{"usdt":0.1,"ton":0.5}}`, "json"); err != nil {
+		t.Fatalf("set forced rate: %v", err)
+	}
+	if _, err := data.AddWalletAddress("TTestTronAddressForTonSub"); err != nil {
+		t.Fatalf("add tron wallet: %v", err)
+	}
+	addr := address.MustParseAddr("EQC6KV4zs8TJtSZapOrRFmqSkxzpq-oSCoxekQRKElf4nC1I")
+	if _, err := data.AddWalletAddressWithNetwork(mdb.NetworkTon, addr.StringRaw()); err != nil {
+		t.Fatalf("add ton wallet: %v", err)
+	}
+
+	parentReq := newCreateTransactionRequest("order_ton_sub_parent_1", 10)
+	parentReq.Network = mdb.NetworkTron
+	parentResp, err := CreateTransaction(parentReq, nil)
+	if err != nil {
+		t.Fatalf("create parent order: %v", err)
+	}
+	subResp, err := SwitchNetwork(&request.SwitchNetworkRequest{
+		TradeId: parentResp.TradeId,
+		Token:   "TON",
+		Network: mdb.NetworkTon,
+	})
+	if err != nil {
+		t.Fatalf("switch to TON: %v", err)
+	}
+
+	TryProcessTonTransfer(&TonObservedTransfer{
+		ReceiveAddress: subResp.ReceiveAddress,
+		Token:          mdb.ChainToken{BaseModel: mdb.BaseModel{ID: 1}, Network: mdb.NetworkTon, Symbol: "TON", Decimals: 9, Enabled: true},
+		RawAmount:      big.NewInt(5_000_000_000),
+		Amount:         subResp.ActualAmount,
+		BlockTimeMs:    time.Now().Add(time.Second).UnixMilli(),
+		LT:             102,
+		TxHashHex:      strings.Repeat("3", 64),
+		BlockID:        TonCanonicalBlockTransactionID(addr.StringRaw(), 102, strings.Repeat("3", 64)),
+	})
+
+	parent, err := data.GetOrderInfoByTradeId(parentResp.TradeId)
+	if err != nil {
+		t.Fatalf("reload parent order: %v", err)
+	}
+	if parent.Status != mdb.StatusPaySuccess {
+		t.Fatalf("parent status = %d, want paid", parent.Status)
+	}
+	sub, err := data.GetOrderInfoByTradeId(subResp.TradeId)
+	if err != nil {
+		t.Fatalf("reload sub order: %v", err)
+	}
+	if sub.Status != mdb.StatusPaySuccess {
+		t.Fatalf("sub status = %d, want paid", sub.Status)
+	}
+	parentLock, err := data.GetTradeIdByWalletAddressAndAmountAndToken(mdb.NetworkTron, parentResp.ReceiveAddress, parentResp.Token, parentResp.ActualAmount)
+	if err != nil {
+		t.Fatalf("lookup parent lock: %v", err)
+	}
+	if parentLock != "" {
+		t.Fatalf("parent lock still exists: %s", parentLock)
+	}
+	subLock, err := data.GetTradeIdByWalletAddressAndAmountAndToken(mdb.NetworkTon, addr.StringRaw(), "TON", subResp.ActualAmount)
+	if err != nil {
+		t.Fatalf("lookup sub lock: %v", err)
+	}
+	if subLock != "" {
+		t.Fatalf("TON sub-order lock still exists: %s", subLock)
+	}
+}
+
 func TestOrderProcessingMarksPaidAndReleasesLock(t *testing.T) {
 	cleanup := testutil.SetupTestDatabases(t)
 	defer cleanup()
@@ -612,6 +1120,81 @@ func TestOrderProcessingSubOrderPaidParentKeepsOwnFields(t *testing.T) {
 	}
 }

+func TestOrderProcessingParentDirectPayExpiresOkPayProviderOrder(t *testing.T) {
+	cleanup := testutil.SetupTestDatabases(t)
+	defer cleanup()
+
+	if _, err := data.AddWalletAddress("TTestTronAddress001"); err != nil {
+		t.Fatalf("add tron wallet: %v", err)
+	}
+
+	parentReq := newCreateTransactionRequest("order_parent_direct_okpay_expire", 1)
+	parentReq.Network = mdb.NetworkTron
+	parentResp, err := CreateTransaction(parentReq, nil)
+	if err != nil {
+		t.Fatalf("create parent order: %v", err)
+	}
+
+	subOrder := &mdb.Orders{
+		TradeId:         "okpay_sub_parent_direct_expire",
+		OrderId:         "okpay_sub_parent_direct_expire",
+		ParentTradeId:   parentResp.TradeId,
+		Amount:          parentResp.Amount,
+		Currency:        parentResp.Currency,
+		ActualAmount:    0.15,
+		ReceiveAddress:  "OKPAY",
+		Token:           "USDT",
+		Network:         mdb.NetworkTron,
+		Status:          mdb.StatusWaitPay,
+		NotifyUrl:       "",
+		CallBackConfirm: mdb.CallBackConfirmOk,
+		PayProvider:     mdb.PaymentProviderOkPay,
+	}
+	if err := dao.Mdb.Create(subOrder).Error; err != nil {
+		t.Fatalf("create okpay sub-order: %v", err)
+	}
+	providerRow := &mdb.ProviderOrder{
+		TradeId:         subOrder.TradeId,
+		Provider:        mdb.PaymentProviderOkPay,
+		ProviderOrderID: "okp-parent-direct-expire",
+		PayURL:          "https://t.me/ExampleWalletBot?start=shop_deposit--okpay-order-parent-direct-expire",
+		Amount:          subOrder.ActualAmount,
+		Coin:            subOrder.Token,
+		Status:          mdb.ProviderOrderStatusPending,
+	}
+	if err := dao.Mdb.Create(providerRow).Error; err != nil {
+		t.Fatalf("create provider row: %v", err)
+	}
+
+	err = OrderProcessing(&request.OrderProcessingRequest{
+		ReceiveAddress:     parentResp.ReceiveAddress,
+		Token:              strings.ToUpper(parentResp.Token),
+		Network:            mdb.NetworkTron,
+		TradeId:            parentResp.TradeId,
+		Amount:             parentResp.ActualAmount,
+		BlockTransactionId: "block_parent_direct_okpay_expire",
+	})
+	if err != nil {
+		t.Fatalf("order processing parent direct pay: %v", err)
+	}
+
+	expiredSub, err := data.GetOrderInfoByTradeId(subOrder.TradeId)
+	if err != nil {
+		t.Fatalf("reload sub-order: %v", err)
+	}
+	if expiredSub.Status != mdb.StatusExpired {
+		t.Fatalf("sub-order status = %d, want %d", expiredSub.Status, mdb.StatusExpired)
+	}
+
+	expiredProviderRow, err := data.GetProviderOrderByTradeIDAndProvider(subOrder.TradeId, mdb.PaymentProviderOkPay)
+	if err != nil {
+		t.Fatalf("reload provider row: %v", err)
+	}
+	if expiredProviderRow.Status != mdb.ProviderOrderStatusExpired {
+		t.Fatalf("provider row status = %q, want %q", expiredProviderRow.Status, mdb.ProviderOrderStatusExpired)
+	}
+}
+
 // TestOrderProcessingSubOrderExpiresSiblingsAndReleasesLocks verifies that when one
 // sub-order is paid all sibling sub-orders are expired and their runtime locks (as
 // well as the parent's lock) are released.
@@ -1,23 +1,23 @@
 package service

 import (
-	"errors"
-
 	"github.com/GMWalletApp/epusdt/config"
 	"github.com/GMWalletApp/epusdt/model/data"
-	"github.com/GMWalletApp/epusdt/model/mdb"
 	"github.com/GMWalletApp/epusdt/model/response"
+	"github.com/GMWalletApp/epusdt/util/constant"
 )

-var ErrOrder = errors.New("不存在待支付订单或已过期")
+// ErrOrder is returned when checkout initialization cannot find the trade id.
+var ErrOrder = constant.OrderNotExists

-// GetCheckoutCounterByTradeId returns checkout info for a pending order.
+// GetCheckoutCounterByTradeId returns checkout initialization data for an existing order.
+// It does not decide the payment state; callers should use CheckStatus for that.
 func GetCheckoutCounterByTradeId(tradeId string) (*response.CheckoutCounterResponse, error) {
 	orderInfo, err := data.GetOrderInfoByTradeId(tradeId)
 	if err != nil {
 		return nil, err
 	}
-	if orderInfo.ID <= 0 || orderInfo.Status != mdb.StatusWaitPay {
+	if orderInfo.ID <= 0 {
 		return nil, ErrOrder
 	}

@@ -5,6 +5,7 @@ import (
 	"errors"
 	"fmt"
 	"math/big"
+	"net/http"
 	"sort"
 	"strings"
 	"sync"
@@ -26,6 +27,14 @@ import (
 // gProcessedSignatures 已处理签名缓存，避免重复调用 getTransaction
 var gProcessedSignatures sync.Map // sig -> unix timestamp

+var processSolanaOrder = OrderProcessing
+
+var (
+	solRPCRetryCount   = 5
+	solRPCRetryWait    = 2 * time.Second
+	solRPCRetryMaxWait = 10 * time.Second
+)
+
 type TransferInfo struct {
 	Source      string  // Source address (for SOL) or source ATA (for SPL tokens)
 	Destination string  // Destination address (for SOL) or destination ATA (for SPL tokens)
@@ -150,6 +159,7 @@ func SolCallBack(address string, wg *sync.WaitGroup) {
 	// Process each transaction signature
 	for sigIdx, txSig := range result {
 		sig := txSig.Signature
+		retrySignature := false

 		// Skip failed transactions
 		if txSig.Err != nil {
@@ -213,6 +223,7 @@ func SolCallBack(address string, wg *sync.WaitGroup) {
 			tradeID, err := data.GetTradeIdByWalletAddressAndAmountAndToken(mdb.NetworkSolana, address, token, amount)
 			if err != nil {
 				log.Sugar.Errorf("[SOL][%s] sig=%s query transaction_lock failed: %v", address, sig, err)
+				retrySignature = true
 				continue
 			}
 			if tradeID == "" {
@@ -226,6 +237,7 @@ func SolCallBack(address string, wg *sync.WaitGroup) {
 			order, err := data.GetOrderInfoByTradeId(tradeID)
 			if err != nil {
 				log.Sugar.Errorf("[SOL][%s] sig=%s load order failed for trade_id=%s: %v", address, sig, tradeID, err)
+				retrySignature = true
 				continue
 			}
 			log.Sugar.Infof("[SOL][%s] order loaded: trade_id=%s order_id=%s status=%d created_at_ms=%d",
@@ -252,13 +264,14 @@ func SolCallBack(address string, wg *sync.WaitGroup) {
 			}
 			log.Sugar.Infof("[SOL][%s] calling OrderProcessing: trade_id=%s sig=%s token=%s amount=%.2f",
 				address, tradeID, sig, token, amount)
-			err = OrderProcessing(req)
+			err = processSolanaOrder(req)
 			if err != nil {
 				if errors.Is(err, constant.OrderBlockAlreadyProcess) || errors.Is(err, constant.OrderStatusConflict) {
 					log.Sugar.Infof("[SOL][%s] sig=%s already resolved: trade_id=%s reason=%v", address, sig, tradeID, err)
 					continue
 				}
 				log.Sugar.Errorf("[SOL][%s] sig=%s OrderProcessing failed for trade_id=%s: %v", address, sig, tradeID, err)
+				retrySignature = true
 				continue
 			}

@@ -268,6 +281,11 @@ func SolCallBack(address string, wg *sync.WaitGroup) {
 			log.Sugar.Infof("[SOL][%s] payment fully processed: trade_id=%s sig=%s", address, tradeID, sig)
 		}

+		if retrySignature {
+			log.Sugar.Debugf("[SOL][%s] sig=%s not marked processed because retryable processing failed", address, sig)
+			continue
+		}
+
 		// 标记已处理
 		gProcessedSignatures.Store(sig, time.Now().Unix())
 	}
@@ -282,26 +300,82 @@ type solSignatureResult struct {
 }

 func resolveSolanaRpcURL() (string, error) {
-	node, err := data.SelectRpcNode(mdb.NetworkSolana, mdb.RpcNodeTypeHttp)
+	node, err := resolveSolanaRpcNode()
 	if err != nil {
 		return "", err
 	}
-	if node == nil || node.ID == 0 {
-		return "", fmt.Errorf("no enabled %s %s RPC node configured in rpc_nodes", mdb.NetworkSolana, mdb.RpcNodeTypeHttp)
-	}
 	rpcURL := strings.TrimSpace(node.Url)
-	if rpcURL == "" {
-		return "", fmt.Errorf("rpc_nodes id=%d has empty url", node.ID)
-	}
 	return rpcURL, nil
 }

+func resolveSolanaRpcNode(excludeIDs ...uint64) (*mdb.RpcNode, error) {
+	node, err := data.SelectGeneralRpcNode(mdb.NetworkSolana, mdb.RpcNodeTypeHttp, excludeIDs...)
+	if err != nil {
+		return nil, err
+	}
+	if node == nil || node.ID == 0 {
+		return nil, fmt.Errorf("no enabled %s %s RPC node configured in rpc_nodes", mdb.NetworkSolana, mdb.RpcNodeTypeHttp)
+	}
+	rpcURL := strings.TrimSpace(node.Url)
+	if rpcURL == "" {
+		return nil, fmt.Errorf("rpc_nodes id=%d has empty url", node.ID)
+	}
+	node.Url = rpcURL
+	return node, nil
+}
+
 // SolRetryClient 发送 Solana JSON-RPC 请求，自动重试
-func SolRetryClient(method string, params []interface{}) ([]byte, error) {
+func SolRetryClient(method string, params []interface{}) (body []byte, err error) {
+	defer func() {
+		if err != nil {
+			data.RecordRpcFailure(mdb.NetworkSolana)
+			return
+		}
+		data.RecordRpcSuccess(mdb.NetworkSolana)
+	}()
+
+	tried := make([]uint64, 0, 3)
+	var lastErr error
+	for attempts := 0; attempts < 3; attempts++ {
+		node, err := resolveSolanaRpcNode(tried...)
+		if err != nil {
+			if lastErr != nil {
+				return nil, lastErr
+			}
+			return nil, err
+		}
+		if len(tried) > 0 {
+			log.Sugar.Warnf("[SOL] trying alternate RPC node method=%s node=%s", method, data.RpcNodeLogLabel(*node))
+		}
+
+		body, err := solRetryClientWithURL(node.Url, method, params)
+		if err == nil {
+			data.RecordRpcNodeSuccess(node.ID)
+			return body, nil
+		}
+
+		lastErr = err
+		failures, cooling := data.RecordRpcNodeFailure(node.ID)
+		nodeLabel := data.RpcNodeLogLabel(*node)
+		if !cooling {
+			log.Sugar.Warnf("[SOL] RPC node failed method=%s node=%s failures=%d/%d", method, nodeLabel, failures, data.RpcFailoverThreshold)
+			return nil, err
+		}
+		log.Sugar.Warnf("[SOL] RPC node reached fail threshold method=%s node=%s, trying another node", method, nodeLabel)
+		tried = append(tried, node.ID)
+	}
+	return nil, lastErr
+}
+
+func solRetryClientWithURL(rpcUrl string, method string, params []interface{}) ([]byte, error) {
+	return solRetryClientWithURLHeaders(rpcUrl, method, params, nil)
+}
+
+func solRetryClientWithURLHeaders(rpcUrl string, method string, params []interface{}, headers http.Header) ([]byte, error) {
 	client := resty.New()
-	client.SetRetryCount(5)
-	client.SetRetryWaitTime(2 * time.Second)
-	client.SetRetryMaxWaitTime(10 * time.Second)
+	client.SetRetryCount(solRPCRetryCount)
+	client.SetRetryWaitTime(solRPCRetryWait)
+	client.SetRetryMaxWaitTime(solRPCRetryMaxWait)
 	client.AddRetryCondition(func(r *resty.Response, err error) bool {
 		if err != nil {
 			return true
@@ -312,25 +386,35 @@ func SolRetryClient(method string, params []interface{}) ([]byte, error) {
 		return false
 	})

-	rpcUrl, err := resolveSolanaRpcURL()
-	if err != nil {
-		return nil, err
+	req := client.R().SetHeader("Content-Type", "application/json")
+	for key, values := range headers {
+		for _, value := range values {
+			req.SetHeader(key, value)
+		}
 	}

-	resp, err := client.R().
-		SetHeader("Content-Type", "application/json").
-		SetBody(map[string]interface{}{
-			"jsonrpc": "2.0",
-			"id":      1,
-			"method":  method,
-			"params":  params,
-		}).
+	resp, err := req.SetBody(map[string]interface{}{
+		"jsonrpc": "2.0",
+		"id":      1,
+		"method":  method,
+		"params":  params,
+	}).
 		Post(rpcUrl)
 	if err != nil {
 		return nil, err
 	}
+	if resp.StatusCode() >= http.StatusBadRequest {
+		return nil, fmt.Errorf("solana rpc HTTP %d", resp.StatusCode())
+	}

 	respBody := resp.Body()
+	if errValue := gjson.GetBytes(respBody, "error"); errValue.Exists() && errValue.Type != gjson.Null {
+		code := errValue.Get("code").String()
+		if code == "" {
+			code = "unknown"
+		}
+		return nil, fmt.Errorf("solana rpc error code=%s", code)
+	}

 	return respBody, nil
 }
@@ -367,6 +451,32 @@ func SolGetSignaturesForAddress(address string, limit int, untilSig string, befo
 	return bodyData, nil
 }

+func SolGetBlockHeight() (height int64, err error) {
+	defer func() {
+		if err != nil {
+			data.RecordRpcFailure(mdb.NetworkSolana)
+			return
+		}
+		data.RecordRpcSuccess(mdb.NetworkSolana)
+	}()
+
+	rpcURL, err := resolveSolanaRpcURL()
+	if err != nil {
+		return 0, err
+	}
+	bodyData, err := solRetryClientWithURL(rpcURL, "getBlockHeight", []interface{}{
+		map[string]interface{}{"commitment": "finalized"},
+	})
+	if err != nil {
+		return 0, err
+	}
+	height = gjson.GetBytes(bodyData, "result").Int()
+	if height <= 0 {
+		return 0, fmt.Errorf("unexpected getBlockHeight response: %s", string(bodyData))
+	}
+	return height, nil
+}
+
 func SolGetTransaction(sig string) ([]byte, error) {
 	txData, err := SolRetryClient("getTransaction", []interface{}{
 		sig,
@@ -390,6 +500,33 @@ func SolGetTransaction(sig string) ([]byte, error) {
 	return txData, nil
 }

+func solGetTransactionWithURL(rpcURL string, sig string) ([]byte, error) {
+	return solGetTransactionWithURLHeaders(rpcURL, sig, nil)
+}
+
+func solGetTransactionWithURLHeaders(rpcURL string, sig string, headers http.Header) ([]byte, error) {
+	txData, err := solRetryClientWithURLHeaders(rpcURL, "getTransaction", []interface{}{
+		sig,
+		map[string]interface{}{
+			"encoding":                       "jsonParsed",
+			"commitment":                     "confirmed",
+			"maxSupportedTransactionVersion": 0, // suport
+		},
+	}, headers)
+	if err != nil {
+		log.Sugar.Errorf("SolRetryClient failed: %v", err)
+		return nil, err
+	}
+
+	errField := gjson.GetBytes(txData, "result.meta.err")
+	if errField.Exists() && errField.Type != gjson.Null {
+		log.Sugar.Warnf("Transaction failed: %v", errField.String())
+		return nil, fmt.Errorf("transaction failed: %s", errField.String())
+	}
+
+	return txData, nil
+}
+
 // isTransferToAddress 判断转账目标是否为指定钱包地址
 func isTransferToAddress(transfer *TransferInfo, targetAddress string) bool {
 	// Native SOL transfer - check destination directly
@@ -471,7 +608,7 @@ const (
 	Token2022ProgramID = "TokenzQdBNbLqP5VEhdkAS6EPFLC1PHnBqCXEpPxuEb"
 )

-// ADJustAmount 将链上原始金额转为可读金额（除以 10^decimals，保留 2 位小数）
+// ADJustAmount 将链上原始金额转为可读金额（除以 10^decimals，保留到系统支持的最大匹配精度）
 func ADJustAmount(amount uint64, decimals int) float64 {
 	if amount == 0 {
 		return 0
@@ -480,8 +617,7 @@ func ADJustAmount(amount uint64, decimals int) float64 {
 	// 10^decimals
 	decimalDivisor := decimal.New(1, int32(decimals))
 	adjustedAmount := decimalAmount.Div(decimalDivisor)
-	// Round to 2 decimal places
-	return math.MustParsePrecFloat64(adjustedAmount.InexactFloat64(), 2)
+	return math.MustParsePrecFloat64(adjustedAmount.InexactFloat64(), data.MaxAmountPrecision)
 }

 func MatchUsdtAtaAddress(address string, ataTo string) bool {
@@ -2,12 +2,19 @@ package service

 import (
 	"encoding/json"
+	"errors"
+	"net/http"
+	"net/http/httptest"
 	"os"
+	"sync"
 	"testing"
+	"time"

 	"github.com/GMWalletApp/epusdt/internal/testutil"
 	"github.com/GMWalletApp/epusdt/model/dao"
+	"github.com/GMWalletApp/epusdt/model/data"
 	"github.com/GMWalletApp/epusdt/model/mdb"
+	"github.com/GMWalletApp/epusdt/model/request"
 	"github.com/tidwall/gjson"
 )

@@ -21,6 +28,7 @@ func setupSolanaRPCNode(t *testing.T, url string) func() {
 		Type:    mdb.RpcNodeTypeHttp,
 		Weight:  1,
 		Enabled: true,
+		Purpose: mdb.RpcNodePurposeGeneral,
 		Status:  mdb.RpcNodeStatusOk,
 	}
 	if err := dao.Mdb.Create(node).Error; err != nil {
@@ -52,6 +60,443 @@ func TestResolveSolanaRpcURLWithRow(t *testing.T) {
 	}
 }

+func TestResolveSolanaRpcURLIgnoresManualVerifyOnly(t *testing.T) {
+	cleanup := testutil.SetupTestDatabases(t)
+	defer cleanup()
+
+	if err := dao.Mdb.Create(&mdb.RpcNode{
+		Network: mdb.NetworkSolana,
+		Url:     "https://paid-solana.example.com",
+		Type:    mdb.RpcNodeTypeHttp,
+		Weight:  100,
+		Enabled: true,
+		Purpose: mdb.RpcNodePurposeManualVerify,
+		Status:  mdb.RpcNodeStatusOk,
+	}).Error; err != nil {
+		t.Fatalf("seed manual rpc_node: %v", err)
+	}
+
+	if got, err := resolveSolanaRpcURL(); err == nil {
+		t.Fatalf("resolveSolanaRpcURL() = %q, nil; want error", got)
+	}
+}
+
+func TestResolveSolanaRpcURLUsesGeneralWhenManualVerifyExists(t *testing.T) {
+	cleanup := testutil.SetupTestDatabases(t)
+	defer cleanup()
+
+	rows := []mdb.RpcNode{
+		{Network: mdb.NetworkSolana, Url: "https://paid-solana.example.com", Type: mdb.RpcNodeTypeHttp, Weight: 100, Enabled: true, Purpose: mdb.RpcNodePurposeManualVerify, Status: mdb.RpcNodeStatusOk},
+		{Network: mdb.NetworkSolana, Url: " https://general-solana.example.com ", Type: mdb.RpcNodeTypeHttp, Weight: 1, Enabled: true, Purpose: mdb.RpcNodePurposeGeneral, Status: mdb.RpcNodeStatusOk},
+	}
+	if err := dao.Mdb.Create(&rows).Error; err != nil {
+		t.Fatalf("seed rpc_nodes: %v", err)
+	}
+
+	got, err := resolveSolanaRpcURL()
+	if err != nil {
+		t.Fatalf("resolveSolanaRpcURL(): %v", err)
+	}
+	if got != "https://general-solana.example.com" {
+		t.Fatalf("resolveSolanaRpcURL() = %q, want general node", got)
+	}
+}
+
+func TestSolGetBlockHeightDoesNotAffectRpcNodeFailover(t *testing.T) {
+	cleanup := testutil.SetupTestDatabases(t)
+	defer cleanup()
+	data.ResetRpcFailoverForTest()
+	data.ResetRpcRuntimeStatsForTest()
+	t.Cleanup(data.ResetRpcFailoverForTest)
+	t.Cleanup(data.ResetRpcRuntimeStatsForTest)
+
+	oldRetryCount := solRPCRetryCount
+	solRPCRetryCount = 0
+	t.Cleanup(func() {
+		solRPCRetryCount = oldRetryCount
+	})
+
+	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		http.Error(w, "temporary", http.StatusBadGateway)
+	}))
+	defer server.Close()
+
+	node := &mdb.RpcNode{
+		Network: mdb.NetworkSolana,
+		Url:     server.URL,
+		Type:    mdb.RpcNodeTypeHttp,
+		Weight:  1,
+		Enabled: true,
+		Purpose: mdb.RpcNodePurposeGeneral,
+		Status:  mdb.RpcNodeStatusOk,
+	}
+	if err := dao.Mdb.Create(node).Error; err != nil {
+		t.Fatalf("seed solana rpc_node: %v", err)
+	}
+
+	for i := 0; i < data.RpcFailoverThreshold+1; i++ {
+		if _, err := SolGetBlockHeight(); err == nil {
+			t.Fatalf("SolGetBlockHeight attempt %d unexpectedly succeeded", i+1)
+		}
+	}
+
+	if data.IsRpcNodeCoolingDown(node.ID) {
+		t.Fatal("SolGetBlockHeight failures should not affect rpc_node failover cooldown")
+	}
+	stats := data.SnapshotRpcRuntimeStats()
+	if got := stats[mdb.NetworkSolana].FailureCount; got != int64(data.RpcFailoverThreshold+1) {
+		t.Fatalf("solana runtime failure_count = %d, want %d", got, data.RpcFailoverThreshold+1)
+	}
+}
+
+func TestSolRetryClientSwitchesAfterFailureThreshold(t *testing.T) {
+	cleanup := testutil.SetupTestDatabases(t)
+	defer cleanup()
+	data.ResetRpcFailoverForTest()
+	t.Cleanup(data.ResetRpcFailoverForTest)
+	oldRetryCount := solRPCRetryCount
+	oldRetryWait := solRPCRetryWait
+	oldRetryMaxWait := solRPCRetryMaxWait
+	solRPCRetryCount = 0
+	solRPCRetryWait = time.Millisecond
+	solRPCRetryMaxWait = time.Millisecond
+	t.Cleanup(func() {
+		solRPCRetryCount = oldRetryCount
+		solRPCRetryWait = oldRetryWait
+		solRPCRetryMaxWait = oldRetryMaxWait
+	})
+
+	var primaryCalls int
+	primary := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		primaryCalls++
+		http.Error(w, "temporary", http.StatusBadGateway)
+	}))
+	defer primary.Close()
+
+	var backupCalls int
+	backup := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		backupCalls++
+		w.Header().Set("Content-Type", "application/json")
+		_ = json.NewEncoder(w).Encode(map[string]interface{}{
+			"jsonrpc": "2.0",
+			"id":      1,
+			"result":  "ok",
+		})
+	}))
+	defer backup.Close()
+
+	rows := []mdb.RpcNode{
+		{Network: mdb.NetworkSolana, Url: primary.URL, Type: mdb.RpcNodeTypeHttp, Weight: 100, Enabled: true, Purpose: mdb.RpcNodePurposeGeneral, Status: mdb.RpcNodeStatusOk},
+		{Network: mdb.NetworkSolana, Url: backup.URL, Type: mdb.RpcNodeTypeHttp, Weight: 1, Enabled: true, Purpose: mdb.RpcNodePurposeGeneral, Status: mdb.RpcNodeStatusOk},
+	}
+	if err := dao.Mdb.Create(&rows).Error; err != nil {
+		t.Fatalf("seed rpc_nodes: %v", err)
+	}
+
+	for i := 0; i < data.RpcFailoverThreshold-1; i++ {
+		if _, err := SolRetryClient("getHealth", nil); err == nil {
+			t.Fatalf("SolRetryClient attempt %d unexpectedly succeeded", i+1)
+		}
+	}
+	if backupCalls != 0 {
+		t.Fatalf("backup calls before threshold = %d, want 0", backupCalls)
+	}
+
+	body, err := SolRetryClient("getHealth", nil)
+	if err != nil {
+		t.Fatalf("SolRetryClient after threshold: %v", err)
+	}
+	if gjson.GetBytes(body, "result").String() != "ok" {
+		t.Fatalf("response body = %s, want result ok", string(body))
+	}
+	if backupCalls == 0 {
+		t.Fatal("backup RPC was not called after threshold")
+	}
+	if primaryCalls == 0 {
+		t.Fatal("primary RPC was not called")
+	}
+}
+
+func TestSolRetryClientCountsJSONRPCErrorAsNodeFailure(t *testing.T) {
+	cleanup := testutil.SetupTestDatabases(t)
+	defer cleanup()
+	data.ResetRpcFailoverForTest()
+	t.Cleanup(data.ResetRpcFailoverForTest)
+	oldRetryCount := solRPCRetryCount
+	oldRetryWait := solRPCRetryWait
+	oldRetryMaxWait := solRPCRetryMaxWait
+	solRPCRetryCount = 0
+	solRPCRetryWait = time.Millisecond
+	solRPCRetryMaxWait = time.Millisecond
+	t.Cleanup(func() {
+		solRPCRetryCount = oldRetryCount
+		solRPCRetryWait = oldRetryWait
+		solRPCRetryMaxWait = oldRetryMaxWait
+	})
+
+	var primaryCalls int
+	primary := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		primaryCalls++
+		w.Header().Set("Content-Type", "application/json")
+		_ = json.NewEncoder(w).Encode(map[string]interface{}{
+			"jsonrpc": "2.0",
+			"id":      1,
+			"error": map[string]interface{}{
+				"code": -32005,
+			},
+		})
+	}))
+	defer primary.Close()
+
+	var backupCalls int
+	backup := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		backupCalls++
+		w.Header().Set("Content-Type", "application/json")
+		_ = json.NewEncoder(w).Encode(map[string]interface{}{
+			"jsonrpc": "2.0",
+			"id":      1,
+			"result":  "ok",
+		})
+	}))
+	defer backup.Close()
+
+	rows := []mdb.RpcNode{
+		{Network: mdb.NetworkSolana, Url: primary.URL, Type: mdb.RpcNodeTypeHttp, Weight: 100, Enabled: true, Purpose: mdb.RpcNodePurposeGeneral, Status: mdb.RpcNodeStatusOk},
+		{Network: mdb.NetworkSolana, Url: backup.URL, Type: mdb.RpcNodeTypeHttp, Weight: 1, Enabled: true, Purpose: mdb.RpcNodePurposeGeneral, Status: mdb.RpcNodeStatusOk},
+	}
+	if err := dao.Mdb.Create(&rows).Error; err != nil {
+		t.Fatalf("seed rpc_nodes: %v", err)
+	}
+
+	for i := 0; i < data.RpcFailoverThreshold-1; i++ {
+		if _, err := SolRetryClient("getHealth", nil); err == nil {
+			t.Fatalf("SolRetryClient attempt %d unexpectedly succeeded", i+1)
+		}
+	}
+	body, err := SolRetryClient("getHealth", nil)
+	if err != nil {
+		t.Fatalf("SolRetryClient after JSON-RPC error threshold: %v", err)
+	}
+	if gjson.GetBytes(body, "result").String() != "ok" {
+		t.Fatalf("response body = %s, want result ok", string(body))
+	}
+	if primaryCalls < data.RpcFailoverThreshold {
+		t.Fatalf("primary calls = %d, want at least threshold", primaryCalls)
+	}
+	if backupCalls == 0 {
+		t.Fatal("backup RPC was not called after JSON-RPC error threshold")
+	}
+}
+
+func TestSolRetryClientWithURLHeadersForwardsCustomHeaders(t *testing.T) {
+	oldRetryCount := solRPCRetryCount
+	oldRetryWait := solRPCRetryWait
+	oldRetryMaxWait := solRPCRetryMaxWait
+	solRPCRetryCount = 0
+	solRPCRetryWait = time.Millisecond
+	solRPCRetryMaxWait = time.Millisecond
+	t.Cleanup(func() {
+		solRPCRetryCount = oldRetryCount
+		solRPCRetryWait = oldRetryWait
+		solRPCRetryMaxWait = oldRetryMaxWait
+	})
+
+	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		if got := r.Header.Get("X-Test-Header"); got != "test-value" {
+			t.Errorf("X-Test-Header = %q, want test-value", got)
+			http.Error(w, "bad custom header", http.StatusBadRequest)
+			return
+		}
+		w.Header().Set("Content-Type", "application/json")
+		_ = json.NewEncoder(w).Encode(map[string]interface{}{
+			"jsonrpc": "2.0",
+			"id":      1,
+			"result":  "ok",
+		})
+	}))
+	defer server.Close()
+
+	headers := http.Header{}
+	headers.Set("X-Test-Header", "test-value")
+	body, err := solRetryClientWithURLHeaders(server.URL, "getHealth", nil, headers)
+	if err != nil {
+		t.Fatalf("solRetryClientWithURLHeaders(): %v", err)
+	}
+	if gjson.GetBytes(body, "result").String() != "ok" {
+		t.Fatalf("response body = %s, want result ok", string(body))
+	}
+}
+
+func TestSolRetryClientWithURLDoesNotForwardUserIPByDefault(t *testing.T) {
+	oldRetryCount := solRPCRetryCount
+	oldRetryWait := solRPCRetryWait
+	oldRetryMaxWait := solRPCRetryMaxWait
+	solRPCRetryCount = 0
+	solRPCRetryWait = time.Millisecond
+	solRPCRetryMaxWait = time.Millisecond
+	t.Cleanup(func() {
+		solRPCRetryCount = oldRetryCount
+		solRPCRetryWait = oldRetryWait
+		solRPCRetryMaxWait = oldRetryMaxWait
+	})
+
+	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		if got := r.Header.Get("X-USER-IP"); got != "" {
+			t.Errorf("X-USER-IP header = %q, want empty", got)
+			http.Error(w, "unexpected user ip header", http.StatusBadRequest)
+			return
+		}
+		w.Header().Set("Content-Type", "application/json")
+		_ = json.NewEncoder(w).Encode(map[string]interface{}{
+			"jsonrpc": "2.0",
+			"id":      1,
+			"result":  "ok",
+		})
+	}))
+	defer server.Close()
+
+	body, err := solRetryClientWithURL(server.URL, "getHealth", nil)
+	if err != nil {
+		t.Fatalf("solRetryClientWithURL(): %v", err)
+	}
+	if gjson.GetBytes(body, "result").String() != "ok" {
+		t.Fatalf("response body = %s, want result ok", string(body))
+	}
+}
+
+func TestSolCallBackDoesNotCacheSignatureAfterRetryableOrderProcessingError(t *testing.T) {
+	cleanup := testutil.SetupTestDatabases(t)
+	defer cleanup()
+	clearProcessedSignatures()
+	t.Cleanup(clearProcessedSignatures)
+
+	const (
+		address = "2uFTf9TZ8gd7Kg6hkb79TxfaeNpaAgpJ8uVHguv2Yweu"
+		sig     = "retryable-sol-signature"
+		tradeID = "sol-retryable-order-001"
+		amount  = 1.23
+	)
+	blockTime := time.Now().Add(time.Minute).Unix()
+
+	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		var rpcReq struct {
+			Method string `json:"method"`
+		}
+		if err := json.NewDecoder(r.Body).Decode(&rpcReq); err != nil {
+			http.Error(w, err.Error(), http.StatusBadRequest)
+			return
+		}
+
+		w.Header().Set("Content-Type", "application/json")
+		switch rpcReq.Method {
+		case "getSignaturesForAddress":
+			_ = json.NewEncoder(w).Encode(map[string]interface{}{
+				"jsonrpc": "2.0",
+				"id":      1,
+				"result": []map[string]interface{}{
+					{
+						"signature": sig,
+						"slot":      1,
+						"err":       nil,
+						"blockTime": blockTime,
+					},
+				},
+			})
+		case "getTransaction":
+			_ = json.NewEncoder(w).Encode(map[string]interface{}{
+				"jsonrpc": "2.0",
+				"id":      1,
+				"result": map[string]interface{}{
+					"blockTime": blockTime,
+					"meta":      map[string]interface{}{"err": nil},
+					"transaction": map[string]interface{}{
+						"message": map[string]interface{}{
+							"instructions": []map[string]interface{}{
+								{
+									"programId": SystemProgramID,
+									"parsed": map[string]interface{}{
+										"type": "transfer",
+										"info": map[string]interface{}{
+											"source":      "source-wallet",
+											"destination": address,
+											"lamports":    1_230_000_000,
+										},
+									},
+								},
+							},
+						},
+					},
+				},
+			})
+		default:
+			http.Error(w, "unexpected method "+rpcReq.Method, http.StatusBadRequest)
+		}
+	}))
+	defer server.Close()
+
+	if err := dao.Mdb.Create(&mdb.RpcNode{
+		Network: mdb.NetworkSolana,
+		Url:     server.URL,
+		Type:    mdb.RpcNodeTypeHttp,
+		Weight:  1,
+		Enabled: true,
+		Status:  mdb.RpcNodeStatusOk,
+	}).Error; err != nil {
+		t.Fatalf("seed solana rpc_node: %v", err)
+	}
+	if err := dao.Mdb.Create(&mdb.ChainToken{
+		Network:         mdb.NetworkSolana,
+		Symbol:          "SOL",
+		ContractAddress: "",
+		Decimals:        SOL_Decimals,
+		Enabled:         true,
+	}).Error; err != nil {
+		t.Fatalf("seed SOL chain token: %v", err)
+	}
+	order := &mdb.Orders{
+		TradeId:        tradeID,
+		OrderId:        "merchant-sol-retryable-001",
+		Amount:         100,
+		Currency:       "CNY",
+		ActualAmount:   amount,
+		ReceiveAddress: address,
+		Token:          "SOL",
+		Network:        mdb.NetworkSolana,
+		Status:         mdb.StatusWaitPay,
+	}
+	if err := dao.Mdb.Create(order).Error; err != nil {
+		t.Fatalf("seed order: %v", err)
+	}
+	if err := data.LockTransaction(mdb.NetworkSolana, address, "SOL", tradeID, amount, time.Hour); err != nil {
+		t.Fatalf("lock transaction: %v", err)
+	}
+
+	oldProcessSolanaOrder := processSolanaOrder
+	calls := 0
+	processSolanaOrder = func(req *request.OrderProcessingRequest) error {
+		calls++
+		if req.TradeId != tradeID {
+			t.Fatalf("order processing trade_id = %q, want %q", req.TradeId, tradeID)
+		}
+		return errors.New("temporary database error")
+	}
+	t.Cleanup(func() {
+		processSolanaOrder = oldProcessSolanaOrder
+	})
+
+	var wg sync.WaitGroup
+	wg.Add(1)
+	SolCallBack(address, &wg)
+	wg.Wait()
+
+	if calls != 1 {
+		t.Fatalf("order processing calls = %d, want 1", calls)
+	}
+	if _, ok := gProcessedSignatures.Load(sig); ok {
+		t.Fatalf("signature %s was cached after retryable order processing error", sig)
+	}
+}
+
 func TestSolClientHealthy(t *testing.T) {
 	requireSolanaIntegration(t)

@@ -78,6 +523,13 @@ func TestSolClientHealthy(t *testing.T) {
 	}
 }

+func clearProcessedSignatures() {
+	gProcessedSignatures.Range(func(key, value interface{}) bool {
+		gProcessedSignatures.Delete(key)
+		return true
+	})
+}
+
 func TestSolClientGetSignaturesForAddress(t *testing.T) {
 	requireSolanaIntegration(t)

@@ -236,7 +688,7 @@ func TestAdjustAmount(t *testing.T) {
 			name:     "USDT amount (6 decimals)",
 			amount:   123456789,
 			decimals: 6,
-			want:     123.46,
+			want:     123.456789,
 		},
 		{
 			name:     "USDC amount (6 decimals)",
@@ -260,7 +712,7 @@ func TestAdjustAmount(t *testing.T) {
 			name:     "Small amount",
 			amount:   1,
 			decimals: 6,
-			want:     0.0,
+			want:     0.000001,
 		},
 	}

@@ -18,65 +18,92 @@ import (
 )

 func resolveTronNode() (string, string, error) {
-	node, err := data.SelectRpcNode(mdb.NetworkTron, mdb.RpcNodeTypeHttp)
+	node, err := ResolveTronRpcNode()
 	if err != nil {
 		return "", "", err
 	}
+	rpcURL := strings.TrimRight(strings.TrimSpace(node.Url), "/")
+	return rpcURL, node.ApiKey, nil
+}
+
+func ResolveTronRpcNode(excludeIDs ...uint64) (*mdb.RpcNode, error) {
+	node, err := data.SelectGeneralRpcNode(mdb.NetworkTron, mdb.RpcNodeTypeHttp, excludeIDs...)
+	if err != nil {
+		return nil, err
+	}
 	if node == nil || node.ID == 0 {
-		return "", "", fmt.Errorf("no enabled %s %s RPC node configured in rpc_nodes", mdb.NetworkTron, mdb.RpcNodeTypeHttp)
+		return nil, fmt.Errorf("no enabled %s %s RPC node configured in rpc_nodes", mdb.NetworkTron, mdb.RpcNodeTypeHttp)
 	}
 	rpcURL := strings.TrimRight(strings.TrimSpace(node.Url), "/")
 	if rpcURL == "" {
-		return "", "", fmt.Errorf("rpc_nodes id=%d has empty url", node.ID)
+		return nil, fmt.Errorf("rpc_nodes id=%d has empty url", node.ID)
 	}
-	return rpcURL, node.ApiKey, nil
+	node.Url = rpcURL
+	return node, nil
 }

 func ResolveTronNode() (string, string, error) {
 	return resolveTronNode()
 }

-func TryProcessTronTRC20Transfer(toAddr string, rawValue *big.Int, txHash string, blockTsMs int64) {
+func TryProcessTronTRC20Transfer(token mdb.ChainToken, toAddr string, rawValue *big.Int, txHash string, blockTsMs int64) {
+	tokenSym := strings.ToUpper(strings.TrimSpace(token.Symbol))
 	defer func() {
 		if err := recover(); err != nil {
-			log.Sugar.Errorf("[TRC20][%s] TryProcessTronTRC20Transfer panic: %v", toAddr, err)
+			log.Sugar.Errorf("[TRC20-%s][%s] TryProcessTronTRC20Transfer panic: %v", tokenSym, toAddr, err)
 		}
 	}()

 	addr := strings.TrimSpace(toAddr)
-	if addr == "" || rawValue == nil || rawValue.Sign() <= 0 {
+	if tokenSym == "" || addr == "" || rawValue == nil || rawValue.Sign() <= 0 {
 		return
 	}
+	decimals := token.Decimals
+	if decimals < 0 {
+		decimals = 0
+	}

 	decimalQuant := decimal.NewFromBigInt(rawValue, 0)
-	amount := math.MustParsePrecFloat64(decimalQuant.Div(decimal.NewFromInt(1_000_000)).InexactFloat64(), 2)
+	amount := math.MustParsePrecFloat64(decimalQuant.Div(decimal.New(1, int32(decimals))).InexactFloat64(), data.MaxAmountPrecision)
 	if amount <= 0 {
 		return
 	}
+	if token.MinAmount > 0 && amount < token.MinAmount {
+		log.Sugar.Debugf("[TRC20-%s][%s] skip below min amount hash=%s amount=%.2f min=%.2f", tokenSym, addr, txHash, amount, token.MinAmount)
+		return
+	}

-	tradeID, err := data.GetTradeIdByWalletAddressAndAmountAndToken(mdb.NetworkTron, addr, "USDT", amount)
+	tradeID, err := data.GetTradeIdByWalletAddressAndAmountAndToken(mdb.NetworkTron, addr, tokenSym, amount)
 	if err != nil {
-		log.Sugar.Warnf("[TRC20][%s] lock lookup: %v", addr, err)
+		log.Sugar.Warnf("[TRC20-%s][%s] lock lookup: %v", tokenSym, addr, err)
 		return
 	}
 	if tradeID == "" {
-		log.Sugar.Debugf("[TRC20][%s] skip unmatched tx hash=%s amount=%.2f", addr, txHash, amount)
+		log.Sugar.Debugf("[TRC20-%s][%s] skip unmatched tx hash=%s amount=%.2f", tokenSym, addr, txHash, amount)
 		return
 	}

 	order, err := data.GetOrderInfoByTradeId(tradeID)
 	if err != nil {
-		log.Sugar.Warnf("[TRC20][%s] load order: %v", addr, err)
+		log.Sugar.Warnf("[TRC20-%s][%s] load order: %v", tokenSym, addr, err)
+		return
+	}
+	if strings.ToLower(strings.TrimSpace(order.Network)) != mdb.NetworkTron {
+		log.Sugar.Warnf("[TRC20-%s][%s] skip trade_id=%s network=%q", tokenSym, addr, tradeID, order.Network)
+		return
+	}
+	if strings.ToUpper(strings.TrimSpace(order.Token)) != tokenSym {
+		log.Sugar.Warnf("[TRC20-%s][%s] skip trade_id=%s token mismatch order=%s", tokenSym, addr, tradeID, order.Token)
 		return
 	}
 	if blockTsMs > 0 && blockTsMs < order.CreatedAt.TimestampMilli() {
-		log.Sugar.Warnf("[TRC20][%s] skip tx %s because block time %d is before order create time %d", addr, txHash, blockTsMs, order.CreatedAt.TimestampMilli())
+		log.Sugar.Warnf("[TRC20-%s][%s] skip tx %s because block time %d is before order create time %d", tokenSym, addr, txHash, blockTsMs, order.CreatedAt.TimestampMilli())
 		return
 	}

 	req := &request.OrderProcessingRequest{
 		ReceiveAddress:     addr,
-		Token:              "USDT",
+		Token:              tokenSym,
 		Network:            mdb.NetworkTron,
 		TradeId:            tradeID,
 		Amount:             amount,
@@ -85,15 +112,15 @@ func TryProcessTronTRC20Transfer(toAddr string, rawValue *big.Int, txHash string
 	err = OrderProcessing(req)
 	if err != nil {
 		if errors.Is(err, constant.OrderBlockAlreadyProcess) || errors.Is(err, constant.OrderStatusConflict) {
-			log.Sugar.Infof("[TRC20][%s] skip resolved transfer trade_id=%s hash=%s err=%v", addr, tradeID, txHash, err)
+			log.Sugar.Infof("[TRC20-%s][%s] skip resolved transfer trade_id=%s hash=%s err=%v", tokenSym, addr, tradeID, txHash, err)
 			return
 		}
-		log.Sugar.Errorf("[TRC20][%s] OrderProcessing trade_id=%s hash=%s: %v", addr, tradeID, txHash, err)
+		log.Sugar.Errorf("[TRC20-%s][%s] OrderProcessing trade_id=%s hash=%s: %v", tokenSym, addr, tradeID, txHash, err)
 		return
 	}

 	sendPaymentNotification(order)
-	log.Sugar.Infof("[TRC20][%s] payment processed trade_id=%s hash=%s", addr, tradeID, txHash)
+	log.Sugar.Infof("[TRC20-%s][%s] payment processed trade_id=%s hash=%s", tokenSym, addr, tradeID, txHash)
 }

 func TryProcessTronTRXTransfer(toAddr string, rawSun int64, txHash string, blockTsMs int64) {
@@ -109,7 +136,7 @@ func TryProcessTronTRXTransfer(toAddr string, rawSun int64, txHash string, block
 	}

 	decimalQuant := decimal.NewFromInt(rawSun)
-	amount := math.MustParsePrecFloat64(decimalQuant.Div(decimal.NewFromInt(1_000_000)).InexactFloat64(), 2)
+	amount := math.MustParsePrecFloat64(decimalQuant.Div(decimal.NewFromInt(1_000_000)).InexactFloat64(), data.MaxAmountPrecision)
 	if amount <= 0 {
 		return
 	}
@@ -178,71 +205,42 @@ func TryProcessEvmERC20Transfer(chainNetwork string, contract common.Address, to
 		}
 	}()

-	var usdt, usdc common.Address
-	var polygonUsdcE common.Address
-	switch chainNetwork {
-	case mdb.NetworkEthereum:
-		usdt = common.HexToAddress("0xdAC17F958D2ee523a2206206994597C13D831ec7")
-		usdc = common.HexToAddress("0xA0b86991c6218b36c1d19d4a2e9eb0ce3606eb48")
-	case mdb.NetworkBsc:
-		usdt = common.HexToAddress("0x55d398326f99059fF775485246999027B3197955")
-		usdc = common.HexToAddress("0x8AC76a51cc950d9822D68b83fE1Ad97B32Cd580d")
-	case mdb.NetworkPolygon:
-		usdt = common.HexToAddress("0xc2132D05D31c914a87C6611C10748AEb04B58e8F")
-		usdc = common.HexToAddress("0x3c499c542cEF5E3811e1192ce70d8cC03d5c3359")
-		polygonUsdcE = common.HexToAddress("0x2791Bca1f2de4661ED88A30C99A7a9449Aa84174")
-	case mdb.NetworkPlasma:
-		// USDT0（官方），6 decimals；链上暂无与 ETH 同级的 Circle USDC 部署，仅匹配 USDT 订单
-		usdt = common.HexToAddress("0xB8CE59FC3717ada4C02eaDF9682A9e934F625ebb")
-	default:
-		return
-	}
-
-	var tokenSym string
-	switch {
-	case contract == usdt:
-		tokenSym = "USDT"
-	case contract == usdc || (polygonUsdcE != (common.Address{}) && contract == polygonUsdcE):
-		tokenSym = "USDC"
-	default:
-		net := evmChainLogLabel(chainNetwork)
-		log.Sugar.Warnf("[%s-WS] skip unsupported contract %s", net, contract.Hex())
-		return
-	}
-
 	net := evmChainLogLabel(chainNetwork)
+	tokenConfig, err := data.GetEnabledChainTokenByContract(chainNetwork, contract.Hex())
+	if err != nil {
+		log.Sugar.Warnf("[%s-WS] load chain token contract=%s: %v", net, contract.Hex(), err)
+		return
+	}
+	if tokenConfig == nil || tokenConfig.ID == 0 {
+		log.Sugar.Warnf("[%s-WS] skip unconfigured contract %s", net, contract.Hex())
+		return
+	}
+	tokenSym := strings.ToUpper(strings.TrimSpace(tokenConfig.Symbol))
+	if tokenSym == "" {
+		log.Sugar.Warnf("[%s-WS] skip contract %s with empty token symbol", net, contract.Hex())
+		return
+	}
 	walletAddr := strings.ToLower(toAddr.Hex())
 	if rawValue == nil || rawValue.Sign() <= 0 {
 		log.Sugar.Infof("[%s-%s][%s] skip non-positive or nil amount", net, tokenSym, walletAddr)
 		return
 	}
-
-	chainTokens, err := data.ListChainTokens(chainNetwork)
-	if err != nil {
-		log.Sugar.Warnf("[%s-%s] load chain tokens: %v", net, tokenSym, err)
-		return
+	decimals := tokenConfig.Decimals
+	if decimals < 0 {
+		decimals = 0
 	}
-	var tokenConfig *mdb.ChainToken
-	for _, t := range chainTokens {
-		if strings.EqualFold(t.Symbol, tokenSym) {
-			tokenConfig = &t
-			break
-		}
-	}
-	if tokenConfig == nil || !tokenConfig.Enabled {
-		log.Sugar.Warnf("[%s-%s] token not enabled or configured in chain_tokens", net, tokenSym)
-		return
-	}
-
-	pow := decimal.New(1, int32(tokenConfig.Decimals))
-	log.Sugar.Warnf("tokenConfig.Decimals %d pow %s", tokenConfig.Decimals, pow.String())
+	pow := decimal.New(1, int32(decimals))

 	decimalQuant := decimal.NewFromBigInt(rawValue, 0)
-	amount := math.MustParsePrecFloat64(decimalQuant.Div(pow).InexactFloat64(), 2)
+	amount := math.MustParsePrecFloat64(decimalQuant.Div(pow).InexactFloat64(), data.MaxAmountPrecision)
 	if amount <= 0 {
 		log.Sugar.Warnf("[%s-%s][%s] skip non-positive amount %.2f", net, tokenSym, walletAddr, amount)
 		return
 	}
+	if tokenConfig.MinAmount > 0 && amount < tokenConfig.MinAmount {
+		log.Sugar.Debugf("[%s-%s][%s] skip below min amount hash=%s amount=%.2f min=%.2f", net, tokenSym, walletAddr, txHash, amount, tokenConfig.MinAmount)
+		return
+	}

 	log.Sugar.Debugf("[%s-%s][%s] processing transfer hash=%s amount=%.2f", net, tokenSym, walletAddr, txHash, amount)

@@ -269,6 +267,10 @@ func TryProcessEvmERC20Transfer(chainNetwork string, contract common.Address, to
 		log.Sugar.Warnf("[%s-%s][%s] skip trade_id=%s token mismatch order=%s", net, tokenSym, walletAddr, tradeID, order.Token)
 		return
 	}
+	if blockTsMs > 0 && blockTsMs < order.CreatedAt.TimestampMilli() {
+		log.Sugar.Warnf("[%s-%s][%s] skip tx %s because block time %d is before order create time %d", net, tokenSym, walletAddr, txHash, blockTsMs, order.CreatedAt.TimestampMilli())
+		return
+	}

 	req := &request.OrderProcessingRequest{
 		ReceiveAddress:     walletAddr,
@@ -305,11 +307,13 @@ func sendPaymentNotification(order *mdb.Orders) {
 		}
 	}

+	precision := data.GetAmountPrecision()
+	amountFormat := fmt.Sprintf("%%.%df", precision)
 	msg := fmt.Sprintf(
 		"🎉 <b>收款成功通知</b>\n\n"+
 			"💰 <b>金额信息</b>\n"+
-			"├ 订单金额：<code>%.2f %s</code>\n"+
-			"└ 实际到账：<code>%.2f %s</code>\n\n"+
+			"├ 订单金额：<code>"+amountFormat+" %s</code>\n"+
+			"└ 实际到账：<code>"+amountFormat+" %s</code>\n\n"+
 			"📋 <b>订单信息</b>\n"+
 			"├ 交易号：<code>%s</code>\n"+
 			"├ 订单号：<code>%s</code>\n"+
@@ -1,16 +1,35 @@
 package service

 import (
+	"math/big"
 	"strings"
 	"testing"
 	"time"

 	"github.com/GMWalletApp/epusdt/internal/testutil"
 	"github.com/GMWalletApp/epusdt/model/dao"
+	"github.com/GMWalletApp/epusdt/model/data"
 	"github.com/GMWalletApp/epusdt/model/mdb"
 	"github.com/GMWalletApp/epusdt/notify"
+	"github.com/ethereum/go-ethereum/common"
+	"gorm.io/gorm/clause"
 )

+func upsertTaskServiceTestChainToken(t *testing.T, token mdb.ChainToken) {
+	t.Helper()
+	if err := dao.Mdb.Clauses(clause.OnConflict{
+		Columns: []clause.Column{{Name: "network"}, {Name: "symbol"}},
+		DoUpdates: clause.AssignmentColumns([]string{
+			"contract_address",
+			"decimals",
+			"enabled",
+			"min_amount",
+		}),
+	}).Create(&token).Error; err != nil {
+		t.Fatalf("seed chain token: %v", err)
+	}
+}
+
 func TestSendPaymentNotificationUsesLatestOrderUpdatedAt(t *testing.T) {
 	cleanup := testutil.SetupTestDatabases(t)
 	defer cleanup()
@@ -77,3 +96,130 @@ func TestSendPaymentNotificationUsesLatestOrderUpdatedAt(t *testing.T) {
 		t.Fatal("timed out waiting for notification")
 	}
 }
+
+func TestTryProcessEvmERC20TransferUsesChainTokenContract(t *testing.T) {
+	cleanup := testutil.SetupTestDatabases(t)
+	defer cleanup()
+
+	const (
+		tradeID  = "T202605110001"
+		orderID  = "ORD202605110001"
+		tokenSym = "FOO"
+		amount   = 12.34
+	)
+	contract := common.HexToAddress("0x1111111111111111111111111111111111111111")
+	receiveAddress := common.HexToAddress("0x2222222222222222222222222222222222222222")
+
+	if err := dao.Mdb.Create(&mdb.ChainToken{
+		Network:         mdb.NetworkEthereum,
+		Symbol:          tokenSym,
+		ContractAddress: contract.Hex(),
+		Decimals:        8,
+		Enabled:         true,
+	}).Error; err != nil {
+		t.Fatalf("seed chain token: %v", err)
+	}
+
+	order := &mdb.Orders{
+		TradeId:        tradeID,
+		OrderId:        orderID,
+		Amount:         100,
+		Currency:       "CNY",
+		ActualAmount:   amount,
+		Token:          tokenSym,
+		Network:        mdb.NetworkEthereum,
+		ReceiveAddress: strings.ToLower(receiveAddress.Hex()),
+		Status:         mdb.StatusWaitPay,
+	}
+	if err := dao.Mdb.Create(order).Error; err != nil {
+		t.Fatalf("seed order: %v", err)
+	}
+	if err := data.LockTransaction(mdb.NetworkEthereum, order.ReceiveAddress, order.Token, order.TradeId, order.ActualAmount, time.Hour); err != nil {
+		t.Fatalf("lock transaction: %v", err)
+	}
+
+	rawValue := big.NewInt(1_234_000_000) // 12.34 with 8 decimals
+	TryProcessEvmERC20Transfer(mdb.NetworkEthereum, contract, receiveAddress, rawValue, "0xfoo-hash", time.Now().UnixMilli())
+
+	paid, err := data.GetOrderInfoByTradeId(tradeID)
+	if err != nil {
+		t.Fatalf("load paid order: %v", err)
+	}
+	if paid.Status != mdb.StatusPaySuccess {
+		t.Fatalf("order status = %d, want %d", paid.Status, mdb.StatusPaySuccess)
+	}
+	if paid.BlockTransactionId != "0xfoo-hash" {
+		t.Fatalf("block transaction id = %q, want %q", paid.BlockTransactionId, "0xfoo-hash")
+	}
+
+	lockTradeID, err := data.GetTradeIdByWalletAddressAndAmountAndToken(mdb.NetworkEthereum, receiveAddress.Hex(), tokenSym, amount)
+	if err != nil {
+		t.Fatalf("lookup released lock: %v", err)
+	}
+	if lockTradeID != "" {
+		t.Fatalf("runtime lock still exists for trade_id=%q", lockTradeID)
+	}
+}
+
+func TestTryProcessEvmERC20TransferSkipsTransfersBeforeOrderCreation(t *testing.T) {
+	cleanup := testutil.SetupTestDatabases(t)
+	defer cleanup()
+
+	const (
+		tradeID  = "T202605110002"
+		orderID  = "ORD202605110002"
+		tokenSym = "USDT"
+		amount   = 25.5
+	)
+	contract := common.HexToAddress("0x3333333333333333333333333333333333333333")
+	receiveAddress := common.HexToAddress("0x4444444444444444444444444444444444444444")
+
+	upsertTaskServiceTestChainToken(t, mdb.ChainToken{
+		Network:         mdb.NetworkEthereum,
+		Symbol:          tokenSym,
+		ContractAddress: contract.Hex(),
+		Decimals:        6,
+		Enabled:         true,
+	})
+
+	order := &mdb.Orders{
+		TradeId:        tradeID,
+		OrderId:        orderID,
+		Amount:         100,
+		Currency:       "CNY",
+		ActualAmount:   amount,
+		Token:          tokenSym,
+		Network:        mdb.NetworkEthereum,
+		ReceiveAddress: strings.ToLower(receiveAddress.Hex()),
+		Status:         mdb.StatusWaitPay,
+	}
+	if err := dao.Mdb.Create(order).Error; err != nil {
+		t.Fatalf("seed order: %v", err)
+	}
+	if err := data.LockTransaction(mdb.NetworkEthereum, order.ReceiveAddress, order.Token, order.TradeId, order.ActualAmount, time.Hour); err != nil {
+		t.Fatalf("lock transaction: %v", err)
+	}
+
+	rawValue := big.NewInt(25_500_000) // 25.5 with 6 decimals
+	oldBlockTsMs := order.CreatedAt.TimestampMilli() - 1
+	TryProcessEvmERC20Transfer(mdb.NetworkEthereum, contract, receiveAddress, rawValue, "0xold-hash", oldBlockTsMs)
+
+	got, err := data.GetOrderInfoByTradeId(tradeID)
+	if err != nil {
+		t.Fatalf("load order: %v", err)
+	}
+	if got.Status != mdb.StatusWaitPay {
+		t.Fatalf("order status = %d, want %d", got.Status, mdb.StatusWaitPay)
+	}
+	if got.BlockTransactionId != "" {
+		t.Fatalf("block transaction id = %q, want empty", got.BlockTransactionId)
+	}
+
+	lockTradeID, err := data.GetTradeIdByWalletAddressAndAmountAndToken(mdb.NetworkEthereum, receiveAddress.Hex(), tokenSym, amount)
+	if err != nil {
+		t.Fatalf("lookup retained lock: %v", err)
+	}
+	if lockTradeID != tradeID {
+		t.Fatalf("runtime lock trade_id = %q, want %q", lockTradeID, tradeID)
+	}
+}
@@ -51,6 +51,49 @@ func TestResolveTronNode_WithRow(t *testing.T) {
 	}
 }

+func TestResolveTronNodeIgnoresManualVerifyOnly(t *testing.T) {
+	cleanup := testutil.SetupTestDatabases(t)
+	defer cleanup()
+
+	if err := dao.Mdb.Create(&mdb.RpcNode{
+		Network: mdb.NetworkTron,
+		Url:     "https://paid-tron.example.com",
+		Type:    mdb.RpcNodeTypeHttp,
+		ApiKey:  "paid-key",
+		Weight:  100,
+		Enabled: true,
+		Purpose: mdb.RpcNodePurposeManualVerify,
+		Status:  mdb.RpcNodeStatusOk,
+	}).Error; err != nil {
+		t.Fatalf("seed manual rpc_node: %v", err)
+	}
+
+	if gotURL, gotKey, err := resolveTronNode(); err == nil {
+		t.Fatalf("resolveTronNode() = (%q, %q, nil), want error", gotURL, gotKey)
+	}
+}
+
+func TestResolveTronNodeUsesGeneralWhenManualVerifyExists(t *testing.T) {
+	cleanup := testutil.SetupTestDatabases(t)
+	defer cleanup()
+
+	rows := []mdb.RpcNode{
+		{Network: mdb.NetworkTron, Url: "https://paid-tron.example.com", Type: mdb.RpcNodeTypeHttp, ApiKey: "paid-key", Weight: 100, Enabled: true, Purpose: mdb.RpcNodePurposeManualVerify, Status: mdb.RpcNodeStatusOk},
+		{Network: mdb.NetworkTron, Url: "https://general-tron.example.com", Type: mdb.RpcNodeTypeHttp, ApiKey: "general-key", Weight: 1, Enabled: true, Purpose: mdb.RpcNodePurposeGeneral, Status: mdb.RpcNodeStatusOk},
+	}
+	if err := dao.Mdb.Create(&rows).Error; err != nil {
+		t.Fatalf("seed rpc_nodes: %v", err)
+	}
+
+	gotURL, gotKey, err := resolveTronNode()
+	if err != nil {
+		t.Fatalf("resolveTronNode(): %v", err)
+	}
+	if gotURL != "https://general-tron.example.com" || gotKey != "general-key" {
+		t.Fatalf("resolveTronNode() = (%q, %q), want general node", gotURL, gotKey)
+	}
+}
+
 // TestResolveTronNode_DisabledRow verifies that a disabled row is ignored.
 func TestResolveTronNode_DisabledRow(t *testing.T) {
 	cleanup := testutil.SetupTestDatabases(t)
@@ -0,0 +1,37 @@
+package service
+
+import (
+	"context"
+	"fmt"
+	"strings"
+	"time"
+
+	"github.com/xssnick/tonutils-go/liteclient"
+	"github.com/xssnick/tonutils-go/ton"
+)
+
+// ConnectTonLiteAPI builds a tonutils-go API client from a liteserver global
+// config URL. Scanner and manual verification use this same connection setup.
+func ConnectTonLiteAPI(ctx context.Context, configURL string, requestTimeout time.Duration, reconnectLimit int) (ton.APIClientWrapped, func(), error) {
+	configURL = strings.TrimSpace(configURL)
+	if configURL == "" {
+		return nil, func() {}, fmt.Errorf("ton lite config url is empty")
+	}
+	if reconnectLimit <= 0 {
+		reconnectLimit = 3
+	}
+	cfg, err := liteclient.GetConfigFromUrl(ctx, configURL)
+	if err != nil {
+		return nil, func() {}, err
+	}
+	pool := liteclient.NewConnectionPool()
+	pool.SetOnDisconnect(pool.DefaultReconnect(3*time.Second, reconnectLimit))
+	if err = pool.AddConnectionsFromConfig(ctx, cfg); err != nil {
+		pool.Stop()
+		return nil, func() {}, err
+	}
+	base := ton.NewAPIClient(pool, ton.ProofCheckPolicyFast)
+	base.SetTrustedBlockFromConfig(cfg)
+	api := base.WithRetry(2).WithTimeout(requestTimeout).WithLSInfoInErrors()
+	return api, pool.Stop, nil
+}
@@ -0,0 +1,262 @@
+package service
+
+import (
+	"encoding/hex"
+	"errors"
+	"fmt"
+	"math/big"
+	"strings"
+
+	"github.com/GMWalletApp/epusdt/model/data"
+	"github.com/GMWalletApp/epusdt/model/mdb"
+	"github.com/GMWalletApp/epusdt/model/request"
+	addressutil "github.com/GMWalletApp/epusdt/util/address"
+	"github.com/GMWalletApp/epusdt/util/constant"
+	"github.com/GMWalletApp/epusdt/util/log"
+	"github.com/GMWalletApp/epusdt/util/math"
+	"github.com/shopspring/decimal"
+	"github.com/xssnick/tonutils-go/address"
+	"github.com/xssnick/tonutils-go/tlb"
+	"github.com/xssnick/tonutils-go/ton/jetton"
+	"github.com/xssnick/tonutils-go/tvm/cell"
+)
+
+const (
+	TonNativeSymbol               = "TON"
+	TonTransferNotificationOpcode = 0x7362d09c
+)
+
+type TonObservedTransfer struct {
+	ReceiveAddress string
+	Token          mdb.ChainToken
+	RawAmount      *big.Int
+	Amount         float64
+	BlockTimeMs    int64
+	LT             uint64
+	TxHashHex      string
+	BlockID        string
+	SenderAddress  string
+	JettonWallet   string
+}
+
+func TonCanonicalBlockTransactionID(receiveRaw string, lt uint64, txHashHex string) string {
+	return fmt.Sprintf("ton:%s:%d:%s", strings.ToLower(strings.TrimSpace(receiveRaw)), lt, strings.ToLower(strings.TrimSpace(txHashHex)))
+}
+
+func ParseTonInboundTransfer(tx *tlb.Transaction, receive *address.Address, nativeToken *mdb.ChainToken, jettonWalletTokens map[string]mdb.ChainToken) (*TonObservedTransfer, error) {
+	if tx == nil || receive == nil || tx.IO.In == nil || tx.IO.In.MsgType != tlb.MsgTypeInternal {
+		return nil, nil
+	}
+	if isTonTransactionBounced(tx) {
+		return nil, nil
+	}
+	in := tx.IO.In.AsInternal()
+	if in == nil || in.DstAddr == nil || !in.DstAddr.Equals(receive) {
+		return nil, nil
+	}
+
+	receiveRaw := addressutil.TonRawAddressObjectKey(receive)
+	txHashHex := hex.EncodeToString(tx.Hash)
+	blockID := TonCanonicalBlockTransactionID(receiveRaw, tx.LT, txHashHex)
+	blockTimeMs := int64(tx.Now) * 1000
+	if in.SrcAddr != nil {
+		srcRaw := addressutil.TonRawAddressObjectKey(in.SrcAddr)
+		if token, ok := jettonWalletTokens[srcRaw]; ok {
+			transfer, err := parseTonJettonTransferNotification(in)
+			if err != nil {
+				return nil, nil
+			}
+			amount := tonRawAmountToFloat(transfer.Amount.Nano(), token.Decimals)
+			if amount <= 0 {
+				return nil, nil
+			}
+			if token.MinAmount > 0 && amount < token.MinAmount {
+				return nil, nil
+			}
+			return &TonObservedTransfer{
+				ReceiveAddress: addressutil.NormalizeTonAddressObject(receive),
+				Token:          token,
+				RawAmount:      transfer.Amount.Nano(),
+				Amount:         amount,
+				BlockTimeMs:    blockTimeMs,
+				LT:             tx.LT,
+				TxHashHex:      txHashHex,
+				BlockID:        blockID,
+				SenderAddress:  addressutil.NormalizeTonAddressObject(transfer.Sender),
+				JettonWallet:   addressutil.NormalizeTonAddressObject(in.SrcAddr),
+			}, nil
+		}
+	}
+
+	if tonPayloadIsTransferNotification(in.Body) {
+		return nil, nil
+	}
+	if nativeToken == nil || nativeToken.ID == 0 {
+		return nil, nil
+	}
+	rawNano := in.Amount.Nano()
+	if rawNano == nil || rawNano.Sign() <= 0 {
+		return nil, nil
+	}
+	amount := tonRawAmountToFloat(rawNano, nativeToken.Decimals)
+	if amount <= 0 {
+		return nil, nil
+	}
+	if nativeToken.MinAmount > 0 && amount < nativeToken.MinAmount {
+		return nil, nil
+	}
+	return &TonObservedTransfer{
+		ReceiveAddress: addressutil.NormalizeTonAddressObject(receive),
+		Token:          *nativeToken,
+		RawAmount:      rawNano,
+		Amount:         amount,
+		BlockTimeMs:    blockTimeMs,
+		LT:             tx.LT,
+		TxHashHex:      txHashHex,
+		BlockID:        blockID,
+	}, nil
+}
+
+func TryProcessTonTransfer(transfer *TonObservedTransfer) {
+	if transfer == nil {
+		return
+	}
+	tokenSym := strings.ToUpper(strings.TrimSpace(transfer.Token.Symbol))
+	defer func() {
+		if err := recover(); err != nil {
+			log.Sugar.Errorf("[TON-%s][%s] TryProcessTonTransfer panic: %v", tokenSym, transfer.ReceiveAddress, err)
+		}
+	}()
+
+	receive := strings.TrimSpace(transfer.ReceiveAddress)
+	if tokenSym == "" || receive == "" || transfer.Amount <= 0 || transfer.BlockID == "" {
+		return
+	}
+	log.Sugar.Infof("[TON-%s][%s] observed transfer tx=%s lt=%d amount=%.6f", tokenSym, receive, transfer.BlockID, transfer.LT, transfer.Amount)
+
+	tradeID, err := data.GetTradeIdByWalletAddressAndAmountAndToken(mdb.NetworkTon, receive, tokenSym, transfer.Amount)
+	if err != nil {
+		log.Sugar.Warnf("[TON-%s][%s] lock lookup: %v", tokenSym, receive, err)
+		return
+	}
+	if tradeID == "" {
+		log.Sugar.Infof("[TON-%s][%s] skip unmatched transfer tx=%s amount=%.6f", tokenSym, receive, transfer.BlockID, transfer.Amount)
+		return
+	}
+
+	order, err := data.GetOrderInfoByTradeId(tradeID)
+	if err != nil {
+		log.Sugar.Warnf("[TON-%s][%s] load order: %v", tokenSym, receive, err)
+		return
+	}
+	if strings.ToLower(strings.TrimSpace(order.Network)) != mdb.NetworkTon {
+		log.Sugar.Warnf("[TON-%s][%s] skip trade_id=%s network=%q", tokenSym, receive, tradeID, order.Network)
+		return
+	}
+	if strings.ToUpper(strings.TrimSpace(order.Token)) != tokenSym {
+		log.Sugar.Warnf("[TON-%s][%s] skip trade_id=%s token mismatch order=%s", tokenSym, receive, tradeID, order.Token)
+		return
+	}
+	if !tonOrderAddressMatches(order.ReceiveAddress, receive) {
+		log.Sugar.Warnf("[TON-%s][%s] skip trade_id=%s receive address mismatch order=%s", tokenSym, receive, tradeID, order.ReceiveAddress)
+		return
+	}
+	if transfer.BlockTimeMs > 0 && transfer.BlockTimeMs < order.CreatedAt.TimestampMilli() {
+		log.Sugar.Warnf("[TON-%s][%s] skip tx %s because block time %d is before order create time %d", tokenSym, receive, transfer.BlockID, transfer.BlockTimeMs, order.CreatedAt.TimestampMilli())
+		return
+	}
+
+	req := &request.OrderProcessingRequest{
+		ReceiveAddress:     order.ReceiveAddress,
+		Token:              tokenSym,
+		Network:            mdb.NetworkTon,
+		TradeId:            tradeID,
+		Amount:             transfer.Amount,
+		BlockTransactionId: transfer.BlockID,
+	}
+	err = OrderProcessing(req)
+	if err != nil {
+		if errors.Is(err, constant.OrderBlockAlreadyProcess) || errors.Is(err, constant.OrderStatusConflict) {
+			log.Sugar.Infof("[TON-%s][%s] skip resolved transfer trade_id=%s tx=%s err=%v", tokenSym, receive, tradeID, transfer.BlockID, err)
+			return
+		}
+		log.Sugar.Errorf("[TON-%s][%s] OrderProcessing trade_id=%s tx=%s: %v", tokenSym, receive, tradeID, transfer.BlockID, err)
+		return
+	}
+
+	sendPaymentNotification(order)
+	log.Sugar.Infof("[TON-%s][%s] payment processed trade_id=%s tx=%s", tokenSym, receive, tradeID, transfer.BlockID)
+}
+
+func tonOrderAddressMatches(a, b string) bool {
+	ar, errA := addressutil.TonRawAddressKey(a)
+	br, errB := addressutil.TonRawAddressKey(b)
+	return errA == nil && errB == nil && ar == br
+}
+
+func tonRawAmountToFloat(rawAmount *big.Int, decimals int) float64 {
+	if rawAmount == nil || rawAmount.Sign() <= 0 {
+		return 0
+	}
+	if decimals < 0 {
+		decimals = 0
+	}
+	amount := decimal.NewFromBigInt(rawAmount, -int32(decimals))
+	return math.MustParsePrecFloat64(amount.InexactFloat64(), data.MaxAmountPrecision)
+}
+
+func parseTonJettonTransferNotification(in *tlb.InternalMessage) (*jetton.TransferNotification, error) {
+	if in == nil || in.Body == nil {
+		return nil, fmt.Errorf("missing jetton transfer notification body")
+	}
+	var transfer jetton.TransferNotification
+	if err := tlb.LoadFromCell(&transfer, in.Body.BeginParse()); err != nil {
+		return nil, err
+	}
+	return &transfer, nil
+}
+
+func tonPayloadIsTransferNotification(body *cell.Cell) bool {
+	if body == nil {
+		return false
+	}
+	op, err := body.BeginParse().LoadUInt(32)
+	return err == nil && op == TonTransferNotificationOpcode
+}
+
+func isTonTransactionBounced(tx *tlb.Transaction) bool {
+	if tx == nil {
+		return false
+	}
+	if dsc, ok := tx.Description.(tlb.TransactionDescriptionOrdinary); ok && dsc.BouncePhase != nil {
+		if _, ok = dsc.BouncePhase.Phase.(tlb.BouncePhaseOk); ok {
+			return true
+		}
+	}
+	return false
+}
+
+func EnsureTonTransferMatchesOrder(order *mdb.Orders, transfer *TonObservedTransfer) error {
+	if order == nil || order.ID == 0 {
+		return fmt.Errorf("order not found")
+	}
+	if transfer == nil {
+		return fmt.Errorf("matching ton transfer to order address not found")
+	}
+	if strings.ToLower(strings.TrimSpace(order.Network)) != mdb.NetworkTon {
+		return fmt.Errorf("order network mismatch")
+	}
+	if !strings.EqualFold(order.Token, transfer.Token.Symbol) {
+		return fmt.Errorf("transaction token mismatch")
+	}
+	if !tonOrderAddressMatches(order.ReceiveAddress, transfer.ReceiveAddress) {
+		return fmt.Errorf("transaction recipient mismatch")
+	}
+	if transfer.BlockTimeMs <= 0 || transfer.BlockTimeMs < order.CreatedAt.TimestampMilli() {
+		return fmt.Errorf("transaction predates the order")
+	}
+	if !amountMatchesRaw(order.ActualAmount, transfer.RawAmount, transfer.Token.Decimals) {
+		return fmt.Errorf("transaction amount mismatch")
+	}
+	return nil
+}
@@ -0,0 +1,173 @@
+package service
+
+import (
+	"bytes"
+	"math/big"
+	"strings"
+	"testing"
+	"time"
+
+	"github.com/GMWalletApp/epusdt/model/mdb"
+	addressutil "github.com/GMWalletApp/epusdt/util/address"
+	"github.com/xssnick/tonutils-go/address"
+	"github.com/xssnick/tonutils-go/tlb"
+	"github.com/xssnick/tonutils-go/ton/jetton"
+	"github.com/xssnick/tonutils-go/tvm/cell"
+)
+
+func tonTestInboundTx(t *testing.T, src, dst *address.Address, amount tlb.Coins, body *cell.Cell) *tlb.Transaction {
+	t.Helper()
+	return &tlb.Transaction{
+		LT:   123,
+		Now:  uint32(time.Now().Unix()),
+		Hash: bytes.Repeat([]byte{0x11}, 32),
+		IO: struct {
+			In  *tlb.Message      `tlb:"maybe ^"`
+			Out *tlb.MessagesList `tlb:"maybe ^"`
+		}{
+			In: &tlb.Message{
+				MsgType: tlb.MsgTypeInternal,
+				Msg: &tlb.InternalMessage{
+					SrcAddr: src,
+					DstAddr: dst,
+					Amount:  amount,
+					Body:    body,
+				},
+			},
+		},
+	}
+}
+
+func TestParseTonInboundTransferNativeTON(t *testing.T) {
+	receive := address.MustParseAddr("EQC6KV4zs8TJtSZapOrRFmqSkxzpq-oSCoxekQRKElf4nC1I")
+	sender := address.NewAddress(0, 0, bytes.Repeat([]byte{0x22}, 32)).Bounce(false).Testnet(false)
+	native := &mdb.ChainToken{BaseModel: mdb.BaseModel{ID: 1}, Network: mdb.NetworkTon, Symbol: "TON", Decimals: 9, Enabled: true}
+
+	tx := tonTestInboundTx(t, sender, receive, tlb.MustFromTON("1.23"), cell.BeginCell().EndCell())
+	transfer, err := ParseTonInboundTransfer(tx, receive, native, nil)
+	if err != nil {
+		t.Fatalf("ParseTonInboundTransfer(): %v", err)
+	}
+	if transfer == nil {
+		t.Fatal("expected native TON transfer")
+	}
+	if transfer.Token.Symbol != "TON" {
+		t.Fatalf("token = %q, want TON", transfer.Token.Symbol)
+	}
+	if transfer.Amount != 1.23 {
+		t.Fatalf("amount = %v, want 1.23", transfer.Amount)
+	}
+	if transfer.ReceiveAddress != addressutil.NormalizeTonAddressObject(receive) {
+		t.Fatalf("receive address = %q", transfer.ReceiveAddress)
+	}
+	if !strings.HasPrefix(transfer.BlockID, "ton:"+addressutil.TonRawAddressObjectKey(receive)+":123:") {
+		t.Fatalf("block id = %q, want canonical TON prefix", transfer.BlockID)
+	}
+}
+
+func TestParseTonInboundTransferJettonNotification(t *testing.T) {
+	receive := address.MustParseAddr("EQC6KV4zs8TJtSZapOrRFmqSkxzpq-oSCoxekQRKElf4nC1I")
+	sender := address.NewAddress(0, 0, bytes.Repeat([]byte{0x33}, 32)).Bounce(false).Testnet(false)
+	jettonWallet := address.NewAddress(0, 0, bytes.Repeat([]byte{0x44}, 32)).Bounce(false).Testnet(false)
+	native := &mdb.ChainToken{BaseModel: mdb.BaseModel{ID: 1}, Network: mdb.NetworkTon, Symbol: "TON", Decimals: 9, Enabled: true}
+	usdt := mdb.ChainToken{BaseModel: mdb.BaseModel{ID: 2}, Network: mdb.NetworkTon, Symbol: "USDT", Decimals: 6, Enabled: true}
+
+	body, err := tlb.ToCell(jetton.TransferNotification{
+		QueryID:        7,
+		Amount:         tlb.MustFromNano(big.NewInt(1230000), 6),
+		Sender:         sender,
+		ForwardPayload: cell.BeginCell().EndCell(),
+	})
+	if err != nil {
+		t.Fatalf("build jetton notification body: %v", err)
+	}
+
+	tx := tonTestInboundTx(t, jettonWallet, receive, tlb.FromNanoTONU(1), body)
+	transfer, err := ParseTonInboundTransfer(tx, receive, native, map[string]mdb.ChainToken{
+		addressutil.TonRawAddressObjectKey(jettonWallet): usdt,
+	})
+	if err != nil {
+		t.Fatalf("ParseTonInboundTransfer(): %v", err)
+	}
+	if transfer == nil {
+		t.Fatal("expected USDT jetton transfer")
+	}
+	if transfer.Token.Symbol != "USDT" {
+		t.Fatalf("token = %q, want USDT", transfer.Token.Symbol)
+	}
+	if transfer.Amount != 1.23 {
+		t.Fatalf("amount = %v, want 1.23", transfer.Amount)
+	}
+	if transfer.SenderAddress != addressutil.NormalizeTonAddressObject(sender) {
+		t.Fatalf("sender address = %q", transfer.SenderAddress)
+	}
+	if transfer.JettonWallet != addressutil.NormalizeTonAddressObject(jettonWallet) {
+		t.Fatalf("jetton wallet = %q", transfer.JettonWallet)
+	}
+}
+
+func TestParseTonInboundTransferJettonNotificationWithNoGasComputeSkip(t *testing.T) {
+	receive := address.MustParseAddr("EQC6KV4zs8TJtSZapOrRFmqSkxzpq-oSCoxekQRKElf4nC1I")
+	sender := address.NewAddress(0, 0, bytes.Repeat([]byte{0x33}, 32)).Bounce(false).Testnet(false)
+	jettonWallet := address.NewAddress(0, 0, bytes.Repeat([]byte{0x44}, 32)).Bounce(false).Testnet(false)
+	usdt := mdb.ChainToken{BaseModel: mdb.BaseModel{ID: 2}, Network: mdb.NetworkTon, Symbol: "USDT", Decimals: 6, Enabled: true}
+
+	body, err := tlb.ToCell(jetton.TransferNotification{
+		QueryID:        7,
+		Amount:         tlb.MustFromNano(big.NewInt(150000), 6),
+		Sender:         sender,
+		ForwardPayload: cell.BeginCell().EndCell(),
+	})
+	if err != nil {
+		t.Fatalf("build jetton notification body: %v", err)
+	}
+
+	tx := tonTestInboundTx(t, jettonWallet, receive, tlb.FromNanoTONU(1), body)
+	tx.Description = tlb.TransactionDescriptionOrdinary{
+		ComputePhase: tlb.ComputePhase{Phase: tlb.ComputePhaseSkipped{
+			Reason: tlb.ComputeSkipReason{Type: tlb.ComputeSkipReasonNoGas},
+		}},
+		Aborted: true,
+	}
+	transfer, err := ParseTonInboundTransfer(tx, receive, nil, map[string]mdb.ChainToken{
+		addressutil.TonRawAddressObjectKey(jettonWallet): usdt,
+	})
+	if err != nil {
+		t.Fatalf("ParseTonInboundTransfer(): %v", err)
+	}
+	if transfer == nil {
+		t.Fatal("expected no-gas jetton notification to be accepted")
+	}
+	if transfer.Token.Symbol != "USDT" {
+		t.Fatalf("token = %q, want USDT", transfer.Token.Symbol)
+	}
+	if transfer.Amount != 0.15 {
+		t.Fatalf("amount = %v, want 0.15", transfer.Amount)
+	}
+}
+
+func TestParseTonInboundTransferDoesNotCountUntrustedJettonNotificationAsTON(t *testing.T) {
+	receive := address.MustParseAddr("EQC6KV4zs8TJtSZapOrRFmqSkxzpq-oSCoxekQRKElf4nC1I")
+	sender := address.NewAddress(0, 0, bytes.Repeat([]byte{0x33}, 32)).Bounce(false).Testnet(false)
+	untrustedJettonWallet := address.NewAddress(0, 0, bytes.Repeat([]byte{0x55}, 32)).Bounce(false).Testnet(false)
+	native := &mdb.ChainToken{BaseModel: mdb.BaseModel{ID: 1}, Network: mdb.NetworkTon, Symbol: "TON", Decimals: 9, Enabled: true}
+
+	body, err := tlb.ToCell(jetton.TransferNotification{
+		QueryID:        7,
+		Amount:         tlb.MustFromNano(big.NewInt(1230000), 6),
+		Sender:         sender,
+		ForwardPayload: cell.BeginCell().EndCell(),
+	})
+	if err != nil {
+		t.Fatalf("build jetton notification body: %v", err)
+	}
+
+	tx := tonTestInboundTx(t, untrustedJettonWallet, receive, tlb.FromNanoTONU(1), body)
+	transfer, err := ParseTonInboundTransfer(tx, receive, native, nil)
+	if err != nil {
+		t.Fatalf("ParseTonInboundTransfer(): %v", err)
+	}
+	if transfer != nil {
+		t.Fatalf("untrusted jetton notification produced transfer: %#v", transfer)
+	}
+}
@@ -37,6 +37,7 @@ func RegisterRoute(e *echo.Echo) {

 	payRoute.GET("/checkout-counter-resp/:trade_id", comm.Ctrl.CheckoutCounter)
 	payRoute.GET("/check-status/:trade_id", comm.Ctrl.CheckStatus)
+	payRoute.POST("/submit-tx-hash/:trade_id", comm.Ctrl.SubmitTxHash)
 	payRoute.POST("/switch-network", comm.Ctrl.SwitchNetwork)

 	// payment routes
@@ -45,9 +46,11 @@ func RegisterRoute(e *echo.Echo) {
 	// gmpay v1 routes
 	gmpayV1 := paymentRoute.Group("/gmpay/v1")
 	gmpayV1.POST("/order/create-transaction", comm.Ctrl.CreateTransaction, middleware.CheckApiSign())
-	gmpayV1.GET("/supported-assets", comm.Ctrl.GetSupportedAssets)
-	// gmpayV1.GET("/supported-assets/records", comm.Ctrl.ListSupportedAssetRecords)
-	// gmpayV1.GET("/supported-assets/:id", comm.Ctrl.GetSupportedAsset)
+	gmpayV1.GET("/config", comm.Ctrl.GetPublicConfig)
+
+	// okpay v1 routes
+	okpayV1 := paymentRoute.Group("/okpay/v1")
+	okpayV1.POST("/notify", comm.Ctrl.OkPayNotify)

 	// epay v1 routes
 	//
@@ -72,7 +75,7 @@ func RegisterRoute(e *echo.Echo) {

 		formParams, err := ctx.FormParams()
 		if err != nil && ctx.Request().Method == http.MethodPost {
-			return comm.Ctrl.FailJson(ctx, fmt.Errorf("invalid epay form params: %w", err))
+			return comm.Ctrl.FailJson(ctx, constant.ParamsMarshalErr)
 		}
 		if err == nil {
 			copyParams(formParams)
@@ -129,7 +132,7 @@ func RegisterRoute(e *echo.Echo) {

 		amountFloat, err := strconv.ParseFloat(money, 64)
 		if err != nil {
-			return comm.Ctrl.FailJson(ctx, fmt.Errorf("invalid money value: %s", money))
+			return comm.Ctrl.FailJson(ctx, constant.PayAmountErr)
 		}

 		body := map[string]interface{}{
@@ -151,7 +154,7 @@ func RegisterRoute(e *echo.Echo) {

 		jsonBytes, err := json.Marshal(body)
 		if err != nil {
-			return comm.Ctrl.FailJson(ctx, err)
+			return comm.Ctrl.FailJson(ctx, constant.SystemErr)
 		}

 		ctx.Request().Body = io.NopCloser(bytes.NewBuffer(jsonBytes))
@@ -222,8 +225,7 @@ func registerAdminRoutes(e *echo.Echo) {
 	authed.POST("/notification-channels/:id/status", admin.Ctrl.ChangeNotificationChannelStatus)
 	authed.DELETE("/notification-channels/:id", admin.Ctrl.DeleteNotificationChannel)

-	//	gmpayV1.GET("/supported-assets", comm.Ctrl.GetSupportedAssets)
-	authed.GET("/supported-assets", comm.Ctrl.GetSupportedAssets) // wrap for admin console, same handler as public endpoint
+	authed.GET("/config", comm.Ctrl.GetPublicConfig) // wrap for admin console, same payload as public endpoint

 	// Chains
 	authed.GET("/chains", admin.Ctrl.ListChains)
@@ -267,6 +269,7 @@ func registerAdminRoutes(e *echo.Echo) {
 	authed.GET("/dashboard/asset-trend", admin.Ctrl.AssetTrend)
 	authed.GET("/dashboard/revenue-trend", admin.Ctrl.RevenueTrend)
 	authed.GET("/dashboard/order-stats", admin.Ctrl.OrderStats)
+	authed.GET("/dashboard/rpc-stats", admin.Ctrl.RpcStats)
 	authed.GET("/dashboard/recent-orders", admin.Ctrl.RecentOrders)

 	// Settings
@@ -14,6 +14,7 @@ func Start() {
 	go StartPolygonWebSocketListener()
 	go StartPlasmaWebSocketListener()
 	go StartTronBlockScannerListener()
+	go StartTonBlockScannerListener()

 	c := cron.New()

@@ -66,18 +66,18 @@ func runBscListener(contracts []common.Address) {
 		}
 	}()

-	wsURL, ok := resolveChainWsURL(mdb.NetworkBsc, "[BSC-WS]")
+	wsNode, ok := resolveChainWsNode(mdb.NetworkBsc, "[BSC-WS]")
 	if !ok {
 		return
 	}
-	log.Sugar.Infof("[BSC-WS] connecting to %s watching %d contract(s)", wsURL, len(contracts))
+	log.Sugar.Infof("[BSC-WS] connecting using WSS node %s watching %d contract(s)", data.RpcNodeLogLabel(wsNode), len(contracts))

 	query := ethereum.FilterQuery{
 		Addresses: contracts,
 		Topics:    [][]common.Hash{},
 	}

-	runEvmWsLogListener(ctx, "[BSC-WS]", wsURL, query, func(client *ethclient.Client, vLog types.Log) {
+	runEvmWsLogListener(ctx, mdb.NetworkBsc, "[BSC-WS]", wsNode, query, func(client *ethclient.Client, vLog types.Log) {
 		if len(vLog.Topics) < 3 {
 			return
 		}
@@ -98,9 +98,11 @@ func runBscListener(contracts []common.Address) {
 		var blockTsMs int64
 		header, err := client.HeaderByNumber(context.Background(), big.NewInt(int64(vLog.BlockNumber)))
 		if err != nil {
+			data.RecordRpcFailure(mdb.NetworkBsc)
 			log.Sugar.Warnf("[BSC-WS] HeaderByNumber block=%d: %v, using local time", vLog.BlockNumber, err)
 			blockTsMs = time.Now().UnixMilli()
 		} else {
+			data.RecordRpcSuccess(mdb.NetworkBsc)
 			blockTsMs = int64(header.Time) * 1000
 		}

@@ -93,19 +93,28 @@ func loadChainTokenContracts(network, logPrefix string) []common.Address {
 // given network. If no enabled node is configured, the caller skips the
 // current listener run so admin-side disabled/deleted rows are respected.
 func resolveChainWsURL(network, logPrefix string) (string, bool) {
-	node, err := data.SelectRpcNode(network, mdb.RpcNodeTypeWs)
+	node, ok := resolveChainWsNode(network, logPrefix)
+	if !ok {
+		return "", false
+	}
+	return strings.TrimSpace(node.Url), true
+}
+
+func resolveChainWsNode(network, logPrefix string, excludeIDs ...uint64) (mdb.RpcNode, bool) {
+	node, err := data.SelectGeneralRpcNode(network, mdb.RpcNodeTypeWs, excludeIDs...)
 	if err == nil && node != nil && node.ID > 0 {
 		rpcURL := strings.TrimSpace(node.Url)
 		if rpcURL != "" {
-			return rpcURL, true
+			node.Url = rpcURL
+			return *node, true
 		}
 		log.Sugar.Errorf("%s rpc_nodes id=%d has empty url", logPrefix, node.ID)
-		return "", false
+		return mdb.RpcNode{}, false
 	}
 	if err != nil {
 		log.Sugar.Errorf("%s resolve rpc_nodes err=%v", logPrefix, err)
 	} else {
 		log.Sugar.Warnf("%s no enabled %s WS RPC node configured in rpc_nodes", logPrefix, network)
 	}
-	return "", false
+	return mdb.RpcNode{}, false
 }
@@ -1,13 +1,23 @@
 package task

 import (
+	"math/big"
 	"testing"
+	"time"

 	"github.com/GMWalletApp/epusdt/internal/testutil"
 	"github.com/GMWalletApp/epusdt/model/dao"
+	"github.com/GMWalletApp/epusdt/model/data"
 	"github.com/GMWalletApp/epusdt/model/mdb"
+	epLog "github.com/GMWalletApp/epusdt/util/log"
+	"github.com/ethereum/go-ethereum/core/types"
+	"go.uber.org/zap"
 )

+func init() {
+	epLog.Sugar = zap.NewNop().Sugar()
+}
+
 func TestResolveChainWsURLRequiresEnabledRpcNode(t *testing.T) {
 	cleanup := testutil.SetupTestDatabases(t)
 	defer cleanup()
@@ -42,6 +52,143 @@ func TestResolveChainWsURLWithRow(t *testing.T) {
 	}
 }

+func TestResolveChainWsURLIgnoresManualVerifyOnly(t *testing.T) {
+	cleanup := testutil.SetupTestDatabases(t)
+	defer cleanup()
+
+	if err := dao.Mdb.Create(&mdb.RpcNode{
+		Network: mdb.NetworkEthereum,
+		Url:     "wss://paid-ethereum.example.com",
+		Type:    mdb.RpcNodeTypeWs,
+		Weight:  100,
+		Enabled: true,
+		Purpose: mdb.RpcNodePurposeManualVerify,
+		Status:  mdb.RpcNodeStatusOk,
+	}).Error; err != nil {
+		t.Fatalf("seed manual rpc_node: %v", err)
+	}
+
+	if got, ok := resolveChainWsURL(mdb.NetworkEthereum, "[TEST]"); ok {
+		t.Fatalf("resolveChainWsURL() = (%q, true), want false", got)
+	}
+}
+
+func TestResolveChainWsURLUsesGeneralWhenManualVerifyExists(t *testing.T) {
+	cleanup := testutil.SetupTestDatabases(t)
+	defer cleanup()
+
+	rows := []mdb.RpcNode{
+		{Network: mdb.NetworkEthereum, Url: "wss://paid-ethereum.example.com", Type: mdb.RpcNodeTypeWs, Weight: 100, Enabled: true, Purpose: mdb.RpcNodePurposeManualVerify, Status: mdb.RpcNodeStatusOk},
+		{Network: mdb.NetworkEthereum, Url: " wss://general-ethereum.example.com ", Type: mdb.RpcNodeTypeWs, Weight: 1, Enabled: true, Purpose: mdb.RpcNodePurposeGeneral, Status: mdb.RpcNodeStatusOk},
+	}
+	if err := dao.Mdb.Create(&rows).Error; err != nil {
+		t.Fatalf("seed rpc_nodes: %v", err)
+	}
+
+	got, ok := resolveChainWsURL(mdb.NetworkEthereum, "[TEST]")
+	if !ok {
+		t.Fatalf("resolveChainWsURL() ok=false, want true")
+	}
+	if got != "wss://general-ethereum.example.com" {
+		t.Fatalf("resolveChainWsURL() = %q, want general node", got)
+	}
+}
+
+func TestResolveChainWsNodeSkipsCoolingNode(t *testing.T) {
+	cleanup := testutil.SetupTestDatabases(t)
+	defer cleanup()
+	data.ResetRpcFailoverForTest()
+	t.Cleanup(data.ResetRpcFailoverForTest)
+
+	rows := []mdb.RpcNode{
+		{Network: mdb.NetworkEthereum, Url: "wss://primary-ethereum.example.com", Type: mdb.RpcNodeTypeWs, Weight: 100, Enabled: true, Purpose: mdb.RpcNodePurposeGeneral, Status: mdb.RpcNodeStatusOk},
+		{Network: mdb.NetworkEthereum, Url: "wss://backup-ethereum.example.com", Type: mdb.RpcNodeTypeWs, Weight: 1, Enabled: true, Purpose: mdb.RpcNodePurposeGeneral, Status: mdb.RpcNodeStatusOk},
+	}
+	if err := dao.Mdb.Create(&rows).Error; err != nil {
+		t.Fatalf("seed rpc_nodes: %v", err)
+	}
+
+	primary, ok := resolveChainWsNode(mdb.NetworkEthereum, "[TEST]")
+	if !ok || primary.Url != "wss://primary-ethereum.example.com" {
+		t.Fatalf("primary node = %#v ok=%v, want primary", primary, ok)
+	}
+	for i := 0; i < data.RpcFailoverThreshold; i++ {
+		data.RecordRpcNodeFailure(primary.ID)
+	}
+
+	got, ok := resolveChainWsNode(mdb.NetworkEthereum, "[TEST]")
+	if !ok {
+		t.Fatalf("resolveChainWsNode() ok=false, want true")
+	}
+	if got.Url != "wss://backup-ethereum.example.com" {
+		t.Fatalf("resolveChainWsNode() = %#v, want backup", got)
+	}
+}
+
+func TestEvmWsNodeFailureRecordsRuntimeStats(t *testing.T) {
+	data.ResetRpcFailoverForTest()
+	data.ResetRpcRuntimeStatsForTest()
+	t.Cleanup(data.ResetRpcFailoverForTest)
+	t.Cleanup(data.ResetRpcRuntimeStatsForTest)
+
+	recordEvmWsNodeFailure("[TEST]", mdb.NetworkEthereum, mdb.RpcNode{
+		BaseModel: mdb.BaseModel{ID: 123},
+		Url:       "wss://ethereum.example.com",
+		Type:      mdb.RpcNodeTypeWs,
+	}, "dial")
+
+	stats := data.SnapshotRpcRuntimeStats()
+	eth := stats[mdb.NetworkEthereum]
+	if eth.SuccessCount != 0 {
+		t.Fatalf("ethereum success_count = %d, want 0", eth.SuccessCount)
+	}
+	if eth.FailureCount != 1 {
+		t.Fatalf("ethereum failure_count = %d, want 1", eth.FailureCount)
+	}
+}
+
+func TestEvmLogBlockHeightRecordsRuntimeHeight(t *testing.T) {
+	data.ResetRpcRuntimeStatsForTest()
+	t.Cleanup(data.ResetRpcRuntimeStatsForTest)
+
+	recordEvmLogBlockHeight(mdb.NetworkEthereum, "[TEST]", 123456)
+	recordEvmLogBlockHeight(mdb.NetworkEthereum, "[TEST]", 123455)
+
+	stats := data.SnapshotRpcRuntimeStats()
+	eth := stats[mdb.NetworkEthereum]
+	if eth.LatestBlockHeight != 123456 {
+		t.Fatalf("ethereum latest_block_height = %d, want 123456", eth.LatestBlockHeight)
+	}
+}
+
+func TestEvmHeaderBlockHeightRecordsRuntimeHeight(t *testing.T) {
+	data.ResetRpcRuntimeStatsForTest()
+	t.Cleanup(data.ResetRpcRuntimeStatsForTest)
+
+	recordEvmHeaderBlockHeight(mdb.NetworkPolygon, "[TEST]", &types.Header{Number: big.NewInt(7654321)})
+	recordEvmHeaderBlockHeight(mdb.NetworkPolygon, "[TEST]", &types.Header{Number: big.NewInt(7654320)})
+
+	stats := data.SnapshotRpcRuntimeStats()
+	polygon := stats[mdb.NetworkPolygon]
+	if polygon.LatestBlockHeight != 7654321 {
+		t.Fatalf("polygon latest_block_height = %d, want 7654321", polygon.LatestBlockHeight)
+	}
+}
+
+func TestShouldRefreshEvmLatestHeaderAfterIdleInterval(t *testing.T) {
+	lastUpdate := time.Now()
+
+	if shouldRefreshEvmLatestHeader(lastUpdate, false, lastUpdate.Add(evmStatsIdleInterval-time.Second)) {
+		t.Fatal("should not refresh latest header before idle interval")
+	}
+	if !shouldRefreshEvmLatestHeader(lastUpdate, false, lastUpdate.Add(evmStatsIdleInterval)) {
+		t.Fatal("should refresh latest header at idle interval")
+	}
+	if shouldRefreshEvmLatestHeader(lastUpdate, true, lastUpdate.Add(evmStatsIdleInterval+time.Second)) {
+		t.Fatal("should not refresh latest header while request is in flight")
+	}
+}
+
 func TestResolveChainWsURLDisabledRow(t *testing.T) {
 	cleanup := testutil.SetupTestDatabases(t)
 	defer cleanup()
@@ -71,18 +71,18 @@ func runEthereumListener(contracts []common.Address) {
 		}
 	}()

-	wsURL, ok := resolveChainWsURL(mdb.NetworkEthereum, "[ETH-WS]")
+	wsNode, ok := resolveChainWsNode(mdb.NetworkEthereum, "[ETH-WS]")
 	if !ok {
 		return
 	}
-	log.Sugar.Infof("[ETH-WS] connecting to %s watching %d contract(s)", wsURL, len(contracts))
+	log.Sugar.Infof("[ETH-WS] connecting using WSS node %s watching %d contract(s)", data.RpcNodeLogLabel(wsNode), len(contracts))

 	query := ethereum.FilterQuery{
 		Addresses: contracts,
 		Topics:    [][]common.Hash{},
 	}

-	runEvmWsLogListener(ctx, "[ETH-WS]", wsURL, query, func(client *ethclient.Client, vLog types.Log) {
+	runEvmWsLogListener(ctx, mdb.NetworkEthereum, "[ETH-WS]", wsNode, query, func(client *ethclient.Client, vLog types.Log) {
 		if len(vLog.Topics) < 3 {
 			return
 		}
@@ -100,9 +100,11 @@ func runEthereumListener(contracts []common.Address) {
 		var blockTsMs int64
 		header, err := client.HeaderByNumber(context.Background(), big.NewInt(int64(vLog.BlockNumber)))
 		if err != nil {
+			data.RecordRpcFailure(mdb.NetworkEthereum)
 			log.Sugar.Warnf("[ETH-WS] HeaderByNumber block=%d: %v, using local time", vLog.BlockNumber, err)
 			blockTsMs = time.Now().UnixMilli()
 		} else {
+			data.RecordRpcSuccess(mdb.NetworkEthereum)
 			blockTsMs = int64(header.Time) * 1000
 		}

@@ -2,8 +2,11 @@ package task

 import (
 	"context"
+	"fmt"
 	"time"

+	"github.com/GMWalletApp/epusdt/model/data"
+	"github.com/GMWalletApp/epusdt/model/mdb"
 	"github.com/GMWalletApp/epusdt/util/log"

 	"github.com/ethereum/go-ethereum"
@@ -11,18 +14,26 @@ import (
 	"github.com/ethereum/go-ethereum/ethclient"
 )

-// runEvmWsLogListener connects to wsURL, subscribes to Transfer logs,
+const (
+	evmStatsIdleInterval  = 30 * time.Second
+	evmStatsHeaderTimeout = 10 * time.Second
+)
+
+// runEvmWsLogListener connects to node.Url, subscribes to Transfer logs,
 // and dispatches each log to handleLog. It retries on transient errors
-// with exponential backoff. The ctx lets the caller trigger a clean
-// exit — e.g. when admin disables the chain, the caller cancels the
-// context and the function returns instead of reconnecting forever.
-func runEvmWsLogListener(ctx context.Context, logPrefix, wsURL string, query ethereum.FilterQuery, handleLog func(*ethclient.Client, types.Log)) {
+// with exponential backoff until the node reaches the failure threshold.
+// The ctx lets the caller trigger a clean exit — e.g. when admin disables
+// the chain, the caller cancels the context and the function returns.
+func runEvmWsLogListener(ctx context.Context, network string, logPrefix string, node mdb.RpcNode, query ethereum.FilterQuery, handleLog func(*ethclient.Client, types.Log)) {
 	const (
-		minBackoff = 2 * time.Second
-		maxBackoff = 60 * time.Second
-		rejoinWait = 3 * time.Second
+		minBackoff       = 2 * time.Second
+		maxBackoff       = 60 * time.Second
+		rejoinWait       = 3 * time.Second
+		stableResetAfter = 60 * time.Second
 	)
 	failWait := minBackoff
+	wsURL := node.Url
+	nodeLabel := data.RpcNodeLogLabel(node)

 	for {
 		if ctx.Err() != nil {
@@ -31,7 +42,13 @@ func runEvmWsLogListener(ctx context.Context, logPrefix, wsURL string, query eth

 		client, err := ethclient.Dial(wsURL)
 		if err != nil {
+			if ctx.Err() != nil {
+				return
+			}
 			log.Sugar.Warnf("%s dial: %v, retry in %s", logPrefix, err, failWait)
+			if recordEvmWsNodeFailure(logPrefix, network, node, "dial") {
+				return
+			}
 			if !sleepOrDone(ctx, failWait) {
 				return
 			}
@@ -43,7 +60,13 @@ func runEvmWsLogListener(ctx context.Context, logPrefix, wsURL string, query eth
 		sub, err := client.SubscribeFilterLogs(ctx, query, logsCh)
 		if err != nil {
 			client.Close()
+			if ctx.Err() != nil {
+				return
+			}
 			log.Sugar.Warnf("%s subscribe: %v, retry in %s", logPrefix, err, failWait)
+			if recordEvmWsNodeFailure(logPrefix, network, node, "subscribe") {
+				return
+			}
 			if !sleepOrDone(ctx, failWait) {
 				return
 			}
@@ -51,22 +74,49 @@ func runEvmWsLogListener(ctx context.Context, logPrefix, wsURL string, query eth
 			continue
 		}
 		failWait = minBackoff
+		data.RecordRpcSuccess(network)

-		log.Sugar.Infof("%s connected, subscribed to Transfer logs", logPrefix)
+		log.Sugar.Infof("%s connected, subscribed to Transfer logs using WSS node %s", logPrefix, nodeLabel)

-		recvLoop(ctx, client, sub, logsCh, logPrefix, handleLog)
+		connectedAt := time.Now()
+		recvErr := recvLoop(ctx, client, sub, logsCh, network, logPrefix, handleLog)

 		if ctx.Err() != nil {
 			return
 		}
+		if time.Since(connectedAt) >= stableResetAfter {
+			if recvErr != nil {
+				data.RecordRpcFailure(network)
+			}
+			data.RecordRpcNodeSuccess(node.ID)
+		} else if recvErr != nil && recordEvmWsNodeFailure(logPrefix, network, node, recvErr.Error()) {
+			return
+		}
 		if !sleepOrDone(ctx, rejoinWait) {
 			return
 		}
 	}
 }

-func recvLoop(ctx context.Context, client *ethclient.Client, sub ethereum.Subscription, logsCh <-chan types.Log, logPrefix string, handleLog func(*ethclient.Client, types.Log)) {
+func recvLoop(ctx context.Context, client *ethclient.Client, sub ethereum.Subscription, logsCh <-chan types.Log, network string, logPrefix string, handleLog func(*ethclient.Client, types.Log)) error {
+	statsCtx, cancelStats := context.WithCancel(ctx)
+	statsTicker := time.NewTicker(evmStatsIdleInterval)
+	headerStatsDone := make(chan bool, 1)
+	lastStatsUpdateAt := time.Now()
+	headerStatsInFlight := false
+	requestLatestHeader := func() {
+		if headerStatsInFlight {
+			return
+		}
+		headerStatsInFlight = true
+		go func() {
+			headerStatsDone <- recordEvmLatestHeader(statsCtx, network, logPrefix, client)
+		}()
+	}
+
 	defer func() {
+		cancelStats()
+		statsTicker.Stop()
 		sub.Unsubscribe()
 		client.Close()
 	}()
@@ -75,24 +125,94 @@ func recvLoop(ctx context.Context, client *ethclient.Client, sub ethereum.Subscr
 		select {
 		case <-ctx.Done():
 			log.Sugar.Infof("%s context cancelled, stopping", logPrefix)
-			return
+			return nil
+		case <-statsTicker.C:
+			if shouldRefreshEvmLatestHeader(lastStatsUpdateAt, headerStatsInFlight, time.Now()) {
+				requestLatestHeader()
+			}
+		case updated := <-headerStatsDone:
+			headerStatsInFlight = false
+			if updated {
+				lastStatsUpdateAt = time.Now()
+			}
 		case err := <-sub.Err():
 			if err != nil {
 				log.Sugar.Warnf("%s subscription error: %v, reconnecting", logPrefix, err)
+				return fmt.Errorf("subscription error")
 			} else {
 				log.Sugar.Warnf("%s subscription closed, reconnecting", logPrefix)
+				return fmt.Errorf("subscription closed")
 			}
-			return
 		case vLog, ok := <-logsCh:
 			if !ok {
 				log.Sugar.Warnf("%s log channel closed, reconnecting", logPrefix)
-				return
+				return fmt.Errorf("log channel closed")
+			}
+			if recordEvmLogBlockHeight(network, logPrefix, vLog.BlockNumber) {
+				lastStatsUpdateAt = time.Now()
 			}
 			handleLog(client, vLog)
 		}
 	}
 }

+func shouldRefreshEvmLatestHeader(lastStatsUpdateAt time.Time, inFlight bool, now time.Time) bool {
+	return !inFlight && now.Sub(lastStatsUpdateAt) >= evmStatsIdleInterval
+}
+
+func recordEvmLogBlockHeight(network string, logPrefix string, blockNumber uint64) bool {
+	if blockNumber == 0 {
+		return false
+	}
+	if blockNumber > uint64(1<<63-1) {
+		log.Sugar.Warnf("%s log block number exceeds int64 range: %d", logPrefix, blockNumber)
+		return false
+	}
+	data.RecordRpcBlockHeight(network, int64(blockNumber))
+	return true
+}
+
+func recordEvmLatestHeader(ctx context.Context, network string, logPrefix string, client *ethclient.Client) bool {
+	headerCtx, cancel := context.WithTimeout(ctx, evmStatsHeaderTimeout)
+	defer cancel()
+
+	header, err := client.HeaderByNumber(headerCtx, nil)
+	if err != nil {
+		if ctx.Err() != nil {
+			return false
+		}
+		data.RecordRpcFailure(network)
+		log.Sugar.Warnf("%s latest header stats failed: %v", logPrefix, err)
+		return false
+	}
+	data.RecordRpcSuccess(network)
+	return recordEvmHeaderBlockHeight(network, logPrefix, header)
+}
+
+func recordEvmHeaderBlockHeight(network string, logPrefix string, header *types.Header) bool {
+	if header == nil || header.Number == nil {
+		return false
+	}
+	if !header.Number.IsInt64() {
+		log.Sugar.Warnf("%s latest header block number exceeds int64 range: %s", logPrefix, header.Number.String())
+		return false
+	}
+	data.RecordRpcBlockHeight(network, header.Number.Int64())
+	return true
+}
+
+func recordEvmWsNodeFailure(logPrefix string, network string, node mdb.RpcNode, reason string) bool {
+	data.RecordRpcFailure(network)
+	failures, cooling := data.RecordRpcNodeFailure(node.ID)
+	nodeLabel := data.RpcNodeLogLabel(node)
+	if !cooling {
+		log.Sugar.Warnf("%s WSS node failed (%s), node=%s failures=%d/%d", logPrefix, reason, nodeLabel, failures, data.RpcFailoverThreshold)
+		return false
+	}
+	log.Sugar.Warnf("%s WSS node reached fail threshold (%s), node=%s, resolving another node", logPrefix, reason, nodeLabel)
+	return true
+}
+
 // sleepOrDone waits for d or for ctx cancellation, whichever comes
 // first. Returns true if the sleep completed normally, false if ctx
 // was cancelled (caller should exit).
@@ -65,18 +65,18 @@ func runPlasmaListener(contracts []common.Address) {
 		}
 	}()

-	wsURL, ok := resolveChainWsURL(mdb.NetworkPlasma, "[PLASMA-WS]")
+	wsNode, ok := resolveChainWsNode(mdb.NetworkPlasma, "[PLASMA-WS]")
 	if !ok {
 		return
 	}
-	log.Sugar.Infof("[PLASMA-WS] connecting to %s watching %d contract(s)", wsURL, len(contracts))
+	log.Sugar.Infof("[PLASMA-WS] connecting using WSS node %s watching %d contract(s)", data.RpcNodeLogLabel(wsNode), len(contracts))

 	query := ethereum.FilterQuery{
 		Addresses: contracts,
 		Topics:    [][]common.Hash{},
 	}

-	runEvmWsLogListener(ctx, "[PLASMA-WS]", wsURL, query, func(client *ethclient.Client, vLog types.Log) {
+	runEvmWsLogListener(ctx, mdb.NetworkPlasma, "[PLASMA-WS]", wsNode, query, func(client *ethclient.Client, vLog types.Log) {
 		if len(vLog.Topics) < 3 {
 			return
 		}
@@ -97,9 +97,11 @@ func runPlasmaListener(contracts []common.Address) {
 		var blockTsMs int64
 		header, err := client.HeaderByNumber(context.Background(), big.NewInt(int64(vLog.BlockNumber)))
 		if err != nil {
+			data.RecordRpcFailure(mdb.NetworkPlasma)
 			log.Sugar.Warnf("[PLASMA-WS] HeaderByNumber block=%d: %v, using local time", vLog.BlockNumber, err)
 			blockTsMs = time.Now().UnixMilli()
 		} else {
+			data.RecordRpcSuccess(mdb.NetworkPlasma)
 			blockTsMs = int64(header.Time) * 1000
 		}

@@ -65,18 +65,18 @@ func runPolygonListener(contracts []common.Address) {
 		}
 	}()

-	wsURL, ok := resolveChainWsURL(mdb.NetworkPolygon, "[POLYGON-WS]")
+	wsNode, ok := resolveChainWsNode(mdb.NetworkPolygon, "[POLYGON-WS]")
 	if !ok {
 		return
 	}
-	log.Sugar.Infof("[POLYGON-WS] connecting to %s watching %d contract(s)", wsURL, len(contracts))
+	log.Sugar.Infof("[POLYGON-WS] connecting using WSS node %s watching %d contract(s)", data.RpcNodeLogLabel(wsNode), len(contracts))

 	query := ethereum.FilterQuery{
 		Addresses: contracts,
 		Topics:    [][]common.Hash{},
 	}

-	runEvmWsLogListener(ctx, "[POLYGON-WS]", wsURL, query, func(client *ethclient.Client, vLog types.Log) {
+	runEvmWsLogListener(ctx, mdb.NetworkPolygon, "[POLYGON-WS]", wsNode, query, func(client *ethclient.Client, vLog types.Log) {
 		if len(vLog.Topics) < 3 {
 			return
 		}
@@ -97,9 +97,11 @@ func runPolygonListener(contracts []common.Address) {
 		var blockTsMs int64
 		header, err := client.HeaderByNumber(context.Background(), big.NewInt(int64(vLog.BlockNumber)))
 		if err != nil {
+			data.RecordRpcFailure(mdb.NetworkPolygon)
 			log.Sugar.Warnf("[POLYGON-WS] HeaderByNumber block=%d: %v, using local time", vLog.BlockNumber, err)
 			blockTsMs = time.Now().UnixMilli()
 		} else {
+			data.RecordRpcSuccess(mdb.NetworkPolygon)
 			blockTsMs = int64(header.Time) * 1000
 		}

@@ -12,31 +12,59 @@ import (
 type ListenSolJob struct{}

 var gListenSolJobLock sync.Mutex
+var gSolanaBlockHeightLock = make(chan struct{}, 1)

 func (r ListenSolJob) Run() {
-	gListenSolJobLock.Lock()
-	defer gListenSolJobLock.Unlock()
-	log.Sugar.Debug("[ListenSolJob] Job triggered")
-	if !data.IsChainEnabled(mdb.NetworkSolana) {
-		log.Sugar.Debug("[ListenSolJob] chain disabled, skipping")
-		return
+	shouldRecordHeight := false
+	func() {
+		gListenSolJobLock.Lock()
+		defer gListenSolJobLock.Unlock()
+
+		log.Sugar.Debug("[ListenSolJob] Job triggered")
+		if !data.IsChainEnabled(mdb.NetworkSolana) {
+			log.Sugar.Debug("[ListenSolJob] chain disabled, skipping")
+			return
+		}
+		shouldRecordHeight = true
+
+		walletAddress, err := data.GetAvailableWalletAddressByNetwork(mdb.NetworkSolana)
+		if err != nil {
+			log.Sugar.Errorf("[ListenSolJob] Failed to get wallet addresses: %v", err)
+			return
+		}
+		if len(walletAddress) <= 0 {
+			log.Sugar.Debug("[ListenSolJob] No available wallet addresses")
+			return
+		}
+		log.Sugar.Infof("[ListenSolJob] Found %d wallet addresses to monitor", len(walletAddress))
+		var wg sync.WaitGroup
+		for _, address := range walletAddress {
+			log.Sugar.Infof("[ListenSolJob] Listening to address: %s", address.Address)
+			wg.Add(1)
+			go service.SolCallBack(address.Address, &wg)
+		}
+		wg.Wait()
+		log.Sugar.Debug("[ListenSolJob] Job completed")
+	}()
+
+	if shouldRecordHeight {
+		recordSolanaLatestBlockHeight()
+	}
+}
+
+func recordSolanaLatestBlockHeight() {
+	select {
+	case gSolanaBlockHeightLock <- struct{}{}:
+		defer func() { <-gSolanaBlockHeightLock }()
+	default:
+		log.Sugar.Debug("[ListenSolJob] previous Solana block height stats still running, skipping")
+		return
+	}
+
+	height, err := service.SolGetBlockHeight()
+	if err != nil {
+		log.Sugar.Warnf("[ListenSolJob] get Solana block height failed: %v", err)
+	} else {
+		data.RecordRpcBlockHeight(mdb.NetworkSolana, height)
 	}
-	walletAddress, err := data.GetAvailableWalletAddressByNetwork(mdb.NetworkSolana)
-	if err != nil {
-		log.Sugar.Errorf("[ListenSolJob] Failed to get wallet addresses: %v", err)
-		return
-	}
-	if len(walletAddress) <= 0 {
-		log.Sugar.Debug("[ListenSolJob] No available wallet addresses")
-		return
-	}
-	log.Sugar.Infof("[ListenSolJob] Found %d wallet addresses to monitor", len(walletAddress))
-	var wg sync.WaitGroup
-	for _, address := range walletAddress {
-		log.Sugar.Infof("[ListenSolJob] Listening to address: %s", address.Address)
-		wg.Add(1)
-		go service.SolCallBack(address.Address, &wg)
-	}
-	wg.Wait()
-	log.Sugar.Debug("[ListenSolJob] Job completed")
 }
@@ -0,0 +1,124 @@
+package task
+
+import (
+	"encoding/json"
+	"net/http"
+	"net/http/httptest"
+	"testing"
+
+	"github.com/GMWalletApp/epusdt/internal/testutil"
+	"github.com/GMWalletApp/epusdt/model/dao"
+	"github.com/GMWalletApp/epusdt/model/data"
+	"github.com/GMWalletApp/epusdt/model/mdb"
+)
+
+func TestListenSolJobRecordsRuntimeBlockHeight(t *testing.T) {
+	cleanup := testutil.SetupTestDatabases(t)
+	defer cleanup()
+	data.ResetRpcRuntimeStatsForTest()
+	t.Cleanup(data.ResetRpcRuntimeStatsForTest)
+
+	methodCalls := make(map[string]int)
+	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		var req struct {
+			Method string `json:"method"`
+		}
+		_ = json.NewDecoder(r.Body).Decode(&req)
+		methodCalls[req.Method]++
+
+		w.Header().Set("Content-Type", "application/json")
+		if req.Method == "getBlockHeight" {
+			_ = json.NewEncoder(w).Encode(map[string]interface{}{
+				"jsonrpc": "2.0",
+				"id":      1,
+				"result":  int64(654321),
+			})
+			return
+		}
+
+		_ = json.NewEncoder(w).Encode(map[string]interface{}{
+			"jsonrpc": "2.0",
+			"id":      1,
+			"result": []map[string]interface{}{
+				{
+					"signature": "solana-test-signature",
+					"slot":      uint64(123456),
+					"err": map[string]interface{}{
+						"InstructionError": []interface{}{0, "Custom"},
+					},
+					"blockTime": nil,
+				},
+			},
+		})
+	}))
+	defer server.Close()
+
+	if err := dao.Mdb.Create(&mdb.RpcNode{
+		Network: mdb.NetworkSolana,
+		Url:     server.URL,
+		Type:    mdb.RpcNodeTypeHttp,
+		Weight:  1,
+		Enabled: true,
+		Purpose: mdb.RpcNodePurposeGeneral,
+		Status:  mdb.RpcNodeStatusOk,
+	}).Error; err != nil {
+		t.Fatalf("seed solana rpc_node: %v", err)
+	}
+	if err := dao.Mdb.Create(&mdb.WalletAddress{
+		Network: mdb.NetworkSolana,
+		Address: "SolTestAddress001",
+		Status:  mdb.TokenStatusEnable,
+	}).Error; err != nil {
+		t.Fatalf("seed solana wallet: %v", err)
+	}
+	if err := dao.Mdb.Create(&mdb.ChainToken{
+		Network:         mdb.NetworkSolana,
+		Symbol:          "SOL",
+		ContractAddress: "",
+		Decimals:        9,
+		Enabled:         true,
+	}).Error; err != nil {
+		t.Fatalf("seed solana chain_token: %v", err)
+	}
+
+	ListenSolJob{}.Run()
+
+	if methodCalls["getSignaturesForAddress"] != 1 {
+		t.Fatalf("getSignaturesForAddress calls = %d, want 1", methodCalls["getSignaturesForAddress"])
+	}
+	if methodCalls["getBlockHeight"] != 1 {
+		t.Fatalf("getBlockHeight calls = %d, want 1", methodCalls["getBlockHeight"])
+	}
+
+	stats := data.SnapshotRpcRuntimeStats()
+	solana := stats[mdb.NetworkSolana]
+	if solana.SuccessCount != 2 {
+		t.Fatalf("solana success_count = %d, want 2", solana.SuccessCount)
+	}
+	if solana.FailureCount != 0 {
+		t.Fatalf("solana failure_count = %d, want 0", solana.FailureCount)
+	}
+	if solana.LatestBlockHeight != 654321 {
+		t.Fatalf("solana latest_block_height = %d, want 654321", solana.LatestBlockHeight)
+	}
+	if solana.LastSyncAt.IsZero() {
+		t.Fatal("solana last_sync_at is zero")
+	}
+}
+
+func TestRecordSolanaLatestBlockHeightSkipsWhenPreviousStatsRunning(t *testing.T) {
+	cleanup := testutil.SetupTestDatabases(t)
+	defer cleanup()
+	data.ResetRpcRuntimeStatsForTest()
+	t.Cleanup(data.ResetRpcRuntimeStatsForTest)
+
+	gSolanaBlockHeightLock <- struct{}{}
+	defer func() { <-gSolanaBlockHeightLock }()
+
+	recordSolanaLatestBlockHeight()
+
+	stats := data.SnapshotRpcRuntimeStats()
+	if _, ok := stats[mdb.NetworkSolana]; ok {
+		t.Fatalf("solana stats = %#v, want no stats when height reporter is already running", stats[mdb.NetworkSolana])
+	}
+}
@@ -0,0 +1,574 @@
+package task
+
+import (
+	"context"
+	"encoding/hex"
+	"fmt"
+	"sort"
+	"strings"
+	"sync"
+	"time"
+
+	"github.com/GMWalletApp/epusdt/model/data"
+	"github.com/GMWalletApp/epusdt/model/mdb"
+	"github.com/GMWalletApp/epusdt/model/service"
+	addressutil "github.com/GMWalletApp/epusdt/util/address"
+	"github.com/GMWalletApp/epusdt/util/log"
+	"github.com/xssnick/tonutils-go/address"
+	"github.com/xssnick/tonutils-go/ton"
+	"github.com/xssnick/tonutils-go/ton/jetton"
+)
+
+const (
+	tonMasterShard           = int64(-0x8000000000000000)
+	tonScannerConnectTimeout = 20 * time.Second
+	tonScannerRequestTimeout = 15 * time.Second
+	tonScannerRetryDelay     = 3 * time.Second
+	tonCatchupYield          = 250 * time.Millisecond
+	tonMaxMasterBlocksTick   = uint32(50)
+	tonBlockTxPageSize       = uint32(256)
+)
+
+type tonWatchState struct {
+	wallets      map[string]*address.Address
+	nativeToken  *mdb.ChainToken
+	jettonTokens []mdb.ChainToken
+}
+
+func (s *tonWatchState) hasWalletInWorkchain(workchain int32) bool {
+	if s == nil {
+		return false
+	}
+	for _, wallet := range s.wallets {
+		if wallet != nil && wallet.Workchain() == workchain {
+			return true
+		}
+	}
+	return false
+}
+
+type tonRuntimeCursor struct {
+	initialized     bool
+	lastMasterSeqNo uint32
+	shardSeqNo      map[string]uint32
+}
+
+func (c *tonRuntimeCursor) ensureShardSeqNo() {
+	if c.shardSeqNo == nil {
+		c.shardSeqNo = make(map[string]uint32)
+	}
+}
+
+type tonJettonWalletCache struct {
+	sync.Mutex
+	walletByOwnerToken map[string]string
+}
+
+func newTonJettonWalletCache() *tonJettonWalletCache {
+	return &tonJettonWalletCache{walletByOwnerToken: make(map[string]string)}
+}
+
+// StartTonBlockScannerListener runs a forward-only TON masterchain scanner.
+func StartTonBlockScannerListener() {
+	cache := newTonJettonWalletCache()
+	cursor := &tonRuntimeCursor{}
+	for {
+		chain, interval := tonChainConfig()
+		if chain == nil || !chain.Enabled {
+			sleepOrDone(context.Background(), interval)
+			continue
+		}
+		node, ok := resolveTonLiteNode()
+		if !ok {
+			sleepOrDone(context.Background(), interval)
+			continue
+		}
+		log.Sugar.Infof("[TON] connecting using lite node %s", data.RpcNodeLogLabel(node))
+		api, closeFn, err := connectTonLiteAPI(node)
+		if err != nil {
+			log.Sugar.Warnf("[TON] connect lite node %s failed: %v", data.RpcNodeLogLabel(node), err)
+			recordTonLiteNodeFailure(node, "connect")
+			sleepOrDone(context.Background(), tonScannerRetryDelay)
+			continue
+		}
+		log.Sugar.Infof("[TON] connected using lite node %s", data.RpcNodeLogLabel(node))
+		err = runTonScanner(context.Background(), api, cache, cursor)
+		closeFn()
+		if err != nil {
+			log.Sugar.Warnf("[TON] scanner stopped: %v", err)
+			recordTonLiteNodeFailure(node, err.Error())
+			sleepOrDone(context.Background(), tonScannerRetryDelay)
+			continue
+		}
+	}
+}
+
+func runTonScanner(ctx context.Context, api ton.APIClientWrapped, cache *tonJettonWalletCache, cursor *tonRuntimeCursor) error {
+	if cursor == nil {
+		cursor = &tonRuntimeCursor{}
+	}
+	watchSignature := ""
+	for {
+		chain, interval := tonChainConfig()
+		if chain == nil || !chain.Enabled {
+			return nil
+		}
+		state, err := loadTonWatchState()
+		if err != nil {
+			return err
+		}
+		if len(state.wallets) == 0 || (state.nativeToken == nil && len(state.jettonTokens) == 0) {
+			log.Sugar.Debug("[TON] no enabled wallets or tokens, idling")
+			if !sleepOrDone(ctx, interval) {
+				return nil
+			}
+			continue
+		}
+		if sig := tonWatchStateSignature(state); sig != watchSignature {
+			watchSignature = sig
+			log.Sugar.Infof(
+				"[TON] watching wallets=%d native_ton=%t jetton_tokens=%d wallet_workchains=%s",
+				len(state.wallets),
+				state.nativeToken != nil,
+				len(state.jettonTokens),
+				tonWalletWorkchainSummary(state),
+			)
+		}
+
+		head, err := api.CurrentMasterchainInfo(ctx)
+		if err != nil {
+			data.RecordRpcFailure(mdb.NetworkTon)
+			return fmt.Errorf("current masterchain info: %w", err)
+		}
+		confirmedHeadSeqNo := tonConfirmedMasterSeqNo(head.SeqNo, chain.MinConfirmations)
+		data.RecordRpcSuccess(mdb.NetworkTon)
+		data.RecordRpcBlockHeight(mdb.NetworkTon, int64(head.SeqNo))
+
+		if !cursor.initialized {
+			if err = initializeTonRuntimeCursor(ctx, api, head, confirmedHeadSeqNo, cursor); err != nil {
+				data.RecordRpcFailure(mdb.NetworkTon)
+				return err
+			}
+			log.Sugar.Infof(
+				"[TON] current masterchain head=%d confirmed=%d root=%s file=%s",
+				head.SeqNo,
+				confirmedHeadSeqNo,
+				shortTonHash(head.RootHash),
+				shortTonHash(head.FileHash),
+			)
+			log.Sugar.Infof("[TON] initialized runtime cursor at masterchain seqno=%d head=%d", cursor.lastMasterSeqNo, head.SeqNo)
+			if !sleepOrDone(ctx, interval) {
+				return nil
+			}
+			continue
+		}
+		if cursor.lastMasterSeqNo >= confirmedHeadSeqNo {
+			if !sleepOrDone(ctx, interval) {
+				return nil
+			}
+			continue
+		}
+
+		target := cursor.lastMasterSeqNo + tonMaxMasterBlocksTick
+		if target > confirmedHeadSeqNo {
+			target = confirmedHeadSeqNo
+		}
+		log.Sugar.Infof("[TON] processing masterchain blocks from=%d to=%d head=%d confirmed=%d", cursor.lastMasterSeqNo+1, target, head.SeqNo, confirmedHeadSeqNo)
+		for seq := cursor.lastMasterSeqNo + 1; seq <= target; seq++ {
+			master, err := api.WaitForBlock(seq).LookupBlock(ctx, address.MasterchainID, tonMasterShard, seq)
+			if err != nil {
+				data.RecordRpcFailure(mdb.NetworkTon)
+				return fmt.Errorf("lookup masterchain seqno=%d: %w", seq, err)
+			}
+			if err = processTonMasterBlockWithCursor(ctx, api, master, state, cache, cursor); err != nil {
+				data.RecordRpcFailure(mdb.NetworkTon)
+				return fmt.Errorf("process masterchain seqno=%d: %w", seq, err)
+			}
+			cursor.lastMasterSeqNo = master.SeqNo
+			data.RecordRpcSuccess(mdb.NetworkTon)
+			data.RecordRpcBlockHeight(mdb.NetworkTon, int64(seq))
+		}
+		if target < confirmedHeadSeqNo {
+			if !sleepOrDone(ctx, tonCatchupYield) {
+				return nil
+			}
+		}
+	}
+}
+
+func tonConfirmedMasterSeqNo(headSeqNo uint32, minConfirmations int) uint32 {
+	if minConfirmations <= 1 {
+		return headSeqNo
+	}
+	conf := uint32(minConfirmations)
+	if headSeqNo < conf-1 {
+		return 0
+	}
+	return headSeqNo - conf + 1
+}
+
+func initializeTonRuntimeCursor(ctx context.Context, api ton.APIClientWrapped, head *ton.BlockIDExt, confirmedHeadSeqNo uint32, cursor *tonRuntimeCursor) error {
+	if cursor == nil {
+		return nil
+	}
+	if head == nil {
+		return fmt.Errorf("current masterchain head is nil")
+	}
+	initMaster := head
+	if confirmedHeadSeqNo > 0 && confirmedHeadSeqNo != head.SeqNo {
+		var err error
+		initMaster, err = api.WaitForBlock(confirmedHeadSeqNo).LookupBlock(ctx, address.MasterchainID, tonMasterShard, confirmedHeadSeqNo)
+		if err != nil {
+			return fmt.Errorf("lookup initial confirmed masterchain seqno=%d: %w", confirmedHeadSeqNo, err)
+		}
+	}
+	if confirmedHeadSeqNo > 0 {
+		if err := initializeTonShardCursors(ctx, api, initMaster, cursor); err != nil {
+			return fmt.Errorf("initialize shard cursors masterchain seqno=%d: %w", initMaster.SeqNo, err)
+		}
+	}
+	cursor.initialized = true
+	cursor.lastMasterSeqNo = confirmedHeadSeqNo
+	return nil
+}
+
+func processTonMasterBlock(ctx context.Context, api ton.APIClientWrapped, master *ton.BlockIDExt, state *tonWatchState, cache *tonJettonWalletCache) error {
+	return processTonMasterBlockWithCursor(ctx, api, master, state, cache, nil)
+}
+
+func processTonMasterBlockWithCursor(ctx context.Context, api ton.APIClientWrapped, master *ton.BlockIDExt, state *tonWatchState, cache *tonJettonWalletCache, cursor *tonRuntimeCursor) error {
+	if state.hasWalletInWorkchain(address.MasterchainID) {
+		if err := processTonShardBlock(ctx, api, master, master, state, cache); err != nil {
+			return fmt.Errorf("process masterchain transactions: %w", err)
+		}
+	}
+	shards, err := api.WaitForBlock(master.SeqNo).GetBlockShardsInfo(ctx, master)
+	if err != nil {
+		return err
+	}
+	log.Sugar.Debugf(
+		"[TON] masterchain seqno=%d root=%s file=%s shard_blocks=%d workchains=%s",
+		master.SeqNo,
+		shortTonHash(master.RootHash),
+		shortTonHash(master.FileHash),
+		len(shards),
+		tonShardWorkchainSummary(shards),
+	)
+	if cursor != nil {
+		return processTonShardBlocksWithCursor(ctx, api, master, shards, state, cache, cursor)
+	}
+	for _, shard := range shards {
+		if err = processTonShardBlock(ctx, api, master, shard, state, cache); err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+func initializeTonShardCursors(ctx context.Context, api ton.APIClientWrapped, master *ton.BlockIDExt, cursor *tonRuntimeCursor) error {
+	if cursor == nil || master == nil {
+		return nil
+	}
+	shards, err := api.WaitForBlock(master.SeqNo).GetBlockShardsInfo(ctx, master)
+	if err != nil {
+		return err
+	}
+	cursor.ensureShardSeqNo()
+	for _, shard := range shards {
+		if shard == nil {
+			continue
+		}
+		cursor.shardSeqNo[tonShardCursorKey(shard)] = shard.SeqNo
+	}
+	log.Sugar.Infof(
+		"[TON] initialized shard cursors masterchain seqno=%d shard_blocks=%d workchains=%s",
+		master.SeqNo,
+		len(shards),
+		tonShardWorkchainSummary(shards),
+	)
+	return nil
+}
+
+func processTonShardBlocksWithCursor(ctx context.Context, api ton.APIClientWrapped, master *ton.BlockIDExt, shards []*ton.BlockIDExt, state *tonWatchState, cache *tonJettonWalletCache, cursor *tonRuntimeCursor) error {
+	if cursor == nil {
+		return nil
+	}
+	cursor.ensureShardSeqNo()
+	for _, shard := range shards {
+		if shard == nil {
+			continue
+		}
+		key := tonShardCursorKey(shard)
+		lastSeqNo, ok := cursor.shardSeqNo[key]
+		if !state.hasWalletInWorkchain(shard.Workchain) {
+			cursor.shardSeqNo[key] = shard.SeqNo
+			continue
+		}
+
+		start := shard.SeqNo
+		if ok {
+			if shard.SeqNo <= lastSeqNo {
+				continue
+			}
+			start = lastSeqNo + 1
+		}
+		if shard.SeqNo > start {
+			log.Sugar.Infof(
+				"[TON] processing shard blocks master_seqno=%d workchain=%d shard=%x from=%d to=%d",
+				master.SeqNo,
+				shard.Workchain,
+				uint64(shard.Shard),
+				start,
+				shard.SeqNo,
+			)
+		}
+		for seq := start; seq <= shard.SeqNo; seq++ {
+			shardBlock := shard
+			if seq != shard.SeqNo {
+				var err error
+				shardBlock, err = api.WaitForBlock(master.SeqNo).LookupBlock(ctx, shard.Workchain, shard.Shard, seq)
+				if err != nil {
+					return fmt.Errorf("lookup shard block workchain=%d shard=%x seqno=%d: %w", shard.Workchain, uint64(shard.Shard), seq, err)
+				}
+			}
+			if err := processTonShardBlock(ctx, api, master, shardBlock, state, cache); err != nil {
+				return err
+			}
+			cursor.shardSeqNo[key] = seq
+		}
+	}
+	return nil
+}
+
+func processTonShardBlock(ctx context.Context, api ton.APIClientWrapped, master, shard *ton.BlockIDExt, state *tonWatchState, cache *tonJettonWalletCache) error {
+	log.Sugar.Debugf("[TON] scanning shard master_seqno=%d workchain=%d shard=%d shard_seqno=%d", master.SeqNo, shard.Workchain, shard.Shard, shard.SeqNo)
+	var after *ton.TransactionID3
+	for {
+		shorts, incomplete, err := api.WaitForBlock(master.SeqNo).GetBlockTransactionsV2(ctx, shard, tonBlockTxPageSize, after)
+		if err != nil {
+			return err
+		}
+		for i := range shorts {
+			account := addressutil.TonAddressFromShortAccount(shard.Workchain, shorts[i].Account)
+			if account == nil {
+				continue
+			}
+			receive, ok := state.wallets[addressutil.TonRawAddressObjectKey(account)]
+			if !ok {
+				continue
+			}
+			log.Sugar.Debugf("[TON] watched account tx candidate master_seqno=%d workchain=%d shard=%d lt=%d account=%s", master.SeqNo, shard.Workchain, shard.Shard, shorts[i].LT, addressutil.TonRawAddressObjectKey(account))
+			tx, err := api.WaitForBlock(master.SeqNo).GetTransaction(ctx, shard, account, shorts[i].LT)
+			if err != nil {
+				return err
+			}
+			if tx == nil {
+				return fmt.Errorf("missing full transaction workchain=%d shard=%d seqno=%d lt=%d", shard.Workchain, shard.Shard, shard.SeqNo, shorts[i].LT)
+			}
+			jettonWallets, err := cache.jettonWalletTokens(ctx, api, master, receive, state.jettonTokens)
+			if err != nil {
+				return err
+			}
+			transfer, err := service.ParseTonInboundTransfer(tx, receive, state.nativeToken, jettonWallets)
+			if err != nil {
+				log.Sugar.Warnf("[TON] parse inbound tx lt=%d hash=%s: %v", tx.LT, hex.EncodeToString(tx.Hash), err)
+				continue
+			}
+			if transfer == nil {
+				log.Sugar.Debugf(
+					"[TON] unsupported watched tx master_seqno=%d workchain=%d shard=%d lt=%d hash=%s account=%s",
+					master.SeqNo,
+					shard.Workchain,
+					shard.Shard,
+					tx.LT,
+					hex.EncodeToString(tx.Hash),
+					addressutil.TonRawAddressObjectKey(account),
+				)
+				continue
+			}
+			service.TryProcessTonTransfer(transfer)
+		}
+		if !incomplete {
+			return nil
+		}
+		if len(shorts) == 0 {
+			return fmt.Errorf("incomplete transaction page without cursor progress workchain=%d shard=%d seqno=%d", shard.Workchain, shard.Shard, shard.SeqNo)
+		}
+		after = shorts[len(shorts)-1].ID3()
+	}
+}
+
+func (c *tonJettonWalletCache) jettonWalletTokens(ctx context.Context, api ton.APIClientWrapped, master *ton.BlockIDExt, owner *address.Address, tokens []mdb.ChainToken) (map[string]mdb.ChainToken, error) {
+	out := make(map[string]mdb.ChainToken, len(tokens))
+	ownerRaw := addressutil.TonRawAddressObjectKey(owner)
+	for _, token := range tokens {
+		masterParsed, err := addressutil.ParseTonMainnetAddress(token.ContractAddress)
+		if err != nil {
+			return nil, fmt.Errorf("invalid jetton master symbol=%s address=%s: %w", token.Symbol, token.ContractAddress, err)
+		}
+		cacheKey := masterParsed.Raw + "|" + ownerRaw
+		c.Lock()
+		walletRaw, ok := c.walletByOwnerToken[cacheKey]
+		c.Unlock()
+		if !ok {
+			wallet, err := jetton.NewJettonMasterClient(api, masterParsed.Address).GetJettonWalletAtBlock(ctx, owner, master)
+			if err != nil {
+				return nil, fmt.Errorf("derive jetton wallet symbol=%s owner=%s: %w", token.Symbol, ownerRaw, err)
+			}
+			walletRaw = addressutil.TonRawAddressObjectKey(wallet.Address())
+			c.Lock()
+			c.walletByOwnerToken[cacheKey] = walletRaw
+			c.Unlock()
+		}
+		out[walletRaw] = token
+	}
+	return out, nil
+}
+
+func loadTonWatchState() (*tonWatchState, error) {
+	walletRows, err := data.GetAvailableWalletAddressByNetwork(mdb.NetworkTon)
+	if err != nil {
+		return nil, err
+	}
+	tokens, err := data.ListEnabledChainTokensByNetwork(mdb.NetworkTon)
+	if err != nil {
+		return nil, err
+	}
+	state := &tonWatchState{wallets: make(map[string]*address.Address)}
+	for _, row := range walletRows {
+		parsed, err := addressutil.ParseTonMainnetAddress(row.Address)
+		if err != nil {
+			log.Sugar.Warnf("[TON] skip invalid wallet address=%s err=%v", row.Address, err)
+			continue
+		}
+		state.wallets[parsed.Raw] = parsed.Address
+	}
+	for i := range tokens {
+		sym := strings.ToUpper(strings.TrimSpace(tokens[i].Symbol))
+		contract := strings.TrimSpace(tokens[i].ContractAddress)
+		switch {
+		case sym == service.TonNativeSymbol && contract == "":
+			token := tokens[i]
+			state.nativeToken = &token
+		case contract != "":
+			state.jettonTokens = append(state.jettonTokens, tokens[i])
+		}
+	}
+	return state, nil
+}
+
+func tonChainConfig() (*mdb.Chain, time.Duration) {
+	row, err := data.GetChainByNetwork(mdb.NetworkTon)
+	if err != nil || row.ID == 0 {
+		return nil, 5 * time.Second
+	}
+	interval := time.Duration(row.ScanIntervalSec) * time.Second
+	if interval <= 0 {
+		interval = 5 * time.Second
+	}
+	return row, interval
+}
+
+func tonWatchStateSignature(state *tonWatchState) string {
+	if state == nil {
+		return ""
+	}
+	return fmt.Sprintf("%d|%t|%d|%s", len(state.wallets), state.nativeToken != nil, len(state.jettonTokens), tonWalletWorkchainSummary(state))
+}
+
+func tonWalletWorkchainSummary(state *tonWatchState) string {
+	if state == nil || len(state.wallets) == 0 {
+		return "none"
+	}
+	counts := make(map[int32]int)
+	for _, wallet := range state.wallets {
+		if wallet == nil {
+			continue
+		}
+		counts[wallet.Workchain()]++
+	}
+	return formatTonWorkchainCounts(counts)
+}
+
+func tonShardWorkchainSummary(shards []*ton.BlockIDExt) string {
+	if len(shards) == 0 {
+		return "none"
+	}
+	counts := make(map[int32]int)
+	for _, shard := range shards {
+		if shard == nil {
+			continue
+		}
+		counts[shard.Workchain]++
+	}
+	return formatTonWorkchainCounts(counts)
+}
+
+func tonShardCursorKey(shard *ton.BlockIDExt) string {
+	if shard == nil {
+		return ""
+	}
+	return fmt.Sprintf("%d:%d", shard.Workchain, shard.Shard)
+}
+
+func formatTonWorkchainCounts(counts map[int32]int) string {
+	if len(counts) == 0 {
+		return "none"
+	}
+	workchains := make([]int, 0, len(counts))
+	for workchain := range counts {
+		workchains = append(workchains, int(workchain))
+	}
+	sort.Ints(workchains)
+	parts := make([]string, 0, len(workchains))
+	for _, workchain := range workchains {
+		parts = append(parts, fmt.Sprintf("%d:%d", workchain, counts[int32(workchain)]))
+	}
+	return strings.Join(parts, ",")
+}
+
+func shortTonHash(raw []byte) string {
+	hash := hex.EncodeToString(raw)
+	if len(hash) > 16 {
+		return hash[:16]
+	}
+	if hash == "" {
+		return "-"
+	}
+	return hash
+}
+
+func resolveTonLiteNode(excludeIDs ...uint64) (mdb.RpcNode, bool) {
+	node, err := data.SelectGeneralRpcNode(mdb.NetworkTon, mdb.RpcNodeTypeLite, excludeIDs...)
+	if err == nil && node != nil && node.ID > 0 {
+		node.Url = strings.TrimSpace(node.Url)
+		if node.Url != "" {
+			return *node, true
+		}
+		log.Sugar.Errorf("[TON] rpc_nodes id=%d has empty url", node.ID)
+		return mdb.RpcNode{}, false
+	}
+	if err != nil {
+		log.Sugar.Errorf("[TON] resolve lite rpc_nodes err=%v", err)
+	} else {
+		log.Sugar.Warn("[TON] no enabled lite RPC node configured in rpc_nodes")
+	}
+	return mdb.RpcNode{}, false
+}
+
+func connectTonLiteAPI(node mdb.RpcNode) (ton.APIClientWrapped, func(), error) {
+	ctx, cancel := context.WithTimeout(context.Background(), tonScannerConnectTimeout)
+	defer cancel()
+	return service.ConnectTonLiteAPI(ctx, node.Url, tonScannerRequestTimeout, 5)
+}
+
+func recordTonLiteNodeFailure(node mdb.RpcNode, reason string) {
+	data.RecordRpcFailure(mdb.NetworkTon)
+	failures, cooling := data.RecordRpcNodeFailure(node.ID)
+	nodeLabel := data.RpcNodeLogLabel(node)
+	if cooling {
+		log.Sugar.Warnf("[TON] lite node reached fail threshold (%s), node=%s failures=%d/%d", reason, nodeLabel, failures, data.RpcFailoverThreshold)
+		return
+	}
+	log.Sugar.Warnf("[TON] lite node failed (%s), node=%s failures=%d/%d", reason, nodeLabel, failures, data.RpcFailoverThreshold)
+}
@@ -0,0 +1,717 @@
+package task
+
+import (
+	"bytes"
+	"context"
+	"encoding/hex"
+	"errors"
+	"fmt"
+	"math/big"
+	"testing"
+	"time"
+
+	"github.com/GMWalletApp/epusdt/internal/testutil"
+	"github.com/GMWalletApp/epusdt/model/dao"
+	"github.com/GMWalletApp/epusdt/model/data"
+	"github.com/GMWalletApp/epusdt/model/mdb"
+	"github.com/GMWalletApp/epusdt/model/request"
+	"github.com/GMWalletApp/epusdt/model/service"
+	addressutil "github.com/GMWalletApp/epusdt/util/address"
+	"github.com/xssnick/tonutils-go/address"
+	"github.com/xssnick/tonutils-go/tlb"
+	"github.com/xssnick/tonutils-go/ton"
+	"github.com/xssnick/tonutils-go/ton/jetton"
+	"github.com/xssnick/tonutils-go/tvm/cell"
+)
+
+type fakeTonShardAPI struct {
+	ton.APIClientWrapped
+	shorts             []ton.TransactionShortInfo
+	shortsByShardSeq   map[uint32][]ton.TransactionShortInfo
+	incomplete         bool
+	shards             []*ton.BlockIDExt
+	shardsErr          error
+	lookupBlocks       map[uint32]*ton.BlockIDExt
+	lookupSeqs         []uint32
+	txByLT             map[uint64]*tlb.Transaction
+	fetchedLTs         []uint64
+	fetchedAddrs       []string
+	fetchedShardSeqNos []uint32
+}
+
+type fakeTonScannerAPI struct {
+	ton.APIClientWrapped
+	head              *ton.BlockIDExt
+	shards            []*ton.BlockIDExt
+	shardsErr         error
+	lookups           []uint32
+	cancel            context.CancelFunc
+	cancelAtLookupSeq uint32
+}
+
+func (f *fakeTonScannerAPI) CurrentMasterchainInfo(context.Context) (*ton.BlockIDExt, error) {
+	return f.head, nil
+}
+
+func (f *fakeTonScannerAPI) WaitForBlock(uint32) ton.APIClientWrapped {
+	return f
+}
+
+func (f *fakeTonScannerAPI) LookupBlock(_ context.Context, workchain int32, shard int64, seqno uint32) (*ton.BlockIDExt, error) {
+	f.lookups = append(f.lookups, seqno)
+	if f.cancel != nil && f.cancelAtLookupSeq == seqno {
+		f.cancel()
+	}
+	return &ton.BlockIDExt{
+		Workchain: workchain,
+		Shard:     shard,
+		SeqNo:     seqno,
+		RootHash:  bytes.Repeat([]byte{byte(seqno)}, 32),
+		FileHash:  bytes.Repeat([]byte{byte(seqno + 1)}, 32),
+	}, nil
+}
+
+func (f *fakeTonScannerAPI) GetBlockShardsInfo(context.Context, *ton.BlockIDExt) ([]*ton.BlockIDExt, error) {
+	if f.shardsErr != nil {
+		return nil, f.shardsErr
+	}
+	return f.shards, nil
+}
+
+func (f *fakeTonShardAPI) WaitForBlock(uint32) ton.APIClientWrapped {
+	return f
+}
+
+func (f *fakeTonShardAPI) GetBlockTransactionsV2(_ context.Context, block *ton.BlockIDExt, _ uint32, _ ...*ton.TransactionID3) ([]ton.TransactionShortInfo, bool, error) {
+	if block != nil {
+		f.fetchedShardSeqNos = append(f.fetchedShardSeqNos, block.SeqNo)
+	}
+	return f.blockShorts(block), f.incomplete, nil
+}
+
+func (f *fakeTonShardAPI) blockShorts(block *ton.BlockIDExt) []ton.TransactionShortInfo {
+	if block != nil && f.shortsByShardSeq != nil {
+		if shorts, ok := f.shortsByShardSeq[block.SeqNo]; ok {
+			return shorts
+		}
+	}
+	return f.shorts
+}
+
+func (f *fakeTonShardAPI) GetBlockShardsInfo(context.Context, *ton.BlockIDExt) ([]*ton.BlockIDExt, error) {
+	if f.shardsErr != nil {
+		return nil, f.shardsErr
+	}
+	return f.shards, nil
+}
+
+func (f *fakeTonShardAPI) LookupBlock(_ context.Context, workchain int32, shard int64, seqno uint32) (*ton.BlockIDExt, error) {
+	f.lookupSeqs = append(f.lookupSeqs, seqno)
+	if f.lookupBlocks != nil {
+		if block, ok := f.lookupBlocks[seqno]; ok {
+			return block, nil
+		}
+	}
+	return &ton.BlockIDExt{Workchain: workchain, Shard: shard, SeqNo: seqno}, nil
+}
+
+func (f *fakeTonShardAPI) GetTransaction(_ context.Context, _ *ton.BlockIDExt, addr *address.Address, lt uint64) (*tlb.Transaction, error) {
+	f.fetchedLTs = append(f.fetchedLTs, lt)
+	f.fetchedAddrs = append(f.fetchedAddrs, addressutil.TonRawAddressObjectKey(addr))
+	tx := f.txByLT[lt]
+	if tx == nil {
+		return nil, fmt.Errorf("missing tx lt=%d", lt)
+	}
+	return tx, nil
+}
+
+func seedTonScannerWallet(t *testing.T) {
+	t.Helper()
+	if _, err := data.AddWalletAddressWithNetwork(mdb.NetworkTon, "EQC6KV4zs8TJtSZapOrRFmqSkxzpq-oSCoxekQRKElf4nC1I"); err != nil {
+		t.Fatalf("seed TON wallet: %v", err)
+	}
+}
+
+func TestResolveTonLiteNodeSkipsCoolingPrimary(t *testing.T) {
+	cleanup := testutil.SetupTestDatabases(t)
+	defer cleanup()
+	data.ResetRpcFailoverForTest()
+	t.Cleanup(data.ResetRpcFailoverForTest)
+
+	rows := []mdb.RpcNode{
+		{Network: mdb.NetworkTon, Url: " https://primary-ton.example.com/global.config.json ", Type: mdb.RpcNodeTypeLite, Weight: 100, Enabled: true, Purpose: mdb.RpcNodePurposeGeneral, Status: mdb.RpcNodeStatusOk},
+		{Network: mdb.NetworkTon, Url: "https://backup-ton.example.com/global.config.json", Type: mdb.RpcNodeTypeLite, Weight: 1, Enabled: true, Purpose: mdb.RpcNodePurposeGeneral, Status: mdb.RpcNodeStatusOk},
+		{Network: mdb.NetworkTon, Url: "https://manual-ton.example.com/global.config.json", Type: mdb.RpcNodeTypeLite, Weight: 1000, Enabled: true, Purpose: mdb.RpcNodePurposeManualVerify, Status: mdb.RpcNodeStatusOk},
+		{Network: mdb.NetworkTon, Url: "https://http-ton.example.com", Type: mdb.RpcNodeTypeHttp, Weight: 2000, Enabled: true, Purpose: mdb.RpcNodePurposeGeneral, Status: mdb.RpcNodeStatusOk},
+	}
+	if err := dao.Mdb.Create(&rows).Error; err != nil {
+		t.Fatalf("seed rpc_nodes: %v", err)
+	}
+
+	primary, ok := resolveTonLiteNode()
+	if !ok {
+		t.Fatalf("resolveTonLiteNode() ok=false, want true")
+	}
+	if primary.Url != "https://primary-ton.example.com/global.config.json" {
+		t.Fatalf("primary node = %#v, want trimmed primary lite node", primary)
+	}
+	for i := 0; i < data.RpcFailoverThreshold; i++ {
+		data.RecordRpcNodeFailure(primary.ID)
+	}
+
+	got, ok := resolveTonLiteNode()
+	if !ok {
+		t.Fatalf("resolveTonLiteNode() after cooldown ok=false, want true")
+	}
+	if got.Url != "https://backup-ton.example.com/global.config.json" {
+		t.Fatalf("resolveTonLiteNode() after cooldown = %#v, want backup lite node", got)
+	}
+}
+
+func TestRunTonScannerInitializesCursorAtCurrentHead(t *testing.T) {
+	cleanup := testutil.SetupTestDatabases(t)
+	defer cleanup()
+	seedTonScannerWallet(t)
+
+	ctx, cancel := context.WithCancel(context.Background())
+	cancel()
+	api := &fakeTonScannerAPI{head: &ton.BlockIDExt{
+		Workchain: address.MasterchainID,
+		Shard:     tonMasterShard,
+		SeqNo:     77,
+		RootHash:  bytes.Repeat([]byte{0x77}, 32),
+		FileHash:  bytes.Repeat([]byte{0x78}, 32),
+	}}
+	cursor := &tonRuntimeCursor{}
+	if err := runTonScanner(ctx, api, newTonJettonWalletCache(), cursor); err != nil {
+		t.Fatalf("runTonScanner(): %v", err)
+	}
+	if !cursor.initialized {
+		t.Fatal("cursor not initialized")
+	}
+	if cursor.lastMasterSeqNo != 77 {
+		t.Fatalf("cursor seqno = %d, want 77", cursor.lastMasterSeqNo)
+	}
+	if len(api.lookups) != 0 {
+		t.Fatalf("initial cursor should not backfill, lookups=%#v", api.lookups)
+	}
+}
+
+func TestRunTonScannerIdleStatesPreserveInitializedCursor(t *testing.T) {
+	tests := []struct {
+		name  string
+		setup func(t *testing.T)
+	}{
+		{
+			name: "chain disabled",
+			setup: func(t *testing.T) {
+				t.Helper()
+				seedTonScannerWallet(t)
+				if err := data.UpdateChainFields(mdb.NetworkTon, map[string]interface{}{"enabled": false}); err != nil {
+					t.Fatalf("disable TON chain: %v", err)
+				}
+			},
+		},
+		{
+			name: "no enabled wallets",
+			setup: func(t *testing.T) {
+				t.Helper()
+			},
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			cleanup := testutil.SetupTestDatabases(t)
+			defer cleanup()
+			tt.setup(t)
+
+			ctx, cancel := context.WithCancel(context.Background())
+			cancel()
+			api := &fakeTonScannerAPI{
+				head: &ton.BlockIDExt{Workchain: address.MasterchainID, Shard: tonMasterShard, SeqNo: 11},
+			}
+			cursor := &tonRuntimeCursor{initialized: true, lastMasterSeqNo: 10}
+			if err := runTonScanner(ctx, api, newTonJettonWalletCache(), cursor); err != nil {
+				t.Fatalf("runTonScanner(): %v", err)
+			}
+			if !cursor.initialized || cursor.lastMasterSeqNo != 10 {
+				t.Fatalf("cursor changed during idle state: initialized=%v seqno=%d, want initialized=true seqno=10", cursor.initialized, cursor.lastMasterSeqNo)
+			}
+		})
+	}
+}
+
+func TestRunTonScannerDoesNotAdvanceCursorOnMasterProcessingFailure(t *testing.T) {
+	cleanup := testutil.SetupTestDatabases(t)
+	defer cleanup()
+	seedTonScannerWallet(t)
+
+	api := &fakeTonScannerAPI{
+		head:      &ton.BlockIDExt{Workchain: address.MasterchainID, Shard: tonMasterShard, SeqNo: 11},
+		shardsErr: errors.New("shard fetch failed"),
+	}
+	cursor := &tonRuntimeCursor{initialized: true, lastMasterSeqNo: 10}
+	err := runTonScanner(context.Background(), api, newTonJettonWalletCache(), cursor)
+	if err == nil {
+		t.Fatal("expected scanner failure")
+	}
+	if cursor.lastMasterSeqNo != 10 {
+		t.Fatalf("cursor advanced after failed block: %d, want 10", cursor.lastMasterSeqNo)
+	}
+
+	ctx, cancel := context.WithCancel(context.Background())
+	cancel()
+	api = &fakeTonScannerAPI{
+		head:   &ton.BlockIDExt{Workchain: address.MasterchainID, Shard: tonMasterShard, SeqNo: 11},
+		shards: nil,
+	}
+	if err := runTonScanner(ctx, api, newTonJettonWalletCache(), cursor); err != nil {
+		t.Fatalf("runTonScanner retry: %v", err)
+	}
+	if len(api.lookups) != 1 || api.lookups[0] != 11 {
+		t.Fatalf("retry lookups = %#v, want [11]", api.lookups)
+	}
+	if cursor.lastMasterSeqNo != 11 {
+		t.Fatalf("cursor seqno after retry = %d, want 11", cursor.lastMasterSeqNo)
+	}
+}
+
+func TestRunTonScannerDoesNotMarkCursorInitializedOnInitialShardFailure(t *testing.T) {
+	cleanup := testutil.SetupTestDatabases(t)
+	defer cleanup()
+	seedTonScannerWallet(t)
+
+	api := &fakeTonScannerAPI{
+		head:      &ton.BlockIDExt{Workchain: address.MasterchainID, Shard: tonMasterShard, SeqNo: 11},
+		shardsErr: errors.New("initial shard fetch failed"),
+	}
+	cursor := &tonRuntimeCursor{}
+	err := runTonScanner(context.Background(), api, newTonJettonWalletCache(), cursor)
+	if err == nil {
+		t.Fatal("expected scanner failure")
+	}
+	if cursor.initialized {
+		t.Fatal("cursor was marked initialized after failed initial shard cursor setup")
+	}
+	if cursor.lastMasterSeqNo != 0 {
+		t.Fatalf("cursor master seqno = %d, want 0", cursor.lastMasterSeqNo)
+	}
+}
+
+func TestRunTonScannerRespectsMinConfirmations(t *testing.T) {
+	cleanup := testutil.SetupTestDatabases(t)
+	defer cleanup()
+	seedTonScannerWallet(t)
+	if err := data.UpdateChainFields(mdb.NetworkTon, map[string]interface{}{"min_confirmations": 3}); err != nil {
+		t.Fatalf("set TON min confirmations: %v", err)
+	}
+
+	ctx, cancel := context.WithCancel(context.Background())
+	cancel()
+	api := &fakeTonScannerAPI{
+		head: &ton.BlockIDExt{Workchain: address.MasterchainID, Shard: tonMasterShard, SeqNo: 12},
+	}
+	cursor := &tonRuntimeCursor{initialized: true, lastMasterSeqNo: 10}
+	if err := runTonScanner(ctx, api, newTonJettonWalletCache(), cursor); err != nil {
+		t.Fatalf("runTonScanner(): %v", err)
+	}
+	if len(api.lookups) != 0 {
+		t.Fatalf("scanner processed unconfirmed blocks, lookups=%#v", api.lookups)
+	}
+	if cursor.lastMasterSeqNo != 10 {
+		t.Fatalf("cursor seqno = %d, want 10", cursor.lastMasterSeqNo)
+	}
+}
+
+func TestRunTonScannerCatchupProcessesAtMostFiftyMasterBlocksPerTick(t *testing.T) {
+	cleanup := testutil.SetupTestDatabases(t)
+	defer cleanup()
+	seedTonScannerWallet(t)
+
+	ctx, cancel := context.WithCancel(context.Background())
+	cancel()
+	api := &fakeTonScannerAPI{
+		head:   &ton.BlockIDExt{Workchain: address.MasterchainID, Shard: tonMasterShard, SeqNo: 100},
+		shards: nil,
+	}
+	cursor := &tonRuntimeCursor{initialized: true, lastMasterSeqNo: 1}
+	if err := runTonScanner(ctx, api, newTonJettonWalletCache(), cursor); err != nil {
+		t.Fatalf("runTonScanner(): %v", err)
+	}
+	if len(api.lookups) != int(tonMaxMasterBlocksTick) {
+		t.Fatalf("lookup count = %d, want %d", len(api.lookups), tonMaxMasterBlocksTick)
+	}
+	if cursor.lastMasterSeqNo != 51 {
+		t.Fatalf("cursor seqno = %d, want 51", cursor.lastMasterSeqNo)
+	}
+}
+
+func TestRunTonScannerCatchupContinuesUntilConfirmedHead(t *testing.T) {
+	cleanup := testutil.SetupTestDatabases(t)
+	defer cleanup()
+	seedTonScannerWallet(t)
+
+	ctx, cancel := context.WithCancel(context.Background())
+	api := &fakeTonScannerAPI{
+		head:              &ton.BlockIDExt{Workchain: address.MasterchainID, Shard: tonMasterShard, SeqNo: 60},
+		shards:            nil,
+		cancel:            cancel,
+		cancelAtLookupSeq: 60,
+	}
+	cursor := &tonRuntimeCursor{initialized: true, lastMasterSeqNo: 1}
+	if err := runTonScanner(ctx, api, newTonJettonWalletCache(), cursor); err != nil {
+		t.Fatalf("runTonScanner(): %v", err)
+	}
+	if len(api.lookups) != 59 {
+		t.Fatalf("lookup count = %d, want 59", len(api.lookups))
+	}
+	if api.lookups[0] != 2 || api.lookups[len(api.lookups)-1] != 60 {
+		t.Fatalf("lookups = %#v, want continuous 2..60", api.lookups)
+	}
+	for i, seq := range api.lookups {
+		want := uint32(i + 2)
+		if seq != want {
+			t.Fatalf("lookup[%d] = %d, want %d", i, seq, want)
+		}
+	}
+	if cursor.lastMasterSeqNo != 60 {
+		t.Fatalf("cursor seqno = %d, want 60", cursor.lastMasterSeqNo)
+	}
+}
+
+func TestProcessTonShardBlockFetchesOnlyWatchedWalletTransactions(t *testing.T) {
+	cleanup := testutil.SetupTestDatabases(t)
+	defer cleanup()
+
+	receive := address.MustParseAddr("EQC6KV4zs8TJtSZapOrRFmqSkxzpq-oSCoxekQRKElf4nC1I")
+	unwatched := address.NewAddress(0, byte(receive.Workchain()), bytes.Repeat([]byte{0x77}, 32)).Bounce(false).Testnet(false)
+	sender := address.NewAddress(0, byte(receive.Workchain()), bytes.Repeat([]byte{0x88}, 32)).Bounce(false).Testnet(false)
+
+	tx := &tlb.Transaction{
+		LT:   2,
+		Now:  uint32(time.Now().Unix()),
+		Hash: bytes.Repeat([]byte{0x99}, 32),
+		IO: struct {
+			In  *tlb.Message      `tlb:"maybe ^"`
+			Out *tlb.MessagesList `tlb:"maybe ^"`
+		}{
+			In: &tlb.Message{
+				MsgType: tlb.MsgTypeInternal,
+				Msg: &tlb.InternalMessage{
+					SrcAddr: sender,
+					DstAddr: receive,
+					Amount:  tlb.MustFromTON("1"),
+					Body:    cell.BeginCell().EndCell(),
+				},
+			},
+		},
+	}
+
+	api := &fakeTonShardAPI{
+		shorts: []ton.TransactionShortInfo{
+			{Account: unwatched.Data(), LT: 1, Hash: bytes.Repeat([]byte{0x01}, 32)},
+			{Account: receive.Data(), LT: 2, Hash: bytes.Repeat([]byte{0x02}, 32)},
+		},
+		txByLT: map[uint64]*tlb.Transaction{2: tx},
+	}
+	state := &tonWatchState{
+		wallets: map[string]*address.Address{
+			addressutil.TonRawAddressObjectKey(receive): receive,
+		},
+		nativeToken: &mdb.ChainToken{BaseModel: mdb.BaseModel{ID: 1}, Network: mdb.NetworkTon, Symbol: service.TonNativeSymbol, Decimals: 9, Enabled: true},
+	}
+
+	master := &ton.BlockIDExt{Workchain: address.MasterchainID, Shard: tonMasterShard, SeqNo: 10}
+	shard := &ton.BlockIDExt{Workchain: receive.Workchain(), Shard: 0, SeqNo: 9}
+	err := processTonShardBlock(context.Background(), api, master, shard, state, newTonJettonWalletCache())
+	if err != nil {
+		t.Fatalf("processTonShardBlock(): %v", err)
+	}
+	if len(api.fetchedLTs) != 1 || api.fetchedLTs[0] != 2 {
+		t.Fatalf("fetched LTs = %#v, want [2]", api.fetchedLTs)
+	}
+	if len(api.fetchedAddrs) != 1 || api.fetchedAddrs[0] != addressutil.TonRawAddressObjectKey(receive) {
+		t.Fatalf("fetched addresses = %#v, want watched receive address", api.fetchedAddrs)
+	}
+}
+
+func TestProcessTonMasterBlockWithCursorScansSkippedShardBlocks(t *testing.T) {
+	receive := address.MustParseAddr("EQC6KV4zs8TJtSZapOrRFmqSkxzpq-oSCoxekQRKElf4nC1I")
+	sender := address.NewAddress(0, byte(receive.Workchain()), bytes.Repeat([]byte{0x88}, 32)).Bounce(false).Testnet(false)
+	txHash := bytes.Repeat([]byte{0x42}, 32)
+	tx := &tlb.Transaction{
+		LT:   88,
+		Now:  uint32(time.Now().Unix()),
+		Hash: txHash,
+		IO: struct {
+			In  *tlb.Message      `tlb:"maybe ^"`
+			Out *tlb.MessagesList `tlb:"maybe ^"`
+		}{
+			In: &tlb.Message{
+				MsgType: tlb.MsgTypeInternal,
+				Msg: &tlb.InternalMessage{
+					SrcAddr: sender,
+					DstAddr: receive,
+					Amount:  tlb.MustFromTON("1"),
+					Body:    cell.BeginCell().EndCell(),
+				},
+			},
+		},
+	}
+
+	currentShard := &ton.BlockIDExt{Workchain: receive.Workchain(), Shard: tonMasterShard, SeqNo: 89}
+	skippedShard := &ton.BlockIDExt{Workchain: receive.Workchain(), Shard: tonMasterShard, SeqNo: 88}
+	api := &fakeTonShardAPI{
+		shards:       []*ton.BlockIDExt{currentShard},
+		lookupBlocks: map[uint32]*ton.BlockIDExt{88: skippedShard},
+		shortsByShardSeq: map[uint32][]ton.TransactionShortInfo{
+			88: {{Account: receive.Data(), LT: tx.LT, Hash: txHash}},
+			89: nil,
+		},
+		txByLT: map[uint64]*tlb.Transaction{tx.LT: tx},
+	}
+	state := &tonWatchState{
+		wallets: map[string]*address.Address{
+			addressutil.TonRawAddressObjectKey(receive): receive,
+		},
+	}
+	cursorKey := tonShardCursorKey(currentShard)
+	cursor := &tonRuntimeCursor{
+		initialized:     true,
+		lastMasterSeqNo: 10,
+		shardSeqNo:      map[string]uint32{cursorKey: 87},
+	}
+
+	master := &ton.BlockIDExt{Workchain: address.MasterchainID, Shard: tonMasterShard, SeqNo: 10}
+	err := processTonMasterBlockWithCursor(context.Background(), api, master, state, newTonJettonWalletCache(), cursor)
+	if err != nil {
+		t.Fatalf("processTonMasterBlockWithCursor(): %v", err)
+	}
+	if len(api.lookupSeqs) != 1 || api.lookupSeqs[0] != 88 {
+		t.Fatalf("lookup shard seqs = %#v, want [88]", api.lookupSeqs)
+	}
+	if len(api.fetchedShardSeqNos) != 2 || api.fetchedShardSeqNos[0] != 88 || api.fetchedShardSeqNos[1] != 89 {
+		t.Fatalf("fetched shard seqs = %#v, want [88 89]", api.fetchedShardSeqNos)
+	}
+	if len(api.fetchedLTs) != 1 || api.fetchedLTs[0] != tx.LT {
+		t.Fatalf("fetched LTs = %#v, want [%d]", api.fetchedLTs, tx.LT)
+	}
+	if cursor.shardSeqNo[cursorKey] != 89 {
+		t.Fatalf("shard cursor = %d, want 89", cursor.shardSeqNo[cursorKey])
+	}
+}
+
+func TestProcessTonShardBlockMatchesJettonUSDTOrder(t *testing.T) {
+	cleanup := testutil.SetupTestDatabases(t)
+	defer cleanup()
+
+	if err := data.SetSetting("rate", "rate.forced_rate_list", `{"cny":{"usdt":0.1}}`, "json"); err != nil {
+		t.Fatalf("set forced rate: %v", err)
+	}
+	receive := address.MustParseAddr("EQC6KV4zs8TJtSZapOrRFmqSkxzpq-oSCoxekQRKElf4nC1I")
+	if _, err := data.AddWalletAddressWithNetwork(mdb.NetworkTon, receive.StringRaw()); err != nil {
+		t.Fatalf("add ton wallet: %v", err)
+	}
+	resp, err := service.CreateTransaction(&request.CreateTransactionRequest{
+		OrderId:   "order_ton_usdt_shard_1",
+		Currency:  "CNY",
+		Token:     "USDT",
+		Network:   mdb.NetworkTon,
+		Amount:    10,
+		NotifyUrl: "https://93.184.216.34/callback",
+	}, nil)
+	if err != nil {
+		t.Fatalf("create TON USDT order: %v", err)
+	}
+
+	sender := address.NewAddress(0, 0, bytes.Repeat([]byte{0x31}, 32)).Bounce(false).Testnet(false)
+	jettonWallet := address.NewAddress(0, byte(receive.Workchain()), bytes.Repeat([]byte{0x44}, 32)).Bounce(false).Testnet(false)
+	body, err := tlb.ToCell(jetton.TransferNotification{
+		QueryID:        7,
+		Amount:         tlb.MustFromNano(big.NewInt(1_000_000), 6),
+		Sender:         sender,
+		ForwardPayload: cell.BeginCell().EndCell(),
+	})
+	if err != nil {
+		t.Fatalf("build jetton notification body: %v", err)
+	}
+	tx := &tlb.Transaction{
+		LT:   22,
+		Now:  uint32(time.Now().Add(time.Second).Unix()),
+		Hash: bytes.Repeat([]byte{0x42}, 32),
+		IO: struct {
+			In  *tlb.Message      `tlb:"maybe ^"`
+			Out *tlb.MessagesList `tlb:"maybe ^"`
+		}{
+			In: &tlb.Message{
+				MsgType: tlb.MsgTypeInternal,
+				Msg: &tlb.InternalMessage{
+					SrcAddr: jettonWallet,
+					DstAddr: receive,
+					Amount:  tlb.FromNanoTONU(1),
+					Body:    body,
+				},
+			},
+		},
+	}
+
+	usdtMaster, err := addressutil.ParseTonMainnetAddress("0:b113a994b5024a16719f69139328eb759596c38a25f59028b146fecdc3621dfe")
+	if err != nil {
+		t.Fatalf("parse USDT jetton master: %v", err)
+	}
+	cache := newTonJettonWalletCache()
+	ownerRaw := addressutil.TonRawAddressObjectKey(receive)
+	cache.walletByOwnerToken[usdtMaster.Raw+"|"+ownerRaw] = addressutil.TonRawAddressObjectKey(jettonWallet)
+
+	api := &fakeTonShardAPI{
+		shorts: []ton.TransactionShortInfo{
+			{Account: receive.Data(), LT: tx.LT, Hash: tx.Hash},
+		},
+		txByLT: map[uint64]*tlb.Transaction{tx.LT: tx},
+	}
+	state := &tonWatchState{
+		wallets: map[string]*address.Address{
+			ownerRaw: receive,
+		},
+		jettonTokens: []mdb.ChainToken{
+			{BaseModel: mdb.BaseModel{ID: 2}, Network: mdb.NetworkTon, Symbol: "USDT", ContractAddress: usdtMaster.Raw, Decimals: 6, Enabled: true},
+		},
+	}
+	master := &ton.BlockIDExt{Workchain: address.MasterchainID, Shard: tonMasterShard, SeqNo: 10}
+	shard := &ton.BlockIDExt{Workchain: receive.Workchain(), Shard: 0, SeqNo: 9}
+	if err := processTonShardBlock(context.Background(), api, master, shard, state, cache); err != nil {
+		t.Fatalf("processTonShardBlock(): %v", err)
+	}
+
+	order, err := data.GetOrderInfoByTradeId(resp.TradeId)
+	if err != nil {
+		t.Fatalf("reload order: %v", err)
+	}
+	if order.Status != mdb.StatusPaySuccess {
+		t.Fatalf("order status = %d, want %d", order.Status, mdb.StatusPaySuccess)
+	}
+	wantBlockID := service.TonCanonicalBlockTransactionID(receive.StringRaw(), tx.LT, hex.EncodeToString(tx.Hash))
+	if order.BlockTransactionId != wantBlockID {
+		t.Fatalf("block transaction id = %q, want %q", order.BlockTransactionId, wantBlockID)
+	}
+	lock, err := data.GetTradeIdByWalletAddressAndAmountAndToken(mdb.NetworkTon, receive.StringRaw(), "USDT", resp.ActualAmount)
+	if err != nil {
+		t.Fatalf("lookup TON USDT lock: %v", err)
+	}
+	if lock != "" {
+		t.Fatalf("TON USDT lock still exists after shard processing: %s", lock)
+	}
+}
+
+func TestProcessTonMasterBlockScansMasterchainWalletTransactions(t *testing.T) {
+	cleanup := testutil.SetupTestDatabases(t)
+	defer cleanup()
+
+	masterchainID := address.MasterchainID
+	masterchainByte := byte(int8(masterchainID))
+	receive := address.NewAddress(0, masterchainByte, bytes.Repeat([]byte{0x66}, 32)).Bounce(false).Testnet(false)
+	sender := address.NewAddress(0, masterchainByte, bytes.Repeat([]byte{0x88}, 32)).Bounce(false).Testnet(false)
+	tx := &tlb.Transaction{
+		LT:   2,
+		Now:  uint32(time.Now().Unix()),
+		Hash: bytes.Repeat([]byte{0x99}, 32),
+		IO: struct {
+			In  *tlb.Message      `tlb:"maybe ^"`
+			Out *tlb.MessagesList `tlb:"maybe ^"`
+		}{
+			In: &tlb.Message{
+				MsgType: tlb.MsgTypeInternal,
+				Msg: &tlb.InternalMessage{
+					SrcAddr: sender,
+					DstAddr: receive,
+					Amount:  tlb.MustFromTON("1"),
+					Body:    cell.BeginCell().EndCell(),
+				},
+			},
+		},
+	}
+	api := &fakeTonShardAPI{
+		shorts: []ton.TransactionShortInfo{
+			{Account: receive.Data(), LT: 2, Hash: bytes.Repeat([]byte{0x02}, 32)},
+		},
+		txByLT: map[uint64]*tlb.Transaction{2: tx},
+	}
+	state := &tonWatchState{
+		wallets: map[string]*address.Address{
+			addressutil.TonRawAddressObjectKey(receive): receive,
+		},
+		nativeToken: &mdb.ChainToken{BaseModel: mdb.BaseModel{ID: 1}, Network: mdb.NetworkTon, Symbol: service.TonNativeSymbol, Decimals: 9, Enabled: true},
+	}
+
+	master := &ton.BlockIDExt{Workchain: address.MasterchainID, Shard: tonMasterShard, SeqNo: 10}
+	if err := processTonMasterBlock(context.Background(), api, master, state, newTonJettonWalletCache()); err != nil {
+		t.Fatalf("processTonMasterBlock(): %v", err)
+	}
+	if len(api.fetchedLTs) != 1 || api.fetchedLTs[0] != 2 {
+		t.Fatalf("fetched LTs = %#v, want [2]", api.fetchedLTs)
+	}
+	if len(api.fetchedAddrs) != 1 || api.fetchedAddrs[0] != addressutil.TonRawAddressObjectKey(receive) {
+		t.Fatalf("fetched addresses = %#v, want masterchain receive address", api.fetchedAddrs)
+	}
+}
+
+func TestProcessTonShardBlockFailsOnIncompleteEmptyPage(t *testing.T) {
+	api := &fakeTonShardAPI{incomplete: true}
+	state := &tonWatchState{wallets: map[string]*address.Address{}}
+	master := &ton.BlockIDExt{Workchain: address.MasterchainID, Shard: tonMasterShard, SeqNo: 10}
+	shard := &ton.BlockIDExt{Workchain: 0, Shard: 0, SeqNo: 9}
+
+	err := processTonShardBlock(context.Background(), api, master, shard, state, newTonJettonWalletCache())
+	if err == nil {
+		t.Fatal("expected incomplete empty page error")
+	}
+}
+
+func TestProcessTonShardBlockFailsWhenJettonWalletsCannotBeResolved(t *testing.T) {
+	receive := address.MustParseAddr("EQC6KV4zs8TJtSZapOrRFmqSkxzpq-oSCoxekQRKElf4nC1I")
+	sender := address.NewAddress(0, byte(receive.Workchain()), bytes.Repeat([]byte{0x88}, 32)).Bounce(false).Testnet(false)
+	tx := &tlb.Transaction{
+		LT:   2,
+		Now:  uint32(time.Now().Unix()),
+		Hash: bytes.Repeat([]byte{0x99}, 32),
+		IO: struct {
+			In  *tlb.Message      `tlb:"maybe ^"`
+			Out *tlb.MessagesList `tlb:"maybe ^"`
+		}{
+			In: &tlb.Message{
+				MsgType: tlb.MsgTypeInternal,
+				Msg: &tlb.InternalMessage{
+					SrcAddr: sender,
+					DstAddr: receive,
+					Amount:  tlb.MustFromTON("1"),
+					Body:    cell.BeginCell().EndCell(),
+				},
+			},
+		},
+	}
+	api := &fakeTonShardAPI{
+		shorts: []ton.TransactionShortInfo{
+			{Account: receive.Data(), LT: 2, Hash: bytes.Repeat([]byte{0x02}, 32)},
+		},
+		txByLT: map[uint64]*tlb.Transaction{2: tx},
+	}
+	state := &tonWatchState{
+		wallets: map[string]*address.Address{
+			addressutil.TonRawAddressObjectKey(receive): receive,
+		},
+		jettonTokens: []mdb.ChainToken{
+			{BaseModel: mdb.BaseModel{ID: 1}, Network: mdb.NetworkTon, Symbol: "USDT", ContractAddress: "not-a-ton-address", Decimals: 6, Enabled: true},
+		},
+	}
+
+	master := &ton.BlockIDExt{Workchain: address.MasterchainID, Shard: tonMasterShard, SeqNo: 10}
+	shard := &ton.BlockIDExt{Workchain: receive.Workchain(), Shard: 0, SeqNo: 9}
+	err := processTonShardBlock(context.Background(), api, master, shard, state, newTonJettonWalletCache())
+	if err == nil {
+		t.Fatal("expected jetton wallet resolution failure")
+	}
+	if len(api.fetchedLTs) != 1 || api.fetchedLTs[0] != 2 {
+		t.Fatalf("fetched LTs = %#v, want [2]", api.fetchedLTs)
+	}
+}
@@ -12,13 +12,13 @@ import (
 	"time"

 	tron "github.com/GMWalletApp/epusdt/crypto"
+	"github.com/GMWalletApp/epusdt/model/data"
+	"github.com/GMWalletApp/epusdt/model/mdb"
 	"github.com/GMWalletApp/epusdt/model/service"
 	"github.com/GMWalletApp/epusdt/util/log"
 )

 const (
-	// USDT 合约地址 (TRC20 主网)
-	USDTContractHex = "41a614f803b6fd780986a42c78ec9c7f77e6ded13c" // Base58: TR7NHqjeKQxGTCi8q8ZY4pL8otSzgjLj6t
 	// transfer(address,uint256) 方法签名前4字节
 	TransferMethodID = "a9059cbb"

@@ -46,6 +46,31 @@ func HexToTronAddress(hexAddr string) (string, error) {
 	return tron.EncodeCheck(raw), nil
 }

+func TronAddressToHex(addr string) (string, error) {
+	addr = strings.TrimSpace(addr)
+	if addr == "" {
+		return "", fmt.Errorf("地址为空")
+	}
+	raw, err := tron.DecodeCheck(addr)
+	if err != nil {
+		return "", err
+	}
+	if len(raw) != 21 {
+		return "", fmt.Errorf("地址长度非法: %d bytes", len(raw))
+	}
+	if raw[0] != 0x41 {
+		return "", fmt.Errorf("非法 TRON 主网地址前缀: 0x%x", raw[0])
+	}
+	return strings.ToLower(hex.EncodeToString(raw)), nil
+}
+
+func normalizeTronHexAddress(hexAddr string) string {
+	hexAddr = strings.TrimSpace(hexAddr)
+	hexAddr = strings.TrimPrefix(hexAddr, "0x")
+	hexAddr = strings.TrimPrefix(hexAddr, "0X")
+	return strings.ToLower(hexAddr)
+}
+
 type BlockHeader struct {
 	RawData struct {
 		Number         int64  `json:"number"`
@@ -89,12 +114,13 @@ type Block struct {
 	Transactions []Transaction `json:"transactions"`
 }

-type USDTTransfer struct {
+type TRC20Transfer struct {
 	TxID   string
 	From   string
 	To     string
-	Raw    *big.Int // 原始数值（6 decimals）
+	Raw    *big.Int
 	Status string
+	Token  mdb.ChainToken
 }

 type TRXTransfer struct {
@@ -141,22 +167,61 @@ func doPost(url string, apiKey string, body interface{}) ([]byte, error) {
 func GetNowBlock(baseURL string, apiKey string) (*Block, error) {
 	b, err := doPost(baseURL+"/wallet/getnowblock", apiKey, map[string]interface{}{})
 	if err != nil {
+		data.RecordRpcFailure(mdb.NetworkTron)
 		return nil, err
 	}
 	var block Block
-	return &block, json.Unmarshal(b, &block)
+	if err := json.Unmarshal(b, &block); err != nil {
+		data.RecordRpcFailure(mdb.NetworkTron)
+		return nil, err
+	}
+	data.RecordRpcSuccess(mdb.NetworkTron)
+	data.RecordRpcBlockHeight(mdb.NetworkTron, block.BlockHeader.RawData.Number)
+	return &block, nil
 }

 func GetBlockByNum(baseURL string, apiKey string, num int64) (*Block, error) {
 	b, err := doPost(baseURL+"/wallet/getblockbynum", apiKey, map[string]interface{}{"num": num})
 	if err != nil {
+		data.RecordRpcFailure(mdb.NetworkTron)
 		return nil, err
 	}
 	var block Block
-	return &block, json.Unmarshal(b, &block)
+	if err := json.Unmarshal(b, &block); err != nil {
+		data.RecordRpcFailure(mdb.NetworkTron)
+		return nil, err
+	}
+	data.RecordRpcSuccess(mdb.NetworkTron)
+	return &block, nil
 }

-func parseUSDTTransfer(tx Transaction) *USDTTransfer {
+func loadTronTRC20TokenMap() map[string]mdb.ChainToken {
+	tokens, err := data.ListEnabledChainTokensByNetwork(mdb.NetworkTron)
+	if err != nil {
+		log.Sugar.Warnf("[TRON-BLOCK] load chain_tokens: %v", err)
+		return nil
+	}
+	tokenMap := make(map[string]mdb.ChainToken)
+	for _, token := range tokens {
+		symbol := strings.ToUpper(strings.TrimSpace(token.Symbol))
+		contractAddress := strings.TrimSpace(token.ContractAddress)
+		if symbol == "TRX" || contractAddress == "" {
+			continue
+		}
+		contractHex, err := TronAddressToHex(contractAddress)
+		if err != nil {
+			log.Sugar.Warnf("[TRON-BLOCK] skip invalid TRC20 contract symbol=%s address=%s err=%v", symbol, contractAddress, err)
+			continue
+		}
+		tokenMap[contractHex] = token
+	}
+	return tokenMap
+}
+
+func parseTRC20Transfer(tx Transaction, tokenMap map[string]mdb.ChainToken) *TRC20Transfer {
+	if len(tokenMap) == 0 {
+		return nil
+	}
 	if len(tx.RawData.Contract) == 0 {
 		return nil
 	}
@@ -170,9 +235,9 @@ func parseUSDTTransfer(tx Transaction) *USDTTransfer {
 		return nil
 	}

-	// 检查是否是 USDT 合约
-	contractHex := strings.ToLower(strings.TrimPrefix(val.ContractAddress, "0x"))
-	if contractHex != USDTContractHex {
+	contractHex := normalizeTronHexAddress(val.ContractAddress)
+	token, ok := tokenMap[contractHex]
+	if !ok {
 		return nil
 	}

@@ -213,12 +278,13 @@ func parseUSDTTransfer(tx Transaction) *USDTTransfer {
 		status = tx.Ret[0].ContractRet
 	}

-	return &USDTTransfer{
+	return &TRC20Transfer{
 		TxID:   tx.TxID,
 		From:   fromAddr,
 		To:     toAddr,
 		Raw:    amountBig,
 		Status: status,
+		Token:  token,
 	}
 }

@@ -262,14 +328,14 @@ func parseTRXTransfer(tx Transaction) *TRXTransfer {
 	}
 }

-func processBlock(block *Block) {
+func processBlock(block *Block, tokenMap map[string]mdb.ChainToken) {
 	blockTsMs := block.BlockHeader.RawData.Timestamp
 	for _, tx := range block.Transactions {
-		if t := parseUSDTTransfer(tx); t != nil {
+		if t := parseTRC20Transfer(tx, tokenMap); t != nil {
 			if t.Status != "SUCCESS" {
 				continue
 			}
-			service.TryProcessTronTRC20Transfer(t.To, t.Raw, t.TxID, blockTsMs)
+			service.TryProcessTronTRC20Transfer(t.Token, t.To, t.Raw, t.TxID, blockTsMs)
 			continue
 		}
 		if t := parseTRXTransfer(tx); t != nil {
@@ -284,11 +350,13 @@ func processBlock(block *Block) {
 type Scanner struct {
 	baseURL   string
 	apiKey    string
+	nodeID    uint64
+	nodeLabel string
 	lastBlock int64
 	// 统计
-	totalBlocks  int64
-	totalUSDTTxs int64
-	totalTRXTxs  int64
+	totalBlocks   int64
+	totalTRC20Txs int64
+	totalTRXTxs   int64
 }

 func NewScanner() *Scanner {
@@ -296,16 +364,16 @@ func NewScanner() *Scanner {
 }

 func (s *Scanner) Init() error {
-	baseURL, apiKey, err := service.ResolveTronNode()
+	node, err := service.ResolveTronRpcNode()
 	if err != nil {
 		return fmt.Errorf("resolve tron node: %w", err)
 	}
-	s.baseURL = baseURL
-	s.apiKey = apiKey
+	s.useRpcNode(node)

-	log.Sugar.Infof("[TRON-BLOCK] node=%s", s.baseURL)
+	log.Sugar.Infof("[TRON-BLOCK] using RPC node %s", s.nodeLabel)
 	block, err := GetNowBlock(s.baseURL, s.apiKey)
 	if err != nil {
+		s.recordRpcFailure("initial get latest block")
 		return fmt.Errorf("获取初始块失败: %w", err)
 	}
 	s.lastBlock = block.BlockHeader.RawData.Number
@@ -313,8 +381,15 @@ func (s *Scanner) Init() error {
 	return nil
 }

+func (s *Scanner) useRpcNode(node *mdb.RpcNode) {
+	s.baseURL = strings.TrimRight(strings.TrimSpace(node.Url), "/")
+	s.apiKey = node.ApiKey
+	s.nodeID = node.ID
+	s.nodeLabel = data.RpcNodeLogLabel(*node)
+}
+
 func (s *Scanner) Run() {
-	log.Sugar.Info("[TRON-BLOCK] start scanning (USDT TRC20 + TRX)")
+	log.Sugar.Info("[TRON-BLOCK] start scanning (TRC20 + TRX)")
 	ticker := time.NewTicker(PollInterval)
 	defer ticker.Stop()

@@ -324,7 +399,7 @@ func (s *Scanner) Run() {
 	for {
 		select {
 		case <-statTicker.C:
-			log.Sugar.Infof("[TRON-BLOCK] stats blocks=%d usdt=%d trx=%d", s.totalBlocks, s.totalUSDTTxs, s.totalTRXTxs)
+			log.Sugar.Infof("[TRON-BLOCK] stats blocks=%d trc20=%d trx=%d", s.totalBlocks, s.totalTRC20Txs, s.totalTRXTxs)
 		case <-ticker.C:
 			s.poll()
 		}
@@ -335,13 +410,17 @@ func (s *Scanner) poll() {
 	latest, err := GetNowBlock(s.baseURL, s.apiKey)
 	if err != nil {
 		log.Sugar.Warnf("[TRON-BLOCK] get latest block: %v", err)
+		s.recordRpcFailure("get latest block")
 		return
 	}
 	latestNum := latest.BlockHeader.RawData.Number
 	if latestNum <= s.lastBlock {
+		data.RecordRpcNodeSuccess(s.nodeID)
 		return
 	}

+	tokenMap := loadTronTRC20TokenMap()
+	hadBlockFetchError := false
 	for num := s.lastBlock + 1; num <= latestNum; num++ {
 		var block *Block
 		if num == latestNum {
@@ -350,29 +429,58 @@ func (s *Scanner) poll() {
 			block, err = GetBlockByNum(s.baseURL, s.apiKey, num)
 			if err != nil {
 				log.Sugar.Warnf("[TRON-BLOCK] get block %d: %v", num, err)
-				continue
+				hadBlockFetchError = true
+				break
 			}
 			time.Sleep(200 * time.Millisecond)
 		}
-		processBlock(block)
+		processBlock(block, tokenMap)
 		s.lastBlock = num
 		s.totalBlocks++

 		for _, tx := range block.Transactions {
-			if parseUSDTTransfer(tx) != nil {
-				s.totalUSDTTxs++
+			if parseTRC20Transfer(tx, tokenMap) != nil {
+				s.totalTRC20Txs++
 			} else if parseTRXTransfer(tx) != nil {
 				s.totalTRXTxs++
 			}
 		}
 	}
+	if hadBlockFetchError {
+		s.recordRpcFailure("get historical block")
+		return
+	}
+	data.RecordRpcNodeSuccess(s.nodeID)
+}
+
+func (s *Scanner) recordRpcFailure(reason string) {
+	failures, cooling := data.RecordRpcNodeFailure(s.nodeID)
+	if !cooling {
+		log.Sugar.Warnf("[TRON-BLOCK] RPC node failed (%s), node=%s failures=%d/%d", reason, s.nodeLabel, failures, data.RpcFailoverThreshold)
+		return
+	}
+
+	log.Sugar.Warnf("[TRON-BLOCK] RPC node reached fail threshold (%s), node=%s, trying another node", reason, s.nodeLabel)
+	node, err := service.ResolveTronRpcNode(s.nodeID)
+	if err != nil {
+		log.Sugar.Warnf("[TRON-BLOCK] no alternate RPC node available after failure, keep current node=%s: %v", s.nodeLabel, err)
+		return
+	}
+	oldLabel := s.nodeLabel
+	s.useRpcNode(node)
+	log.Sugar.Warnf("[TRON-BLOCK] switched RPC node from %s to %s", oldLabel, s.nodeLabel)
 }

 func StartTronBlockScannerListener() {
-	scanner := NewScanner()
-	if err := scanner.Init(); err != nil {
-		log.Sugar.Errorf("[TRON-BLOCK] init: %v", err)
-		return
+	for {
+		scanner := NewScanner()
+		if err := scanner.Init(); err != nil {
+			log.Sugar.Errorf("[TRON-BLOCK] init: %v, retrying...", err)
+			time.Sleep(10 * time.Second)
+			continue
+		}
+		scanner.Run()
+		log.Sugar.Warn("[TRON-BLOCK] scanner stopped, restarting...")
+		time.Sleep(3 * time.Second)
 	}
-	scanner.Run()
 }
@@ -0,0 +1,176 @@
+package task
+
+import (
+	"encoding/json"
+	"net/http"
+	"net/http/httptest"
+	"testing"
+
+	"github.com/GMWalletApp/epusdt/internal/testutil"
+	"github.com/GMWalletApp/epusdt/model/dao"
+	"github.com/GMWalletApp/epusdt/model/data"
+	"github.com/GMWalletApp/epusdt/model/mdb"
+)
+
+func TestTronScannerSwitchesNodeAfterFailureThreshold(t *testing.T) {
+	cleanup := testutil.SetupTestDatabases(t)
+	defer cleanup()
+	data.ResetRpcFailoverForTest()
+	t.Cleanup(data.ResetRpcFailoverForTest)
+
+	primary := &mdb.RpcNode{
+		Network: mdb.NetworkTron,
+		Url:     "https://primary-tron.example.com",
+		Type:    mdb.RpcNodeTypeHttp,
+		Weight:  100,
+		Enabled: true,
+		Purpose: mdb.RpcNodePurposeGeneral,
+		Status:  mdb.RpcNodeStatusOk,
+	}
+	backup := &mdb.RpcNode{
+		Network: mdb.NetworkTron,
+		Url:     "https://backup-tron.example.com",
+		Type:    mdb.RpcNodeTypeHttp,
+		Weight:  1,
+		Enabled: true,
+		Purpose: mdb.RpcNodePurposeGeneral,
+		Status:  mdb.RpcNodeStatusOk,
+	}
+	if err := dao.Mdb.Create(primary).Error; err != nil {
+		t.Fatalf("seed primary rpc_node: %v", err)
+	}
+	if err := dao.Mdb.Create(backup).Error; err != nil {
+		t.Fatalf("seed backup rpc_node: %v", err)
+	}
+
+	scanner := NewScanner()
+	scanner.useRpcNode(primary)
+	for i := 0; i < data.RpcFailoverThreshold-1; i++ {
+		scanner.recordRpcFailure("test")
+		if scanner.nodeID != primary.ID {
+			t.Fatalf("node switched before threshold to id=%d", scanner.nodeID)
+		}
+	}
+
+	scanner.recordRpcFailure("test")
+	if scanner.nodeID != backup.ID {
+		t.Fatalf("scanner node id = %d, want backup id=%d", scanner.nodeID, backup.ID)
+	}
+	if scanner.baseURL != backup.Url {
+		t.Fatalf("scanner baseURL = %q, want %q", scanner.baseURL, backup.Url)
+	}
+}
+
+func TestTronScannerStopsOnHistoricalBlockFetchError(t *testing.T) {
+	cleanup := testutil.SetupTestDatabases(t)
+	defer cleanup()
+	data.ResetRpcFailoverForTest()
+	t.Cleanup(data.ResetRpcFailoverForTest)
+
+	node := &mdb.RpcNode{
+		Network: mdb.NetworkTron,
+		Type:    mdb.RpcNodeTypeHttp,
+		Weight:  1,
+		Enabled: true,
+		Purpose: mdb.RpcNodePurposeGeneral,
+		Status:  mdb.RpcNodeStatusOk,
+	}
+	if err := dao.Mdb.Create(node).Error; err != nil {
+		t.Fatalf("seed rpc_node: %v", err)
+	}
+
+	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		w.Header().Set("Content-Type", "application/json")
+		switch r.URL.Path {
+		case "/wallet/getnowblock":
+			_ = json.NewEncoder(w).Encode(map[string]interface{}{
+				"block_header": map[string]interface{}{
+					"raw_data": map[string]interface{}{
+						"number":    3,
+						"timestamp": int64(1000),
+					},
+				},
+				"transactions": []interface{}{},
+			})
+		case "/wallet/getblockbynum":
+			http.Error(w, "temporary", http.StatusBadGateway)
+		default:
+			http.NotFound(w, r)
+		}
+	}))
+	defer server.Close()
+
+	node.Url = server.URL
+	scanner := NewScanner()
+	scanner.useRpcNode(node)
+	scanner.lastBlock = 1
+
+	scanner.poll()
+	if scanner.lastBlock != 1 {
+		t.Fatalf("lastBlock = %d, want 1 so failed block is retried", scanner.lastBlock)
+	}
+}
+
+func TestTronRPCRecordsRuntimeStats(t *testing.T) {
+	data.ResetRpcRuntimeStatsForTest()
+	t.Cleanup(data.ResetRpcRuntimeStatsForTest)
+
+	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		w.Header().Set("Content-Type", "application/json")
+		switch r.URL.Path {
+		case "/wallet/getnowblock":
+			_ = json.NewEncoder(w).Encode(map[string]interface{}{
+				"block_header": map[string]interface{}{
+					"raw_data": map[string]interface{}{
+						"number":    10,
+						"timestamp": int64(1000),
+					},
+				},
+				"transactions": []interface{}{},
+			})
+		case "/wallet/getblockbynum":
+			_ = json.NewEncoder(w).Encode(map[string]interface{}{
+				"block_header": map[string]interface{}{
+					"raw_data": map[string]interface{}{
+						"number":    9,
+						"timestamp": int64(1000),
+					},
+				},
+				"transactions": []interface{}{},
+			})
+		default:
+			http.NotFound(w, r)
+		}
+	}))
+	defer server.Close()
+
+	if _, err := GetNowBlock(server.URL, ""); err != nil {
+		t.Fatalf("GetNowBlock(): %v", err)
+	}
+	if _, err := GetBlockByNum(server.URL, "", 9); err != nil {
+		t.Fatalf("GetBlockByNum(): %v", err)
+	}
+
+	failing := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		http.Error(w, "temporary", http.StatusBadGateway)
+	}))
+	defer failing.Close()
+	if _, err := GetBlockByNum(failing.URL, "", 8); err == nil {
+		t.Fatal("GetBlockByNum() error = nil, want failure")
+	}
+
+	stats := data.SnapshotRpcRuntimeStats()
+	tron := stats[mdb.NetworkTron]
+	if tron.SuccessCount != 2 {
+		t.Fatalf("tron success_count = %d, want 2", tron.SuccessCount)
+	}
+	if tron.FailureCount != 1 {
+		t.Fatalf("tron failure_count = %d, want 1", tron.FailureCount)
+	}
+	if tron.LatestBlockHeight != 10 {
+		t.Fatalf("tron latest_block_height = %d, want 10", tron.LatestBlockHeight)
+	}
+	if tron.LastSyncAt.IsZero() {
+		t.Fatal("tron last_sync_at is zero")
+	}
+}
@@ -14,9 +14,9 @@ import (

 const rpcProbeTimeout = 5 * time.Second

-// RpcHealthJob periodically probes every enabled rpc_nodes row and
-// writes status/last_latency_ms. Results drive SelectRpcNode weighted
-// picking at runtime.
+// RpcHealthJob periodically probes enabled general/both rpc_nodes rows.
+// Manual verification nodes are left for on-demand admin checks so paid
+// endpoints are not consumed by the scheduler.
 type RpcHealthJob struct{}

 var gRpcHealthJobLock sync.Mutex
@@ -25,7 +25,7 @@ func (r RpcHealthJob) Run() {
 	gRpcHealthJobLock.Lock()
 	defer gRpcHealthJobLock.Unlock()

-	nodes, err := data.ListRpcNodes("")
+	nodes, err := data.ListRpcNodesForHealth()
 	if err != nil {
 		log.Sugar.Errorf("[rpc-health] list nodes err=%v", err)
 		return
@@ -6,6 +6,7 @@ import (
 	"strings"

 	"github.com/GMWalletApp/epusdt/model/mdb"
+	addressutil "github.com/GMWalletApp/epusdt/util/address"
 	"github.com/btcsuite/btcutil/base58"
 	"github.com/gagliardetto/solana-go"
 )
@@ -53,6 +54,9 @@ func isValidAddressByNetwork(network, addr string) bool {
 		return isValidTronAddress(addr)
 	case mdb.NetworkSolana:
 		return isValidSolanaAddress(addr)
+	case mdb.NetworkTon:
+		_, err := addressutil.ParseTonMainnetAddress(addr)
+		return err == nil
 	default:
 		// 其余 EVM 链统一使用 0x 地址校验
 		return isValidEthereumAddress(addr)
@@ -64,6 +68,11 @@ func normalizeWalletAddressByNetwork(network, addr string) string {
 	switch strings.ToLower(strings.TrimSpace(network)) {
 	case mdb.NetworkTron, mdb.NetworkSolana:
 		return addr
+	case mdb.NetworkTon:
+		if normalized, err := addressutil.NormalizeTonAddress(addr); err == nil {
+			return normalized
+		}
+		return addr
 	default:
 		return strings.ToLower(addr)
 	}
@@ -0,0 +1,135 @@
+package addressutil
+
+import (
+	"encoding/base64"
+	"encoding/binary"
+	"fmt"
+	"strings"
+
+	"github.com/xssnick/tonutils-go/address"
+	"github.com/xssnick/tonutils-go/crc16"
+)
+
+// TonParsedAddress carries the canonical display and raw forms used by epusdt.
+type TonParsedAddress struct {
+	Address *address.Address
+	Display string
+	Raw     string
+}
+
+// ParseTonMainnetAddress accepts raw and user-friendly TON addresses and rejects
+// user-friendly testnet-only addresses. Raw addresses do not contain a testnet
+// flag, so they are treated as mainnet addresses by definition.
+func ParseTonMainnetAddress(input string) (*TonParsedAddress, error) {
+	raw := strings.TrimSpace(input)
+	if raw == "" {
+		return nil, fmt.Errorf("ton address is empty")
+	}
+
+	var (
+		addr       *address.Address
+		err        error
+		checkFlags bool
+	)
+	if strings.Contains(raw, ":") {
+		addr, err = address.ParseRawAddr(raw)
+	} else {
+		addr, err = parseUserFriendly(raw)
+		checkFlags = true
+	}
+	if err != nil {
+		return nil, err
+	}
+	if addr == nil || addr.Type() != address.StdAddress || addr.IsAddrNone() {
+		return nil, fmt.Errorf("unsupported ton address type")
+	}
+	if checkFlags && addr.IsTestnetOnly() {
+		return nil, fmt.Errorf("testnet-only ton address is not supported")
+	}
+
+	mainnet := addr.Bounce(false).Testnet(false)
+	return &TonParsedAddress{
+		Address: mainnet,
+		Display: mainnet.String(),
+		Raw:     strings.ToLower(mainnet.StringRaw()),
+	}, nil
+}
+
+// NormalizeTonAddress returns the canonical user-friendly address stored in DB.
+func NormalizeTonAddress(input string) (string, error) {
+	parsed, err := ParseTonMainnetAddress(input)
+	if err != nil {
+		return "", err
+	}
+	return parsed.Display, nil
+}
+
+// TonRawAddressKey returns the workchain:hash key used for comparisons and locks.
+func TonRawAddressKey(input string) (string, error) {
+	parsed, err := ParseTonMainnetAddress(input)
+	if err != nil {
+		return "", err
+	}
+	return parsed.Raw, nil
+}
+
+// NormalizeTonAddressObject returns the canonical user-friendly form for a parsed
+// address object.
+func NormalizeTonAddressObject(addr *address.Address) string {
+	if addr == nil {
+		return ""
+	}
+	return addr.Bounce(false).Testnet(false).String()
+}
+
+// TonRawAddressObjectKey returns the raw workchain:hash key for a parsed address.
+func TonRawAddressObjectKey(addr *address.Address) string {
+	if addr == nil {
+		return ""
+	}
+	return strings.ToLower(addr.Bounce(false).Testnet(false).StringRaw())
+}
+
+// TonAddressFromShortAccount builds a standard TON address from a shard
+// transaction account id returned by liteserver block transaction lists.
+func TonAddressFromShortAccount(workchain int32, account []byte) *address.Address {
+	if len(account) != 32 {
+		return nil
+	}
+	return address.NewAddress(0, byte(workchain), append([]byte(nil), account...)).Bounce(false).Testnet(false)
+}
+
+func parseUserFriendly(input string) (*address.Address, error) {
+	if addr, err := address.ParseAddr(input); err == nil {
+		return addr, nil
+	}
+	for _, enc := range []*base64.Encoding{
+		base64.RawStdEncoding,
+		base64.StdEncoding,
+		base64.URLEncoding,
+	} {
+		data, err := enc.DecodeString(input)
+		if err != nil {
+			continue
+		}
+		addr, err := addressFromFriendlyBytes(data)
+		if err == nil {
+			return addr, nil
+		}
+	}
+	return nil, fmt.Errorf("invalid ton address")
+}
+
+func addressFromFriendlyBytes(data []byte) (*address.Address, error) {
+	if len(data) != 36 {
+		return nil, fmt.Errorf("incorrect ton address data length")
+	}
+	want := binary.BigEndian.Uint16(data[34:])
+	if crc16.ChecksumXMODEM(data[:34]) != want {
+		return nil, fmt.Errorf("invalid ton address checksum")
+	}
+	if len(data[2:34]) != 32 {
+		return nil, fmt.Errorf("incorrect ton address hash length")
+	}
+	return address.NewAddress(data[0], data[1], append([]byte(nil), data[2:34]...)), nil
+}
@@ -0,0 +1,56 @@
+package addressutil
+
+import (
+	"encoding/base64"
+	"strings"
+	"testing"
+
+	"github.com/xssnick/tonutils-go/address"
+)
+
+const testTonBounceable = "EQC6KV4zs8TJtSZapOrRFmqSkxzpq-oSCoxekQRKElf4nC1I"
+
+func TestParseTonMainnetAddressNormalizesSupportedFormats(t *testing.T) {
+	base := address.MustParseAddr(testTonBounceable)
+	raw := base.StringRaw()
+	nonBounce := base.Bounce(false).String()
+	rawBytes, err := base64.RawURLEncoding.DecodeString(testTonBounceable)
+	if err != nil {
+		t.Fatalf("decode fixture: %v", err)
+	}
+	stdBase64 := base64.RawStdEncoding.EncodeToString(rawBytes)
+
+	for _, input := range []string{testTonBounceable, nonBounce, raw, stdBase64} {
+		parsed, err := ParseTonMainnetAddress(input)
+		if err != nil {
+			t.Fatalf("ParseTonMainnetAddress(%q): %v", input, err)
+		}
+		if parsed.Display != nonBounce {
+			t.Fatalf("display for %q = %q, want %q", input, parsed.Display, nonBounce)
+		}
+		if parsed.Raw != strings.ToLower(raw) {
+			t.Fatalf("raw for %q = %q, want %q", input, parsed.Raw, strings.ToLower(raw))
+		}
+	}
+}
+
+func TestParseTonMainnetAddressRejectsTestnetOnly(t *testing.T) {
+	testnet := address.MustParseAddr(testTonBounceable).Testnet(true).String()
+	if _, err := ParseTonMainnetAddress(testnet); err == nil {
+		t.Fatal("expected testnet-only address to be rejected")
+	}
+}
+
+func TestTonAddressFromShortAccount(t *testing.T) {
+	base := address.MustParseAddr(testTonBounceable)
+	got := TonAddressFromShortAccount(base.Workchain(), base.Data())
+	if got == nil {
+		t.Fatal("TonAddressFromShortAccount() returned nil")
+	}
+	if TonRawAddressObjectKey(got) != TonRawAddressObjectKey(base) {
+		t.Fatalf("raw address = %q, want %q", TonRawAddressObjectKey(got), TonRawAddressObjectKey(base))
+	}
+	if got = TonAddressFromShortAccount(base.Workchain(), base.Data()[:31]); got != nil {
+		t.Fatalf("TonAddressFromShortAccount() with short account = %#v, want nil", got)
+	}
+}
@@ -1,5 +1,7 @@
 package constant

+import "errors"
+
 var Errno = map[int]string{
 	400:   "system error",
 	401:   "signature verification failed",
@@ -18,6 +20,33 @@ var Errno = map[int]string{
 	10013: "order is not awaiting payment",
 	10014: "chain is not enabled",
 	10016: "supported asset not found",
+	10017: "payment provider is not enabled",
+	10018: "payment provider configuration is incomplete",
+	10019: "payment provider does not support this token or network",
+	10020: "invalid rpc node purpose",
+	10021: "invalid rpc node url",
+	10022: "rpc node http url required",
+	10023: "rpc node websocket url required",
+	10024: "invalid rpc node type",
+	10025: "invalid username or password",
+	10026: "admin user disabled",
+	10027: "admin unauthorized",
+	10028: "admin user not found",
+	10029: "old password incorrect",
+	10030: "wallet not found",
+	10031: "api key not found",
+	10032: "rpc node not found",
+	10033: "order callback not applicable",
+	10034: "order notify url empty",
+	10035: "resend callback failed",
+	10036: "invalid notification config",
+	10037: "invalid notification events",
+	10038: "manual payment verification failed",
+	10039: "manual payment only supports on-chain orders",
+	10040: "initial admin password unavailable, check from logs",
+	10041: "invalid notify url",
+	10042: "payment provider order creation failed",
+	10043: "invalid setting item",
 }

 var (
@@ -38,6 +67,33 @@ var (
 	OrderNotWaitPay            = Err(10013)
 	ChainNotEnabled            = Err(10014)
 	SupportedAssetNotFound     = Err(10016)
+	PaymentProviderNotEnabled  = Err(10017)
+	PaymentProviderConfigErr   = Err(10018)
+	PaymentProviderNotSupport  = Err(10019)
+	RpcNodePurposeErr          = Err(10020)
+	RpcNodeURLErr              = Err(10021)
+	RpcNodeHTTPURLErr          = Err(10022)
+	RpcNodeWebSocketURLErr     = Err(10023)
+	RpcNodeTypeErr             = Err(10024)
+	AdminInvalidCredentialErr  = Err(10025)
+	AdminUserDisabledErr       = Err(10026)
+	AdminUnauthorizedErr       = Err(10027)
+	AdminUserNotFoundErr       = Err(10028)
+	AdminOldPasswordErr        = Err(10029)
+	WalletNotFoundErr          = Err(10030)
+	ApiKeyNotFoundErr          = Err(10031)
+	RpcNodeNotFoundErr         = Err(10032)
+	OrderCallbackNotApplicable = Err(10033)
+	OrderNotifyURLEmptyErr     = Err(10034)
+	OrderResendCallbackErr     = Err(10035)
+	NotificationConfigErr      = Err(10036)
+	NotificationEventsErr      = Err(10037)
+	ManualPaymentVerifyErr     = Err(10038)
+	ManualPaymentProviderErr   = Err(10039)
+	InitialAdminPasswordErr    = Err(10040)
+	NotifyURLErr               = Err(10041)
+	PaymentProviderCreateErr   = Err(10042)
+	SettingItemErr             = Err(10043)
 )

 type RspError struct {
@@ -61,6 +117,14 @@ func (re *RspError) Render() (code int, msg string) {
 	return re.Code, re.Msg
 }

+func ResolveErrno(err error) (code int, msg string) {
+	var rspErr *RspError
+	if errors.As(err, &rspErr) {
+		return rspErr.Render()
+	}
+	return SystemErr.(*RspError).Render()
+}
+
 // HttpStatus maps a RspError code to the HTTP status the handler
 // should use on the wire. Small codes (< 1000) are treated as real
 // HTTP status codes (e.g. 400 system error, 401 signature failure) so
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
line-6000	04c2b9b0b6	Merge pull request #87 from GMWalletApp/dev	2026-06-12 00:50:10 +08:00
line-6000	9ac9894dba	feat: add runtime log level settings	2026-06-12 00:49:18 +08:00
line-6000	9b397bd45e	feat: support TON and USDT Jetton payments - add TON chain, token, RPC, address normalization, and order matching support - add liteclient scanner with masterchain/shard catch-up and Jetton validation - add TON manual payment verification and focused tests	2026-06-11 14:47:46 +08:00
line-6000	225cae2c24	Merge pull request #86 from GMWalletApp/dev feat: add in-memory RPC runtime stats SSE endpoint	2026-06-10 00:19:38 +08:00
line-6000	08d409d5eb	feat: add in-memory RPC runtime stats SSE endpoint	2026-06-10 00:18:24 +08:00
line-6000	54b83f8b16	Update README with security audit and screenshots Added security audit section and program screenshots to README.	2026-06-03 21:43:17 +08:00
line-6000	3879853836	Add files	2026-06-03 21:28:24 +08:00
line-6000	2824687d9f	Merge pull request #85 from GMWalletApp/dev feat(www): enable RPC node create and edit actions	2026-06-03 21:01:05 +08:00
line-6000	3e85bf77c2	update www	2026-06-03 20:58:57 +08:00
line-6000	cd44c7c818	Merge pull request #82 from GMWalletApp/dev Dev	2026-05-27 19:41:55 +08:00
line-6000	c69b0d6c0c	feat: isolate manual verification RPC usage - add rpc node purpose support for general/manual_verify/both - keep scan, WSS and health checks away from manual_verify nodes - fallback manual hash verification from general RPC to manual_verify RPC - add public cashier hash submission path and errno responses - update tests for RPC selection, failover and manual payment flows	2026-05-27 19:36:56 +08:00
line-6000	13c81ee560	feat(order): use crypto-random url-safe trade IDs and update docs examples	2026-05-27 02:59:25 +08:00
line-6000	c38f728e10	update www	2026-05-27 02:29:20 +08:00
line-6000	b70995f8e9	fix: aggregate dashboard trends by database dialect	2026-05-27 02:06:31 +08:00
line-6000	fca75a99ea	feat(payment): allow cashier manual tx hash submission	2026-05-26 23:16:10 +08:00
line-6000	8bf2adad89	fix: reject private callback and rate API URLs	2026-05-26 20:54:41 +08:00
Astra3456	0d97237c71	Update supported systems in README	2026-05-26 00:20:53 +10:00
line-6000	c65b07cfe7	Merge pull request #81 from GMWalletApp/dev docs: update payment API integration guide	2026-05-23 17:24:44 +08:00
line-6000	7fcb7b38fe	docs: update payment API integration guide	2026-05-23 17:23:41 +08:00
line-6000	2a00a0332b	Merge pull request #80 from GMWalletApp/dev Dev	2026-05-22 23:14:35 +08:00
line-6000	8a48611625	feat(rate): support multi-currency forced rate list	2026-05-22 23:13:21 +08:00
line-6000	dec1b97b9e	fix: retry Solana signatures after transient processing errors Avoid marking a Solana signature as processed when order matching or OrderProcessing fails with a retryable error. Keep terminal outcomes idempotent while allowing later scans to retry transient failures.	2026-05-22 16:37:50 +08:00
line-6000	449d22a41b	fix: send OkPay payment success notifications	2026-05-22 16:25:23 +08:00
line-6000	4b4701f5b9	fix: skip stale EVM ERC20 transfers before order creation	2026-05-22 15:13:09 +08:00
line-6000	f4ef71b359	fix: accept bare admin JWT authorization header Allow the admin JWT middleware to parse either Authorization: Bearer <jwt> or a bare JWT value, matching the existing comment. Add tests covering both accepted forms plus missing and empty authorization headers.	2026-05-22 15:03:59 +08:00
line-6000	c19a7e5f2c	Merge pull request #73 from GMWalletApp/dev update www	2026-05-21 19:39:48 +08:00
line-6000	09642d4c2b	update www	2026-05-21 19:38:42 +08:00
line-6000	9f9b258d59	Merge pull request #72 from GMWalletApp/dev feat: expose build version in public config	2026-05-21 19:23:58 +08:00
line-6000	85b81e661c	feat: expose build version in public config - add version to public/admin config responses - inject build version in Docker and GoReleaser builds - limit Docker image publishing to v* tags - restore soft-deleted settings on upsert	2026-05-21 19:23:04 +08:00
line-6000	049a15cb95	Merge pull request #70 from GMWalletApp/dev feat: verify manual mark-paid payments	2026-05-21 00:07:09 +08:00
line-6000	2a36a10e7f	feat: verify manual mark-paid payments - add on-chain validation before manual mark-paid - verify recipient address, token contract, amount, confirmations, and tx time - reject duplicate transaction hashes and non on-chain orders - add manual payment verification tests for EVM, TRON, and Solana - change BSC network key to binance - add display_name to supported_assets while keeping network unchanged	2026-05-20 23:48:00 +08:00
line-6000	864eb5969c	Merge pull request #66 from GMWalletApp/dev	2026-05-13 17:00:39 +08:00
line-6000	b0093c48c7	fix: update service worker precache manifest and improve module registration	2026-05-13 16:59:06 +08:00
line-6000	4a69b7c863	Merge pull request #65 from GMWalletApp/dev update readme.md	2026-05-12 15:20:43 +08:00
line-6000	52b171b49b	update readme.md	2026-05-12 15:19:36 +08:00
line-6000	4dc1ba88cd	Merge pull request #64 from GMWalletApp/dev Dev	2026-05-11 18:07:56 +08:00
line-6000	7a905ba307	update www	2026-05-11 18:06:53 +08:00
line-6000	07d1d8345f	update readme.md	2026-05-11 17:23:18 +08:00
line-6000	8d2ddbd045	feat: add configurable payment amount precision - add system.amount_precision setting with 2-6 validation	2026-05-11 17:11:43 +08:00
line-6000	1c805ed061	feat: support background_color background_image_url	2026-05-11 16:03:32 +08:00
line-6000	84972ea0f0	fix: resolve chain tokens dynamically in block listeners - resolve EVM ERC20 tokens by chain_tokens contract_address instead of hardcoded contracts	2026-05-11 13:40:07 +08:00
line-6000	7c9e3e123e	fix: (update tron logic)	2026-05-11 13:16:42 +08:00
line-6000	3e0be9bb20	docs: split README into English and Simplified Chinese versions	2026-05-11 12:45:18 +08:00
line-6000	a8a3b8697f	fix: print initial admin credentials to console on first bootstrap	2026-05-11 12:20:36 +08:00
Astra3456	2d546e3478	Revise disclaimer to add terms of use Updated disclaimer section to include terms of use.	2026-05-10 03:27:25 +10:00
Astra3456	1a35cab919	Update README with project disclaimer and risk information Added a disclaimer regarding the use and risks associated with EPusdt, clarifying its non-profit and open-source nature.	2026-05-10 03:26:50 +10:00
line-6000	ff157c33d9	Remove database config for PostgreSQL and MySQL Removed PostgreSQL and MySQL configuration settings from the example environment file.	2026-05-09 21:46:44 +08:00
line-6000	51ad344b36	Merge pull request #62 from GMWalletApp/pay	2026-05-09 21:28:42 +08:00
mcmc	3623a543bb	feat: expose site config in public/admin config responses	2026-05-09 19:01:53 +08:00
mcmc	377176a0f2	feat: integrate okpay switch-network flow and notify handling	2026-05-09 18:06:27 +08:00
line-6000	a4022df7b4	Change logo source Updated logo source URL in README.	2026-05-07 17:27:39 +08:00
line-6000	32aa1b66f5	Clean up Dockerfile by removing static file copies Remove redundant COPY commands for static files.	2026-05-02 01:51:40 +08:00
Astra3456	53e66bad35	Update disclaimer for clarity and completeness Clarify the disclaimer regarding the use of the project and its risks.	2026-04-29 17:15:56 +10:00