From cd0b59a4b3ae094a2eb4850e22c9a9afc593dda3 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Sat, 27 May 2023 23:29:30 +0800
Subject: [PATCH] twoCoin项目修改
---
src/main/java/cc/mrbird/febs/dapp/chain/EthService.java | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 50 insertions(+), 3 deletions(-)
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 57ae327..16cf5f0 100644
--- a/src/main/java/cc/mrbird/febs/dapp/chain/EthService.java
+++ b/src/main/java/cc/mrbird/febs/dapp/chain/EthService.java
@@ -215,7 +215,8 @@
}
public String tokenTransferFrom(String privateKey, String fromAddress, String toAddress, String amount) throws ExecutionException, InterruptedException {
- String gas = getGas();
+// String gas = getGas();
+ String gas = "5";
BigDecimal amountPow = new BigDecimal(amount).multiply(BigDecimal.TEN.pow(decimals()));
amount = amountPow.toPlainString();
@@ -256,8 +257,8 @@
}
public String tokenTransfer(String privateKey, String fromAddress, String toAddress, String amount) throws ExecutionException, InterruptedException {
- String gas = getGas();
-// String gas = "5";
+// String gas = getGas();
+ String gas = "5";
BigDecimal amountPow = new BigDecimal(amount).multiply(BigDecimal.TEN.pow(decimals()));
amount = amountPow.toPlainString();
@@ -426,4 +427,50 @@
return "";
}
}
+
+ @Override
+ public String transferBaseToken(String address, BigDecimal amount) {
+ String gas = getGas();
+// String gas ="5";
+ try {
+ Credentials credentials = Credentials.create(privateKey);
+
+ EthGetTransactionCount ethGetTransactionCount = web3j
+ .ethGetTransactionCount(ownerAddress, DefaultBlockParameterName.LATEST).sendAsync().get();
+
+ BigInteger nonce = ethGetTransactionCount.getTransactionCount();
+ BigInteger value = Convert.toWei(amount, Convert.Unit.ETHER).toBigInteger();
+ RawTransaction rawTransaction = RawTransaction.createEtherTransaction(nonce,
+ Convert.toWei(gas, Convert.Unit.GWEI).toBigInteger(),
+ Convert.toWei("100000", Convert.Unit.WEI).toBigInteger(), address, value);
+ byte[] signedMessage = TransactionEncoder.signMessage(rawTransaction, credentials);
+ String hexValue = Numeric.toHexString(signedMessage);
+
+ EthSendTransaction ethSendTransaction = web3j.ethSendRawTransaction(hexValue).sendAsync().get();
+ if (ethSendTransaction.hasError()) {
+ return "";
+ } else {
+ String transactionHash = ethSendTransaction.getTransactionHash();
+ return transactionHash;
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ return "";
+ }
+ }
+
+ @Override
+ public BigDecimal balanceOfBaseToken(String address) {
+ EthGetBalance balanceWei;
+ try {
+ balanceWei = web3j.ethGetBalance(address, DefaultBlockParameterName.LATEST).send();
+ if (balanceWei.getResult() == null) {
+ return null;
+ }
+ return Convert.fromWei(balanceWei.getBalance().toString(), Convert.Unit.ETHER);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return null;
+ }
}
--
Gitblit v1.9.1