From 05c74ca131add20dbcf23dc109e63c21b3e2be29 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 24 Feb 2021 18:11:57 +0800
Subject: [PATCH] Merge branch 'whole_new_trc20' into whole_new
---
src/main/java/com/xcong/excoin/modules/blackchain/service/TrxUsdtUpdateService.java | 78 ++++++++++++++++++++++++++++++++-------
1 files changed, 64 insertions(+), 14 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 43af25b..42367ee 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
@@ -23,11 +23,11 @@
import javax.annotation.Resource;
import java.math.BigDecimal;
import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+/**
+ * TRX TRC20服务类
+ */
@Service
public class TrxUsdtUpdateService {
@@ -35,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;
@@ -45,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");
@@ -54,18 +62,29 @@
});
}
}
+ // 扫块区块
+ Object trc20BlockNum = redisUtils.get("USDT_TRC20_BLOCK_NUM");
+ if(trc20BlockNum==null){
+ trc20BlockNum = 27805917L;
+
+ }
+ Long blockNum = Long.valueOf(trc20BlockNum.toString());
+ redisUtils.set("USDT_TRC20_BLOCK_NUM",blockNum);
if (CollectionUtils.isEmpty(addressList)) {
return;
}
- Object trc20BlockNum = redisUtils.get("USDT_TRC20_BLOCK_NUM");
- Long blockNum = (Long) trc20BlockNum;
- // 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)) {
@@ -99,6 +118,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");
@@ -163,6 +186,12 @@
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 +248,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) {
@@ -236,10 +270,27 @@
return false;
}
Trc20Service.sendTrc20(coinAddressEntity.getPrivateKey(), Trc20Service.POOL_ADDRESS, trc20Balance);
+ // 需要将存在redis的待归集地址删除
+ Object trc20_pool = redisUtils.get("TRC20_POOL");
+ if(trc20_pool!=null){
+ List<String> poolList = (List) trc20_pool;
+ Iterator<String> iterator = poolList.iterator();
+ while (iterator.hasNext()){
+ String next = iterator.next();
+ if(address.equals(next)){
+ iterator.remove();
+ }
+ }
+ if(CollectionUtils.isEmpty(poolList)) {
+ redisUtils.del("TRC20_POOL");
+ }else{
+ redisUtils.set("TRC20_POOL", poolList);
+ }
+ }
return true;
} else {
- Trc20Service.sendTrx(Trc20Service.TRX_PRIVATE_KEY, address, new BigDecimal(1));
- // 将这个地址记录，后续同步 TODO
+ Trc20Service.sendTrx(Trc20Service.TRX_PRIVATE_KEY, address, TRX_FEE);
+ // 将这个地址记录，后续同步
Object trc20_pool = redisUtils.get("TRC20_POOL");
List<String> poolList = new ArrayList<>();
if (trc20_pool != null) {
@@ -247,8 +298,7 @@
}
poolList.add(address);
redisUtils.set("TRC20_POOL", poolList);
-
+ return true;
}
- return false;
}
}
--
Gitblit v1.9.1