From 911a3634ee645f207485c329a44fcf77036a149e Mon Sep 17 00:00:00 2001 From: luqingjie <544309509@qq.com> Date: Wed, 28 Oct 2026 11:12:50 -0400 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3RPC=E5=93=8D=E5=BA=94?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/rental/history-service.md | 17 ++--- .../system/rental/RentalHistoryCollector.java | 8 ++- .../system/rental/RentalHistoryService.java | 69 ++++++++++++++++--- .../com/ruoyi/system/rental/RentalHttp.java | 3 +- .../system/rental/RentalHistoryTest.java | 48 ++++++++++++- 5 files changed, 124 insertions(+), 21 deletions(-) diff --git a/docs/rental/history-service.md b/docs/rental/history-service.md index 4452aad..77507a1 100644 --- a/docs/rental/history-service.md +++ b/docs/rental/history-service.md @@ -6,15 +6,16 @@ ## 1. 实现范围与可信前提 -普通 HTTP RPC 不支持任意历史高度的完整账户/全网资源状态。内置实现采用“实时确认状态采集 + 完整区块事件归档 + 地址对重放”,从启用时开始积累可用的历史证据,不是完整 TRON 归档节点,也不能凭空恢复上线前的历史资源参数。 +普通 HTTP RPC 不支持任意历史高度的完整账户/全网资源状态。内置实现采用“FullNode实时状态采样、等待确认 + 完整区块事件归档 + 地址对重放”,从启用时开始积累可用的历史证据,不是完整 TRON 归档节点,也不能凭空恢复上线前的历史资源参数。 -采集必须使用**由运营信任、状态一致的固定 RPC 节点**。`walletsolidity` 读的是最后确认状态,不能用 `wallet` 当前状态替代。公共负载均衡服务即使前后两次确认头相同,也无法证明中间请求一定落在同一后端;生产应使用自己的固定节点或有一致性保证的服务。需要支持以下 POST 接口: +采集必须使用**由运营信任、状态一致的固定 RPC 节点**。Nile公共服务没有`/walletsolidity/getaccountresource`,不能用该路径,也不能把最新参数标记为当前确认头参数。当前实现先用最新头夹读绑定采样高度,待该高度进入确认链并核对哈希后才归档。公共负载均衡服务即使前后两次头相同,也不能证明中间请求来自同一后端;生产应使用自己的固定节点或有一致性保证的服务。需要支持以下 POST 接口: | 接口 | 用途 | | --- | --- | | `/walletsolidity/getnowblock` | 获取确认头高度、区块哈希 | -| `/walletsolidity/getaccountresource` | 获取该确认状态的能量/带宽全网额度和权重 | -| `/walletsolidity/getdelegatedresourcev2` | 读取指定地址对的锁定、非锁定 Stake 2.0 本金 | +| `/wallet/getnowblock` | FullNode最新头,夹读以绑定实时采样高度 | +| `/wallet/getaccountresource` | 该最新高度的能量/带宽全网额度和权重 | +| `/wallet/getdelegatedresourcev2` | 该最新高度指定地址对的 Stake 2.0 本金 | | `/walletsolidity/getblockbynum` | 按高度读取确认区块及按序交易、执行回执 | 示例RPC地址仅表示接口来源,不能据此认为公共服务已通过生产验收。不支持某接口、返回参数不完整或限流时,采集会失败,不用空值伪造成功。 @@ -23,11 +24,11 @@ ## 2. 业务流程 -1. 采集器读取确认头 H1,读取全网资源参数,再次读取确认头 H2。只有高度和哈希均一致才把参数绑定到该区块。变化时最多重试3次,仍不稳定则放弃这次采样。 +1. 采集器读取FullNode最新头 H1,读取全网资源参数及所需关系,再次读取最新头 H2。仅高度和哈希一致才绑定该高度。最多尝试3次。不立即写入历史证据;内存保留最多10000份、最长10分钟的未确认采样,每轮继续采集后续高度。确认头到达采样高度后,使用确认区块查询核对原采样哈希,再归档。分叉、超时或重启丢失的采样不补造。 2. 首次采集从当前确认头开始;已有派单前基线时,从最早基线的下一高度开始。以后从数据库游标下一高度补采确认区块。 3. 每个区块按原交易顺序解析成功的 `DelegateResourceContract` 和 `UnDelegateResourceContract`,保存全网委托/回收事件。相关交易没有完整回执时整个区块不推进。 4. 写入区块事件、标记区块完整和推进游标在同一事务中完成;父哈希不连续、重复高度哈希不同、同高度参数冲突时拒绝覆盖。 -5. 平台派单前对候选供应钱包/接收地址/资源类型采集确认关系基线,同样使用确认头夹读。锁定与非锁定本金合计必须为0,失败时订单仍等待派单,不先发送任务再补证据。原有当前关系检查继续保留。 +5. 平台派单前对候选供应钱包/接收地址/资源类型采集关系基线,同样使用最新头夹读并等待对应区块确认。锁定与非锁定本金合计必须为0,等待确认时订单仍等待派单,后续调度重试,不先发送任务再补证据。原有当前关系检查继续保留。首次启动需要等待确认预热;不要因此关闭确认校验。 6. 本地 Agent 按原流程执行,云端原有核验继续检查真实交易、owner/receiver、网络、资源类型、非锁定、SUN、回执、确认深度及当前关系。 7. 内置服务查找目标交易之前最近的关系基线,验证从基线到交易区块的所有区块连续且事件完整,按区块高度和交易序号重放本金变化。目标交易必须真实存在于归档,不能用请求的本金代替事件。 8. 从目标区块读取当时保存的额度和权重,返回目标交易前后本金及资源参数。云端以原有精确整数公式换算资源,达标且租期未结束时才扣款、记供应商收入。 @@ -78,7 +79,7 @@ | events_complete | TINYINT | 1表示本块全部相关成功事件已完整归档 | | energy_limit / energy_weight | BIGINT,可空 | 该区块确认状态的全网能量参数 | | bandwidth_limit / bandwidth_weight | BIGINT,可空 | 该区块确认状态的全网带宽参数 | -| parameters_at | DATETIME(3),可空 | 实时夹读参数成功的UTC时间 | +| parameters_at | DATETIME(3),可空 | 实时夹读采样经确认哈希校验后入库的UTC时间;区块高度仍是原采样高度 | | created_at | DATETIME(3) | 首次记录UTC时间 | 唯一索引 `(network, block_id)` 防止同哈希被绑定不同高度。参数全部为空且 `parameters_at` 为空表示**该高度资源参数漏采**,即使区块交易成功补齐也不能把后来参数填入该行。 @@ -210,7 +211,7 @@ RENT_RPC_KEY=按所用RPC要求提供 | 文件 | 职责 | | --- | --- | -| `ruoyi-system/.../rental/RentalHistoryService.java` | 确认状态夹读、不可变入库、网络租约、区块解析、关系重放、证明 | +| `ruoyi-system/.../rental/RentalHistoryService.java` | 最新状态夹读、暂存等待确认、哈希核对、不可变入库、网络租约、区块解析、关系重放、证明 | | `ruoyi-system/.../rental/RentalHistoryCollector.java` | 独立后台线程、分网络轮询、关闭 | | `ruoyi-system/.../rental/RentalHistoryController.java` | 受保护的状态/证明查询 | | `RentalChain.java` | 内置/外部证明选择,原链上核验保留 | 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 index aeaf933..25a34c0 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalHistoryCollector.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalHistoryCollector.java @@ -1,5 +1,6 @@ package com.ruoyi.system.rental; +import lombok.extern.slf4j.Slf4j; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; @@ -14,7 +15,10 @@ import java.util.concurrent.ScheduledThreadPoolExecutor; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -/** 独立采集线程,不与业务五秒/十五秒调度争抢同一个调度线程;无链上写操作。 */ +/** + * 独立采集线程,不与业务五秒/十五秒调度争抢同一个调度线程;无链上写操作。 + */ +@Slf4j @Component @ConditionalOnProperty(name = {"rental.enabled", "rental.history.embedded-enabled"}, havingValue = "true") public class RentalHistoryCollector { @@ -50,6 +54,8 @@ public class RentalHistoryCollector { executor.scheduleWithFixedDelay(() -> { try { service.collect(network); + } catch (RentalHistoryService.PendingConfirmationException ex) { + LOG.debug("租赁历史采样等待区块确认,network={}", network); } catch (Exception ex) { // 不记录异常原文,避免RPC配置、认证头或供应商数据进入日志。 LOG.warn("租赁历史采集未完成,network={},请查看受保护的历史状态接口", network); 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 index 039b108..7bc8659 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalHistoryService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalHistoryService.java @@ -26,7 +26,7 @@ import java.util.Map; /** * 云端内置的只读历史采集与证明服务。 * - *

