From 11f6a8c911c5ef241f42953976661a249aa8b83e Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 08 Aug 2023 17:18:58 +0800
Subject: [PATCH] 数据修改

---
 src/main/java/cc/mrbird/febs/dapp/contract/andao/AndaoContractMain.java |   44 ++++++++++++++++++++++++++++++++------------
 1 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/dapp/contract/andao/AndaoContractMain.java b/src/main/java/cc/mrbird/febs/dapp/contract/andao/AndaoContractMain.java
index e276648..58099f1 100644
--- a/src/main/java/cc/mrbird/febs/dapp/contract/andao/AndaoContractMain.java
+++ b/src/main/java/cc/mrbird/febs/dapp/contract/andao/AndaoContractMain.java
@@ -1,5 +1,6 @@
 package cc.mrbird.febs.dapp.contract.andao;
 
+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.DappFundFlowEntity;
@@ -24,10 +25,11 @@
 import org.web3j.utils.Convert;
 
 import java.math.BigInteger;
+import java.util.List;
 
 
 @Component
-@ConditionalOnProperty(prefix = "system", name = "quartz-job", havingValue = "true")
+@ConditionalOnProperty(prefix = "system", name = "chain-listener", havingValue = "true")
 public class AndaoContractMain {
 
     @Autowired
@@ -80,18 +82,22 @@
         return Web3j.build(httpService);
     }
 
+    private static Web3j getInstanceScopes() {
+
+        HttpService httpService = new HttpService(blockchainNode);
+        return Web3j.build(httpService);
+    }
+
     // 区块链节点地址 TODO
 //    private static String blockchainNode = "https://bsc-dataseed.binance.org";
     private static String blockchainNode = "https://bsc-dataseed1.ninicoin.io";
 
     // 合约地址 TODO
 //    private static String contractAddr = "0xb5a1aC0fA05BFb8ad16B231e84b0bAC1d46eAfD0";//测试
-    private static String contractAddr = "0x99A08A65DB5542f35b96FD69F01896Bd3cDB9DC4";
+    private static String contractAddr = "0xbE8470ff4cF69eb6F2923aE3A8B29f58Ea81cEb0";
 
     // 操作账号 手续费钱包地址的私钥(合约里会把手续费转到你这个私钥地址上) 用于操作合约内方法 TODO
-    private static String privateKey = "3ff7147104fcc4b3e47eef1c6a826107ad13f8ceaf46d6747b7cd4e56f8b01c6";//测试
-
-//    private static String privateKey = AppContants.FEE_ADDRESS_KEY.get("feeAddressKey").toString() ;
+    private static String privateKey = AppContants.FEE_ADDRESS_KEY.get("feeAddressKey").toString() ;
 
     private EthFilter getFilter(BigInteger startBlock) {
         if (startBlock != null) {
@@ -170,16 +176,12 @@
         System.out.println("启动投注监听事件");
         // 指定密钥文件并进行账号和密码的验证
         Credentials credentials = Credentials.create(privateKey);
-        Abi contract = Abi.load(contractAddr, getInstanceScope(), credentials, new DefaultGasProvider());
+        Abi contract = Abi.load(contractAddr, getInstanceScopes(), credentials, new DefaultGasProvider());
         EthFilter filter = getFilter(startBlock);
         contract.withdrawnEventFlowable(filter).subscribe(e->{
             try {
                 // 更新区块编号 TODO
-                if(ObjectUtil.isEmpty(e.log.getBlockNumber())){
-                    redisService.set("BNB_BLOCK_NUMBER",startBlock.intValue());
-                }else{
-                    redisService.set("BNB_BLOCK_NUMBER",e.log.getBlockNumber().intValue());
-                }
+                redisService.set("BNB_BLOCK_NUMBER",e.log.getBlockNumber().intValue());
             }catch (Exception exception) {
                 exception.printStackTrace();
             }
@@ -207,11 +209,29 @@
         }
         return transactionHash;
     }
+//    /**
+//     * 初始化合约地址
+//     */
+//    public String setAddress(List<String> list){
+//        String transactionHash = null;
+//        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.initializeAddresses(list).send();
+//            if(ObjectUtil.isNotEmpty(send)){
+//                transactionHash = send.getTransactionHash();
+//            }
+//        } catch (Exception exception) {
+//            exception.printStackTrace();
+//        }
+//        return transactionHash;
+//    }
 
     public static void main(String[] args) {
         AndaoContractMain andaoContractMain = new AndaoContractMain();
 
-        String address = "0x7a9bfE048d110EF90a467803653f9B8666f9096C";
+        String address = "0xA60AaC0da34C76F3f60207ee09e9F75043319ab4";
         BigInteger bigInteger = new BigInteger(Convert.toWei("1", Convert.Unit.ETHER).setScale(0).toString());
         String hash = andaoContractMain.trans(bigInteger,address);
         System.out.println(hash);

--
Gitblit v1.9.1