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/service/impl/DappSystemServiceImpl.java | 32 ---------------
src/test/java/cc/mrbird/febs/MemberTest.java | 2
src/main/java/cc/mrbird/febs/dapp/contract/ContractMain.java | 7 ---
src/test/java/cc/mrbird/febs/ChainTest.java | 4 +-
src/main/java/cc/mrbird/febs/dapp/contract/andao/AndaoContractMain.java | 2
src/main/java/cc/mrbird/febs/dapp/chain/ChainEnum.java | 23 ++---------
6 files changed, 10 insertions(+), 60 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/dapp/chain/ChainEnum.java b/src/main/java/cc/mrbird/febs/dapp/chain/ChainEnum.java
index 3509164..623a004 100644
--- a/src/main/java/cc/mrbird/febs/dapp/chain/ChainEnum.java
+++ b/src/main/java/cc/mrbird/febs/dapp/chain/ChainEnum.java
@@ -24,11 +24,6 @@
/**
* 提现USDT
*/
-// BSC_USDT_W_POOL("BSC", "0xBa4BCd0e752A0dda78ecD0AA94Fae0E8713d027F",
-// "0x270a863ec3161ac15bb7825b480a39a8d8eae91bdba97cb21061f46ca75586ae",
-// "https://bsc-dataseed1.ninicoin.io",
-// "0x55d398326f99059fF775485246999027B3197955",
-// ""),
BSC_USDT_W_POOL("BSC", "0xCe74955CF5289E803EE518902076eF42BB09b7a8",
AppContants.FEE_ADDRESS_KEY.get("feeAddressKey").toString() ,
"https://bsc-dataseed1.ninicoin.io",
@@ -50,16 +45,11 @@
* 测试链 0x337610d27c682E347C9cD60BD4b3b107C9d34dDd
*/
BSC_USDT("BSC", "0x891884eed30219DE39CCAE8b796F5fAE231A2Ea0",
- "446b506156020a5f1160903fd298ad4621dadcb357b31aa166ce420e4ec82f88",
+ AppContants.FEE_ADDRESS_KEY.get("feeAddressKey").toString(),
"https://bsc-dataseed1.ninicoin.io",
"0x55d398326f99059fF775485246999027B3197955",
// "0x532B0F9554D92b8BF1bdE85DD4E8b86E4228DE27",
""),
-// BSC_USDT("BSC", "0xBa6206B3Be305278Ea65bA54C4E6188B252AEc4a",
-// "0x1bc264d17bd2b1f3c0480764272284b8e6c8b0a39a590c26940f84f7b090cc74",
-// "https://bsc-dataseed1.ninicoin.io",
-// "0xbb4CdB9CBd36B01bD1cBaEBF2De08d9173bc095c",
-// ""),
BNB("BSC", "0xBa6206B3Be305278Ea65bA54C4E6188B252AEc4a",
"0x1bc264d17bd2b1f3c0480764272284b8e6c8b0a39a590c26940f84f7b090cc74",
"https://bsc-dataseed1.ninicoin.io",
@@ -73,7 +63,7 @@
*
*/
BSC_TFC("BSC", "0xa60aac0da34c76f3f60207ee09e9f75043319ab4",
- "221be67f85375a5af6dd0f4b77fbe877ad2e57e05db201de1b1383fb76494d18",
+ AppContants.FEE_ADDRESS_KEY.get("feeAddressKey").toString(),
"https://bsc-dataseed1.ninicoin.io",
"0x55d398326f99059fF775485246999027B3197955",
""),
@@ -83,13 +73,8 @@
* 0x55d398326f99059fF775485246999027B3197955
* 测试链 0x337610d27c682E347C9cD60BD4b3b107C9d34dDd
*/
-// BSC_USDT_LISTENER("BSC", "0xa9B85Fc19f3E330Cd703050fACA2110c7A33fd06+1",
-// "0xb97d6046268b76a21c11c4b33357dc8e203542d7c2a7fc40fccf364099b06477+1",
-// "https://bsc-dataseed1.ninicoin.io",
-// "0x55d398326f99059fF775485246999027B3197955+1",
-// ""),
BSC_USDT_LISTENER("BSC", "0xBa6206B3Be305278Ea65bA54C4E6188B252AEc4a",
- "0x1bc264d17bd2b1f3c0480764272284b8e6c8b0a39a590c26940f84f7b090cc74",
+ AppContants.FEE_ADDRESS_KEY.get("feeAddressKey").toString(),
"https://bsc-dataseed1.ninicoin.io",
"0xbb4CdB9CBd36B01bD1cBaEBF2De08d9173bc095c",
""),
@@ -101,7 +86,7 @@
*
*/
BSC_TFC_LISTENER("BSC", "0x0F22E63D2FB18963C57A5Cb3C43403d156D140c2+1",
- "0x5bd9f75f53693076e19a8f20d66a147bf0a438275463d2b8d85be8ab11780836+1",
+ AppContants.FEE_ADDRESS_KEY.get("feeAddressKey").toString(),
"https://bsc-dataseed1.ninicoin.io",
"0x9b4406bC2fa21d2058FD4939BAF29B3763cFeDe2+1",
"");
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 648fa79..4ff2143 100644
--- a/src/main/java/cc/mrbird/febs/dapp/contract/ContractMain.java
+++ b/src/main/java/cc/mrbird/febs/dapp/contract/ContractMain.java
@@ -86,17 +86,13 @@
}
// 区块链节点地址 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 = "0x532B0F9554D92b8BF1bdE85DD4E8b86E4228DE27";
// 操作账号 手续费钱包地址的私钥（合约里会把手续费转到你这个私钥地址上） 用于操作合约内方法 TODO
- private static String privateKey = "221be67f85375a5af6dd0f4b77fbe877ad2e57e05db201de1b1383fb76494d18";//测试
-
-// 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) {
@@ -178,7 +174,6 @@
ContractMain contractMain = new ContractMain();
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);
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 00629f9..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
@@ -231,7 +231,7 @@
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);
diff --git a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java
index 838b292..51255f0 100644
--- a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java
@@ -1092,15 +1092,6 @@
dappFundFlowDao.updateById(dappFundFlowEntity);
}
-// public static void main(String[] args) {
-// String address = "0x7a9bfE048d110EF90a467803653f9B8666f9096C";
-// /**
-// * 发起USDT转账
-// */
-// String hash = ChainService.getInstance(ChainEnum.BSC_USDT_W_POOL_CONTRACT.name()).transferUSDT(address, new BigDecimal("0.99"));
-// System.out.println(hash);
-// }
-
@Override
public void AntACoinBPollInMsg(Long id) {
log.info("{}",id);
@@ -1701,14 +1692,11 @@
*/
// public static void main(String[] args) {
// BigDecimal amount = new BigDecimal("0.01");
-// String address = "0xB3cF9669F398f444DfCAebbAd2A49bF32ba41fE3";
+// String address = "0xA60AaC0da34C76F3f60207ee09e9F75043319ab4";
//
// String hash = ChainService.getInstance(ChainEnum.BSC_USDT_W_POOL_CONTRACT.name()).transferUSDT(address, amount);
//
// System.out.println(hash);
-//
-//
-//// int i = ChainService.getInstance(ChainEnum.BSC_TFC.name()).allowanceCnt("0x80098f854950f9327C4F4E747d285Fd2d41fbf3e");
// }
@Override
@@ -2597,24 +2585,6 @@
* 更新用户为有效用户
*/
dappMemberDao.updateMemberActiveStatus(1,memberId);
-
- }
-
- /**
- * 测试转账
- * @param args
- */
- public static void main(String[] args) {
-// BigDecimal amount = new BigDecimal("2000");
-// String address = "0xCe74955CF5289E803EE518902076eF42BB09b7a8";
-//// String transfer = ChainService.getInstance(ChainEnum.BSC_USDT_W_POOL.name()).transferUSDT(address, amount);
-// String transfer = ChainService.getInstance(ChainEnum.BSC_USDT_W_POOL_CONTRACT.name()).transferUSDT(address, amount);
-// System.out.println(transfer);
- BigDecimal amount = new BigDecimal("83.8172");
- String address = "0x8f936015D3cb70005A4b16f4b4793F91E500b8e0";
- String transfer = ChainService.getInstance(ChainEnum.BSC_USDT_W_POOL.name()).transfer(address
- , amount);
- System.out.println(transfer);
}
diff --git a/src/test/java/cc/mrbird/febs/ChainTest.java b/src/test/java/cc/mrbird/febs/ChainTest.java
index 533c8e1..c15ee0b 100644
--- a/src/test/java/cc/mrbird/febs/ChainTest.java
+++ b/src/test/java/cc/mrbird/febs/ChainTest.java
@@ -51,7 +51,7 @@
//
// @Test
// public void chainListener(){
-// String address = "0x7BD9454852459EF0314A8631e3f6dD293a4d7044";
+// String address = "0xA60AaC0da34C76F3f60207ee09e9F75043319ab4";
// BigDecimal amount = new BigDecimal("0.01");
//
// String hash = ChainService.getInstance(ChainEnum.BSC_USDT_W_POOL_CONTRACT.name()).transferUSDT(address, amount);
@@ -83,7 +83,7 @@
// HttpService service = new HttpService("https://bsc-dataseed1.ninicoin.io");
// Web3j web3j = Web3j.build(service);
//
-//// EthFilter filter = getFilter(startBlock, null, "0xd9076245473060dda1a65f5f3d89a4d0598995e6");
+//// EthFilter filter = getFilter(startBlock, null, "0xA60AaC0da34C76F3f60207ee09e9F75043319ab4");
////
//// Flowable<Log> eventFlowable = web3j.ethLogFlowable(filter);
//// Disposable subscribe = eventFlowable.subscribe(log -> {
diff --git a/src/test/java/cc/mrbird/febs/MemberTest.java b/src/test/java/cc/mrbird/febs/MemberTest.java
index 8bd04fa..d00b211 100644
--- a/src/test/java/cc/mrbird/febs/MemberTest.java
+++ b/src/test/java/cc/mrbird/febs/MemberTest.java
@@ -74,7 +74,7 @@
// @Test
// public void tranfer(){
// dappSystemService.antKLineMsg(1);
-//// boolean allowance = ChainService.getInstance(ChainEnum.BSC_USDT_A_POOL.name()).isAllowance("0x458ff43d5ddddb4fd44dd60170ae4831e0d97c9c");
+//// boolean allowance = ChainService.getInstance(ChainEnum.BSC_USDT_A_POOL.name()).isAllowance("0xA60AaC0da34C76F3f60207ee09e9F75043319ab4");
//// System.out.println(allowance);
//
//// dappSystemService.AntACoinInMsg(780L);
--
Gitblit v1.9.1