From e6b4a6e816a4bc435e6d5819826256bc9da7a2e8 Mon Sep 17 00:00:00 2001
From: 2019232 <zh123456>
Date: Wed, 14 Dec 2022 15:40:51 +0800
Subject: [PATCH] 增加空判断
---
src/main/java/cc/mrbird/febs/dapp/contract/ContractMain.java | 29 ++++++++++++++++++++---------
1 files changed, 20 insertions(+), 9 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/dapp/contract/ContractMain.java b/src/main/java/cc/mrbird/febs/dapp/contract/ContractMain.java
index 96d14bd..cd25d46 100644
--- a/src/main/java/cc/mrbird/febs/dapp/contract/ContractMain.java
+++ b/src/main/java/cc/mrbird/febs/dapp/contract/ContractMain.java
@@ -61,6 +61,7 @@
// gas费用单价
// public static final BigInteger GAS_PRICE = BigInteger.valueOf(32000000000L);
public static final BigInteger GAS_PRICE = Convert.toWei(getGas(), Convert.Unit.GWEI).toBigInteger();
+// public static final BigInteger GAS_PRICE = Convert.toWei("5", Convert.Unit.GWEI).toBigInteger();
// gas费用最大值
// public static final BigInteger GAS_LIMIT = BigInteger.valueOf(4300000L);
public static final BigInteger GAS_LIMIT = Convert.toWei("100000", Convert.Unit.WEI).toBigInteger();
@@ -69,11 +70,15 @@
}
private static String getGas() {
- String gas;
- 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;
+ String gas = "5";
+ try{
+ String resp = HttpUtil.get("https://gbsc.blockscan.com/gasapi.ashx?apikey=key&method=gasoracle");
+ JSONObject data = JSONObject.parseObject(resp);
+ gas = data.getString("FastGasPrice");
+ }catch (Exception exception) {
+ exception.printStackTrace();
+ }
+ return StrUtil.isBlank(gas) ? "5" : gas;
}
private static Web3j getInstanceScope() {
@@ -83,16 +88,16 @@
}
// 区块链节点地址 TODO
- private static String blockchainNode = "https://data-seed-prebsc-1-s1.binance.org:8545/";
+ private static String blockchainNode = "https://bsc-dataseed.binance.org";
// 合约地址 TODO
- private static String contractAddr = "0x90EEba71E1d2D0C09840cdB9B74759dFAe15Fc7E";
+ private static String contractAddr = "0x7FDD62bA4451ABB40d72C6690088755115bFf9d7";
// private static String contractAddr = "0x4703cfEf33b6DbcF6a3020Ef98FC6ab9C4CC06b3";
// private static String contractAddr = "0x8f444b9b9C71f4Be883aE15466D71EC7699Cb5B1";
// 操作账号 合约创建者的私钥 用于操作合约内方法 TODO
//private static String privateKey = "8ea073b74265f41a03138e1adf2e8a80f4f394ac5337aa2eec07562c1040a4e4";
- private static String privateKey = "0x8daacf781c7ad486abafba45aa9a68d6febcb618ce9cfaf21b9e6059729dac4e";
+ private static String privateKey = "0xbf6f11f5689961d5351375bebbae751de0d0d5c2e2095c1017368485dc909ff8";
private EthFilter getFilter(BigInteger startBlock) {
if (startBlock != null) {
@@ -121,10 +126,15 @@
String regCode = e.regCode;
// 投注人的地址
String from = e.from;
+ if(from==null){
+ // 为空则不进入后续逻辑
+ return;
+ }
+
// TODO 业务操作逻辑代码
System.out.println("regCode:"+regCode+",address:"+from);
// 更新区块编号 TODO
- //redisService.set("BNB_BLOCK_NUMBER",e.log.getBlockNumber().intValue());
+ redisService.set("BNB_BLOCK_NUMBER",e.log.getBlockNumber().intValue());
//投注人
DappMemberEntity dappMemberEntity = dappMemberDao.selectByAddress(from, "BSC");
if(ObjectUtil.isNotEmpty(dappMemberEntity)){
@@ -157,6 +167,7 @@
Credentials credentials = Credentials.create(privateKey);
Abi contract = Abi.load(contractAddr, getInstance(), credentials, getStaticGasProvider());
try {
+ //BigInteger bigInteger = Convert.toWei(amount.toString(), Convert.Unit.ETHER).toBigInteger();
TransactionReceipt send = contract.trans(amount, to1).send();
if(ObjectUtil.isNotEmpty(send)){
transactionHash = send.getTransactionHash();
--
Gitblit v1.9.1