普通节点只提供最新确认状态,因此用同一确认头前后夹读为参数、关系基线绑定高度。 + *

FullNode状态以最新头前后夹读绑定高度,等待Solidity确认并核对哈希后才归档。 * 已错过高度只能补区块交易,不能补造历史参数。所有HTTP在事务外执行,数据库事务只保存事实。 * 本服务信任运营配置的同一一致性RPC节点,不接受供应商提交的历史参数,不持有私钥,不广播。 */ @@ -50,6 +50,18 @@ public class RentalHistoryService { @Value("${rental.confirmations:19}") private long confirmations = 19; + /** 未确认采样只驻留内存;重启丢弃,禁止回填或使用其他高度参数替代。 */ + private final Map pendingSnapshots = new java.util.concurrent.ConcurrentHashMap<>(); + + /** 确认预热属于正常等待,不作为RPC故障反复输出错误堆栈。 */ + public static final class PendingConfirmationException extends IllegalStateException { + private static final long serialVersionUID = 1L; + + private PendingConfirmationException() { + super("资源采样区块尚未确认,请稍后重试"); + } + } + public RentalHistoryService(RentalStore store, RentalChain chain, PlatformTransactionManager manager) { this.store = store; @@ -94,21 +106,26 @@ public class RentalHistoryService { } /** - * 三次有界尝试,只有确认头高度和哈希均未变化才接纳快照。 - * 这里读取walletsolidity状态,不允许用wallet最新未确认状态冒充历史快照。 + * 最新头夹读绑定采样高度;采样必须等该高度确认且哈希一致后才能用于历史证明。 + * 必须配置同一一致性FullNode(或保证会话一致性的网关),不能混用不同高度后端。 */ - private Snapshot capture(String network, String owner, String receiver, String type) { + private synchronized Snapshot capture(String network, String owner, String receiver, String type) { + String key = network + ":" + owner + ":" + receiver + ":" + type; + // 有界缓存防止异常地址请求造成无限内存增长;过期快照不再用于新基线。 + long oldest = System.currentTimeMillis() - 10 * 60 * 1000L; + pendingSnapshots.entrySet().removeIf(entry -> entry.getValue().sampledAt < oldest); + require(pendingSnapshots.size() < 10000, "待确认资源采样过多,请稍后重试"); for (int attempt = 0; attempt < 3; attempt++) { - JsonNode before = head(network); + JsonNode before = chain.call(network, "/wallet/getnowblock", map()); long blockHeight = height(before); String blockId = hash(before); - long[] totals = parameters(chain.call(network, "/walletsolidity/getaccountresource", + long[] totals = parameters(chain.call(network, "/wallet/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", + JsonNode response = chain.call(network, "/wallet/getdelegatedresourcev2", map("fromAddress", owner, "toAddress", receiver, "lock", locked, "visible", true)); require(!response.has("Error") && !response.has("error") @@ -125,12 +142,40 @@ public class RentalHistoryService { } } } - JsonNode after = head(network); + JsonNode after = chain.call(network, "/wallet/getnowblock", map()); if (blockHeight == height(after) && blockId.equals(hash(after))) { - return new Snapshot(before, totals, balance); + // 每轮继续采样,等待确认期间不能停止采样,否则会漏掉后续交易高度的参数。 + String sampleKey = key + ":" + blockHeight; + Snapshot sampled = new Snapshot(before.deepCopy(), totals, balance); + Snapshot original = pendingSnapshots.putIfAbsent(sampleKey, sampled); + if (original != null) { + if (!hash(original.block).equals(blockId)) { + pendingSnapshots.remove(sampleKey); + throw new IllegalStateException("未确认采样区块发生分叉,丢弃并重新采样"); + } + require(hash(original.block).equals(blockId) + && Arrays.equals(original.totals, totals) && original.balance == balance, + "同一采样高度状态不一致,请检查RPC后端一致性"); + } + long confirmedHeight = height(head(network)); + Map.Entry ready = pendingSnapshots.entrySet().stream() + .filter(entry -> entry.getKey().startsWith(key + ":") + && height(entry.getValue().block) <= confirmedHeight) + .min(java.util.Comparator.comparingLong(entry -> height(entry.getValue().block))) + .orElse(null); + if (ready == null) { + throw new PendingConfirmationException(); + } + Snapshot pending = ready.getValue(); + JsonNode canonical = chain.call(network, "/walletsolidity/getblockbynum", + map("num", height(pending.block), "visible", false)); + pendingSnapshots.remove(ready.getKey()); + require(height(canonical) == height(pending.block) + && hash(canonical).equals(hash(pending.block)), "资源采样区块发生分叉,丢弃并重新采样"); + return pending; } } - throw new IllegalStateException("确认头在采样期间变化,请重试,未记录历史证据"); + throw new IllegalStateException("最新头在采样期间变化,请重试,未记录历史证据"); } /** 派单前建立真实基线;非零关系拒绝派单,不用任务声明的0替代链上读取。 */ @@ -241,6 +286,9 @@ public class RentalHistoryService { return null; }); } + } catch (PendingConfirmationException ex) { + // 预热不会推进游标或生成参数;finally仍然释放本网络租约。 + throw ex; } catch (RuntimeException ex) { store.execute("UPDATE rent_history_cursor SET last_error=?,updated_at=?" + " WHERE network=? AND lease_owner=?", "采集未完成,请检查RPC一致性、限流、表结构及确认链连续性", @@ -430,6 +478,7 @@ public class RentalHistoryService { private final JsonNode block; private final long[] totals; private final long balance; + private final long sampledAt = System.currentTimeMillis(); private Snapshot(JsonNode block, long[] totals, long balance) { this.block = block; 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 289ef84..d2f9ee7 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 @@ -81,7 +81,8 @@ public final class RentalHttp { /** 完整区块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响应失败"); + require(response.isSuccessful() && response.body() != null, + "RPC响应失败,HTTP状态码=" + response.code()); java.io.InputStream stream = response.body().byteStream(); java.io.ByteArrayOutputStream output = new java.io.ByteArrayOutputStream(); byte[] buffer = new byte[4096]; 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 index 4ac37a2..7144aeb 100644 --- a/ruoyi-system/src/test/java/com/ruoyi/system/rental/RentalHistoryTest.java +++ b/ruoyi-system/src/test/java/com/ruoyi/system/rental/RentalHistoryTest.java @@ -34,6 +34,7 @@ public class RentalHistoryTest { private boolean invalidParameters; private boolean rpcFailure; private int calls; + private long confirmationLag; @Before public void setup() throws Exception { @@ -61,14 +62,18 @@ public class RentalHistoryTest { } if (path.endsWith("getnowblock")) { long height = changingHeads > 0 ? currentHead + changingHeads-- : currentHead; + if (path.startsWith("/walletsolidity/")) { + height -= confirmationLag; + } return block(height); } if (path.endsWith("getaccountresource")) { + assertEquals("/wallet/getaccountresource", path); return json.valueToTree(invalidParameters ? map("TotalEnergyLimit", 0) : map("TotalEnergyLimit", energyLimit, "TotalEnergyWeight", 1000000, "TotalNetLimit", 1500000, "TotalNetWeight", 1000000)); } - if (path.equals("/walletsolidity/getdelegatedresourcev2")) { + if (path.equals("/wallet/getdelegatedresourcev2")) { return json.valueToTree(Boolean.TRUE.equals(body.get("lock")) ? map() : map("delegatedResource", Arrays.asList(map("frozen_balance_for_energy", relation)))); } @@ -157,6 +162,45 @@ public class RentalHistoryTest { } } + @Test + public void fullNodeSamplesWaitForConfirmationWithoutRelabelingParameters() { + confirmationLag = 2; + rejects(this::anchor); + assertEquals(0, number(store.one("SELECT COUNT(*) AS n FROM rent_history_anchor"), "n")); + currentHead = 101; + energyLimit = 90000000; + rejects(this::anchor); + currentHead = 102; + anchor(); + Map saved = store.one("SELECT * FROM rent_history_anchor"); + assertEquals(100, number(saved, "block_height")); + assertEquals(60000000, number(store.one("SELECT * FROM rent_history_block WHERE block_height=100"), "energy_limit")); + } + + @Test + public void collectionKeepsSamplingWhileWaitingAndArchivesOriginalHeight() { + confirmationLag = 2; + rejects(() -> collect(100)); + energyLimit = 90000000; + rejects(() -> collect(101)); + collect(102); + assertEquals(100, number(service.status().get(0), "scanned_height")); + assertEquals(60000000, number(store.one("SELECT * FROM rent_history_block WHERE block_height=100"), "energy_limit")); + collect(103); + assertEquals(101, number(service.status().get(0), "scanned_height")); + assertEquals(90000000, number(store.one("SELECT * FROM rent_history_block WHERE block_height=101"), "energy_limit")); + } + + @Test + public void forkedUnconfirmedSampleCannotBecomeEvidence() { + confirmationLag = 2; + rejects(this::anchor); + ((ObjectNode) block(100)).put("blockID", hash(999)); + currentHead = 102; + rejects(this::anchor); + assertEquals(0, number(store.one("SELECT COUNT(*) AS n FROM rent_history_anchor"), "n")); + } + @Test public void coherentArchiveProducesProofAndPreservesOldParameters() { anchor(); @@ -399,6 +443,7 @@ public class RentalHistoryTest { chain.prepareHistory("NILE", OWNER, RECEIVER, "ENERGY"); transactions(101, event(1001, "DelegateResourceContract", "ENERGY", SUN)); collect(101); + relation = SUN; 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")); @@ -413,6 +458,7 @@ public class RentalHistoryTest { collect(100); transactions(101, event(1001, "DelegateResourceContract", "ENERGY", SUN)); collect(102); + relation = SUN; 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"));