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

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, "价格已变更,请重新报价");
@@ -36,6 +36,9 @@ public class RentalBusinessTest {
private long wallet;
private long node;
private boolean proofAvailable = true;
private boolean receiverActivated;
private boolean activationRpcFailed;
private int activationChecks;
private static final String ADDRESS = "TXYZopYRdj2D9XRtbG411XZZ3kM5VkAeBf";
private static final String OWNER = "TR7NHqjeKQxGTCi8q8ZY4pL8otgjLj6t";
private final ObjectMapper json = new ObjectMapper();
@@ -228,6 +231,17 @@ public class RentalBusinessTest {
java.lang.reflect.Field envField = RentalOnchain.class.getDeclaredField("environment");
envField.setAccessible(true);
envField.set(onchain, environment);
java.lang.reflect.Field activationField = RentalOnchain.class.getDeclaredField("chain");
activationField.setAccessible(true);
activationField.set(onchain, new RentalChain(json) {
@Override public com.fasterxml.jackson.databind.JsonNode call(String network, String path, Map<String, Object> body) {
assertEquals("/wallet/getaccount", path);
assertEquals("NILE", network);
activationChecks++;
if (activationRpcFailed) { throw new IllegalStateException("controlled RPC failure"); }
return json.valueToTree(receiverActivated ? map("address", ADDRESS, "balance", 0) : map());
}
});
java.lang.reflect.Field onchainField = RentalOrders.class.getDeclaredField("onchain");
onchainField.setAccessible(true);
onchainField.set(orders, onchain);
@@ -501,6 +515,32 @@ public class RentalBusinessTest {
assertEquals(0, store.rows("SELECT id FROM rent_ledger WHERE order_id=? AND event_type='SUPPLIER_FEE'", orderId).size());
}
@Test
public void onchainRejectsActivatedOrUnknownWithoutOrderOrFrozenFunds() {
BigDecimal before = amount(store.get("account", payer, false), "available_amount");
for (boolean active : new boolean[] {true, false}) {
receiverActivated = active;
activationRpcFailed = !active;
try {
tx.execute(status -> orders.create(app, 10, onchainRequest("activation-reject")));
fail("已激活或状态未知不允许创建");
} catch (IllegalArgumentException | IllegalStateException expected) { /* 保持余额且无新订单 */ }
assertEquals(before, amount(store.get("account", payer, false), "available_amount"));
assertEquals(ZERO, amount(store.get("account", payer, false), "frozen_amount"));
assertTrue(store.rows("SELECT id FROM rent_order WHERE merchant_order_no='activation-reject'").isEmpty());
}
}
@Test
public void onchainIdempotentRetryStillWorksAfterReceiverActivated() {
Map<String, Object> request = onchainRequest("activation-idempotent");
Map<String, Object> original = tx.execute(status -> orders.create(app, 10, request));
receiverActivated = true;
Map<String, Object> retry = tx.execute(status -> orders.create(app, 10, request));
assertEquals(number(original, "id"), number(retry, "id"));
assertEquals(1, activationChecks);
}
private Map<String, Object> onchainRequest(String merchant) {
return map("order_type", "ADDRESS_ONCHAIN", "network", "NILE", "merchant_order_no", merchant,
"receiver_address", ADDRESS, "expected_amount", "0.173457");
@@ -133,6 +133,31 @@ public class RentalOnchainTest {
private interface Action { void run() throws Exception; }
@Test
public void activationUsesRequestedNetworkAndRejectsUnknownResponses() {
final com.fasterxml.jackson.databind.node.ObjectNode response = json.createObjectNode();
final String[] observedNetwork = new String[1];
RentalChain chain = new RentalChain(json) {
@Override public JsonNode call(String network, String path, Map<String, Object> body) {
observedNetwork[0] = network;
assertEquals("/wallet/getaccount", path);
assertEquals(RECEIVER, body.get("address"));
assertEquals(Boolean.TRUE, body.get("visible"));
return response;
}
};
chain.requireUnactivated("NILE", RECEIVER);
assertEquals("NILE", observedNetwork[0]);
// 已存在的零余额账户仍为已激活,不允许用余额判断或跨网络兜底。
response.put("address", RECEIVER); response.put("balance", 0);
expectRejected(() -> chain.requireUnactivated("MAINNET", RECEIVER));
assertEquals("MAINNET", observedNetwork[0]);
response.removeAll(); response.put("Error", "controlled node error");
expectRejected(() -> chain.requireUnactivated("NILE", RECEIVER));
response.removeAll(); response.put("address", OWNER);
expectRejected(() -> chain.requireUnactivated("NILE", RECEIVER));
}
private static void expectRejected(Action action) {
try { action.run(); fail("必须拒绝不安全请求"); }
catch (IllegalArgumentException expected) { /* 明确校验拒绝 */ }