创建地址上链订单,需要判断该地址是否已经是地址地址,如果是,不允许创建。
This commit is contained in:
1 parent
22735b80c0
commit
e5820e36e7
7 files changed
+102
-2
No files matched your search
@@ -27,7 +27,7 @@
|
|||||||
|
|
||||||
链上独立确认成功才在同一事务写CHARGE、SUPPLIER_EARN和SUPPLIER_FEE流水:先登记供应商毛收入,再扣平台份额并写入 `rent_ledger.delta_platform_fee`;供应商待结算余额只增加净额。平台收入不是用户可用余额,平台统计沿用平台流水汇总。重复确认不重复入账,失败/未知不会确认收入。结算使用净应收,不二次扣费;退款/冲正仍走现有审核流程,平台退费累计上限为订单快照supplier_fee_amount,不随当前配置变化。
|
链上独立确认成功才在同一事务写CHARGE、SUPPLIER_EARN和SUPPLIER_FEE流水:先登记供应商毛收入,再扣平台份额并写入 `rent_ledger.delta_platform_fee`;供应商待结算余额只增加净额。平台收入不是用户可用余额,平台统计沿用平台流水汇总。重复确认不重复入账,失败/未知不会确认收入。结算使用净应收,不二次扣费;退款/冲正仍走现有审核流程,平台退费累计上限为订单快照supplier_fee_amount,不随当前配置变化。
|
||||||
|
|
||||||
已激活普通地址也允许收到1TRX;未激活地址会由TRX转账激活。合约地址由本地Agent拒绝;网络由请求明确指定,不通过地址推断。不要用主网地址格式相同误以为两个网络余额可以混用。
|
地址上链仅允许当前网络尚未激活的地址。创建新单前,云端调用所选网络最新节点的 `/wallet/getaccount`,已存在账户(即使余额为0)拒绝创建;RPC异常或响应异常时中止,不生成订单、不冻结USDT。报价只计算费用,不保证下单时仍未激活。原商户单号幂等重试仍返回原单,不会因原单执行后地址已激活而失败。合约地址由本地Agent拒绝;网络由请求明确指定,不通过地址推断。此检查不构成对外部链上交易的锁定,检查之后地址仍可能被第三方激活。
|
||||||
|
|
||||||
## 流程与失败处理
|
## 流程与失败处理
|
||||||
|
|
||||||
|
|||||||
@@ -7,13 +7,15 @@
|
|||||||
## 使用流程
|
## 使用流程
|
||||||
|
|
||||||
1. 输入API基地址、租赁应用的API Key与API Secret。基地址默认取当前后台代理前缀,例如 `/prod-api`,最终调用 `/prod-api/api/rental/v1/packages`;直连API域名时填写 `https://租赁域名`,也支持包含实际代理前缀。
|
1. 输入API基地址、租赁应用的API Key与API Secret。基地址默认取当前后台代理前缀,例如 `/prod-api`,最终调用 `/prod-api/api/rental/v1/packages`;直连API域名时填写 `https://租赁域名`,也支持包含实际代理前缀。
|
||||||
2. 左侧选择7个商户接入接口之一:套餐、资源报价/下单/查询、地址上链报价/下单/查询。编辑器保留每个接口本次页面内的草稿,可格式化或恢复文档示例。
|
2. 在接口下拉框中选择7个商户接入接口之一,按“资源租赁 / 地址上链”分组。页面自动显示对应参数表单、必填标记、单位和填写说明;不适用的参数不显示。每个接口分别保留当前页面内的草稿。
|
||||||
3. 查询套餐后点击“使用此套餐报价”,填写真实资源接收地址,发送报价。
|
3. 查询套餐后点击“使用此套餐报价”,填写真实资源接收地址,发送报价。
|
||||||
4. 报价成功后点击“使用此报价准备下单”,自动沿用参数、报价原始金额字符串并生成商户单号。确认接收地址、网络、费用和回调地址,再发送下单请求。
|
4. 报价成功后点击“使用此报价准备下单”,自动沿用参数、报价原始金额字符串并生成商户单号。确认接收地址、网络、费用和回调地址,再发送下单请求。
|
||||||
5. 下单成功后点击“查询此商户订单”跟踪状态。创建成功不代表履约成功;超时/停止等待不会取消服务端业务,请用原商户单号查询,不要贸然生成新单号重试。
|
5. 下单成功后点击“查询此商户订单”跟踪状态。创建成功不代表履约成功;超时/停止等待不会取消服务端业务,请用原商户单号查询,不要贸然生成新单号重试。
|
||||||
|
|
||||||
## 调试信息
|
## 调试信息
|
||||||
|
|
||||||
|
默认使用表单填写网络、套餐ID、接收地址、商户单号、时长、资源数量、预计金额和回调地址。查询仅需原商户订单号,套餐查询仅需网络。选填参数清空时从请求中移除,不发送空字符串;金额和资源整数按精确字符串提交。需要扩展参数或排查原始字节时,切换“高级JSON / 请求预览”,两种模式共享同一份请求数据。无效JSON需先修正才能继续表单编辑。
|
||||||
|
|
||||||
页面展示HTTP状态、业务原始响应、耗时、可见响应头、完整请求URL、JSON原文、请求体SHA256和脱敏签名原文。API Key与签名脱敏,Secret不展示、不写日志、不持久化。签名与发送共用同一原始UTF-8请求体,时间戳和nonce每次更新;反向代理前缀不参与签名。
|
页面展示HTTP状态、业务原始响应、耗时、可见响应头、完整请求URL、JSON原文、请求体SHA256和脱敏签名原文。API Key与签名脱敏,Secret不展示、不写日志、不持久化。签名与发送共用同一原始UTF-8请求体,时间戳和nonce每次更新;反向代理前缀不参与签名。
|
||||||
|
|
||||||
页面使用独立浏览器请求,不携带后台Token或Cookie,不使用后端代发代理。签名依赖Web Crypto,需要HTTPS或localhost。跨域API必须允许当前后台来源、POST、Content-Type和X-Rent-*认证头;响应头受浏览器CORS可见范围限制。证书不可信、网络错误、跨域或重定向均需按实际部署修复,页面不会关闭证书校验。
|
页面使用独立浏览器请求,不携带后台Token或Cookie,不使用后端代发代理。签名依赖Web Crypto,需要HTTPS或localhost。跨域API必须允许当前后台来源、POST、Content-Type和X-Rent-*认证头;响应头受浏览器CORS可见范围限制。证书不可信、网络错误、跨域或重定向均需按实际部署修复,页面不会关闭证书校验。
|
||||||
|
|||||||
@@ -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) {
|
private long block(JsonNode row) {
|
||||||
return row.path("block_header").path("raw_data").path("number").asLong(-1);
|
return row.path("block_header").path("raw_data").path("number").asLong(-1);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -20,6 +20,14 @@ public class RentalOnchain {
|
|||||||
@Autowired
|
@Autowired
|
||||||
private Environment environment;
|
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) {
|
public static boolean isOrder(Map<String, Object> row) {
|
||||||
return ORDER_TYPE.equals(text(row, "order_type"));
|
return ORDER_TYPE.equals(text(row, "order_type"));
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -210,6 +210,9 @@ public class RentalOrders {
|
|||||||
return existing;
|
return existing;
|
||||||
}
|
}
|
||||||
Map<String, Object> price = onchain.quote(request);
|
Map<String, Object> price = onchain.quote(request);
|
||||||
|
// 在任何账户创建、订单写入和资金冻结前查询最新链上状态;RPC未知时直接中止。
|
||||||
|
// 必须位于原单幂等返回之后,已成功激活的原订单仍可安全重试和查询。
|
||||||
|
onchain.requireUnactivated(network, receiver);
|
||||||
BigDecimal total = amount(price, "amount");
|
BigDecimal total = amount(price, "amount");
|
||||||
if (request.containsKey("expected_amount")) {
|
if (request.containsKey("expected_amount")) {
|
||||||
require(total.compareTo(amount(request, "expected_amount")) == 0, "价格已变更,请重新报价");
|
require(total.compareTo(amount(request, "expected_amount")) == 0, "价格已变更,请重新报价");
|
||||||
|
|||||||
@@ -36,6 +36,9 @@ public class RentalBusinessTest {
|
|||||||
private long wallet;
|
private long wallet;
|
||||||
private long node;
|
private long node;
|
||||||
private boolean proofAvailable = true;
|
private boolean proofAvailable = true;
|
||||||
|
private boolean receiverActivated;
|
||||||
|
private boolean activationRpcFailed;
|
||||||
|
private int activationChecks;
|
||||||
private static final String ADDRESS = "TXYZopYRdj2D9XRtbG411XZZ3kM5VkAeBf";
|
private static final String ADDRESS = "TXYZopYRdj2D9XRtbG411XZZ3kM5VkAeBf";
|
||||||
private static final String OWNER = "TR7NHqjeKQxGTCi8q8ZY4pL8otgjLj6t";
|
private static final String OWNER = "TR7NHqjeKQxGTCi8q8ZY4pL8otgjLj6t";
|
||||||
private final ObjectMapper json = new ObjectMapper();
|
private final ObjectMapper json = new ObjectMapper();
|
||||||
@@ -228,6 +231,17 @@ public class RentalBusinessTest {
|
|||||||
java.lang.reflect.Field envField = RentalOnchain.class.getDeclaredField("environment");
|
java.lang.reflect.Field envField = RentalOnchain.class.getDeclaredField("environment");
|
||||||
envField.setAccessible(true);
|
envField.setAccessible(true);
|
||||||
envField.set(onchain, environment);
|
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");
|
java.lang.reflect.Field onchainField = RentalOrders.class.getDeclaredField("onchain");
|
||||||
onchainField.setAccessible(true);
|
onchainField.setAccessible(true);
|
||||||
onchainField.set(orders, onchain);
|
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());
|
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) {
|
private Map<String, Object> onchainRequest(String merchant) {
|
||||||
return map("order_type", "ADDRESS_ONCHAIN", "network", "NILE", "merchant_order_no", merchant,
|
return map("order_type", "ADDRESS_ONCHAIN", "network", "NILE", "merchant_order_no", merchant,
|
||||||
"receiver_address", ADDRESS, "expected_amount", "0.173457");
|
"receiver_address", ADDRESS, "expected_amount", "0.173457");
|
||||||
|
|||||||
@@ -133,6 +133,31 @@ public class RentalOnchainTest {
|
|||||||
|
|
||||||
private interface Action { void run() throws Exception; }
|
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) {
|
private static void expectRejected(Action action) {
|
||||||
try { action.run(); fail("必须拒绝不安全请求"); }
|
try { action.run(); fail("必须拒绝不安全请求"); }
|
||||||
catch (IllegalArgumentException expected) { /* 明确校验拒绝 */ }
|
catch (IllegalArgumentException expected) { /* 明确校验拒绝 */ }
|
||||||
|
|||||||
Reference in new issue
Block a user