From 1b44a9a25a51324dba8e8640cb405440f2cf7d48 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 13 May 2021 11:21:32 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/modules/blackchain/service/TrxUsdtUpdateService.java | 143 +++++++++++++++++++++++++++++------------------
1 files changed, 87 insertions(+), 56 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/blackchain/service/TrxUsdtUpdateService.java b/src/main/java/com/xcong/excoin/modules/blackchain/service/TrxUsdtUpdateService.java
index d1cd4b1..7393792 100644
--- a/src/main/java/com/xcong/excoin/modules/blackchain/service/TrxUsdtUpdateService.java
+++ b/src/main/java/com/xcong/excoin/modules/blackchain/service/TrxUsdtUpdateService.java
@@ -1,5 +1,6 @@
package com.xcong.excoin.modules.blackchain.service;
+import cn.hutool.core.math.MathUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
@@ -9,12 +10,11 @@
import com.xcong.excoin.modules.member.entity.MemberCoinAddressEntity;
import com.xcong.excoin.rabbit.producer.UsdtUpdateProducer;
import com.xcong.excoin.utils.RedisUtils;
+import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
-import org.springframework.http.HttpEntity;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
+import org.springframework.http.*;
+import org.springframework.http.client.SimpleClientHttpRequestFactory;
import org.springframework.stereotype.Service;
import org.springframework.web.client.RestTemplate;
import org.tron.common.utils.ByteArray;
@@ -26,8 +26,9 @@
import java.util.*;
/**
- * TRX TRC20服务类
+ * TRX TRC20服务类
*/
+@Slf4j
@Service
public class TrxUsdtUpdateService {
@@ -37,7 +38,7 @@
private static String TRC20_CONTRACT_ADDRESS = "TR7NHqjeKQxGTCi8q8ZY4pL8otSzgjLj6t";
/**
- * 手续费
+ * 手续费
*/
private final static BigDecimal TRX_FEE = new BigDecimal("10");
@@ -51,9 +52,9 @@
RedisUtils redisUtils;
/**
- * 扫块 同步充值USDT-TRC20和TRX
+ * 扫块 同步充值USDT-TRC20和TRX
*/
- public void monitorCoinListener() {
+ public void monitorCoinListener(Long blockNum) {
if (CollectionUtils.isEmpty(addressList)) {
List<MemberCoinAddressEntity> coinAddressList = memberCoinAddressDao.selectAllBlockAddressBySymbolAndTag(CoinTypeEnum.USDT.name(), "TRC20");
if (CollectionUtils.isNotEmpty(coinAddressList)) {
@@ -61,20 +62,6 @@
addressList.add(e.getAddress());
});
}
- }
- // 扫块区块
- Object trc20BlockNum = redisUtils.get("USDT_TRC20_BLOCK_NUM");
- if(trc20BlockNum==null){
- trc20BlockNum = 28471475L;
-
- }
- Long blockNum = Long.valueOf(trc20BlockNum.toString());
- redisUtils.set("USDT_TRC20_BLOCK_NUM",blockNum);
- // 查询一下最新区块
- long getnowblock = getnowblock()-20L;
- if(getnowblock<blockNum){
- // 如果当前区块比最新已确认区块还大，则不继续执行
- return;
}
if (CollectionUtils.isEmpty(addressList)) {
return;
@@ -87,28 +74,32 @@
}
/**
- * 解析区块数据 同步用户充值
+ * 解析区块数据 同步用户充值
+ *
* @param addressList
* @param num
*/
private void httpTransactionInfo(List<String> addressList, Long num) {
- String transactionInfoByBlockNum = getTransactionInfoByBlockNum(BigInteger.valueOf(num));
+ // 查询详情，包含了所有交易信息
+ String transactionInfoByBlockNum = getblockbynum(BigInteger.valueOf(num));
if (StringUtils.isBlank(transactionInfoByBlockNum)) {
return;
}
+// log.info("--->{}, {}", num, System.currentTimeMillis());
// 不用等到扫完再累加 只要进来就加 还有一个条件是必须查询出区块再加 否则当区块超过实际区块
- redisUtils.set("USDT_TRC20_BLOCK_NUM", (num + 1L));
- JSONArray parseArray = JSON.parseArray(transactionInfoByBlockNum);
- if (parseArray.size() > 0) {
+// redisUtils.set("USDT_TRC20_BLOCK_NUM", (num + 1L));
+ JSONArray parseArray = JSON.parseObject(transactionInfoByBlockNum).getJSONArray("transactions");
+ if (parseArray != null && parseArray.size() > 0) {
for (Object e : parseArray) {
try {
- String txId = JSON.parseObject(e.toString()).getString("id");
- String contract_address = JSON.parseObject(e.toString()).getString("contract_address");
- if(!"41a614f803b6fd780986a42c78ec9c7f77e6ded13c".equals(contract_address)){
- continue;
- }
+// String txId = JSON.parseObject(e.toString()).getString("id");
+// String contract_address = JSON.parseObject(e.toString()).getString("contract_address");
+// if(!"41a614f803b6fd780986a42c78ec9c7f77e6ded13c".equals(contract_address)){
+// continue;
+// }
//判断 数据库 txId 有 就不用往下继续了
- JSONObject parseObject = JSON.parseObject(getTransactionById(txId));
+ JSONObject parseObject = JSON.parseObject(e.toString());
+ String txId = parseObject.getString("txID");
String contractRet = parseObject.getJSONArray("ret").getJSONObject(0).getString("contractRet");
//交易成功
if ("SUCCESS".equals(contractRet)) {
@@ -119,7 +110,7 @@
} else if ("TransferContract".equals(type)) {
//trx 转账
- transferContract(parseObject);
+ //transferContract(parseObject);
}
}
} catch (Exception exception) {
@@ -131,7 +122,8 @@
/**
- * 比对本地地址 同步TRX充值
+ * 比对本地地址 同步TRX充值
+ *
* @param parseObject
*/
private void transferContract(JSONObject parseObject) {
@@ -164,6 +156,20 @@
return postForEntity(url, param).getBody();
}
+ /**
+ * 获取特定区块的所有交易 Info 信息
+ *
+ * @param num 区块
+ * @return
+ */
+ public static String getblockbynum(BigInteger num) {
+ String url = http + "/wallet/getblockbynum";
+ Map<String, Object> map = new HashMap<>();
+ map.put("num", num);
+ String param = JSON.toJSONString(map);
+ return postForEntity(url, param).getBody();
+ }
+
/**
* https://cn.developers.tron.network/docs/%E4%BA%A4%E6%98%9311#%E4%BA%A4%E6%98%93%E7%A1%AE%E8%AE%A4%E6%96%B9%E6%B3%95
@@ -189,18 +195,22 @@
* @return
*/
private static ResponseEntity<String> postForEntity(String url, String param) {
- RestTemplate restTemplate = new RestTemplate();
+ SimpleClientHttpRequestFactory factory = new SimpleClientHttpRequestFactory();
+ factory.setConnectTimeout(20000);
+ factory.setReadTimeout(20000);
+ RestTemplate restTemplate = new RestTemplate(factory);
HttpHeaders headers = new HttpHeaders();
headers.setContentType(MediaType.APPLICATION_JSON);
- headers.set("TRON-PRO-API-KEY",Trc20Service.API_KEY);
- HttpEntity<String> request = new HttpEntity<>(param);
+ headers.set("TRON-PRO-API-KEY", Trc20Service.API_KEY);
+ HttpEntity<String> request = new HttpEntity<>(param, headers);
ResponseEntity<String> result = restTemplate.postForEntity(url, request, String.class);
// System.out.println("url:" + url + ",param:" + param + ",result:" + result.getBody());
return result;
}
/**
- * 比对本地地址 同步充值USDT-TRC20
+ * 比对本地地址 同步充值USDT-TRC20
+ *
* @param addressList
* @param txId
* @param parseObject
@@ -249,20 +259,21 @@
}
for (String address : addressList) {
if (address.equals(to_address)) {
- System.out.println("存在本地的地址：" + address);
+ log.info("存在本地的地址：" + address);
// 金额
// 发送消息队列
EthUsdtChargeDto dto = new EthUsdtChargeDto(address, txId, amount);
dto.setSymbol(EthUsdtChargeDto.Symbol.USDT_TRC20);
usdtUpdateProducer.sendMsg(JSONObject.toJSONString(dto));
- System.out.println("===to_address:" + to_address + "===amount:" + amount);
+ log.info("===to_address:" + to_address + "===amount:" + amount);
}
}
}
/**
- * 根据地址归集USDT-TRC20
+ * 根据地址归集USDT-TRC20
+ *
* @param address
* @return
*/
@@ -285,20 +296,20 @@
Trc20Service.sendTrc20(coinAddressEntity.getPrivateKey(), Trc20Service.POOL_ADDRESS, trc20Balance);
// 需要将存在redis的待归集地址删除
Object trc20_pool = redisUtils.get("TRC20_POOL");
- if(trc20_pool!=null){
+ if (trc20_pool != null) {
List<String> poolList = (List) trc20_pool;
Iterator<String> iterator = poolList.iterator();
- while (iterator.hasNext()){
+ while (iterator.hasNext()) {
String next = iterator.next();
- if(address.equals(next)){
+ if (address.equals(next)) {
iterator.remove();
}
}
- if(CollectionUtils.isEmpty(poolList)) {
- redisUtils.del("TRC20_POOL");
- }else{
- redisUtils.set("TRC20_POOL", poolList);
- }
+ if (CollectionUtils.isEmpty(poolList)) {
+ redisUtils.del("TRC20_POOL");
+ } else {
+ redisUtils.set("TRC20_POOL", poolList);
+ }
}
return true;
} else {
@@ -318,19 +329,39 @@
// https://api.trongrid.io/wallet/getnowblock
/**
- * 获取最新区块
+ * 获取最新区块
+ *
* @return
*/
- public long getnowblock(){
- String url = http+"/wallet/getnowblock";
+ public long getnowblock() {
+ String url = http + "/wallet/getnowblock";
RestTemplate restTemplate = new RestTemplate();
HttpHeaders headers = new HttpHeaders();
headers.setContentType(MediaType.APPLICATION_JSON);
- headers.set("TRON-PRO-API-KEY",Trc20Service.API_KEY);
- //HttpEntity<String> request = new HttpEntity<>();
- String forObject = restTemplate.getForObject(url, String.class);
+ headers.set("TRON-PRO-API-KEY", Trc20Service.API_KEY);
+ HttpEntity<String> request = new HttpEntity<>(headers);
+ ResponseEntity<String> exchange = restTemplate.exchange(url, HttpMethod.GET, request, String.class);
+ String forObject = exchange.getBody();
+ //System.out.println(forObject);
+ // String forObject = restTemplate.getForObject(url, String.class);
String number = JSON.parseObject(forObject).getJSONObject("block_header").getJSONObject("raw_data").getString("number");
return Long.valueOf(number);
}
+ /**
+ * 从tronscan.io查询最新区块
+ * {"whole_block_count":29625671,"whole_pay":3392835760,"last_day_pay":460432,"last_day_block_count":28777}
+ * @return
+ */
+ public Long getnowblockFromTronScan() {
+ String roundNum = Math.random() + "";
+ String url = "https://apiasia.tronscan.io:5566/api/block/statistic?randomNum=" + roundNum;
+ SimpleClientHttpRequestFactory factory = new SimpleClientHttpRequestFactory();
+ factory.setConnectTimeout(20000);
+ factory.setReadTimeout(20000);
+ RestTemplate restTemplate = new RestTemplate(factory);
+ String forObject = restTemplate.getForObject(url, String.class);
+ String wholeBlockCount = JSON.parseObject(forObject).getString("whole_block_count");
+ return Long.valueOf(wholeBlockCount);
+ }
}
--
Gitblit v1.9.1