diff --git a/README.md b/README.md index 8b4dc3c..e610c8e 100644 --- a/README.md +++ b/README.md @@ -82,6 +82,10 @@ susdt是一套全部开源的快速开发平台,毫无保留给个人及企业 +## 租赁历史资源证明 + +租赁模块已提供与云端同进程运行的历史资源证明采集,部署与4张增量表设计见 [内置历史证明服务](docs/rental/history-service.md),业务运行说明见 [租赁模块](docs/rental/implementation.md)。 + ## Authenticator 动态码登录 保留密码和 Google 账号登录,新增六位动态码登录及个人中心绑定/解绑。部署前执行 `sql/totp_auth.sql` 并配置 `TOTP_ENCRYPTION_KEY`,详见 [部署与使用说明](docs/totp-login.md)。 diff --git a/docs/rental/history-service.md b/docs/rental/history-service.md new file mode 100644 index 0000000..4452aad --- /dev/null +++ b/docs/rental/history-service.md @@ -0,0 +1,228 @@ +# 云端内置 TRON 历史资源证明服务 + +本功能随现有 Java 8 云端服务启动,复用 MySQL 和只读 TRON RPC,不需要另起一个 Java 服务,也不需要供应商运行 TRON 节点。默认关闭;不持有钱包私钥,不签名、不广播、不执行自动出金。 + +业务16表保持不变,新增4张独立历史表,总计20张租赁相关表。安装脚本为 [rent_history_init.sql](../../sql/rent_history_init.sql),业务基础脚本仍为 [rent_init.sql](../../sql/rent_init.sql)。没有对现有数据库执行这些脚本。 + +## 1. 实现范围与可信前提 + +普通 HTTP RPC 不支持任意历史高度的完整账户/全网资源状态。内置实现采用“实时确认状态采集 + 完整区块事件归档 + 地址对重放”,从启用时开始积累可用的历史证据,不是完整 TRON 归档节点,也不能凭空恢复上线前的历史资源参数。 + +采集必须使用**由运营信任、状态一致的固定 RPC 节点**。`walletsolidity` 读的是最后确认状态,不能用 `wallet` 当前状态替代。公共负载均衡服务即使前后两次确认头相同,也无法证明中间请求一定落在同一后端;生产应使用自己的固定节点或有一致性保证的服务。需要支持以下 POST 接口: + +| 接口 | 用途 | +| --- | --- | +| `/walletsolidity/getnowblock` | 获取确认头高度、区块哈希 | +| `/walletsolidity/getaccountresource` | 获取该确认状态的能量/带宽全网额度和权重 | +| `/walletsolidity/getdelegatedresourcev2` | 读取指定地址对的锁定、非锁定 Stake 2.0 本金 | +| `/walletsolidity/getblockbynum` | 按高度读取确认区块及按序交易、执行回执 | + +示例RPC地址仅表示接口来源,不能据此认为公共服务已通过生产验收。不支持某接口、返回参数不完整或限流时,采集会失败,不用空值伪造成功。 + +全网参数是**交易所在区块执行完成后的确认状态**,不是交易在区块内执行前的瞬时参数,也不是保证整个租期内用户可用资源恒定不变。资源被用户消耗、全网参数后续变化不由这份历史证明保证。 + +## 2. 业务流程 + +1. 采集器读取确认头 H1,读取全网资源参数,再次读取确认头 H2。只有高度和哈希均一致才把参数绑定到该区块。变化时最多重试3次,仍不稳定则放弃这次采样。 +2. 首次采集从当前确认头开始;已有派单前基线时,从最早基线的下一高度开始。以后从数据库游标下一高度补采确认区块。 +3. 每个区块按原交易顺序解析成功的 `DelegateResourceContract` 和 `UnDelegateResourceContract`,保存全网委托/回收事件。相关交易没有完整回执时整个区块不推进。 +4. 写入区块事件、标记区块完整和推进游标在同一事务中完成;父哈希不连续、重复高度哈希不同、同高度参数冲突时拒绝覆盖。 +5. 平台派单前对候选供应钱包/接收地址/资源类型采集确认关系基线,同样使用确认头夹读。锁定与非锁定本金合计必须为0,失败时订单仍等待派单,不先发送任务再补证据。原有当前关系检查继续保留。 +6. 本地 Agent 按原流程执行,云端原有核验继续检查真实交易、owner/receiver、网络、资源类型、非锁定、SUN、回执、确认深度及当前关系。 +7. 内置服务查找目标交易之前最近的关系基线,验证从基线到交易区块的所有区块连续且事件完整,按区块高度和交易序号重放本金变化。目标交易必须真实存在于归档,不能用请求的本金代替事件。 +8. 从目标区块读取当时保存的额度和权重,返回目标交易前后本金及资源参数。云端以原有精确整数公式换算资源,达标且租期未结束时才扣款、记供应商收入。 +9. 完整历史证明进入 `rent_transaction.evidence` JSON,供审计查看;不会把额外证明字段当作交易表的新列写入。 + +```text +派单前确认基线 B + ↓ +连续归档 B+1 … H 的成功委托/回收事件 + ↓ +重放到指定交易 → baseline_sun / after_sun + + +实时采到的区块 H 全网额度 / 权重 + ↓ +完整历史证明 → 原有交付核验与资金状态机 +``` + +公式保持: + +```text +交付资源 = floor(委托本金SUN × 当时全网资源额度 ÷ (当时全网资源权重 × 1,000,000)) +``` + +## 3. 四张表的具体设计 + +### rent_history_cursor:采集进度和网络租约 + +| 字段 | 类型 | 功能 | +| --- | --- | --- | +| network | VARCHAR(16),主键 | NILE/MAINNET,各自独立 | +| scanned_height | BIGINT,可空 | 已完整入库事件的最后区块高度,首次采集前为空 | +| scanned_block_id | VARCHAR(64),可空 | 游标区块哈希,下一块必须引用它 | +| lease_owner | VARCHAR(64),可空 | 本轮采集实例随机令牌 | +| lease_until | DATETIME(3),可空 | 以数据库 UTC 时钟计算的60秒租约 | +| last_success_at | DATETIME(3),可空 | 最近完整区块成功入库时间 | +| last_error | VARCHAR(255),可空 | 脱敏状态,不保存RPC原始异常或密钥 | +| updated_at | DATETIME(3) | 最近更新UTC时间 | + +每网络一次只允许一个实例采集。RPC结束后、落库前持锁检查租约,过期实例不得写入或推进游标;释放租约也匹配原令牌,不能释放新实例的租约。 + +### rent_history_block:区块事实和历史参数 + +| 字段 | 类型 | 功能 | +| --- | --- | --- | +| network + block_height | VARCHAR(16) + BIGINT,复合主键 | 唯一定位网络内区块 | +| block_id / parent_id | VARCHAR(64) | 当前/父区块哈希,检查连续性 | +| block_time | BIGINT | 链上区块时间戳,毫秒 | +| events_complete | TINYINT | 1表示本块全部相关成功事件已完整归档 | +| energy_limit / energy_weight | BIGINT,可空 | 该区块确认状态的全网能量参数 | +| bandwidth_limit / bandwidth_weight | BIGINT,可空 | 该区块确认状态的全网带宽参数 | +| parameters_at | DATETIME(3),可空 | 实时夹读参数成功的UTC时间 | +| created_at | DATETIME(3) | 首次记录UTC时间 | + +唯一索引 `(network, block_id)` 防止同哈希被绑定不同高度。参数全部为空且 `parameters_at` 为空表示**该高度资源参数漏采**,即使区块交易成功补齐也不能把后来参数填入该行。 + +### rent_history_event:全网成功 Stake 2.0 委托事件 + +| 字段 | 类型 | 功能 | +| --- | --- | --- | +| network + tx_id | VARCHAR(16) + VARCHAR(64),复合主键 | 同网络交易幂等去重 | +| block_height / tx_index | BIGINT / INT | 所在区块及原始交易顺序 | +| owner_address / receiver_address | VARCHAR(64) | 统一小写41前缀十六进制地址 | +| resource_type | VARCHAR(16) | ENERGY/BANDWIDTH,分别重放 | +| operation | VARCHAR(16) | DELEGATE/UNDELEGATE | +| amount_sun | BIGINT | 正整数本金,SUN单位 | +| locked | TINYINT | 是否锁定;目标交付交易必须非锁定 | +| created_at | DATETIME(3) | 归档UTC时间 | + +唯一索引 `(network, block_height, tx_index)` 保证位置唯一;关系重放索引为 `(network, owner_address, receiver_address, resource_type, block_height)`。失败交易不改变关系,不记录为成功事件。 + +### rent_history_anchor:派单前关系基线 + +| 字段 | 类型 | 功能 | +| --- | --- | --- | +| network | VARCHAR(16) | 所属网络 | +| owner_address / receiver_address | VARCHAR(64) | 规范化十六进制地址对 | +| resource_type | VARCHAR(16) | 资源类型 | +| block_height | BIGINT | 真实采样的确认区块高度 | +| block_id | VARCHAR(64) | 基线区块哈希 | +| balance_sun | BIGINT | 锁定及非锁定Stake2.0本金合计 | +| created_at | DATETIME(3) | 采样UTC时间 | + +复合主键 `(network, owner_address, receiver_address, resource_type, block_height)`。当前派单只接纳余额0的基线;相同主键的事实必须一致,不能修改旧基线以通过结算。 + +### 表之间及与业务表的协作 + +| 来源 | 去向 | 协作 | +| --- | --- | --- | +| rent_wallet、rent_order | rent_history_anchor | 派单前按钱包地址、接收地址、网络和资源建立基线 | +| rent_history_cursor | rent_history_block | 确定下一采集高度、校验父哈希及网络租约 | +| rent_history_block | rent_history_event | 同事务写入该块全部相关事件后才标记完整 | +| rent_history_anchor + block + event | 内置证明 | 连续区块重放出目标交易前后本金,读取目标区块参数 | +| 内置证明 | rent_transaction、rent_order、rent_account、rent_ledger | 复用既有核验、证据JSON、订单及资金事务,不直接修改业务余额 | + +历史表按网络和链上事实归属,不存在 `user_id`;不生成普通用户任意增删改接口。采用逻辑外键,不影响旧业务表结构。 + +## 4. 安装与同进程部署 + +1. 检查并备份目标数据库;新环境先执行 `sql/rent_init.sql`,再执行 `sql/rent_history_init.sql`。既有业务库只需执行后者,不要重建业务表。 +2. 使用JDK8执行 `mvn -o -pl ruoyi-admin -am package -DskipTests`。当前项目采用瘦JAR加外部依赖目录:部署时同时更新 `ruoyi-admin/target/ruoyi-admin.jar` 和 `ruoyi-admin/target/lib/`,不能只替换入口JAR,否则可能继续加载旧的ruoyi-system。仍使用原来的MySQL和启动方式,载入 `rental` profile,不需要新增独立Java进程。 +3. 设置环境变量,先在NILE验收: + +```text +RENT_ENABLED=true +RENT_HISTORY_EMBEDDED_ENABLED=true +RENT_HISTORY_NETWORKS=NILE +RENT_HISTORY_POLL_MS=1000 +RENT_HISTORY_BATCH_SIZE=30 +RENT_NILE_RPC=https://你的固定且状态一致的TRON-RPC +RENT_RPC_KEY=按所用RPC要求提供 +``` + +`RENT_HISTORY_PROBE_ADDRESS` 可设置为该网络已激活的公开TRON地址,只用于读取全网额度/权重,不需要私钥,不发生扣费。默认是TRON零地址;若节点对未激活地址不返回全网参数,应配置已激活的地址。 + +4. 保留原有主密钥等业务配置。**内置模式不需要设置 `RENT_NILE_HISTORY` 或 `RENT_MAINNET_HISTORY`,不要把它们设为本机HTTP地址。** 代码直接调用内置Java服务,避免自请求、登录认证及线程池依赖。 +5. 使用具有 `rent:manage:audit` 的运营账号调用 `GET /rental/history/status`,确认目标网络产生游标和参数高度,再测试注册、下单、委托及回收。没有新菜单授权要求,复用既有运营核对权限;业务角色不授予这个权限。 +6. 主网验收后显式配置 `RENT_HISTORY_NETWORKS=NILE,MAINNET`,并提供主网RPC。该配置只启用只读采集,不会打开本地Agent的广播授权。 + +完整配置项: + +| 配置 | 默认值 | 说明 | +| --- | --- | --- | +| rental.history.embedded-enabled | false | 开启内置核验;采集器还要求rental.enabled=true | +| rental.history.networks | NILE | 逗号分隔,允许NILE、MAINNET;未启用网络不建立派单基线 | +| rental.history.poll-interval-ms | 1000 | 每网络轮询间隔,允许200至60000毫秒 | +| rental.history.batch-size | 30 | 每轮最多补采区块数,允许1至200 | +| rental.history.probe-address | TRON零地址 | 查询全网参数的公开地址 | +| rental.history.nile/mainnet | 空 | 保留外部历史服务兼容;内置开启时不使用 | + +每个启用网络有独立守护线程,正常关闭时停止线程。网络间互不阻塞;多实例利用数据库租约避免重复扫描。既有Agent WebSocket单入口限制不因历史采集多实例而改变。 + +## 5. 查询接口 + +两接口都要求若依登录态和 `rent:manage:audit`,没有匿名开放,没有供应商写入历史数据的接口。 + +### GET /rental/history/status + +标准若依AjaxResult,data为每网络采集状态:`network`、`scanned_height`、`scanned_block_id`、`last_success_at`、`last_error`、`last_parameter_height`、`parameter_gap_count`。 + +`parameter_gap_count` 为已有完整事件区块中参数为空的区块数,不代表遗漏区块没有交易,也不代表所有订单都会受影响。应监控游标停滞、错误和参数缺口。 + +### POST /rental/resource-proof + +请求: + +```json +{ + "network": "NILE", + "tx_id": "64位十六进制交易哈希", + "block_height": 12345678, + "owner": "供应商Base58地址", + "receiver": "租赁接收Base58地址", + "resource_type": "ENERGY" +} +``` + +成功直接返回证明对象,兼容既有数据字段,另外包含 `network`、`block_id`、`owner`、`receiver`、`resource_type`、`anchor_height` 和 `source=EMBEDDED_SOLIDITY_REPLAY_V1`。不会接受请求方指定的 `baseline_sun`、`after_sun`、额度或权重。 + +该接口用于运营排查,**自动核验不通过此HTTP接口**。它不是原外部无登录RPC模式的替换地址。内部本金、区块高度为精确Java long;HTTP继续复用租赁响应转换器,将BIGINT转为十进制字符串、UTC时间转为ISO8601,并设置no-store。运营脚本应保留精度,不用浮点数解析。 + +## 6. 失败处理与运维边界 + +| 场景 | 行为 | +| --- | --- | +| 扫描游标尚未到交易高度 | 核验抛出待重试错误,原有后台核验下轮继续 | +| 交易高度没有实时历史参数 | 不出具证明;已确认委托进入原有MANUAL_REVIEW,保留冻结资金 | +| 无交易之前的基线 | 不出具证明;不能用交易之后的状态倒造基线 | +| 缺区块、父哈希断裂、目标区块哈希与RPC不符 | 拒绝核验,保留占用和资金,等待运营检查 | +| 同区块同关系在目标交易后继续变化 | 若最终本金不等于目标交易后本金则拒绝证明 | +| 目标交易锁定、交易不存在、资源类型不符 | 拒绝证明 | +| 重放本金为负或整数溢出 | 拒绝证明 | +| 基线到目标区块跨度超过10000 | 拒绝自动重放,避免无界查询 | +| 停机后重启 | 从持久游标补交易;已错过的全网参数保持NULL | + +采集间隔小于出块间隔不保证每个高度都能捕获:节点确认头跳跃、网络慢、RPC限流和采集停机均可能造成参数缺口。生产需要低延迟且有容量保障的RPC,并根据状态接口告警;**本实现不会声称公共RPC轮询等同完整历史归档节点**。需要任意历史补录能力时,应另外建设可回放状态的归档节点/节点侧采集,而不是手工向历史表填当前参数。 + +历史数据没有自动删除策略。单网络每天约有28800个三秒区块,事件量取决于全网委托交易;应评估磁盘、备份与索引容量,保留覆盖所有在途订单和审计周期的数据,不得随意删除基线和重放区块。状态接口中的缺口统计可能随数据规模增加成本,应控制调用频率。 + +## 7. 代码与测试 + +| 文件 | 职责 | +| --- | --- | +| `ruoyi-system/.../rental/RentalHistoryService.java` | 确认状态夹读、不可变入库、网络租约、区块解析、关系重放、证明 | +| `ruoyi-system/.../rental/RentalHistoryCollector.java` | 独立后台线程、分网络轮询、关闭 | +| `ruoyi-system/.../rental/RentalHistoryController.java` | 受保护的状态/证明查询 | +| `RentalChain.java` | 内置/外部证明选择,原链上核验保留 | +| `RentalTasks.java` | 派单前采集基线,完整证明写入evidence JSON | +| `ruoyi-system/src/test/.../rental/RentalHistoryTest.java` | H2真实DDL与SQL、可控RPC隔离测试 | + +运行: + +```shell +mvn -o -pl ruoyi-system -am test -Dtest=RentalHistoryTest,RentalBusinessTest,RentalRolePermissionTest -Dsurefire.failIfNoSpecifiedTests=false +``` + +Windows PowerShell需要给含逗号的 `-Dtest=...` 参数加引号。H2不支持MySQL的UTC_TIMESTAMP,测试仅为该时钟函数注册等价UTC实现,不改变生产SQL。 + +本次JDK8验证:历史服务29项全部通过,云端全回归119项无失败(4项原有外网/手动测试跳过),SQL/文档12项通过,云端package成功;已核对打包lib中的ruoyi-system与本次构建产物一致且包含历史服务类。隔离测试不等同MySQL、固定RPC以及真实NILE端到端验收;本次未执行数据库迁移或任何链上广播。 diff --git a/docs/rental/implementation.md b/docs/rental/implementation.md index 8dabe49..f2fdf4a 100644 --- a/docs/rental/implementation.md +++ b/docs/rental/implementation.md @@ -133,13 +133,15 @@ TASK_PUSH中保留稳定delivery_message_id、原api_key/intent/timestamp/nonce/ Agent事件先落本地可靠队列,云端同事务以 `NODE:nodeId:eventId` 去重后RESULT_ACK。ACK只说明持久接收,ACCEPTED只说明本地接受,BUILT/BROADCASTED/RESULT只说明执行线索。云端另查交易合约、owner/receiver、网络、资源类型、非锁定、SUN、回执、确认深度和关系,不能凭节点消息扣款。 -普通TRON RPC没有任意确认区块的资源历史查询,因此自动交付核验要求 `RENT_NILE_HISTORY` / `RENT_MAINNET_HISTORY` 指向运营自行部署、独立于供应商的可信历史证明服务。后端向 `/rental/resource-proof` POST `network,tx_id,block_height,owner,receiver,resource_type`,服务必须基于该实际区块状态返回: +普通TRON RPC没有任意确认区块的资源历史查询。现已增加与云端同进程部署的内置历史采集/证明服务:执行 `sql/rent_history_init.sql` 增加4张历史表,设置 `RENT_HISTORY_EMBEDDED_ENABLED=true` 和 `RENT_HISTORY_NETWORKS=NILE`。派单前采集确认关系基线,持续归档确认区块和资源参数,交付核验直接调用Java服务;不需要填写 `RENT_NILE_HISTORY` / `RENT_MAINNET_HISTORY`。表设计、接口、配置、采集缺口与部署详见 [内置历史证明服务](history-service.md)。 + +外部服务模式继续兼容:内置关闭时,`RENT_NILE_HISTORY` / `RENT_MAINNET_HISTORY` 可以指向运营部署、独立于供应商的可信历史证明服务。后端向 `/rental/resource-proof` POST `network,tx_id,block_height,owner,receiver,resource_type`,服务必须基于该实际区块状态返回: ```json {"tx_id":"原交易哈希","block_height":123,"baseline_sun":0,"after_sun":1300000000,"total_limit":60000000,"total_weight":1000000} ``` -示例参数不代表当前链。证明服务是外部基础设施契约,仓库没有伪造历史状态或用当前L/W替代的实现。**未配置历史服务时,可以确认真实委托,但订单转MANUAL_REVIEW、保留HELD资金并按原SUN回收,不自动记SUCCESS或供应商收入。** 交易已确认而交付不足、核验时已过期,同样人工隔离。可在确认回收DONE后通过受保护的resolve解冻。外部擅自变更委托关系会告警并转人工,不能任意释放关系占位。 +示例参数不代表当前链。内置实现从启用时开始保存真实确认状态,不会补造上线前或停机期间漏采的全网参数。**未配置历史服务,或内置服务缺少该高度参数/派单前基线时,可以确认真实委托,但订单转MANUAL_REVIEW、保留HELD资金并按原SUN回收,不自动记SUCCESS或供应商收入。** 内置区块尚未采集到交易高度则保持待核验并重试。交易已确认而交付不足、核验时已过期,同样人工隔离。可在确认回收DONE后通过受保护的resolve解冻。外部擅自变更委托关系会告警并转人工,不能任意释放关系占位。 ## 8. 验证与边界 diff --git a/docs/rental/role-permissions.md b/docs/rental/role-permissions.md index 49edc83..af51573 100644 --- a/docs/rental/role-permissions.md +++ b/docs/rental/role-permissions.md @@ -33,6 +33,8 @@ 两个角色均不授予 `rent:manage:*`、`rent:account:topup`、`rent:refund:create`、`rent:refund:approve`、`rent:settlement:create`、`rent:settlement:approve`、`rent:package:edit`。充值审核、退款申请/审批、结算申请/审批及付款由独立运营财务角色处理。外部商户API与Agent WSS分别使用APP/NODE HMAC凭证,不使用若依菜单权限替代协议认证。 +内置历史服务复用运营 `rent:manage:audit` 权限,保护 `GET /rental/history/status` 和 `POST /rental/resource-proof`。供应商、租赁用户不授予此权限,不提供历史表普通CRUD;自动交付核验使用进程内部调用,无需开放匿名证明接口。见 [历史服务部署说明](history-service.md)。 + 旧 `rent:portal:register` 保留兼容既有运营配置;新角色脚本不授予此宽权限,前端根据细分权限显示创建按钮。未执行本脚本或未获 `rent:portal:view` 时,首页提示联系管理员,不调用支付统计接口。 ## 本次验证 diff --git a/docs/rental/schema-design.md b/docs/rental/schema-design.md index 141f80d..5238f3f 100644 --- a/docs/rental/schema-design.md +++ b/docs/rental/schema-design.md @@ -28,6 +28,8 @@ ## 2. 16张表及职责 +以下为业务核心16表。内置历史证明另增加4张只读采集/审计表,独立增量安装,详细字段及协作见 [内置历史服务表设计](history-service.md) 和 [历史DDL](../../sql/rent_history_init.sql)。启用后租赁相关表合计20张,不修改原16表结构。 + | 表 | 作用 | | --- | --- | | rent_app | 独立商户应用,user_id关联sys_user | diff --git a/docs/rental/validation-implementation.md b/docs/rental/validation-implementation.md index 0507486..402d12a 100644 --- a/docs/rental/validation-implementation.md +++ b/docs/rental/validation-implementation.md @@ -1,13 +1,15 @@ # 租赁三端实现验证记录 -验证日期:2026-10-22。以当前工作区为准,不比较历史提交,不操作业务数据库,不执行真实链上广播。 +基础验证日期:2026-10-22;内置历史服务验证更新:2026-10-23。以当前工作区为准,不比较历史提交,不操作业务数据库,不执行真实链上广播。 ## 已执行验证 | 范围 | 命令或方法 | 结果 | | --- | --- | --- | -| Java后端回归 | JDK8,`mvn -o -pl ruoyi-admin -am test -q` | 88项,0失败、0错误,4项原有手动/外网测试跳过 | +| Java后端回归 | JDK8,`mvn -o -pl ruoyi-admin -am test -q` | 119项(system 91 + admin 28),0失败、0错误,4项原有手动/外网测试跳过 | | 新增租赁业务 | `RentalBusinessTest` | 23项,覆盖资金事务、并发、退款/结算、认证、任务恢复及可控Socket | +| 内置历史服务 | `RentalHistoryTest` | 29项,覆盖真实增量DDL、稳定确认头采样、参数缺口、连续区块、回执、幂等、租约、两类资源、基线重放、内置核验接入、运营权限和区块响应上限 | +| 云端打包 | JDK8,`mvn -o -pl ruoyi-admin -am package -DskipTests -q` | 成功;已核对target/lib中的ruoyi-system与构建产物哈希一致,包含历史服务类;部署需要同步入口JAR和lib | | 本地Agent | Node24,`node --test test/agent.test.js` | 10项通过;`node --check src/index.js`通过 | | Vue页面 | 新增API、租赁组件及原菜单包装页ESLint | 通过 | | Vue生产构建 | `vue-cli-service build --mode production --dest D:/myprojects/usdt/.codex-rental-build` | 通过,仅既有Browserslist及体积提示;未覆盖原dist | @@ -21,7 +23,7 @@ - 可控Socket测试不等于公网WSS、TLS代理、网络半开或真实供应商设备联调。 - 前端完成静态检查及生产构建,尚未完成真实浏览器TronLink及全链路人工验收。 - 尚未执行NILE或MAINNET真实委托、回收和USDT转账。 -- 历史资源证明服务是外部依赖,仓库未实现历史节点基础设施。未配置时委托进入人工核对、保留冻结资金,不自动确认收入;实际回收完成后才允许受保护的解冻操作。 +- 已实现云端内置历史采集和证明,使用固定一致性的确认RPC;未部署真实MySQL或固定TRON节点验证。未启用、缺历史参数或缺基线时仍进入人工核对、保留冻结资金,不自动确认收入;实际回收完成后才允许受保护的解冻操作。内置采集不能补造上线前或停机漏采参数,见 [详细边界](history-service.md)。 - 供应商私钥仅在本地Agent使用;广播默认关闭。退款为内部余额操作,外部结算付款由人工执行并核验原交易,不自动出金。 部署步骤及环境变量见 [implementation.md](implementation.md);Agent安装及本地限制见 [Agent README](../../../rent-agent/README.md)。启用前应在独立NILE环境完成上述外部联调。 diff --git a/ruoyi-admin/src/main/resources/application-rental.yml b/ruoyi-admin/src/main/resources/application-rental.yml index 7da013d..7668c22 100644 --- a/ruoyi-admin/src/main/resources/application-rental.yml +++ b/ruoyi-admin/src/main/resources/application-rental.yml @@ -2,16 +2,23 @@ rental: enabled: ${RENT_ENABLED:false} domain: ${RENT_DOMAIN:localhost} - master-key: ${RENT_MASTER_KEY:} + master-key: ${RENT_MASTER_KEY:ZA+5tLy20rbLxsMEvVm7Ow9hl2qtAPD3nmiK1Tf52NA=} master-key-version: ${RENT_MASTER_KEY_VERSION:v1} confirmations: ${RENT_CONFIRMATIONS:19} rpc: nile: ${RENT_NILE_RPC:https://nile.trongrid.io} mainnet: ${RENT_MAINNET_RPC:https://api.trongrid.io} - api-key: ${RENT_RPC_KEY:} + api-key: ${RENT_RPC_KEY:719b2ba2-dedd-48ad-99a6-df1caa6f08ae} history: + # 内置历史采集与云端同进程;先执行sql/rent_history_init.sql。默认关闭,不自动启用主网。 + embedded-enabled: ${RENT_HISTORY_EMBEDDED_ENABLED:false} + networks: ${RENT_HISTORY_NETWORKS:NILE} + poll-interval-ms: ${RENT_HISTORY_POLL_MS:1000} + batch-size: ${RENT_HISTORY_BATCH_SIZE:30} + probe-address: ${RENT_HISTORY_PROBE_ADDRESS:T9yD14Nj9j7xAB4dbGeiX9h8unkKHxuWwb} + # 外部历史服务兼容配置;开启embedded-enabled后走Java内部调用,不需要填写这两项。 nile: ${RENT_NILE_HISTORY:} mainnet: ${RENT_MAINNET_HISTORY:} deposit-address: - nile: ${RENT_NILE_DEPOSIT:} - mainnet: ${RENT_MAINNET_DEPOSIT:} + nile: ${RENT_NILE_DEPOSIT:TSeHZVEWQaCcWQrxevbt9LQfb1YC53ww8a} + mainnet: ${RENT_MAINNET_DEPOSIT:TSeHZVEWQaCcWQrxevbt9LQfb1YC53ww8a} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalChain.java b/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalChain.java index f1b11ed..3a64243 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalChain.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalChain.java @@ -33,6 +33,13 @@ public class RentalChain { @Value("${rental.history.mainnet:}") private String mainHistory; + @Value("${rental.history.embedded-enabled:false}") + private boolean embeddedHistory; + + // 延迟获取内置历史服务,避免历史采集复用本只读RPC适配器时发生构造循环依赖。 + @org.springframework.beans.factory.annotation.Autowired + private org.springframework.beans.factory.ObjectProvider historyService; + @Value("${rental.rpc.api-key:}") private String apiKey; @@ -72,7 +79,9 @@ public class RentalChain { json.writeValueAsString(body))) .build(); try (Response response = client.newCall(request).execute()) { - return json.readTree(RentalHttp.body(response)); + boolean fullBlock = path.endsWith("/getnowblock") || path.endsWith("/getblockbynum"); + return json.readTree(RentalHttp.body(response, + (fullBlock ? 16 : 1) * 1024 * 1024)); } } catch (Exception ex) { throw new IllegalStateException("链上查询失败,保留原业务状态"); @@ -168,6 +177,13 @@ public class RentalChain { return total; } + /** 内置历史模式在派单前建立确认关系基线,RPC失败时继续等待派单,不先广播再补基线。 */ + public void prepareHistory(String network, String owner, String receiver, String resource) { + if (embeddedHistory) { + historyService.getObject().anchor(network, owner, receiver, resource); + } + } + /** 返回CONFIRMED仅代表交易真实成功;历史资源证据不足时delivery_proven=false。 */ public Map verify( Map task, String txId, String owner, String receiver) { @@ -224,9 +240,18 @@ public class RentalChain { "delivery_proven", !delegate); String history = "NILE".equals(network) ? nileHistory : mainHistory; - if (delegate && !history.isEmpty()) { - JsonNode proof = - request( + if (delegate && (embeddedHistory || !history.isEmpty())) { + JsonNode proof; + if (embeddedHistory) { + Map archived = historyService.getObject().proof( + network, txId, height, owner, receiver, text(task, "resource_type")); + if (archived == null) { + // 参数漏采或缺少派单前基线:保留原有MANUAL_REVIEW路径,绝不降级为当前快照。 + return result; + } + proof = json.valueToTree(archived); + } else { + proof = request( history, "/rental/resource-proof", map( @@ -242,6 +267,7 @@ public class RentalChain { receiver, "resource_type", text(task, "resource_type"))); + } require( height == proof.path("block_height").asLong(-1) && txId.equalsIgnoreCase(proof.path("tx_id").asText()) @@ -252,6 +278,8 @@ public class RentalChain { weight = proof.path("total_weight").asLong(); result.put("verified_total_limit", limit); result.put("verified_total_weight", weight); + // 完整历史证明写入交易evidence JSON,保留区块哈希、基线高度和数据来源供审计。 + result.put("history_proof", json.convertValue(proof, Map.class)); result.put( "verified_resource_quantity", quantity(number(task, "delegate_sun"), limit, weight)); diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalHistoryCollector.java b/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalHistoryCollector.java new file mode 100644 index 0000000..aeaf933 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalHistoryCollector.java @@ -0,0 +1,67 @@ +package com.ruoyi.system.rental; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.stereotype.Component; + +import javax.annotation.PostConstruct; +import javax.annotation.PreDestroy; +import java.util.LinkedHashSet; +import java.util.Set; +import java.util.concurrent.ScheduledThreadPoolExecutor; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicInteger; + +/** 独立采集线程,不与业务五秒/十五秒调度争抢同一个调度线程;无链上写操作。 */ +@Component +@ConditionalOnProperty(name = {"rental.enabled", "rental.history.embedded-enabled"}, havingValue = "true") +public class RentalHistoryCollector { + private static final Logger LOG = LoggerFactory.getLogger(RentalHistoryCollector.class); + private final RentalHistoryService service; + private ScheduledThreadPoolExecutor executor; + + @Value("${rental.history.networks:NILE}") + private String networks = "NILE"; + + @Value("${rental.history.poll-interval-ms:1000}") + private long interval = 1000; + + public RentalHistoryCollector(RentalHistoryService service) { + this.service = service; + } + + @PostConstruct + public void start() { + RentalValues.require(interval >= 200 && interval <= 60000, "历史采集间隔必须为200到60000毫秒"); + Set selected = new LinkedHashSet<>(); + for (String name : networks.split(",")) { + selected.add(RentalValues.network(name.trim())); + } + AtomicInteger sequence = new AtomicInteger(); + executor = new ScheduledThreadPoolExecutor(selected.size(), action -> { + Thread thread = new Thread(action, "rental-history-" + sequence.incrementAndGet()); + thread.setDaemon(true); + return thread; + }); + executor.setRemoveOnCancelPolicy(true); + for (String network : selected) { + executor.scheduleWithFixedDelay(() -> { + try { + service.collect(network); + } catch (Exception ex) { + // 不记录异常原文,避免RPC配置、认证头或供应商数据进入日志。 + LOG.warn("租赁历史采集未完成,network={},请查看受保护的历史状态接口", network); + } + }, 0, interval, TimeUnit.MILLISECONDS); + } + } + + @PreDestroy + public void close() { + if (executor != null) { + executor.shutdownNow(); + } + } +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalHistoryController.java b/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalHistoryController.java new file mode 100644 index 0000000..d6384e0 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalHistoryController.java @@ -0,0 +1,43 @@ +package com.ruoyi.system.rental; + +import static com.ruoyi.system.rental.RentalValues.input; +import static com.ruoyi.system.rental.RentalValues.number; +import static com.ruoyi.system.rental.RentalValues.require; + +import com.ruoyi.common.core.domain.AjaxResult; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import java.util.Map; + +/** 历史状态与证明只向已登录运营开放;自动结算使用进程内调用,不需要开放匿名接口。 */ +@RestController +@RequestMapping("/rental") +public class RentalHistoryController { + private final RentalHistoryService service; + + public RentalHistoryController(RentalHistoryService service) { + this.service = service; + } + + @GetMapping("/history/status") + @PreAuthorize("@ss.hasPermi('rent:manage:audit')") + public AjaxResult status() { + return AjaxResult.success(service.status()); + } + + /** 与原resource-proof数据协议一致,直接返回证明JSON;不接受用户指定RPC地址或本金。 */ + @PostMapping("/resource-proof") + @PreAuthorize("@ss.hasPermi('rent:manage:audit')") + public Map proof(@RequestBody Map request) { + Map result = service.proof(input(request, "network", 16), + input(request, "tx_id", 64), number(request, "block_height"), + input(request, "owner", 64), input(request, "receiver", 64), + input(request, "resource_type", 16)); + require(result != null, "该交易缺少历史参数或派单前基线,不能出具证明"); + return result; + } +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalHistoryService.java b/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalHistoryService.java new file mode 100644 index 0000000..039b108 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalHistoryService.java @@ -0,0 +1,440 @@ +package com.ruoyi.system.rental; + +import static com.ruoyi.system.rental.RentalValues.id; +import static com.ruoyi.system.rental.RentalValues.map; +import static com.ruoyi.system.rental.RentalValues.network; +import static com.ruoyi.system.rental.RentalValues.now; +import static com.ruoyi.system.rental.RentalValues.number; +import static com.ruoyi.system.rental.RentalValues.require; +import static com.ruoyi.system.rental.RentalValues.resource; +import static com.ruoyi.system.rental.RentalValues.text; + +import com.fasterxml.jackson.databind.JsonNode; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.dao.DuplicateKeyException; +import org.springframework.stereotype.Service; +import org.springframework.transaction.PlatformTransactionManager; +import org.springframework.transaction.support.TransactionTemplate; +import org.tron.trident.core.ApiWrapper; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Locale; +import java.util.Map; + +/** + * 云端内置的只读历史采集与证明服务。 + * + *

