From cc6d44ddf61b67225461b159f0eccdf597982c10 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 18 Mar 2021 18:14:52 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/modules/blackchain/service/TrxUsdtUpdateService.java | 88 ++++++++++++++++++++++++++++++++++++++-----
1 files changed, 77 insertions(+), 11 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 ac95937..d1cd4b1 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
@@ -25,6 +25,9 @@
import java.math.BigInteger;
import java.util.*;
+/**
+ * TRX TRC20服务类
+ */
@Service
public class TrxUsdtUpdateService {
@@ -32,6 +35,11 @@
private static String http = "https://api.trongrid.io";
private static String TRC20_CONTRACT_ADDRESS = "TR7NHqjeKQxGTCi8q8ZY4pL8otSzgjLj6t";
+
+ /**
+ * 手续费
+ */
+ private final static BigDecimal TRX_FEE = new BigDecimal("10");
@Resource
private UsdtUpdateProducer usdtUpdateProducer;
@@ -42,6 +50,9 @@
@Resource
RedisUtils redisUtils;
+ /**
+ * 扫块 同步充值USDT-TRC20和TRX
+ */
public void monitorCoinListener() {
if (CollectionUtils.isEmpty(addressList)) {
List<MemberCoinAddressEntity> coinAddressList = memberCoinAddressDao.selectAllBlockAddressBySymbolAndTag(CoinTypeEnum.USDT.name(), "TRC20");
@@ -51,31 +62,51 @@
});
}
}
+ // 扫块区块
+ 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;
}
- Object trc20BlockNum = redisUtils.get("USDT_TRC20_BLOCK_NUM");
- if(trc20BlockNum==null){
- trc20BlockNum = 27805917L;
- }
- Long blockNum = Long.valueOf(trc20BlockNum.toString());
- // http 请求
- // httpTransactionInfo(addressList, 26599313L);
- //httpTransactionInfo(addressList, 26603621L);
+
+
+ // 解析区块
httpTransactionInfo(addressList, blockNum);
- redisUtils.set("USDT_TRC20_BLOCK_NUM", (blockNum + 1L));
+
}
+ /**
+ * 解析区块数据 同步用户充值
+ * @param addressList
+ * @param num
+ */
private void httpTransactionInfo(List<String> addressList, Long num) {
String transactionInfoByBlockNum = getTransactionInfoByBlockNum(BigInteger.valueOf(num));
if (StringUtils.isBlank(transactionInfoByBlockNum)) {
return;
}
+ // 不用等到扫完再累加 只要进来就加 还有一个条件是必须查询出区块再加 否则当区块超过实际区块
+ redisUtils.set("USDT_TRC20_BLOCK_NUM", (num + 1L));
JSONArray parseArray = JSON.parseArray(transactionInfoByBlockNum);
if (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;
+ }
//判断 数据库 txId 有 就不用往下继续了
JSONObject parseObject = JSON.parseObject(getTransactionById(txId));
String contractRet = parseObject.getJSONArray("ret").getJSONObject(0).getString("contractRet");
@@ -99,6 +130,10 @@
}
+ /**
+ * 比对本地地址 同步TRX充值
+ * @param parseObject
+ */
private void transferContract(JSONObject parseObject) {
//数量
BigDecimal amount = parseObject.getJSONObject("raw_data").getJSONArray("contract").getJSONObject(0).getJSONObject("parameter").getJSONObject("value").getBigDecimal("amount");
@@ -157,12 +192,19 @@
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<>(param);
ResponseEntity<String> result = restTemplate.postForEntity(url, request, String.class);
// System.out.println("url:" + url + ",param:" + param + ",result:" + result.getBody());
return result;
}
+ /**
+ * 比对本地地址 同步充值USDT-TRC20
+ * @param addressList
+ * @param txId
+ * @param parseObject
+ */
private void triggerSmartContract(List<String> addressList, String txId, JSONObject parseObject) {
//方法参数
String data = parseObject.getJSONObject("raw_data").getJSONArray("contract").getJSONObject(0).getJSONObject("parameter").getJSONObject("value").getString("data");
@@ -219,13 +261,18 @@
}
+ /**
+ * 根据地址归集USDT-TRC20
+ * @param address
+ * @return
+ */
public boolean poolByAddress(String address) {
// 首先查询trx余额
BigDecimal trxBalance = Trc20Service.getTrxBalance(address);
if (trxBalance == null) {
return false;
}
- if (trxBalance.compareTo(new BigDecimal(1)) >= 0) {
+ if (trxBalance.compareTo(TRX_FEE) >= 0) {
// 转
BigDecimal trc20Balance = Trc20Service.getTrc20Balance(address);
if (trc20Balance == null) {
@@ -255,7 +302,7 @@
}
return true;
} else {
- Trc20Service.sendTrx(Trc20Service.TRX_PRIVATE_KEY, address, new BigDecimal(1));
+ Trc20Service.sendTrx(Trc20Service.TRX_PRIVATE_KEY, address, TRX_FEE);
// 将这个地址记录，后续同步
Object trc20_pool = redisUtils.get("TRC20_POOL");
List<String> poolList = new ArrayList<>();
@@ -267,4 +314,23 @@
return true;
}
}
+
+ // https://api.trongrid.io/wallet/getnowblock
+
+ /**
+ * 获取最新区块
+ * @return
+ */
+ 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);
+ String number = JSON.parseObject(forObject).getJSONObject("block_header").getJSONObject("raw_data").getString("number");
+ return Long.valueOf(number);
+ }
+
}
--
Gitblit v1.9.1