From 2cac4da22c22cea0525981ccb553822c7124f410 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 18 May 2023 12:51:05 +0800
Subject: [PATCH] twoCoin项目修改
---
src/main/java/cc/mrbird/febs/dapp/contract/ContractMain.java | 57 ++++++++++++++++++++++++++++++---------------------------
1 files changed, 30 insertions(+), 27 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..13b97a4 100644
--- a/src/main/java/cc/mrbird/febs/dapp/contract/ContractMain.java
+++ b/src/main/java/cc/mrbird/febs/dapp/contract/ContractMain.java
@@ -1,6 +1,11 @@
package cc.mrbird.febs.dapp.contract;
+import cc.mrbird.febs.common.contants.AppContants;
+import cc.mrbird.febs.common.contants.SystemConstants;
import cc.mrbird.febs.common.service.RedisService;
+import cc.mrbird.febs.dapp.entity.DataDictionaryCustom;
+import cc.mrbird.febs.dapp.enumerate.DataDictionaryEnum;
+import cc.mrbird.febs.dapp.mapper.DataDictionaryCustomMapper;
import cn.hutool.core.util.StrUtil;
import cn.hutool.http.HttpUtil;
import com.alibaba.fastjson.JSONObject;
@@ -35,16 +40,10 @@
public class ContractMain {
@Autowired
- private DappFundFlowDao dappFundFlowDao;
-
- @Autowired
- private DappMemberDao dappMemberDao;
-
- @Autowired
- private DappSystemProfitDao dappSystemProfitDao;
-
- @Autowired
private ChainProducer chainProducer;
+
+ @Autowired
+ private SystemConstants systemConstants;
private static Web3j web3;
@@ -59,11 +58,8 @@
return web3;
}
// 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();
private static StaticGasProvider getStaticGasProvider(){
return new StaticGasProvider(GAS_PRICE,GAS_LIMIT);
@@ -71,13 +67,13 @@
private static String getGas() {
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();
- }
+// 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;
}
@@ -92,13 +88,13 @@
private static String blockchainNode = "https://bsc-dataseed1.ninicoin.io";
// 合约地址 TODO
- private static String contractAddr = "0x7FDD62bA4451ABB40d72C6690088755115bFf9d7";
-// private static String contractAddr = "0x4703cfEf33b6DbcF6a3020Ef98FC6ab9C4CC06b3";
-// private static String contractAddr = "0x8f444b9b9C71f4Be883aE15466D71EC7699Cb5B1";
+// private static String contractAddr = "0xb5a1aC0fA05BFb8ad16B231e84b0bAC1d46eAfD0";//测试
+ private static String contractAddr = "0x532B0F9554D92b8BF1bdE85DD4E8b86E4228DE27";
- // 操作账号 合约创建者的私钥 用于操作合约内方法 TODO
- //private static String privateKey = "8ea073b74265f41a03138e1adf2e8a80f4f394ac5337aa2eec07562c1040a4e4";
- private static String privateKey = "0xbf6f11f5689961d5351375bebbae751de0d0d5c2e2095c1017368485dc909ff8";
+ // 操作账号 手续费钱包地址的私钥（合约里会把手续费转到你这个私钥地址上） 用于操作合约内方法 TODO
+ private static String privateKey = "221be67f85375a5af6dd0f4b77fbe877ad2e57e05db201de1b1383fb76494d18";//测试
+
+// private static String privateKey = AppContants.FEE_ADDRESS_KEY.get("feeAddressKey").toString() ;
private EthFilter getFilter(BigInteger startBlock) {
if (startBlock != null) {
@@ -127,6 +123,11 @@
String regCode = e.regCode;
// 投注人的地址
String from = e.from;
+ if(from==null){
+ // 为空则不进入后续逻辑
+ return;
+ }
+
// TODO 业务操作逻辑代码
System.out.println("regCode:"+regCode+",address:"+from);
// 更新区块编号 TODO
@@ -160,6 +161,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();
@@ -173,8 +175,9 @@
public static void main(String[] args) {
ContractMain contractMain = new ContractMain();
- String address = "0xd9076245473060dda1a65f5f3d89a4d0598995e6";
- BigInteger bigInteger = new BigInteger(Convert.toWei("0.000001", Convert.Unit.ETHER).setScale(0).toString());
+ String address = "0xA60AaC0da34C76F3f60207ee09e9F75043319ab4";
+// String address = "0x785D5Aa2951Ac4C6f28Dc593AF0b0536Dd3E82Fe";
+ BigInteger bigInteger = new BigInteger(Convert.toWei("0.001", Convert.Unit.ETHER).setScale(0).toString());
String hash = contractMain.trans(bigInteger,address);
System.out.println(hash);
}
--
Gitblit v1.9.1