普通节点只提供最新确认状态,因此用同一确认头前后夹读为参数、关系基线绑定高度。 + * 已错过高度只能补区块交易,不能补造历史参数。所有HTTP在事务外执行,数据库事务只保存事实。 + * 本服务信任运营配置的同一一致性RPC节点,不接受供应商提交的历史参数,不持有私钥,不广播。 + */ +@Service +public class RentalHistoryService { + private static final int MAX_REPLAY_BLOCKS = 10000; + private static final String DEFAULT_PROBE = "T9yD14Nj9j7xAB4dbGeiX9h8unkKHxuWwb"; + private final RentalStore store; + private final RentalChain chain; + private final TransactionTemplate transaction; + + @Value("${rental.history.batch-size:30}") + private int batchSize = 30; + + @Value("${rental.history.probe-address:T9yD14Nj9j7xAB4dbGeiX9h8unkKHxuWwb}") + private String probeAddress = DEFAULT_PROBE; + + @Value("${rental.history.networks:NILE}") + private String enabledNetworks = "NILE"; + + @Value("${rental.confirmations:19}") + private long confirmations = 19; + + public RentalHistoryService(RentalStore store, RentalChain chain, + PlatformTransactionManager manager) { + this.store = store; + this.chain = chain; + this.transaction = new TransactionTemplate(manager); + } + + /** 仅接受合法TRON地址;库内统一十六进制,避免Base58大小写折叠或多种编码造成漏重放。 */ + static String addressHex(String address) { + RentalOrders.address(address); + return ApiWrapper.toHex(ApiWrapper.parseAddress(address)).toLowerCase(Locale.ROOT); + } + + private static long height(JsonNode block) { + return positive(block.path("block_header").path("raw_data").path("number"), true); + } + + private static String hash(JsonNode block) { + String value = block.path("blockID").asText(); + require(value.matches("[0-9a-fA-F]{64}"), "确认区块缺少合法哈希"); + return value.toLowerCase(Locale.ROOT); + } + + private static long positive(JsonNode value, boolean zeroAllowed) { + require(value.isIntegralNumber() && value.canConvertToLong(), "链上整数缺失或越界"); + long result = value.longValue(); + require(zeroAllowed ? result >= 0 : result > 0, "链上整数范围无效"); + return result; + } + + private JsonNode head(String network) { + return chain.call(network, "/walletsolidity/getnowblock", map()); + } + + private long[] parameters(JsonNode resource) { + return new long[] { + positive(resource.path("TotalEnergyLimit"), false), + positive(resource.path("TotalEnergyWeight"), false), + positive(resource.path("TotalNetLimit"), false), + positive(resource.path("TotalNetWeight"), false) + }; + } + + /** + * 三次有界尝试,只有确认头高度和哈希均未变化才接纳快照。 + * 这里读取walletsolidity状态,不允许用wallet最新未确认状态冒充历史快照。 + */ + private Snapshot capture(String network, String owner, String receiver, String type) { + for (int attempt = 0; attempt < 3; attempt++) { + JsonNode before = head(network); + long blockHeight = height(before); + String blockId = hash(before); + long[] totals = parameters(chain.call(network, "/walletsolidity/getaccountresource", + map("address", owner, "visible", true))); + long balance = 0; + if (receiver != null) { + // 锁定和非锁定本金都参与基线,锁定到期解锁不会改变合计本金。 + for (boolean locked : new boolean[] {false, true}) { + JsonNode response = chain.call(network, "/walletsolidity/getdelegatedresourcev2", + map("fromAddress", owner, "toAddress", receiver, + "lock", locked, "visible", true)); + require(!response.has("Error") && !response.has("error") + && (!response.has("result") || !response.path("result").isBoolean() + || response.path("result").asBoolean()), "确认关系查询失败"); + JsonNode rows = response.path("delegatedResource"); + require(rows.isMissingNode() || rows.isArray(), "确认关系响应结构错误"); + for (JsonNode row : rows) { + String field = "ENERGY".equals(type) + ? "frozen_balance_for_energy" : "frozen_balance_for_bandwidth"; + // protobuf省略零字段;有值时必须为精确非负整数。 + balance = Math.addExact(balance, row.has(field) + ? positive(row.path(field), true) : 0); + } + } + } + JsonNode after = head(network); + if (blockHeight == height(after) && blockId.equals(hash(after))) { + return new Snapshot(before, totals, balance); + } + } + throw new IllegalStateException("确认头在采样期间变化,请重试,未记录历史证据"); + } + + /** 派单前建立真实基线;非零关系拒绝派单,不用任务声明的0替代链上读取。 */ + public void anchor(String network, String owner, String receiver, String type) { + network(network); + require(Arrays.asList(enabledNetworks.split(",")).stream() + .anyMatch(value -> network.equals(value.trim())), "该网络尚未启用历史采集,暂不派单"); + resource(type); + String ownerHex = addressHex(owner); + String receiverHex = addressHex(receiver); + Snapshot snapshot = capture(network, owner, receiver, type); + require(snapshot.balance == 0, "确认状态存在旧委托,暂不派单"); + transaction.execute(status -> { + saveParameters(network, snapshot); + Map existing = store.one( + "SELECT * FROM rent_history_anchor WHERE network=? AND owner_address=?" + + " AND receiver_address=? AND resource_type=? AND block_height=?", + network, ownerHex, receiverHex, type, height(snapshot.block)); + if (existing == null) { + try { + store.execute("INSERT INTO rent_history_anchor (network,owner_address," + + "receiver_address,resource_type,block_height,block_id,balance_sun,created_at)" + + " VALUES (?,?,?,?,?,?,?,?)", network, ownerHex, receiverHex, type, + height(snapshot.block), hash(snapshot.block), snapshot.balance, now()); + } catch (DuplicateKeyException ex) { + // 并发派单采到同一基线时,只接受完全相同的不可变事实。 + existing = store.one("SELECT * FROM rent_history_anchor WHERE network=?" + + " AND owner_address=? AND receiver_address=? AND resource_type=?" + + " AND block_height=?", network, ownerHex, receiverHex, type, + height(snapshot.block)); + } + } + if (existing != null) { + require(hash(snapshot.block).equals(text(existing, "block_id")) + && number(existing, "balance_sun") == snapshot.balance, "历史基线发生冲突"); + } + return null; + }); + } + + /** + * 每网络一个数据库租约;RPC结束后落库前再次校验租约,过期实例不得推进游标。 + * 首次从当前确认头开始,后续只沿父哈希顺序前进。停机后交易可补,参数不能回填。 + */ + public void collect(String network) { + network(network); + String lease = id("H"); + try { + store.execute("INSERT INTO rent_history_cursor (network,updated_at) VALUES (?,?)", + network, now()); + } catch (DuplicateKeyException ex) { + // 既有网络保留原进度。 + } + if (store.execute("UPDATE rent_history_cursor SET lease_owner=?," + + "lease_until=TIMESTAMPADD(SECOND,60,UTC_TIMESTAMP(3)),updated_at=?" + + " WHERE network=? AND (lease_until IS NULL OR lease_until { + lockLease(network, lease); + saveParameters(network, snapshot); + return null; + }); + long confirmed = height(snapshot.block); + Map cursor = store.one( + "SELECT * FROM rent_history_cursor WHERE network=?", network); + Map firstAnchor = store.one("SELECT MIN(block_height) AS first_height" + + " FROM rent_history_anchor WHERE network=?", network); + long next = cursor.get("scanned_height") == null + ? (firstAnchor.get("first_height") == null ? confirmed + : Math.min(confirmed, Math.addExact(number(firstAnchor, "first_height"), 1))) + : Math.addExact(number(cursor, "scanned_height"), 1); + require(batchSize > 0 && batchSize <= 200, "历史采集batch-size必须为1到200"); + for (int i = 0; i < batchSize && next <= confirmed; i++, next++) { + final long expectedHeight = next; + JsonNode block = chain.call(network, "/walletsolidity/getblockbynum", + map("num", next, "visible", false)); + require(height(block) == expectedHeight, "补采区块高度不符"); + List> events = parseEvents(block); + transaction.execute(status -> { + Map locked = lockLease(network, lease); + if (locked.get("scanned_height") != null) { + require(number(locked, "scanned_height") + 1 == expectedHeight + && text(locked, "scanned_block_id").equals(parent(block)), + "确认链不连续或发生分叉,停止采集"); + } + saveBlock(network, block); + Map saved = block(network, expectedHeight); + if (number(saved, "events_complete") == 0) { + for (Map event : events) { + store.execute("INSERT INTO rent_history_event (network,tx_id,block_height," + + "tx_index,owner_address,receiver_address,resource_type,operation," + + "amount_sun,locked,created_at) VALUES (?,?,?,?,?,?,?,?,?,?,?)", + network, event.get("tx_id"), expectedHeight, event.get("tx_index"), + event.get("owner_address"), event.get("receiver_address"), + event.get("resource_type"), event.get("operation"), + event.get("amount_sun"), event.get("locked"), now()); + } + store.execute("UPDATE rent_history_block SET events_complete=1" + + " WHERE network=? AND block_height=?", network, expectedHeight); + } + store.execute("UPDATE rent_history_cursor SET scanned_height=?,scanned_block_id=?," + + "last_success_at=?,last_error=NULL,updated_at=? WHERE network=?", + expectedHeight, hash(block), now(), now(), network); + return null; + }); + } + } catch (RuntimeException ex) { + store.execute("UPDATE rent_history_cursor SET last_error=?,updated_at=?" + + " WHERE network=? AND lease_owner=?", "采集未完成,请检查RPC一致性、限流、表结构及确认链连续性", + now(), network, lease); + throw ex; + } finally { + store.execute("UPDATE rent_history_cursor SET lease_owner=NULL,lease_until=NULL" + + " WHERE network=? AND lease_owner=?", network, lease); + } + } + + private Map lockLease(String network, String lease) { + Map row = store.one("SELECT * FROM rent_history_cursor WHERE network=?" + + " AND lease_owner=? AND lease_until>UTC_TIMESTAMP(3) FOR UPDATE", network, lease); + require(row != null, "历史采集租约过期"); + return row; + } + + private static String parent(JsonNode block) { + String parent = block.path("block_header").path("raw_data").path("parentHash").asText(); + require(parent.matches("[0-9a-fA-F]{64}"), "确认区块缺少父哈希"); + return parent.toLowerCase(Locale.ROOT); + } + + private Map block(String network, long height) { + return store.one("SELECT * FROM rent_history_block WHERE network=? AND block_height=?", + network, height); + } + + private void saveBlock(String network, JsonNode block) { + try { + store.execute("INSERT INTO rent_history_block (network,block_height,block_id,parent_id," + + "block_time,events_complete,created_at) VALUES (?,?,?,?,?,0,?)", + network, height(block), hash(block), parent(block), + positive(block.path("block_header").path("raw_data").path("timestamp"), false), now()); + } catch (DuplicateKeyException ex) { + // 并发参数采集和区块补采允许命中同一区块,不允许覆盖不同哈希。 + } + Map existing = store.one("SELECT * FROM rent_history_block WHERE network=?" + + " AND block_height=? FOR UPDATE", network, height(block)); + require(existing != null && hash(block).equals(text(existing, "block_id")) + && parent(block).equals(text(existing, "parent_id")), "已归档确认区块发生冲突"); + } + + private void saveParameters(String network, Snapshot snapshot) { + saveBlock(network, snapshot.block); + Map row = block(network, height(snapshot.block)); + long[] totals = snapshot.totals; + if (row.get("parameters_at") == null) { + store.execute("UPDATE rent_history_block SET energy_limit=?,energy_weight=?," + + "bandwidth_limit=?,bandwidth_weight=?,parameters_at=?" + + " WHERE network=? AND block_height=?", totals[0], totals[1], totals[2], + totals[3], now(), network, height(snapshot.block)); + } else { + require(number(row, "energy_limit") == totals[0] + && number(row, "energy_weight") == totals[1] + && number(row, "bandwidth_limit") == totals[2] + && number(row, "bandwidth_weight") == totals[3], "相同确认区块资源参数不一致"); + } + } + + /** 解析全网成功委托事件,保留原交易顺序;未知/不完整的相关回执阻止整个区块完成。 */ + static List> parseEvents(JsonNode block) { + List> result = new ArrayList<>(); + JsonNode transactions = block.path("transactions"); + require(transactions.isMissingNode() || transactions.isArray(), "区块交易列表格式不符"); + int index = 0; + for (JsonNode tx : transactions) { + JsonNode contracts = tx.path("raw_data").path("contract"); + require(contracts.isArray() && contracts.size() > 0, "区块内交易缺少合约,不能标记事件完整"); + for (JsonNode contract : contracts) { + String operation = contract.path("type").asText(); + if (!"DelegateResourceContract".equals(operation) + && !"UnDelegateResourceContract".equals(operation)) { + continue; + } + require(contracts.size() == 1 && tx.path("ret").size() == 1 + && tx.path("ret").get(0).has("contractRet"), "相关交易缺少完整执行回执"); + if (!"SUCCESS".equals(tx.path("ret").get(0).path("contractRet").asText())) { + continue; + } + String txId = tx.path("txID").asText().toLowerCase(Locale.ROOT); + require(txId.matches("[0-9a-f]{64}"), "区块交易哈希不合法"); + JsonNode value = contract.path("parameter").path("value"); + String owner = value.path("owner_address").asText().toLowerCase(Locale.ROOT); + String receiver = value.path("receiver_address").asText().toLowerCase(Locale.ROOT); + require(owner.matches("41[0-9a-f]{40}") && receiver.matches("41[0-9a-f]{40}"), + "区块交易地址不是TRON十六进制地址"); + String type = resource(value.path("resource").asText("BANDWIDTH")); + result.add(map("tx_id", txId, "tx_index", index, "owner_address", owner, + "receiver_address", receiver, "resource_type", type, + "operation", "DelegateResourceContract".equals(operation) ? "DELEGATE" : "UNDELEGATE", + "amount_sun", positive(value.path("balance"), false), + "locked", value.path("lock").asBoolean(false) ? 1 : 0)); + } + index++; + } + return result; + } + + /** + * 返回null表示已明确缺少不可补造的参数/基线;扫描尚未赶上则抛异常让现有核验任务重试。 + * 不查询当前资源参数,不根据请求中的本金构造证明,目标交易必须出现在完整归档区块中。 + */ + public Map proof(String network, String txId, long targetHeight, + String owner, String receiver, String type) { + network(network); + resource(type); + require(txId != null && txId.matches("[0-9a-fA-F]{64}") && targetHeight >= 0, + "证明交易或高度无效"); + String ownerHex = addressHex(owner); + String receiverHex = addressHex(receiver); + Map cursor = store.one("SELECT * FROM rent_history_cursor WHERE network=?", network); + require(cursor != null && cursor.get("scanned_height") != null + && number(cursor, "scanned_height") >= targetHeight, "历史区块正在采集中,请稍后重试"); + Map target = block(network, targetHeight); + if (target == null || target.get("parameters_at") == null) { + return null; + } + Map anchor = store.one("SELECT * FROM rent_history_anchor WHERE network=?" + + " AND owner_address=? AND receiver_address=? AND resource_type=? AND block_height> blocks = store.rows("SELECT * FROM rent_history_block WHERE network=?" + + " AND block_height>? AND block_height<=? ORDER BY block_height", network, baselineHeight, targetHeight); + long expected = baselineHeight; + String previous = text(anchor, "block_id"); + for (Map row : blocks) { + require(number(row, "block_height") == ++expected + && number(row, "events_complete") == 1 + && previous.equals(text(row, "parent_id")), "历史区块缺失或链不连续"); + previous = text(row, "block_id"); + } + require(expected == targetHeight, "历史区块覆盖不足"); + require(confirmations > 0 && height(head(network)) - targetHeight + 1 >= confirmations, + "历史证明交易确认深度不足"); + // 再向配置节点核对目标区块哈希;节点换链/误切网络时不使用旧库证据继续结算。 + JsonNode canonical = chain.call(network, "/walletsolidity/getblockbynum", + map("num", targetHeight, "visible", false)); + require(height(canonical) == targetHeight && hash(canonical).equals(text(target, "block_id")), + "历史证明区块与确认链不一致"); + List> events = store.rows("SELECT * FROM rent_history_event WHERE network=?" + + " AND owner_address=? AND receiver_address=? AND resource_type=?" + + " AND block_height>? AND block_height<=? ORDER BY block_height,tx_index", + network, ownerHex, receiverHex, type, baselineHeight, targetHeight); + long balance = number(anchor, "balance_sun"); + Map proof = null; + for (Map event : events) { + long before = balance; + balance = "DELEGATE".equals(text(event, "operation")) + ? Math.addExact(balance, number(event, "amount_sun")) + : Math.subtractExact(balance, number(event, "amount_sun")); + require(balance >= 0, "历史委托本金重放出现负数"); + if (txId.equalsIgnoreCase(text(event, "tx_id"))) { + require(number(event, "block_height") == targetHeight + && "DELEGATE".equals(text(event, "operation")) + && number(event, "locked") == 0, "目标历史交易与请求不匹配"); + proof = map("network", network, "tx_id", text(event, "tx_id"), + "block_height", targetHeight, "block_id", text(target, "block_id"), + "owner", owner, "receiver", receiver, "resource_type", type, + "baseline_sun", before, "after_sun", balance, + "total_limit", number(target, "ENERGY".equals(type) ? "energy_limit" : "bandwidth_limit"), + "total_weight", number(target, "ENERGY".equals(type) ? "energy_weight" : "bandwidth_weight"), + "anchor_height", baselineHeight, "source", "EMBEDDED_SOLIDITY_REPLAY_V1"); + } + } + require(proof != null && balance == number(proof, "after_sun"), + "交易未归档或同区块存在后续关系变更"); + return proof; + } + + /** 仅供运营查看,不返回RPC地址、认证头、私钥或响应原文。 */ + public List> status() { + return store.rows("SELECT c.network,c.scanned_height,c.scanned_block_id,c.last_success_at," + + "c.last_error,(SELECT MAX(b.block_height) FROM rent_history_block b" + + " WHERE b.network=c.network AND b.parameters_at IS NOT NULL) AS last_parameter_height," + + "(SELECT COUNT(*) FROM rent_history_block b WHERE b.network=c.network" + + " AND b.events_complete=1 AND b.parameters_at IS NULL) AS parameter_gap_count" + + " FROM rent_history_cursor c ORDER BY c.network"); + } + + private static final class Snapshot { + private final JsonNode block; + private final long[] totals; + private final long balance; + + private Snapshot(JsonNode block, long[] totals, long balance) { + this.block = block; + this.totals = totals; + this.balance = balance; + } + } +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalHttp.java b/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalHttp.java index e5c2e53..289ef84 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalHttp.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalHttp.java @@ -75,13 +75,19 @@ public final class RentalHttp { } public static String body(Response response) throws IOException { + return body(response, 1024 * 1024); + } + + /** 完整区块JSON可能超过普通RPC的1MiB限制;仅受信区块查询允许显式提高至16MiB。 */ + public static String body(Response response, int maxBytes) throws IOException { + require(maxBytes > 0 && maxBytes <= 16 * 1024 * 1024, "RPC响应上限配置错误"); require(response.isSuccessful() && response.body() != null, "RPC响应失败"); java.io.InputStream stream = response.body().byteStream(); java.io.ByteArrayOutputStream output = new java.io.ByteArrayOutputStream(); byte[] buffer = new byte[4096]; int count; while ((count = stream.read(buffer)) != -1) { - require(output.size() + count <= 1024 * 1024, "RPC响应超过限制"); + require(output.size() + count <= maxBytes, "RPC响应超过限制"); output.write(buffer, 0, count); } return new String(output.toByteArray(), java.nio.charset.StandardCharsets.UTF_8); diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalTasks.java b/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalTasks.java index be23421..53df2c0 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalTasks.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalTasks.java @@ -106,6 +106,8 @@ public class RentalTasks { != 0) { continue; } + chain.prepareHistory(text(initial, "network"), owner, + text(initial, "receiver_address"), type); Boolean assigned = tx( () -> { @@ -574,6 +576,7 @@ public class RentalTasks { } Map fields = new LinkedHashMap<>(proof); fields.remove("delivery_proven"); + fields.remove("history_proof"); fields.put("evidence", orders.encode(proof)); fields.put("confirmed_at", now()); store.update("transaction", number(record, "id"), fields); diff --git a/ruoyi-system/src/test/java/com/ruoyi/system/rental/RentalHistoryTest.java b/ruoyi-system/src/test/java/com/ruoyi/system/rental/RentalHistoryTest.java new file mode 100644 index 0000000..4ac37a2 --- /dev/null +++ b/ruoyi-system/src/test/java/com/ruoyi/system/rental/RentalHistoryTest.java @@ -0,0 +1,461 @@ +package com.ruoyi.system.rental; + +import static com.ruoyi.system.rental.RentalValues.*; +import static org.junit.Assert.*; + +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.node.ObjectNode; +import org.h2.jdbcx.JdbcDataSource; +import org.junit.Before; +import org.junit.Test; +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.jdbc.datasource.DataSourceTransactionManager; + +import java.nio.charset.StandardCharsets; +import java.nio.file.Files; +import java.nio.file.Paths; +import java.util.*; + +/** 真实DDL/SQL/事务 + 可控确认RPC;不访问业务数据库、不连接TRON、不广播交易。 */ +public class RentalHistoryTest { + private static final String OWNER = "TMVQGm1qAQYVdetCeGRRkTWYYrLXuHK2HC"; + private static final String RECEIVER = "TXYZopYRdj2D9XRtbG411XZZ3kM5VkAeBf"; + private static final long SUN = 1300000000L; + private final ObjectMapper json = new ObjectMapper(); + private final Map blocks = new HashMap<>(); + private RentalStore store; + private RentalHistoryService service; + private RentalChain chain; + private long currentHead; + private long relation; + private long energyLimit = 60000000; + private int changingHeads; + private boolean invalidParameters; + private boolean rpcFailure; + private int calls; + + @Before + public void setup() throws Exception { + JdbcDataSource source = new JdbcDataSource(); + source.setURL("jdbc:h2:mem:" + UUID.randomUUID() + + ";MODE=MySQL;DATABASE_TO_UPPER=false;DB_CLOSE_DELAY=-1;LOCK_TIMEOUT=10000"); + JdbcTemplate jdbc = new JdbcTemplate(source); + // H2 1.4没有MySQL UTC_TIMESTAMP;仅为数据库时钟函数提供等价UTC测试适配。 + jdbc.execute("CREATE ALIAS UTC_TIMESTAMP FOR \"com.ruoyi.system.rental.RentalHistoryTest.utcTimestamp\""); + store = new RentalStore(jdbc); + String ddl = new String(Files.readAllBytes(Paths.get("../sql/rent_history_init.sql")), + StandardCharsets.UTF_8).replaceAll("(?m)^--.*$", "") + .replace("ENGINE=InnoDB ROW_FORMAT=DYNAMIC DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin", ""); + for (String statement : ddl.split(";")) { + if (!statement.trim().isEmpty()) { + jdbc.execute(statement); + } + } + RentalChain rpc = new RentalChain(json) { + @Override + public JsonNode call(String network, String path, Map body) { + calls++; + if (rpcFailure) { + throw new IllegalStateException("controlled RPC failure"); + } + if (path.endsWith("getnowblock")) { + long height = changingHeads > 0 ? currentHead + changingHeads-- : currentHead; + return block(height); + } + if (path.endsWith("getaccountresource")) { + return json.valueToTree(invalidParameters ? map("TotalEnergyLimit", 0) + : map("TotalEnergyLimit", energyLimit, "TotalEnergyWeight", 1000000, + "TotalNetLimit", 1500000, "TotalNetWeight", 1000000)); + } + if (path.equals("/walletsolidity/getdelegatedresourcev2")) { + return json.valueToTree(Boolean.TRUE.equals(body.get("lock")) ? map() + : map("delegatedResource", Arrays.asList(map("frozen_balance_for_energy", relation)))); + } + if (path.endsWith("getblockbynum")) { + return block(number(body, "num")); + } + if (path.equals("/wallet/getdelegatedresourcev2")) { + return json.valueToTree(map("delegatedResource", Arrays.asList( + map("frozen_balance_for_energy", SUN)))); + } + if (path.endsWith("gettransactionbyid") || path.endsWith("gettransactioninfobyid")) { + for (Map.Entry entry : blocks.entrySet()) { + for (JsonNode tx : entry.getValue().path("transactions")) { + if (text(body, "value").equals(tx.path("txID").asText())) { + return path.endsWith("gettransactionbyid") ? tx + : json.valueToTree(map("blockNumber", entry.getKey(), + "blockTimeStamp", 1700000000000L + entry.getKey() * 3000)); + } + } + } + return json.createObjectNode(); + } + throw new AssertionError("unexpected RPC " + path); + } + }; + service = new RentalHistoryService(store, rpc, new DataSourceTransactionManager(source)); + chain = rpc; + setField(service, "confirmations", 1L); + currentHead = 100; + } + + private static String hash(long number) { + return String.format("%064x", number); + } + + public static java.sql.Timestamp utcTimestamp(int precision) { + return java.sql.Timestamp.valueOf(now()); + } + + private static void setField(Object target, String name, Object value) throws Exception { + java.lang.reflect.Field field = target instanceof RentalChain + ? RentalChain.class.getDeclaredField(name) : RentalHistoryService.class.getDeclaredField(name); + field.setAccessible(true); + field.set(target, value); + } + + private JsonNode block(long number) { + return blocks.computeIfAbsent(number, height -> json.valueToTree(map( + "blockID", hash(height), "block_header", map("raw_data", map( + "number", height, "parentHash", hash(height - 1), + "timestamp", 1700000000000L + height * 3000)), "transactions", new ArrayList<>()))); + } + + private JsonNode event(long tx, String operation, String type, long sun) { + return json.valueToTree(map("txID", hash(tx), "raw_data", map("contract", Arrays.asList(map( + "type", operation, "parameter", map("value", map( + "owner_address", RentalHistoryService.addressHex(OWNER), + "receiver_address", RentalHistoryService.addressHex(RECEIVER), + "resource", type, "balance", sun, "lock", false))))), + "ret", Arrays.asList(map("contractRet", "SUCCESS")))); + } + + private void transactions(long height, JsonNode... transactions) { + ((ObjectNode) block(height)).set("transactions", json.valueToTree(Arrays.asList(transactions))); + } + + private void collect(long height) { + currentHead = height; + service.collect("NILE"); + } + + private Map proof(long tx, long height) { + return service.proof("NILE", hash(tx), height, OWNER, RECEIVER, "ENERGY"); + } + + private void anchor() { + service.anchor("NILE", OWNER, RECEIVER, "ENERGY"); + } + + private void rejects(Runnable action) { + try { + action.run(); + fail("expected fail-closed rejection"); + } catch (IllegalArgumentException | IllegalStateException expected) { + // 所有拒绝必须发生在写入成功状态/返回证明之前。 + } + } + + @Test + public void coherentArchiveProducesProofAndPreservesOldParameters() { + anchor(); + collect(100); + transactions(101, event(1001, "DelegateResourceContract", "ENERGY", SUN)); + collect(101); + energyLimit = 90000000; + collect(102); + Map proof = proof(1001, 101); + assertEquals(0, number(proof, "baseline_sun")); + assertEquals(SUN, number(proof, "after_sun")); + assertEquals(60000000, number(proof, "total_limit")); + assertEquals(78000, quantity(SUN, number(proof, "total_limit"), number(proof, "total_weight"))); + assertEquals(hash(101), proof.get("block_id")); + } + + @Test + public void missedParameterHeightIsNotFilledWithCurrentState() { + anchor(); + collect(100); + transactions(101, event(1001, "DelegateResourceContract", "ENERGY", SUN)); + collect(102); + assertNull(proof(1001, 101)); + assertEquals(1, number(service.status().get(0), "parameter_gap_count")); + } + + @Test + public void noPreTransactionAnchorCannotProduceProof() { + collect(100); + transactions(101, event(1001, "DelegateResourceContract", "ENERGY", SUN)); + collect(101); + assertNull(proof(1001, 101)); + } + + @Test + public void firstCollectorStartsFromEarlierAnchorInsteadOfSkippingItsEvents() { + anchor(); + transactions(101, event(1001, "DelegateResourceContract", "ENERGY", SUN)); + collect(101); + assertNotNull(proof(1001, 101)); + } + + @Test + public void repeatedCollectionAndAnchorAreIdempotent() { + anchor(); + anchor(); + collect(100); + transactions(101, event(1001, "DelegateResourceContract", "ENERGY", SUN)); + collect(101); + collect(101); + assertEquals(1, number(store.one("SELECT COUNT(*) AS n FROM rent_history_anchor"), "n")); + assertEquals(1, number(store.one("SELECT COUNT(*) AS n FROM rent_history_event"), "n")); + } + + @Test + public void failedDelegateIsExcludedFromReplay() { + JsonNode failed = event(1001, "DelegateResourceContract", "ENERGY", SUN); + ((ObjectNode) failed.path("ret").get(0)).put("contractRet", "REVERT"); + transactions(101, failed, event(1002, "DelegateResourceContract", "ENERGY", SUN)); + anchor(); + collect(101); + assertEquals(0, number(proof(1002, 101), "baseline_sun")); + rejects(() -> proof(1001, 101)); + } + + @Test + public void missingReceiptPreventsPartialBlockCommit() { + anchor(); + collect(100); + JsonNode incomplete = event(1002, "DelegateResourceContract", "ENERGY", SUN); + ((ObjectNode) incomplete).remove("ret"); + transactions(101, event(1001, "DelegateResourceContract", "ENERGY", SUN), incomplete); + rejects(() -> collect(101)); + assertEquals(100, number(service.status().get(0), "scanned_height")); + assertEquals(0, number(store.one("SELECT COUNT(*) AS n FROM rent_history_event"), "n")); + } + + @Test + public void parentMismatchStopsCursor() { + collect(100); + ((ObjectNode) block(101).path("block_header").path("raw_data")).put("parentHash", hash(99)); + rejects(() -> collect(101)); + assertEquals(100, number(service.status().get(0), "scanned_height")); + } + + @Test + public void changedCanonicalTargetRefusesExistingProof() { + anchor(); + transactions(101, event(1001, "DelegateResourceContract", "ENERGY", SUN)); + collect(101); + ((ObjectNode) block(101)).put("blockID", hash(999)); + rejects(() -> proof(1001, 101)); + } + + @Test + public void movingConfirmedHeadDoesNotWriteAnAnchor() { + changingHeads = 6; + rejects(this::anchor); + assertEquals(0, number(store.one("SELECT COUNT(*) AS n FROM rent_history_anchor"), "n")); + } + + @Test + public void invalidParametersCannotBeStored() { + invalidParameters = true; + rejects(this::anchor); + assertEquals(0, number(store.one("SELECT COUNT(*) AS n FROM rent_history_block"), "n")); + } + + @Test + public void nonzeroConfirmedRelationPreventsDispatchBaseline() { + relation = 1; + rejects(this::anchor); + assertEquals(0, number(store.one("SELECT COUNT(*) AS n FROM rent_history_anchor"), "n")); + } + + @Test + public void scannerLagIsRetryableInsteadOfMissingEvidence() { + anchor(); + collect(100); + rejects(() -> proof(1001, 101)); + } + + @Test + public void otherResourceEventsDoNotPolluteEnergyProof() { + anchor(); + transactions(101, event(1001, "DelegateResourceContract", "BANDWIDTH", 1000000), + event(1002, "DelegateResourceContract", "ENERGY", SUN)); + collect(101); + assertEquals(0, number(proof(1002, 101), "baseline_sun")); + } + + @Test + public void bandwidthUsesOwnHistoricalParameters() { + service.anchor("NILE", OWNER, RECEIVER, "BANDWIDTH"); + transactions(101, event(1001, "DelegateResourceContract", "BANDWIDTH", SUN)); + collect(101); + Map proof = service.proof("NILE", hash(1001), 101, OWNER, RECEIVER, "BANDWIDTH"); + assertEquals(1500000, number(proof, "total_limit")); + } + + @Test + public void replayIncludesIntermediateDelegationAndReclaim() { + anchor(); + collect(100); + transactions(101, event(1001, "DelegateResourceContract", "ENERGY", 1000000)); + transactions(102, event(1002, "UnDelegateResourceContract", "ENERGY", 1000000)); + transactions(103, event(1003, "DelegateResourceContract", "ENERGY", SUN)); + collect(103); + assertEquals(0, number(proof(1003, 103), "baseline_sun")); + } + + @Test + public void negativeReplayBalanceIsRejected() { + anchor(); + transactions(101, event(1001, "UnDelegateResourceContract", "ENERGY", 1), + event(1002, "DelegateResourceContract", "ENERGY", SUN)); + collect(101); + rejects(() -> proof(1002, 101)); + } + + @Test + public void laterSameBlockReclaimCannotBeReportedAsDelivered() { + anchor(); + transactions(101, event(1001, "DelegateResourceContract", "ENERGY", SUN), + event(1002, "UnDelegateResourceContract", "ENERGY", SUN)); + collect(101); + rejects(() -> proof(1001, 101)); + } + + @Test + public void deletedIntermediateBlockIsRejected() { + anchor(); + collect(100); + transactions(102, event(1001, "DelegateResourceContract", "ENERGY", SUN)); + collect(102); + store.execute("DELETE FROM rent_history_block WHERE network='NILE' AND block_height=101"); + rejects(() -> proof(1001, 102)); + } + + @Test + public void lockedTargetCannotProduceNonlockedDeliveryProof() { + anchor(); + JsonNode locked = event(1001, "DelegateResourceContract", "ENERGY", SUN); + ((ObjectNode) locked.path("raw_data").path("contract").get(0).path("parameter").path("value")).put("lock", true); + transactions(101, locked); + collect(101); + rejects(() -> proof(1001, 101)); + } + + @Test + public void networkLeasePreventsSecondCollectorRpcCalls() { + collect(100); + store.execute("UPDATE rent_history_cursor SET lease_owner='other'," + + "lease_until=TIMESTAMPADD(SECOND,60,UTC_TIMESTAMP(3)) WHERE network='NILE'"); + int before = calls; + collect(101); + assertEquals(before, calls); + } + + @Test + public void rpcFailureReleasesLeaseAndDoesNotAdvanceCursor() { + collect(100); + rpcFailure = true; + rejects(() -> collect(101)); + Map status = store.one("SELECT * FROM rent_history_cursor WHERE network='NILE'"); + assertEquals(100, number(status, "scanned_height")); + assertNull(status.get("lease_owner")); + assertFalse(text(status, "last_error").isEmpty()); + } + + @Test + public void sameHeightParameterConflictNeverOverwritesStoredValues() { + collect(100); + energyLimit++; + rejects(() -> collect(100)); + assertEquals(60000000, number(store.one("SELECT * FROM rent_history_block WHERE block_height=100"), "energy_limit")); + } + + @Test + public void invalidInputsAreRejectedBeforeRpc() { + rejects(() -> service.anchor("OTHER", OWNER, RECEIVER, "ENERGY")); + rejects(() -> service.anchor("MAINNET", OWNER, RECEIVER, "ENERGY")); + rejects(() -> service.proof("NILE", "bad", 1, OWNER, RECEIVER, "ENERGY")); + rejects(() -> service.proof("NILE", hash(1), 1, "bad", RECEIVER, "ENERGY")); + assertEquals(0, calls); + } + + private void embeddedMode() throws Exception { + org.springframework.beans.factory.support.DefaultListableBeanFactory factory = + new org.springframework.beans.factory.support.DefaultListableBeanFactory(); + factory.registerSingleton("history", service); + setField(chain, "embeddedHistory", true); + setField(chain, "historyService", factory.getBeanProvider(RentalHistoryService.class)); + setField(chain, "confirmations", 1L); + } + + @Test + public void actualChainVerificationUsesInternalProofAndReturnsAuditEvidence() throws Exception { + embeddedMode(); + chain.prepareHistory("NILE", OWNER, RECEIVER, "ENERGY"); + transactions(101, event(1001, "DelegateResourceContract", "ENERGY", SUN)); + collect(101); + Map verified = chain.verify(map("network", "NILE", "task_type", "DELEGATE", + "delegate_sun", SUN, "resource_type", "ENERGY"), hash(1001), OWNER, RECEIVER); + assertEquals(Boolean.TRUE, verified.get("delivery_proven")); + assertEquals(78000, number(verified, "verified_resource_quantity")); + assertEquals("EMBEDDED_SOLIDITY_REPLAY_V1", ((Map) verified.get("history_proof")).get("source")); + } + + @Test + public void actualChainVerificationKeepsManualPathWhenHistoricalParameterWasMissed() throws Exception { + embeddedMode(); + chain.prepareHistory("NILE", OWNER, RECEIVER, "ENERGY"); + collect(100); + transactions(101, event(1001, "DelegateResourceContract", "ENERGY", SUN)); + collect(102); + Map verified = chain.verify(map("network", "NILE", "task_type", "DELEGATE", + "delegate_sun", SUN, "resource_type", "ENERGY"), hash(1001), OWNER, RECEIVER); + assertEquals("CONFIRMED", verified.get("status")); + assertEquals(Boolean.FALSE, verified.get("delivery_proven")); + assertFalse(verified.containsKey("verified_resource_quantity")); + } + + @Test + public void proofEndpointRequiresConfiguredConfirmationDepth() throws Exception { + anchor(); + transactions(101, event(1001, "DelegateResourceContract", "ENERGY", SUN)); + collect(101); + setField(service, "confirmations", 19L); + rejects(() -> proof(1001, 101)); + } + + @Test + public void historyHttpEndpointsAreRestrictedToOperationsPermission() throws Exception { + for (java.lang.reflect.Method method : RentalHistoryController.class.getDeclaredMethods()) { + String expression = method.getAnnotation( + org.springframework.security.access.prepost.PreAuthorize.class).value(); + assertEquals("@ss.hasPermi('rent:manage:audit')", expression); + } + } + + @Test + public void fullBlockResponseCanExceedOrdinaryRpcLimitButStaysBounded() throws Exception { + byte[] bytes = new byte[1024 * 1024 + 1]; + okhttp3.Request request = new okhttp3.Request.Builder().url("https://rpc.invalid/").build(); + try (okhttp3.Response response = new okhttp3.Response.Builder().request(request) + .protocol(okhttp3.Protocol.HTTP_1_1).code(200).message("OK") + .body(okhttp3.ResponseBody.create(null, bytes)).build()) { + assertEquals(bytes.length, RentalHttp.body(response, 16 * 1024 * 1024).length()); + } + try (okhttp3.Response response = new okhttp3.Response.Builder().request(request) + .protocol(okhttp3.Protocol.HTTP_1_1).code(200).message("OK") + .body(okhttp3.ResponseBody.create(null, bytes)).build()) { + try { + RentalHttp.body(response); + fail("ordinary RPC must remain bounded"); + } catch (IllegalArgumentException expected) { + // 不扩大回调或普通RPC的响应上限。 + } + } + } +} diff --git a/sql/rent_history_init.sql b/sql/rent_history_init.sql new file mode 100644 index 0000000..d909b5c --- /dev/null +++ b/sql/rent_history_init.sql @@ -0,0 +1,60 @@ +-- 租赁历史证明增量安装脚本;MySQL 5.7.8+/8.0。先执行rent_init.sql,再执行本文件。 +-- 不删除、不修改既有16张业务表;四表均不保存私钥/API密钥。日期为UTC。 +-- 多实例共用network租约;确认区块和基线只追加,冲突必须告警,不覆盖历史事实。 +CREATE TABLE IF NOT EXISTS `rent_history_cursor` ( + `network` VARCHAR(16) NOT NULL COMMENT 'NILE或MAINNET,独立采集游标', + `scanned_height` BIGINT NULL COMMENT '完整持久化交易事件的最后确认高度', + `scanned_block_id` VARCHAR(64) NULL COMMENT '游标对应区块哈希,连续性校验', + `lease_owner` VARCHAR(64) NULL COMMENT '采集实例租约令牌', + `lease_until` DATETIME(3) NULL COMMENT '数据库UTC租约截止', + `last_success_at` DATETIME(3) NULL COMMENT '最近完整采集成功时间', + `last_error` VARCHAR(255) NULL COMMENT '脱敏运行状态,不记录RPC响应或密钥', + `updated_at` DATETIME(3) NOT NULL COMMENT '最近更新时间', + PRIMARY KEY (`network`) +) ENGINE=InnoDB ROW_FORMAT=DYNAMIC DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin COMMENT='历史采集进度和多实例网络租约'; + +CREATE TABLE IF NOT EXISTS `rent_history_block` ( + `network` VARCHAR(16) NOT NULL COMMENT '所属网络', + `block_height` BIGINT NOT NULL COMMENT '确认区块高度', + `block_id` VARCHAR(64) NOT NULL COMMENT '区块哈希', + `parent_id` VARCHAR(64) NOT NULL COMMENT '父区块哈希', + `block_time` BIGINT NOT NULL COMMENT '链上区块时间,毫秒Unix时间戳', + `events_complete` TINYINT NOT NULL DEFAULT 0 COMMENT '1代表本区块成功委托事件已同事务完整落库', + `energy_limit` BIGINT NULL COMMENT '该确认高度全网能量额度;漏采必须为NULL', + `energy_weight` BIGINT NULL COMMENT '该确认高度全网能量权重', + `bandwidth_limit` BIGINT NULL COMMENT '该确认高度全网质押带宽额度', + `bandwidth_weight` BIGINT NULL COMMENT '该确认高度全网带宽权重', + `parameters_at` DATETIME(3) NULL COMMENT '稳定确认头夹读参数的采集UTC时间', + `created_at` DATETIME(3) NOT NULL COMMENT '首次记录UTC时间', + PRIMARY KEY (`network`,`block_height`), + UNIQUE KEY `uk_history_block_hash` (`network`,`block_id`) +) ENGINE=InnoDB ROW_FORMAT=DYNAMIC DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin COMMENT='确认区块及准确绑定高度的资源参数'; + +CREATE TABLE IF NOT EXISTS `rent_history_event` ( + `network` VARCHAR(16) NOT NULL COMMENT '所属网络', + `tx_id` VARCHAR(64) NOT NULL COMMENT '成功链上交易哈希,小写', + `block_height` BIGINT NOT NULL COMMENT '所在确认区块', + `tx_index` INT NOT NULL COMMENT '区块内交易原始顺序,从0开始', + `owner_address` VARCHAR(64) NOT NULL COMMENT 'TRON十六进制地址,小写含41前缀', + `receiver_address` VARCHAR(64) NOT NULL COMMENT '接收方十六进制地址,小写含41前缀', + `resource_type` VARCHAR(16) NOT NULL COMMENT 'ENERGY或BANDWIDTH', + `operation` VARCHAR(16) NOT NULL COMMENT 'DELEGATE或UNDELEGATE', + `amount_sun` BIGINT NOT NULL COMMENT '正整数委托本金SUN', + `locked` TINYINT NOT NULL COMMENT '是否锁定委托;证明目标只能为非锁定', + `created_at` DATETIME(3) NOT NULL COMMENT '入库UTC时间', + PRIMARY KEY (`network`,`tx_id`), + UNIQUE KEY `uk_history_event_position` (`network`,`block_height`,`tx_index`), + KEY `idx_history_relation_replay` (`network`,`owner_address`,`receiver_address`,`resource_type`,`block_height`) +) ENGINE=InnoDB ROW_FORMAT=DYNAMIC DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin COMMENT='全网成功Stake2.0委托和回收事件,供关系重放'; + +CREATE TABLE IF NOT EXISTS `rent_history_anchor` ( + `network` VARCHAR(16) NOT NULL COMMENT '所属网络', + `owner_address` VARCHAR(64) NOT NULL COMMENT 'TRON十六进制地址,小写含41前缀', + `receiver_address` VARCHAR(64) NOT NULL COMMENT '接收方十六进制地址,小写含41前缀', + `resource_type` VARCHAR(16) NOT NULL COMMENT 'ENERGY或BANDWIDTH', + `block_height` BIGINT NOT NULL COMMENT '采样的稳定确认高度,区块执行后状态', + `block_id` VARCHAR(64) NOT NULL COMMENT '确认区块哈希', + `balance_sun` BIGINT NOT NULL COMMENT '该地址对Stake2.0锁定与非锁定本金合计SUN', + `created_at` DATETIME(3) NOT NULL COMMENT '采集UTC时间', + PRIMARY KEY (`network`,`owner_address`,`receiver_address`,`resource_type`,`block_height`) +) ENGINE=InnoDB ROW_FORMAT=DYNAMIC DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin COMMENT='派单前稳定确认状态的地址对基线';