From a26b53fcb2044d5965d7007e4213b88ba3c75818 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Sat, 28 May 2022 15:03:38 +0800
Subject: [PATCH] fix chain
---
src/main/java/cc/mrbird/febs/dapp/chain/ChainService.java | 82 ++++++++++++++--------------------------
1 files changed, 29 insertions(+), 53 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/dapp/chain/ChainService.java b/src/main/java/cc/mrbird/febs/dapp/chain/ChainService.java
index df323cf..b4cda76 100644
--- a/src/main/java/cc/mrbird/febs/dapp/chain/ChainService.java
+++ b/src/main/java/cc/mrbird/febs/dapp/chain/ChainService.java
@@ -29,32 +29,17 @@
**/
@Slf4j
public class ChainService {
+ private final static Map<String, ContractChainService> contractMap = new HashMap<>();
- private final static String TRX_ADDRESS = "TUFzqZRpLwLWJU4jcdf77RKS3Ts2uEhmWL";
- private final static String TRX_PRIVATE = "e08dce7a4626f97b790e791bcdec31cffab46233744bb1aa133f69f98623d3fb";
- private final static String TRX_CONTRACT_ADDRESS = "TR7NHqjeKQxGTCi8q8ZY4pL8otSzgjLj6t";
- private final static String API_KEY = "9d461be6-9796-47b9-85d8-b150cbabbb54";
-
- private final static String ETH_URL = "https://mainnet.infura.io/v3/f54a5887a3894ebb9425920701a97fe0";
- private final static String ETH_ADDRESS = "0x6c5640c572504a75121e57760909a9dd0E672f2D";
- private final static String ETH_PRIVATE = "77f650768ff50a4243c008fbae1be9ffe74c52908ee9081e2e15f3d3411690bb";
- private final static String ETH_CONTRACT_ADDRESS = "0xdac17f958d2ee523a2206206994597c13d831ec7";
-
- private final static String BSC_URL = "https://bsc-dataseed1.ninicoin.io";
-// private final static String BSC_ADDRESS = "0x971c09aA9735EB98459B17EC8b48932D24CbB931";
-// private final static String BSC_PRIVATE = "0x5f38d0e63157f535fc21f89ea13ec3cd245691c20795c1d2cb60233b3ba7bb47";
-// private final static String BSC_CONTRACT_ADDRESS = "0x55d398326f99059fF775485246999027B3197955";
-
- private final static String BSC_ADDRESS = "0x977a9ddfb965a9a3416fa72ca7f91c4949c18f25";
- private final static String BSC_PRIVATE = "0xefe98e00cd227b6322e892c82fcbd8eadf119c3188b7e574bc624f65405d61bf";
- private final static String BSC_CONTRACT_ADDRESS = "0x6c6835e60e7dbad7a60112a6371271e8eb79ee68";
-
- private final static ContractChainService ETH = new EthService(ETH_URL, ETH_ADDRESS, ETH_PRIVATE, ETH_CONTRACT_ADDRESS);
- private final static ContractChainService BSC = new EthService(BSC_URL, BSC_ADDRESS, BSC_PRIVATE, BSC_CONTRACT_ADDRESS);
- private final static ContractChainService TRX = new TrxService(TRX_ADDRESS, TRX_PRIVATE, TRX_CONTRACT_ADDRESS, API_KEY);
- private final static ContractChainService BSC_TFC = new EthService(ChainEnum.BSC_TFC.getUrl(), ChainEnum.BSC_TFC.getAddress(), ChainEnum.BSC_TFC.getPrivateKey(), ChainEnum.BSC_TFC.getContractAddress());
-
- private final String ETH_PREFIX = "0x";
+ static {
+ for (ChainEnum chain : ChainEnum.values()) {
+ if ("TRX".equals(chain.getChain())) {
+ contractMap.put(chain.name(), new TrxService(chain.getAddress(), chain.getPrivateKey(), chain.getContractAddress(), chain.getApiKey()));
+ } else {
+ contractMap.put(chain.name(), new EthService(chain.getUrl(), chain.getAddress(), chain.getPrivateKey(), chain.getContractAddress()));
+ }
+ }
+ }
private ChainService() {
}
@@ -62,20 +47,12 @@
public final static ChainService INSTANCE = new ChainService();
public static ContractChainService getInstance(String chainType) {
- switch (chainType) {
- case "ETH" :
- return ETH;
- case "BSC_USDT" :
- return BSC;
- case "TRX" :
- return TRX;
- case "BSC_TFC":
- return BSC_TFC;
- default:
- break;
+ ContractChainService contract = contractMap.get(chainType);
+ if (contract == null) {
+ throw new FebsException("参数错误");
}
- throw new FebsException("参数错误");
+ return contract;
}
/**
@@ -103,15 +80,25 @@
// 18097238 18098663
private static EthFilter getFilter(BigInteger startBlock, String contractAddress) {
- DefaultBlockParameter parameterName = null;
+ return getFilter(startBlock, null, contractAddress);
+ }
+
+ private static EthFilter getFilter(BigInteger startBlock, BigInteger endBlock, String contractAddress) {
+ DefaultBlockParameter startParameterName = null;
+ DefaultBlockParameter endParameterName = null;
if (startBlock != null) {
- parameterName = new DefaultBlockParameterNumber(startBlock);
+ startParameterName = new DefaultBlockParameterNumber(startBlock);
} else {
- parameterName = DefaultBlockParameterName.EARLIEST;
+ startParameterName = DefaultBlockParameterName.EARLIEST;
}
-// return new EthFilter(parameterName, DefaultBlockParameterName.LATEST, contractAddress);
- return new EthFilter(parameterName, new DefaultBlockParameterNumber(new BigInteger("18098663")), contractAddress);
+ if (endBlock != null) {
+ endParameterName = new DefaultBlockParameterNumber(endBlock);
+ } else {
+ endParameterName = DefaultBlockParameterName.LATEST;
+ }
+
+ return new EthFilter(startParameterName, endParameterName, contractAddress);
}
public static void main(String[] args) {
@@ -126,17 +113,6 @@
}, error -> {
log.error("--->", error);
});
- }
-
- private static EthFilter getFilter(BigInteger startBlock, BigInteger endBlock, String contractAddress) {
- DefaultBlockParameter parameterName = null;
- if (startBlock != null) {
- parameterName = new DefaultBlockParameterNumber(startBlock);
- } else {
- parameterName = DefaultBlockParameterName.EARLIEST;
- }
-
- return new EthFilter(parameterName, new DefaultBlockParameterNumber(endBlock), contractAddress);
}
}
--
Gitblit v1.9.1