diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index f0ab939..7bdb9ad 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -139,9 +139,9 @@ tron: operation-resource-redundancy-percent: ${TRON_OPERATION_RESOURCE_REDUNDANCY_PERCENT:20} chain-data: # 多个端点按顺序尝试,使用英文逗号分隔。生产环境建议通过对应环境变量覆盖。 - api-key: ${TRON_GRID_API_KEY:} + api-key: ${TRON_GRID_API_KEY:719b2ba2-dedd-48ad-99a6-df1caa6f08ae} # TronScan 独立申请的 API Key,不能填写 TronGrid 的 Key。 - tronscan-api-key: ${TRONSCAN_API_KEY:} + tronscan-api-key: ${TRONSCAN_API_KEY:47fae50b-b5e8-4d1b-8329-501a422a3169} mainnet: transaction-endpoints: ${TRON_MAINNET_TRANSACTION_ENDPOINTS:https://api.trongrid.io,https://apilist.tronscanapi.com,https://api.tronscan.org} account-endpoints: ${TRON_MAINNET_ACCOUNT_ENDPOINTS:https://apilist.tronscanapi.com,https://api.tronscan.org} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/TronChainDataClient.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/TronChainDataClient.java index 2efb7ec..7a5a227 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/TronChainDataClient.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/TronChainDataClient.java @@ -49,8 +49,8 @@ public class TronChainDataClient { @Autowired public TronChainDataClient( - @Value("${tron.chain-data.mainnet.transaction-endpoints:https://api.trongrid.io,https://apilist.tronscanapi.com,https://api.tronscan.org}") String mainnetTransactionEndpoints, - @Value("${tron.chain-data.mainnet.account-endpoints:https://apilist.tronscanapi.com,https://api.tronscan.org}") String mainnetAccountEndpoints, + @Value("${tron.chain-data.mainnet.transaction-endpoints:https://api.trongrid.io,https://apilist.tronscanapi.com}") String mainnetTransactionEndpoints, + @Value("${tron.chain-data.mainnet.account-endpoints:https://apilist.tronscanapi.com}") String mainnetAccountEndpoints, @Value("${tron.chain-data.nile.transaction-endpoints:https://nile.trongrid.io,https://nileapi.tronscan.org}") String nileTransactionEndpoints, @Value("${tron.chain-data.nile.account-endpoints:https://nileapi.tronscan.org}") String nileAccountEndpoints, @Value("${tron.chain-data.shasta.transaction-endpoints:https://api.shasta.trongrid.io,https://shastapi.tronscan.org}") String shastaTransactionEndpoints, @@ -130,19 +130,20 @@ public class TronChainDataClient { EnergyAndBandwidthVo queryDelegatedResourceSummary(String network, String address, String serviceApiKey) { for (String endpoint : endpoints(accountEndpoints, network)) { - try { - URI uri = UriComponentsBuilder.fromHttpUrl(endpoint) - .path("/api/accountv2") - .queryParam("address", address) - .build().encode().toUri(); - JSONObject json = requestJson(uri, tronscanApiKey); - if (!address.equals(json.getString("address"))) { - throw new IllegalStateException("账户响应缺少匹配地址"); + for (String path : Arrays.asList("/api/accountv2", "/api/account")) { + try { + URI uri = UriComponentsBuilder.fromHttpUrl(endpoint) + .path(path).queryParam("address", address) + .build().encode().toUri(); + JSONObject json = requestJson(uri, tronscanApiKey); + if (!address.equals(json.getString("address"))) { + throw new IllegalStateException("账户响应缺少匹配地址"); + } + TronAccountResp account = json.toJavaObject(TronAccountResp.class); + return toDelegatedResourceSummary(account); + } catch (RuntimeException ex) { + warnUnavailable(endpoint + path, network, "账户代理汇总", ex); } - TronAccountResp account = json.toJavaObject(TronAccountResp.class); - return toDelegatedResourceSummary(account); - } catch (RuntimeException ex) { - warnUnavailable(endpoint, network, "账户代理汇总", ex); } } log.warn("所有 TRON 账户聚合数据源均不可用,代理资源值暂按0返回,网络={}", network); diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TronShastaServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TronShastaServiceImpl.java index 860bb2d..3d0fd11 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TronShastaServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TronShastaServiceImpl.java @@ -38,6 +38,7 @@ import org.tron.trident.core.NodeType; import org.tron.trident.core.contract.Contract; import org.tron.trident.core.contract.Trc20Contract; import org.tron.trident.core.exceptions.IllegalException; +import org.tron.trident.core.key.KeyPair; import org.tron.trident.proto.Chain; import org.tron.trident.proto.Common; import org.tron.trident.proto.Response; @@ -172,8 +173,7 @@ public class TronShastaServiceImpl implements ITronService { @Override public ApiWrapper buildApiWrapper() { - ApiWrapper apiWrapper = ApiWrapper.ofShasta(null); - return apiWrapper; + return ApiWrapper.ofShasta(KeyPair.generate().toPrivateKey()); } @Override diff --git a/ruoyi-system/src/test/java/com/ruoyi/system/service/TronChainDataClientTest.java b/ruoyi-system/src/test/java/com/ruoyi/system/service/TronChainDataClientTest.java index 5674041..e49c8a0 100644 --- a/ruoyi-system/src/test/java/com/ruoyi/system/service/TronChainDataClientTest.java +++ b/ruoyi-system/src/test/java/com/ruoyi/system/service/TronChainDataClientTest.java @@ -103,6 +103,20 @@ public class TronChainDataClientTest { assertEquals("scan-key", keys[1]); } + @Test + public void shouldFallbackToPublicAccountEndpoint() { + server.createContext("/scan/api/accountv2", new FixedResponseHandler(401, "unauthorized")); + server.createContext("/scan/api/account", new FixedResponseHandler(200, + "{\"address\":\"TAddress\",\"totalFrozenV2\":2000000}")); + TronChainDataClient client = client(Collections.singletonList(baseUrl + "/scan"), + Collections.singletonList(baseUrl + "/scan")); + client.setTronscanApiKey("scan-key"); + + EnergyAndBandwidthVo summary = client.queryDelegatedResourceSummary("mainnet", "TAddress", ""); + + assertEquals(Long.valueOf(2L), summary.getStakedTrxNum()); + } + private TronChainDataClient client(List transactions, List accounts) { Map> transactionEndpoints = new LinkedHashMap<>(); Map> accountEndpoints = new LinkedHashMap<>(); diff --git a/ruoyi-system/src/test/java/com/ruoyi/system/service/TronGrpcConnectivityTest.java b/ruoyi-system/src/test/java/com/ruoyi/system/service/TronGrpcConnectivityTest.java new file mode 100644 index 0000000..874e734 --- /dev/null +++ b/ruoyi-system/src/test/java/com/ruoyi/system/service/TronGrpcConnectivityTest.java @@ -0,0 +1,37 @@ +package com.ruoyi.system.service; + +import io.grpc.ManagedChannel; +import io.grpc.ManagedChannelBuilder; +import org.junit.Assume; +import org.junit.Test; +import org.tron.api.GrpcAPI; +import org.tron.api.WalletGrpc; +import org.tron.protos.Protocol; + +import java.util.concurrent.TimeUnit; + +import static org.junit.Assert.assertTrue; + +/** 真实网络检查,默认跳过;使用 -Dtron.grpc.integration=true 显式启用。 */ +public class TronGrpcConnectivityTest { + @Test + public void shouldQueryLatestBlockFromAllNetworks() throws Exception { + Assume.assumeTrue(Boolean.getBoolean("tron.grpc.integration")); + assertLatestBlock("grpc.trongrid.io"); + assertLatestBlock("grpc.nile.trongrid.io"); + assertLatestBlock("grpc.shasta.trongrid.io"); + } + + private void assertLatestBlock(String host) throws Exception { + ManagedChannel channel = ManagedChannelBuilder.forAddress(host, 50051).usePlaintext().build(); + try { + Protocol.Block block = WalletGrpc.newBlockingStub(channel) + .withDeadlineAfter(60, TimeUnit.SECONDS) + .getNowBlock(GrpcAPI.EmptyMessage.getDefaultInstance()); + assertTrue(host + " 未返回有效区块", block.hasBlockHeader() + && block.getBlockHeader().getRawData().getNumber() > 0L); + } finally { + channel.shutdownNow().awaitTermination(5, TimeUnit.SECONDS); + } + } +}