修复市场条件查询的 RPC 调用错误
- 修复 BlockchainService.getCondition 方法：将错误的 conditions(bytes32) 函数调用改为正确的 getOutcomeSlotCount(bytes32) 和 payoutDenominator(bytes32) 函数调用，解决 execution reverted 错误 - 改进 MarketPriceService 的错误处理：当链上查询出现 RPC 错误时，降级到 CLOB API 或 Gamma API 查询，而不是直接抛出异常，提高容错性
This commit is contained in:
WrBug
+57
-27
@@ -734,54 +734,84 @@ class BlockchainService(
|
||||
|
||||
val rpcApi = polygonRpcApi
|
||||
|
||||
// 1. 调用 conditions(bytes32) 获取 outcomeSlotCount 和 payoutDenominator
|
||||
// 注意：这是一个公开的 mapping，Solidity 自动生成的 getter
|
||||
// 函数签名: conditions(bytes32) returns (uint outcomeSlotCount, uint payoutDenominator)
|
||||
val conditionsFunctionSelector = EthereumUtils.getFunctionSelector("conditions(bytes32)")
|
||||
// 1. 调用 getOutcomeSlotCount(bytes32) 获取结果槽位数量
|
||||
// 函数签名: getOutcomeSlotCount(bytes32) returns (uint)
|
||||
val getOutcomeSlotCountSelector = EthereumUtils.getFunctionSelector("getOutcomeSlotCount(bytes32)")
|
||||
val encodedConditionId = EthereumUtils.encodeBytes32(conditionId)
|
||||
val conditionsData = conditionsFunctionSelector + encodedConditionId
|
||||
val outcomeSlotCountData = getOutcomeSlotCountSelector + encodedConditionId
|
||||
|
||||
// 构建 JSON-RPC 请求
|
||||
val conditionsRequest = JsonRpcRequest(
|
||||
val outcomeSlotCountRequest = JsonRpcRequest(
|
||||
method = "eth_call",
|
||||
params = listOf(
|
||||
mapOf(
|
||||
"to" to conditionalTokensAddress,
|
||||
"data" to conditionsData
|
||||
"data" to outcomeSlotCountData
|
||||
),
|
||||
"latest"
|
||||
)
|
||||
)
|
||||
|
||||
// 发送 RPC 请求
|
||||
val conditionsResponse = rpcApi.call(conditionsRequest)
|
||||
val outcomeSlotCountResponse = rpcApi.call(outcomeSlotCountRequest)
|
||||
|
||||
if (!conditionsResponse.isSuccessful || conditionsResponse.body() == null) {
|
||||
return Result.failure(Exception("RPC 请求失败 (conditions): ${conditionsResponse.code()} ${conditionsResponse.message()}"))
|
||||
if (!outcomeSlotCountResponse.isSuccessful || outcomeSlotCountResponse.body() == null) {
|
||||
return Result.failure(Exception("RPC 请求失败 (getOutcomeSlotCount): ${outcomeSlotCountResponse.code()} ${outcomeSlotCountResponse.message()}"))
|
||||
}
|
||||
|
||||
val conditionsRpcResponse = conditionsResponse.body()!!
|
||||
val outcomeSlotCountRpcResponse = outcomeSlotCountResponse.body()!!
|
||||
|
||||
// 检查错误
|
||||
if (conditionsRpcResponse.error != null) {
|
||||
// 记录完整的错误信息，包括 code 和 data
|
||||
val errorMsg = "RPC 错误 (code=${conditionsRpcResponse.error.code}): ${conditionsRpcResponse.error.message}, data=${conditionsRpcResponse.error.data}"
|
||||
logger.error("查询市场条件(conditions)出现RPC错误: conditionId=$conditionId, $errorMsg")
|
||||
logger.debug("RPC 请求详情: to=$conditionalTokensAddress, data=$conditionsData")
|
||||
if (outcomeSlotCountRpcResponse.error != null) {
|
||||
val errorMsg = "RPC 错误 (code=${outcomeSlotCountRpcResponse.error.code}): ${outcomeSlotCountRpcResponse.error.message}, data=${outcomeSlotCountRpcResponse.error.data}"
|
||||
logger.warn("查询市场条件(getOutcomeSlotCount)出现RPC错误: conditionId=$conditionId, $errorMsg")
|
||||
logger.debug("RPC 请求详情: to=$conditionalTokensAddress, data=$outcomeSlotCountData")
|
||||
return Result.failure(Exception(errorMsg))
|
||||
}
|
||||
|
||||
// 使用 Gson 解析 result（JsonElement）
|
||||
val hexResult = conditionsRpcResponse.result?.asString
|
||||
val outcomeSlotCountHex = outcomeSlotCountRpcResponse.result?.asString
|
||||
?: return Result.failure(Exception("RPC 响应格式错误: result 为空"))
|
||||
|
||||
// 解析返回的 (outcomeSlotCount, payoutDenominator)
|
||||
val cleanHex = hexResult.removePrefix("0x")
|
||||
val outcomeSlotCountHex = cleanHex.substring(0, 64)
|
||||
val payoutDenominatorHex = cleanHex.substring(64, 128)
|
||||
val outcomeSlotCount = EthereumUtils.decodeUint256(outcomeSlotCountHex).toInt()
|
||||
|
||||
val outcomeSlotCount = BigInteger(outcomeSlotCountHex, 16).toInt()
|
||||
val payoutDenominator = BigInteger(payoutDenominatorHex, 16)
|
||||
// 如果 outcomeSlotCount 为 0，说明市场尚未创建或不存在
|
||||
if (outcomeSlotCount <= 0) {
|
||||
logger.debug("市场尚未创建或不存在: conditionId=$conditionId, outcomeSlotCount=$outcomeSlotCount")
|
||||
return Result.success(Pair(BigInteger.ZERO, emptyList()))
|
||||
}
|
||||
|
||||
// 2. 调用 payoutDenominator(bytes32) 获取分母
|
||||
// 函数签名: payoutDenominator(bytes32) returns (uint)
|
||||
val payoutDenominatorSelector = EthereumUtils.getFunctionSelector("payoutDenominator(bytes32)")
|
||||
val payoutDenominatorData = payoutDenominatorSelector + encodedConditionId
|
||||
|
||||
val payoutDenominatorRequest = JsonRpcRequest(
|
||||
method = "eth_call",
|
||||
params = listOf(
|
||||
mapOf(
|
||||
"to" to conditionalTokensAddress,
|
||||
"data" to payoutDenominatorData
|
||||
),
|
||||
"latest"
|
||||
)
|
||||
)
|
||||
|
||||
val payoutDenominatorResponse = rpcApi.call(payoutDenominatorRequest)
|
||||
|
||||
if (!payoutDenominatorResponse.isSuccessful || payoutDenominatorResponse.body() == null) {
|
||||
return Result.failure(Exception("RPC 请求失败 (payoutDenominator): ${payoutDenominatorResponse.code()} ${payoutDenominatorResponse.message()}"))
|
||||
}
|
||||
|
||||
val payoutDenominatorRpcResponse = payoutDenominatorResponse.body()!!
|
||||
|
||||
if (payoutDenominatorRpcResponse.error != null) {
|
||||
val errorMsg = "RPC 错误 (code=${payoutDenominatorRpcResponse.error.code}): ${payoutDenominatorRpcResponse.error.message}, data=${payoutDenominatorRpcResponse.error.data}"
|
||||
logger.warn("查询市场条件(payoutDenominator)出现RPC错误: conditionId=$conditionId, $errorMsg")
|
||||
logger.debug("RPC 请求详情: to=$conditionalTokensAddress, data=$payoutDenominatorData")
|
||||
return Result.failure(Exception(errorMsg))
|
||||
}
|
||||
|
||||
val payoutDenominatorHex = payoutDenominatorRpcResponse.result?.asString
|
||||
?: return Result.failure(Exception("RPC 响应格式错误: result 为空"))
|
||||
|
||||
val payoutDenominator = EthereumUtils.decodeUint256(payoutDenominatorHex)
|
||||
|
||||
// 如果 outcomeSlotCount 为 0，说明市场尚未创建或不存在
|
||||
if (outcomeSlotCount <= 0) {
|
||||
|
||||
+3
-4
@@ -50,11 +50,10 @@ class MarketPriceService(
|
||||
}
|
||||
|
||||
// 如果链上查询出现 RPC 错误（execution reverted），说明市场可能不存在或尚未创建
|
||||
// 在这种情况下，不应该继续处理，应该抛出异常，让调用方决定如何处理
|
||||
// 在这种情况下，降级到其他数据源（CLOB API 或 Gamma API），而不是直接抛出异常
|
||||
// 因为 marketId 可能在 API 中存在，但在链上尚未创建
|
||||
if (hasRpcError) {
|
||||
val errorMsg = "链上查询市场条件出现 RPC 错误（execution reverted），市场可能不存在或尚未创建: marketId=$marketId, outcomeIndex=$outcomeIndex"
|
||||
logger.warn(errorMsg)
|
||||
throw IllegalStateException(errorMsg)
|
||||
logger.debug("链上查询市场条件出现 RPC 错误（execution reverted），降级到 API 查询: marketId=$marketId, outcomeIndex=$outcomeIndex")
|
||||
}
|
||||
|
||||
// 2. 从 CLOB API 查询订单簿价格（最准确，优先使用）
|
||||
|
||||
Reference in New Issue
Block a user