创建地址上链订单,需要判断该地址是否已经是地址地址,如果是,不允许创建。

This commit is contained in:
lu7213 committed 2026-10-30 05:31:19 -04:00
1 parent 22735b80c0
commit e5820e36e7
7 files changed
+102 -2

No files matched your search

@@ -91,6 +91,28 @@ public class RentalChain {
}
}
/**
* 地址激活以所选网络最新全节点账户记录为准,不能用余额是否为零判断。
* 仅TRON getaccount返回空对象表示未激活;错误/异常结构视为未知,禁止继续冻结资金。
*/
public void requireUnactivated(String network, String address) {
network(network);
RentalOrders.address(address);
log.info("地址上链激活检查开始 network={} receiver={}", network, address);
JsonNode account = call(network, "/wallet/getaccount", map("address", address, "visible", true));
require(account != null && account.isObject(), "地址激活状态查询异常,请稍后重试");
if (account.size() == 0) {
log.info("地址上链激活检查通过 network={} receiver={} activated=false", network, address);
return;
}
String returnedAddress = account.path("address").asText();
require(address.equals(returnedAddress)
|| ApiWrapper.toHex(ApiWrapper.parseAddress(address)).equalsIgnoreCase(returnedAddress),
"地址激活状态响应不完整或不一致,请稍后重试");
log.warn("地址上链创建被拒绝 network={} receiver={} activated=true", network, address);
throw new IllegalArgumentException("该地址在当前网络已激活,无需地址上链,不允许创建订单");
}
private long block(JsonNode row) {
return row.path("block_header").path("raw_data").path("number").asLong(-1);
}
@@ -20,6 +20,14 @@ public class RentalOnchain {
@Autowired
private Environment environment;
@Autowired
private RentalChain chain;
/** 仅新订单检查;原单幂等重试不能因履约后地址已激活而失败。 */
public void requireUnactivated(String network, String receiver) {
chain.requireUnactivated(network, receiver);
}
public static boolean isOrder(Map<String, Object> row) {
return ORDER_TYPE.equals(text(row, "order_type"));
}
@@ -210,6 +210,9 @@ public class RentalOrders {
return existing;
}
Map<String, Object> price = onchain.quote(request);
// 在任何账户创建、订单写入和资金冻结前查询最新链上状态;RPC未知时直接中止。
// 必须位于原单幂等返回之后,已成功激活的原订单仍可安全重试和查询。
onchain.requireUnactivated(network, receiver);
BigDecimal total = amount(price, "amount");
if (request.containsKey("expected_amount")) {
require(total.compareTo(amount(request, "expected_amount")) == 0, "价格已变更,请重新报价");