From f3ec8f99b408fead9f3e36041926637666ba6e71 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 08 Aug 2022 13:35:01 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/dapp/chain/ChainService.java | 20 +++++++++++++++-----
src/main/resources/application-prod.yml | 2 +-
src/main/java/cc/mrbird/febs/dapp/chain/ChainEnum.java | 18 +++++++++---------
3 files changed, 25 insertions(+), 15 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/dapp/chain/ChainEnum.java b/src/main/java/cc/mrbird/febs/dapp/chain/ChainEnum.java
index a7bbef7..2d05fb7 100644
--- a/src/main/java/cc/mrbird/febs/dapp/chain/ChainEnum.java
+++ b/src/main/java/cc/mrbird/febs/dapp/chain/ChainEnum.java
@@ -16,19 +16,19 @@
*/
BSC_USDT("BSC", "0x4f5b6875d0d42f019ab6CdFB3054649b5B7b5472",
"0x86bd3ad3ffd055b27dd7685d494074982fe96d6cc9dde0e42e85a85036e8abe9",
- "https://apis.ankr.com/d310879693be48f7b3a695d52c62b0a7/9142a08a63dbf8f0951418acbf4324c5/binance/full/main",
+ "https://bsc-mainnet.blockvision.org/v1/2D3n5NXWVLnIBsdBKZDlDFAC76x",
"0x55d398326f99059fF775485246999027B3197955",
""),
/**
* 币安链 代币合约
* 测试链 0xdd92ea2f41d807a60b29004bf7db807d8ac09212
- * 正式 0xb27e44f98543e480dbd071b6605005e3d99b3dd4 https://apis.ankr.com/d310879693be48f7b3a695d52c62b0a7/9142a08a63dbf8f0951418acbf4324c5/binance/full/main
+ * 正式 0xb27e44f98543e480dbd071b6605005e3d99b3dd4 https://bsc-mainnet.blockvision.org/v1/2D3n5NXWVLnIBsdBKZDlDFAC76x
*
*/
BSC_TFC("BSC", "0x4f5b6875d0d42f019ab6CdFB3054649b5B7b5472",
"0x86bd3ad3ffd055b27dd7685d494074982fe96d6cc9dde0e42e85a85036e8abe9",
- "https://apis.ankr.com/d310879693be48f7b3a695d52c62b0a7/9142a08a63dbf8f0951418acbf4324c5/binance/full/main",
+ "https://bsc-mainnet.blockvision.org/v1/2D3n5NXWVLnIBsdBKZDlDFAC76x",
"0xb27e44f98543e480dbd071b6605005e3d99b3dd4",
""),
@@ -37,7 +37,7 @@
*/
BSC_TFC_SOURCE("BSC", "0x8cE9d2A8cA6eF9e05493e73C9b6479D100B94847",
"",
- "https://apis.ankr.com/d310879693be48f7b3a695d52c62b0a7/9142a08a63dbf8f0951418acbf4324c5/binance/full/main",
+ "https://bsc-mainnet.blockvision.org/v1/2D3n5NXWVLnIBsdBKZDlDFAC76x",
"0xb27e44f98543e480dbd071b6605005e3d99b3dd4",
""),
@@ -46,7 +46,7 @@
*/
BSC_USDT_SOURCE("BSC", "0x8cE9d2A8cA6eF9e05493e73C9b6479D100B94847",
"",
- "https://apis.ankr.com/d310879693be48f7b3a695d52c62b0a7/9142a08a63dbf8f0951418acbf4324c5/binance/full/main",
+ "https://bsc-mainnet.blockvision.org/v1/2D3n5NXWVLnIBsdBKZDlDFAC76x",
"0x55d398326f99059fF775485246999027B3197955",
""),
@@ -55,7 +55,7 @@
*/
// BSC_TFC_MAKE("BSC", "0xBae24dAa3aB94cfF8114a16A4267D769b3a651F8",
// "0xc0cabaf5f1fce227e5f1b8a7f83a5dc28972389ffc59559d7852ce8d27c3bec4",
-// "https://apis.ankr.com/d310879693be48f7b3a695d52c62b0a7/9142a08a63dbf8f0951418acbf4324c5/binance/full/main",
+// "https://bsc-mainnet.blockvision.org/v1/2D3n5NXWVLnIBsdBKZDlDFAC76x",
// "0x46ac4921e58773ca22826df1640672b91b1db2b3",
// ""),
@@ -64,7 +64,7 @@
*/
BSC_TFC_TECH("BSC", "0x8DB4d0E470e6cD206b774f5DAD2b5D0dD43C7688",
"",
- "https://apis.ankr.com/d310879693be48f7b3a695d52c62b0a7/9142a08a63dbf8f0951418acbf4324c5/binance/full/main",
+ "https://bsc-mainnet.blockvision.org/v1/2D3n5NXWVLnIBsdBKZDlDFAC76x",
"0xb27e44f98543e480dbd071b6605005e3d99b3dd4",
""),
@@ -73,7 +73,7 @@
*/
BSC_TFC_REWARD("BSC", "0x286DDA62A7171a6d6eA6558510834fE8afc0446C",
"0x3d35db460e2eead11fca7b6ce5a9c5c8a8e0866775008ef5e1721b9f17b57f4f",
- "https://apis.ankr.com/d310879693be48f7b3a695d52c62b0a7/9142a08a63dbf8f0951418acbf4324c5/binance/full/main",
+ "https://bsc-mainnet.blockvision.org/v1/2D3n5NXWVLnIBsdBKZDlDFAC76x",
"0xb27e44f98543e480dbd071b6605005e3d99b3dd4",
""),
@@ -82,7 +82,7 @@
*/
BSC_NFT_SDC("BSC", "0x3afD1Bf0994214DBe5ccfA7d8643261B195532c2",
"0x07ee6de0ca4b289f8e69484f70d09988c6df6697f411dc623179930a3578994f",
- "https://apis.ankr.com/d310879693be48f7b3a695d52c62b0a7/9142a08a63dbf8f0951418acbf4324c5/binance/full/main",
+ "https://bsc-mainnet.blockvision.org/v1/2D3n5NXWVLnIBsdBKZDlDFAC76x",
"0xb7FDE337f2236F78B2823d9F97eAB03ce893CC3D",
"");
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 a771eb9..c2141de 100644
--- a/src/main/java/cc/mrbird/febs/dapp/chain/ChainService.java
+++ b/src/main/java/cc/mrbird/febs/dapp/chain/ChainService.java
@@ -1,13 +1,18 @@
package cc.mrbird.febs.dapp.chain;
import cc.mrbird.febs.common.exception.FebsException;
+import cn.hutool.core.codec.Base64;
import cn.hutool.core.util.StrUtil;
import cn.hutool.http.HttpUtil;
import com.alibaba.fastjson.JSONObject;
import io.reactivex.Flowable;
import lombok.extern.slf4j.Slf4j;
+import okhttp3.Interceptor;
import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.Response;
import org.springframework.data.repository.query.ParameterOutOfBoundsException;
+import org.springframework.util.Base64Utils;
import org.web3j.crypto.Credentials;
import org.web3j.protocol.Web3j;
import org.web3j.protocol.core.DefaultBlockParameter;
@@ -18,8 +23,10 @@
import org.web3j.protocol.http.HttpService;
import org.web3j.tx.gas.StaticGasProvider;
+import java.io.IOException;
import java.math.BigDecimal;
import java.math.BigInteger;
+import java.nio.charset.StandardCharsets;
import java.rmi.activation.UnknownObjectException;
import java.util.HashMap;
import java.util.List;
@@ -84,12 +91,15 @@
private static EthUsdtContract contract(String privateKey, String contractAddress, String url) {
Credentials credentials = Credentials.create(privateKey);
+ HttpService httpService = new HttpService(url, new OkHttpClient().newBuilder()
+ .connectTimeout(100, TimeUnit.SECONDS)
+ .writeTimeout(100, TimeUnit.SECONDS)
+ .readTimeout(100, TimeUnit.SECONDS)
+ .build());
+// httpService.addHeader("Authorization", "Bearer " + Base64.encode("tfc:tfc123".getBytes()));
+// httpService.addHeader("Authorization", "Bearer eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJhdWQiOiJwdWJsaWMiLCJleHAiOjE2NTk5MzcxOTAsImp0aSI6IjRiMjNkYTVjLWRlZWEtNDYzNi04YjMwLWNmMmZmMjVkM2NlYyIsImlhdCI6MTY1OTkzMzU5MCwiaXNzIjoiQW5rciIsIm5iZiI6MTY1OTkzMzU5MCwic3ViIjoiZmNiNjY0YjItOGEwNC00N2E5LTg3ZjMtNTJhMjE2ODVlMzEzIn0.YfEwvDByU2MGHywsblZpEmKMIbjv4cWYkn5CaFglXY0TSANzd2pCSbIe40yU_R9_nV6xZeE8Uk74jJOdd_QvMpFyUgo-MMNWZP6uiEaYvK_K3tlpk5yzeZq9D4ruWaq8rFKggr-iaRGzu6coRSAOFv2prWll3a7NdEbmkM-y5Y85xYD6g1N-TPIpE_Y-_-WPf3JUavk744kG8YyHhGvAmk2IL0N2xePfC6CHesdJhwvmJJXzr_53dbPwit1y5KljS0iTZz3mGTML2bq4hGaEHbQxeY2fBpZOSm8sPMz-zB9IVJQKzH5-DXlPKz01mJ9XiBJlubfHsN72RdqFD-O2Tw");
return EthUsdtContract.load(contractAddress,
- Web3j.build(new HttpService(url, new OkHttpClient().newBuilder()
- .connectTimeout(100, TimeUnit.SECONDS)
- .writeTimeout(100, TimeUnit.SECONDS)
- .readTimeout(100, TimeUnit.SECONDS)
- .build())),
+ Web3j.build(httpService),
credentials,
new StaticGasProvider(BigInteger.valueOf(4500000L), BigInteger.valueOf(200000L)));
}
diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml
index 2b7511a..4239dba 100644
--- a/src/main/resources/application-prod.yml
+++ b/src/main/resources/application-prod.yml
@@ -54,5 +54,5 @@
system:
online-transfer: true
- chain-listener: false
+ chain-listener: true
trade-job: true
\ No newline at end of file
--
Gitblit v1.9.1