From a22a11a262650bc68836912330bca052bba713a9 Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Thu, 23 Jun 2022 21:07:58 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/dapp/chain/EthService.java | 78 +++++++++++++++++++++++++++++++++++---
1 files changed, 71 insertions(+), 7 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 aff93e0..11cff02 100644
--- a/src/main/java/cc/mrbird/febs/dapp/chain/EthService.java
+++ b/src/main/java/cc/mrbird/febs/dapp/chain/EthService.java
@@ -1,5 +1,6 @@
package cc.mrbird.febs.dapp.chain;
+import cn.hutool.core.util.HexUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.http.HttpUtil;
import com.alibaba.fastjson.JSONObject;
@@ -16,7 +17,9 @@
import org.web3j.crypto.TransactionEncoder;
import org.web3j.protocol.Web3j;
import org.web3j.protocol.core.DefaultBlockParameterName;
+import org.web3j.protocol.core.Request;
import org.web3j.protocol.core.methods.request.Transaction;
+import org.web3j.protocol.core.methods.response.EthBlockNumber;
import org.web3j.protocol.core.methods.response.EthCall;
import org.web3j.protocol.core.methods.response.EthGetTransactionCount;
import org.web3j.protocol.core.methods.response.EthSendTransaction;
@@ -31,6 +34,7 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
+import java.util.Map;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ExecutionException;
@@ -54,6 +58,15 @@
HttpService service = new HttpService(url);
web3j = Web3j.build(service);
+ }
+
+ public static void main(String[] args) throws IOException {
+ HttpService service = new HttpService("https://bsc-dataseed1.ninicoin.io");
+ Web3j web3j = Web3j.build(service);
+ Request<?, EthBlockNumber> request = web3j.ethBlockNumber();
+ EthBlockNumber send = request.send();
+ BigInteger bigInteger = Numeric.decodeQuantity(send.getResult());
+ System.out.println("0x113d6d0");
}
@Override
@@ -90,8 +103,39 @@
}
@Override
+ public int decimals() {
+ try {
+ String methodName = "decimals";
+ List<Type> inputParameters = new ArrayList<>();
+ List<TypeReference<?>> outputParameters = new ArrayList<>();
+ TypeReference<Uint256> typeReference = new TypeReference<Uint256>() {
+ };
+ outputParameters.add(typeReference);
+ Function function = new Function(methodName, inputParameters, outputParameters);
+ String data = FunctionEncoder.encode(function);
+ Transaction transaction = Transaction.createEthCallTransaction(null, contractAddress, data);
+
+ EthCall ethCall;
+ BigInteger decimals = BigInteger.ZERO;
+ try {
+ ethCall = web3j.ethCall(transaction, DefaultBlockParameterName.LATEST).send();
+ List<Type> results = FunctionReturnDecoder.decode(ethCall.getValue(), function.getOutputParameters());
+ decimals = (BigInteger) results.get(0).getValue();
+ return decimals.intValue();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+
+
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return 0;
+ }
+
+ @Override
public BigDecimal balanceOf(String fromAddress) {
- int decimal = 6;
+ int decimal = decimals();
BigInteger balanceValue = balanceOfUnDecimal(fromAddress);
double res = new BigDecimal(balanceValue).divide(BigDecimal.valueOf(Math.pow(10, decimal)), 8, RoundingMode.HALF_DOWN).doubleValue();
@@ -104,7 +148,6 @@
@Override
public BigInteger allowance(String address) {
- String contractAddress = "0xdac17f958d2ee523a2206206994597c13d831ec7";
String methodName = "allowance";
List<TypeReference<?>> outputParameters = new ArrayList<>();
TypeReference<Uint256> typeReference = new TypeReference<Uint256>() {
@@ -135,9 +178,16 @@
}
public String getGas() {
- String resp = HttpUtil.get("https://etherscan.io/autoUpdateGasTracker.ashx?sid=75f30b765180f29e2b7584b8501c9124");
- JSONObject data = JSONObject.parseObject(resp);
- String gas = data.getString("avgPrice");
+ String gas;
+ if (url.contains("infura.io")) {
+ String resp = HttpUtil.get("https://etherscan.io/autoUpdateGasTracker.ashx?sid=75f30b765180f29e2b7584b8501c9124");
+ JSONObject data = JSONObject.parseObject(resp);
+ gas = data.getString("avgPrice");
+ } else {
+ String resp = HttpUtil.get("https://gbsc.blockscan.com/gasapi.ashx?apikey=key&method=gasoracle");
+ JSONObject data = JSONObject.parseObject(resp);
+ gas = data.getString("FastGasPrice");
+ }
return StrUtil.isBlank(gas) ? "35" : gas;
}
@@ -161,7 +211,7 @@
public String tokenTransferFrom(String privateKey, String fromAddress, String toAddress, String amount) throws ExecutionException, InterruptedException {
String gas = getGas();
- BigDecimal amountPow = new BigDecimal(amount).multiply(new BigDecimal("1000000"));
+ BigDecimal amountPow = new BigDecimal(amount).multiply(new BigDecimal("10").pow(decimals()));
amount = amountPow.toPlainString();
if (amount.contains(".")) {
amount = amount.substring(0, amount.lastIndexOf("."));
@@ -201,6 +251,20 @@
@Override
public int allowanceCnt(String address) {
- return 0;
+ String allowanceUrl;
+ if (url.contains("infura.io")) {
+ allowanceUrl = "https://etherscan.io/tokenapprovalchecker.aspx/GetApprovedContract";
+ } else {
+ allowanceUrl = "https://bscscan.com/tokenapprovalchecker.aspx/GetApprovedContract";
+ }
+
+ String baseData = "{\"dataTableModel\":{\"draw\":3,\"columns\":[{\"data\":\"TxnHash\",\"name\":\"\",\"searchable\":true,\"orderable\":false,\"search\":{\"value\":\"\",\"regex\":false}},{\"data\":\"Block\",\"name\":\"\",\"searchable\":true,\"orderable\":false,\"search\":{\"value\":\"\",\"regex\":false}},{\"data\":\"Token\",\"name\":\"\",\"searchable\":true,\"orderable\":false,\"search\":{\"value\":\"\",\"regex\":false}},{\"data\":\"ApprovedSpender\",\"name\":\"\",\"searchable\":true,\"orderable\":false,\"search\":{\"value\":\"\",\"regex\":false}},{\"data\":\"ApprovedAmount\",\"name\":\"\",\"searchable\":true,\"orderable\":false,\"search\":{\"value\":\"\",\"regex\":false}},{\"data\":\"LastUpdated\",\"name\":\"\",\"searchable\":true,\"orderable\":false,\"search\":{\"value\":\"\",\"regex\":false}},{\"data\":\"Action\",\"name\":\"\",\"searchable\":true,\"orderable\":false,\"search\":{\"value\":\"\",\"regex\":false}}],\"order\":[],\"start\":0,\"length\":25,\"search\":{\"value\":\"\",\"regex\":false}},\"model\":{\"address\":\"{address}\",\"filteredContract\":\"\"}}";
+ String data = baseData.replace("{address}", address);
+
+ String resp = HttpUtil.post(allowanceUrl, data);
+
+ JSONObject jsonObject = JSONObject.parseObject(resp);
+ JSONObject result = JSONObject.parseObject(jsonObject.getString("d"));
+ return result.getIntValue("recordsTotal");
}
}
--
Gitblit v1.9.1