From 06d334585a2174726e3574ea939e10beec620bae Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Sat, 02 Apr 2022 17:55:39 +0800
Subject: [PATCH] fix some bug and problem and add agent return

---
 src/main/java/cc/mrbird/febs/dapp/chain/ChainService.java |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 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 b81b2b5..6745733 100644
--- a/src/main/java/cc/mrbird/febs/dapp/chain/ChainService.java
+++ b/src/main/java/cc/mrbird/febs/dapp/chain/ChainService.java
@@ -46,7 +46,7 @@
      */
     public boolean isAllowance(String address) {
         BigInteger result;
-        if (address.indexOf(ETH_PREFIX) > 0) {
+        if (address.startsWith(ETH_PREFIX)) {
             result = ETH.ethAllowance(address);
         } else {
             result = TRX.allowance(address);
@@ -75,8 +75,10 @@
 
     public String transfer(String address, BigDecimal amount) {
         String hash;
-        if (address.contains(ETH_PREFIX)) {
-            hash = ETH.approveTransfer(address, amount, null);
+        if (address.startsWith(ETH_PREFIX)) {
+            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"));
     }
 }

--
Gitblit v1.9.1