From ad959c3690aea52a0e54e92b001d1959c26c4cc4 Mon Sep 17 00:00:00 2001
From: 2019232 <zh123456>
Date: Wed, 14 Dec 2022 15:40:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/BNBWEB' into BNBWEB
---
src/main/java/cc/mrbird/febs/dapp/contract/ContractMain.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 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 2143b3c..41450fb 100644
--- a/src/main/java/cc/mrbird/febs/dapp/contract/ContractMain.java
+++ b/src/main/java/cc/mrbird/febs/dapp/contract/ContractMain.java
@@ -127,6 +127,11 @@
String regCode = e.regCode;
// 投注人的地址
String from = e.from;
+ if(from==null){
+ // 为空则不进入后续逻辑
+ return;
+ }
+
// TODO 业务操作逻辑代码
System.out.println("regCode:"+regCode+",address:"+from);
// 更新区块编号 TODO
@@ -160,6 +165,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();
@@ -174,7 +180,7 @@
ContractMain contractMain = new ContractMain();
String address = "0xd9076245473060dda1a65f5f3d89a4d0598995e6";
- BigInteger bigInteger = new BigInteger(Convert.toWei("0.000001", Convert.Unit.ETHER).setScale(0).toString());
+ BigInteger bigInteger = new BigInteger(Convert.toWei("0.00105", Convert.Unit.ETHER).setScale(0).toString());
String hash = contractMain.trans(bigInteger,address);
System.out.println(hash);
}
--
Gitblit v1.9.1