From 46e20ff02e0cd73c739087dd8c08e3bfdc4c9ad4 Mon Sep 17 00:00:00 2001
From: 2019232 <zh123456>
Date: Wed, 14 Dec 2022 17:39:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/BNBWEB' into BNBWEB
---
src/main/java/cc/mrbird/febs/dapp/contract/ContractMain.java | 51 ++++++++++++++++++++++++++++++---------------------
1 files changed, 30 insertions(+), 21 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 cd25d46..55ef8d2 100644
--- a/src/main/java/cc/mrbird/febs/dapp/contract/ContractMain.java
+++ b/src/main/java/cc/mrbird/febs/dapp/contract/ContractMain.java
@@ -1,5 +1,6 @@
package cc.mrbird.febs.dapp.contract;
+import cc.mrbird.febs.common.contants.AppContants;
import cc.mrbird.febs.common.service.RedisService;
import cn.hutool.core.util.StrUtil;
import cn.hutool.http.HttpUtil;
@@ -88,16 +89,18 @@
}
// 区块链节点地址 TODO
- private static String blockchainNode = "https://bsc-dataseed.binance.org";
+// private static String blockchainNode = "https://bsc-dataseed.binance.org";
+ private static String blockchainNode = "https://bsc-dataseed1.ninicoin.io";
// 合约地址 TODO
- private static String contractAddr = "0x7FDD62bA4451ABB40d72C6690088755115bFf9d7";
+ private static String contractAddr = "0xb5a1aC0fA05BFb8ad16B231e84b0bAC1d46eAfD0";
// private static String contractAddr = "0x4703cfEf33b6DbcF6a3020Ef98FC6ab9C4CC06b3";
// private static String contractAddr = "0x8f444b9b9C71f4Be883aE15466D71EC7699Cb5B1";
- // 操作账号 合约创建者的私钥 用于操作合约内方法 TODO
+ // 操作账号 手续费钱包地址的私钥（合约里会把手续费转到你这个私钥地址上） 用于操作合约内方法 TODO
//private static String privateKey = "8ea073b74265f41a03138e1adf2e8a80f4f394ac5337aa2eec07562c1040a4e4";
- private static String privateKey = "0xbf6f11f5689961d5351375bebbae751de0d0d5c2e2095c1017368485dc909ff8";
+// private static String privateKey = "0x5672e3b09eae475fc2ad725757874b453b9c7ed76bb3df76340a96c819de0845";
+ private static String privateKey = AppContants.FEE_ADDRESS_KEY.get("feeAddressKey").toString();
private EthFilter getFilter(BigInteger startBlock) {
if (startBlock != null) {
@@ -136,23 +139,20 @@
// 更新区块编号 TODO
redisService.set("BNB_BLOCK_NUMBER",e.log.getBlockNumber().intValue());
//投注人
- DappMemberEntity dappMemberEntity = dappMemberDao.selectByAddress(from, "BSC");
- if(ObjectUtil.isNotEmpty(dappMemberEntity)){
- //投注人是否加入
- DappSystemProfit dappSystemProfit = dappSystemProfitDao.selectByMemberIdAndState(dappMemberEntity.getId(), DappSystemProfit.STATE_IN);
- if(ObjectUtil.isNotEmpty(dappSystemProfit)){
- List<DappFundFlowEntity> dappFundFlowEntities = dappFundFlowDao.selectListByState(DappFundFlowEntity.WITHDRAW_STATUS_ING);
- if(CollUtil.isNotEmpty(dappFundFlowEntities)){
- for(DappFundFlowEntity dappFundFlowEntity : dappFundFlowEntities){
-
- //发送转币消息
- chainProducer.sendBnbTransferMsg(dappFundFlowEntity.getId());
-// DappMemberEntity dappMember = dappMemberDao.selectById(dappFundFlowEntity.getMemberId());
-// trans(new BigInteger(dappFundFlowEntity.getAmount().toString()),dappMember.getAddress());
- }
- }
- }
- }
+// DappMemberEntity dappMemberEntity = dappMemberDao.selectByAddress(from, "BSC");
+// if(ObjectUtil.isNotEmpty(dappMemberEntity)){
+// //投注人是否加入
+// DappSystemProfit dappSystemProfit = dappSystemProfitDao.selectByMemberIdAndState(dappMemberEntity.getId(), DappSystemProfit.STATE_IN);
+// if(ObjectUtil.isNotEmpty(dappSystemProfit)){
+// List<DappFundFlowEntity> dappFundFlowEntities = dappFundFlowDao.selectListByState(DappFundFlowEntity.WITHDRAW_STATUS_ING);
+// if(CollUtil.isNotEmpty(dappFundFlowEntities)){
+// for(DappFundFlowEntity dappFundFlowEntity : dappFundFlowEntities){
+// //发送转币消息
+// chainProducer.sendBnbTransferMsg(dappFundFlowEntity.getId());
+// }
+// }
+// }
+// }
}catch (Exception exception) {
exception.printStackTrace();
}
@@ -177,4 +177,13 @@
}
return transactionHash;
}
+
+ public static void main(String[] args) {
+ ContractMain contractMain = new ContractMain();
+
+ String address = "0xd9076245473060dda1a65f5f3d89a4d0598995e6";
+ 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