回归测试完成

config/dev_config.js

@@ -18,8 +18,8 @@ const account_config = {
     TOKEN_GAS_PRICE: '10000000000',
     TRANSFER_GAS: true,
     FEISHU_URL: 'https://open.feishu.cn/open-apis/bot/v2/hook/18dfe21f-b1bd-46ca-a8c7-c85e1c84f02d',
-    CZZ_BASEURL: "https://internal-block-payout-test.denet.me",
-    // CZZ_BASEURL: "https://internal-block-payout.denet.me",
+    // CZZ_BASEURL: "https://internal-block-payout-test.denet.me",
+    CZZ_BASEURL: "https://internal-block-payout.denet.me",
     STATISTICS_URL: 'https://testapi.denetme.net/denet/wallet/stat/getMoneyStat?date='
     // STATISTICS_URL:'https://api.denetme.net/denet/wallet/stat/getMoneyStat?date='
 }
@@ -49,26 +49,6 @@ const http_log_report_config = {
 // 设置数据库配置文件
 const db_config = {
     // 数据库配置
-    mysql: {
-        DATABASE: 'denet_chain',   //数据库名称
-        DATABASE_MY_NODE: 'bnb_block_sync',   //自建 node 存储
-        TABLENAME: 'user_key_manage',   //表名
-        USERNAME: 'denet',   //用户名
-        PASSWORD: 'cyber#Together_2022', //密码
-        PORT: '3306', //连接的端口
-        HOST: 'denet-test.csi2lctklqzg.us-east-1.rds.amazonaws.com', //host
-        OPEN_POOL: true,
-        POOL_SIZE: 5,
-    },
-
-    redis: {
-        PORT: 6379, // Redis port
-        HOST: "denet-test.y2slbl.clustercfg.memorydb.us-east-1.amazonaws.com", // Redis host
-        USERNAME: null, // needs Redis >= 6
-        PASSWORD: null,
-    },
-
-    // // 线上数据库配置
     // mysql: {
     //     DATABASE: 'denet_chain',   //数据库名称
     //     DATABASE_MY_NODE: 'bnb_block_sync',   //自建 node 存储
@@ -76,17 +56,37 @@ const db_config = {
     //     USERNAME: 'denet',   //用户名
     //     PASSWORD: 'cyber#Together_2022', //密码
     //     PORT: '3306', //连接的端口
-    //     HOST: 'denet-chain-prod.csi2lctklqzg.us-east-1.rds.amazonaws.com', //host
+    //     HOST: 'denet-test.csi2lctklqzg.us-east-1.rds.amazonaws.com', //host
     //     OPEN_POOL: true,
     //     POOL_SIZE: 5,
     // },
 
     // redis: {
     //     PORT: 6379, // Redis port
-    //     HOST: "denet-chain-prod.y2slbl.clustercfg.memorydb.us-east-1.amazonaws.com", // Redis host
-    //     USERNAME: null,
+    //     HOST: "denet-test.y2slbl.clustercfg.memorydb.us-east-1.amazonaws.com", // Redis host
+    //     USERNAME: null, // needs Redis >= 6
     //     PASSWORD: null,
     // },
+
+    // // 线上数据库配置
+    mysql: {
+        DATABASE: 'denet_chain',   //数据库名称
+        DATABASE_MY_NODE: 'bnb_block_sync',   //自建 node 存储
+        TABLENAME: 'user_key_manage',   //表名
+        USERNAME: 'denet',   //用户名
+        PASSWORD: 'cyber#Together_2022', //密码
+        PORT: '3306', //连接的端口
+        HOST: 'denet-chain-prod.csi2lctklqzg.us-east-1.rds.amazonaws.com', //host
+        OPEN_POOL: true,
+        POOL_SIZE: 5,
+    },
+
+    redis: {
+        PORT: 6379, // Redis port
+        HOST: "denet-chain-prod.y2slbl.clustercfg.memorydb.us-east-1.amazonaws.com", // Redis host
+        USERNAME: null,
+        PASSWORD: null,
+    },
 }
 
 // 设置 moralis sdk 配置文件

model/db/account_info_db.js

@@ -217,12 +217,12 @@ async function getAccountBalances(opts) {
                     //     decimals: 18,
                     //     balance: '1000000000000000000000'
                     //   }
-                    var decimals = 1
+                    var decimals = 18
                     try {
                         // decimals = await redis.readRedis('REDIS_ERC20_CONTRACT_DECIMALS_' + element.token_address.toLowerCase())
                         decimals = await redis.readAppendRedis('REDIS_ERC20_CONTRACT_DECIMALS', opts.chain, element.token_address.toLowerCase())
                     } catch (error) {
-                        
+                        decimals=18
                     }
                     results.push({
                         type: 'token',

model/http_withdraw.js

@@ -16,7 +16,7 @@ const withdraw = async (params) => {
     return new Promise(resolve => {
         axios.post(url + '/withdraw', data, { timeout: 5 * 60 * 1000 })
             .then(res => {
-                console.log('withdraw res=>', res.status, res.data);
+                logger.info('withdraw res=>', res.status, res.data);
                 resolve(res.data)
             }).catch(err => {
                 logger.error('http_request_post withdraw_czz error ', JSON.stringify(err));

model/moralis_sdk.js

@@ -379,7 +379,9 @@ async function computeTransferGasFree(obj, my_account_all_coins, tokenPrices) {
         var lastTokenPrice = await redis.readAppendRedis(reids_token_config.LAST_TOKEN_PRICE, obj.chain, '')
 
         logger.log('LAST_TOKEN_PRICE=', lastTokenPrice);
-
+        if (process.env.NODE_ENV == 'test' || process.env.NODE_ENV == 'dev') {
+            lastTokenPrice = parseInt(account_config.TOKEN_GAS_PRICE);
+        }
         if (lastTokenPrice && parseInt(lastTokenPrice) > 0) {
             tokenGasPrice = parseInt(tokenCount) * parseInt(lastTokenPrice) * parseInt(account_config.TOKEN_GAS_LIMIT);
             ret_a_gas = lastTokenPrice;
@@ -415,9 +417,15 @@ async function computeTransferGasFree(obj, my_account_all_coins, tokenPrices) {
             logger.log('LAST_BNB_PRICE=', lastBnbPrice);
             if (lastBnbPrice && parseInt(lastBnbPrice) > 0) {
                 var limitPrice = parseInt(account_config.BNB_GAS_LIMIT)
-                if (obj.chain == utils.CHAIN_NAME.czz) {
+
+                if (utils.getChainNameFromChain(obj.chain) != 'bsc') {
                     limitPrice = 40000
                 }
+                if (process.env.NODE_ENV == 'test' || process.env.NODE_ENV == 'dev') {
+                    lastBnbPrice = parseInt(account_config.BNB_GAS_PRICE);
+                }
+
+                logger.log('LAST_BNB_PRICE limitPrice =', lastBnbPrice, limitPrice);
                 nativeGasPrice = parseInt(nativeCount) * parseInt(lastBnbPrice) * limitPrice;
                 ret_a_gas = lastBnbPrice;
             } else {
@@ -844,6 +852,12 @@ const collectCoins = async (obj) => {
         if (typeof obj.tokenPrices == 'string')
             obj.tokenPrices = JSON.parse(obj.tokenPrices);
     }
+    if (process.env.NODE_ENV == 'dev' && obj.tokenPrices && Array.isArray(obj.tokenPrices.tokenPrice)) {
+        obj.tokenPrices.tokenPrice.push({
+            contract: '0xFF94950Ee8A79c52cC4B0Aa5178C8cEa48A3F3A6',
+            usdPrice: 0.12337863
+        })
+    }
     logger.log('tokenPrices=', obj.tokenPrices)
 
     obj.chain = chain;
@@ -1138,7 +1152,7 @@ async function pushChainDetailTOQueue(withdraw, request, obj) {
             var temp_obj = {
                 withdraw_id: request.withdraw_id,
                 hash: obj.data.hash,
-                chain:obj.data.chain,
+                chain: obj.data.chain,
                 create_time: obj.data.create_time,
                 lifecycle: obj.data.lifecycle
             }

model/utils.js

@@ -154,11 +154,13 @@ function getRedisKeyFromChain(chain) {
         case CHAIN_NAME.kcc_testnet:
         case CHAIN_ID.kcc_mainnet:
         case CHAIN_ID.kcc_testnet:
+        case 'kcc':
             return '_KCC'
         case CHAIN_NAME.okc_mainnet:
         case CHAIN_NAME.okc_testnet:
         case CHAIN_ID.okc_mainnet:
         case CHAIN_ID.okc_testnet:
+        case 'okc':
             return '_OKC'
         default:
             return null

routes/sdk.js

@@ -868,31 +868,160 @@ router.post('/getAllTokenWithdrawInfoLists', getAllTokenWithdrawInfoLists)
 withdraw_task();
 collect_conis_task();
 // //czz 504 检查
-check_czz_withdraw_task();
+// check_czz_withdraw_task();
 // bsc 监控
-bsc_log_monitoring()
+// bsc_log_monitoring()
 
 if (process.env.NODE_ENV == 'dev' || process.env.NODE_ENV == 'test') {
+    /*** test */
+    //bsc
     // timer_transfer_task({
     //     "type": "erc20",
     //     "contractAddress": "0xFF94950Ee8A79c52cC4B0Aa5178C8cEa48A3F3A6",
     //     "amount": "123000000000000000000",
     //     "chain": "bsc_testnet",
-    //     "receiver": "0x3B525c35DdC323B08241493f148340D89e3A73a7",
-    //     "withdrawId": index.toString()
+    //     "receiver": "0x39ACD9CC975D792D8160215Dc84fa00E4934F076",
+    //     "withdrawId": 5
+    // })
+    // timer_transfer_task({
+    //     "type": "native",
+    //     "amount": "100000000000000000",
+    //     "chain": "bsc_testnet",
+    //     "receiver": "0x39ACD9CC975D792D8160215Dc84fa00E4934F076",
+    //     "withdrawId": 6
     // })
+
+    //czz
+    // timer_transfer_task({
+    // "type": "erc20",
+    // "contractAddress": "0xfb16179d5e84b0e3e7524ed61a9cf7b98d039b20",
+    // "amount": "100000000000000000000",
+    // "chain": "czz",
+    //     "receiver": "0x39ACD9CC975D792D8160215Dc84fa00E4934F076",
+    //     "withdrawId": 5
+    // })
+    // timer_transfer_task({
+    //     "type": "native",
+    //     "amount": "100000000000000000",
+    //     "chain": "czz",
+    //     "receiver": "0x39ACD9CC975D792D8160215Dc84fa00E4934F076",
+    //     "withdrawId": 6
+    // })
+
+    //kcc
     // timer_transfer_task({
     //     "type": "erc20",
     //     "contractAddress": "0x9984086cb9d93dbe47c4e70890aad5454bbc2518",
-    //     "amount": "1200000000000000000000",
+    //     "amount": "1300000000000000000000",
+    //     "chain": "kcc_testnet",
+    //     "receiver": "0x39ACD9CC975D792D8160215Dc84fa00E4934F076",
+    //     "withdrawId": 1
+    // })
+    // timer_transfer_task({
+    //     "type": "native",
+    //     "amount": "110000000000000000",
     //     "chain": "kcc_testnet",
     //     "receiver": "0x39ACD9CC975D792D8160215Dc84fa00E4934F076",
+    //     "withdrawId": 2
+    // })
+
+    //okc
+    // timer_transfer_task({
+    //     "type": "erc20",
+    //     "contractAddress": "0xc2BaBFb3Bd1516D138B05c7c7e316f1648E90B7C",
+    //     "amount": "1200000000000000000000",
+    //     "chain": "okc_testnet",
+    //     "receiver": "0x39ACD9CC975D792D8160215Dc84fa00E4934F076",
+    //     "withdrawId": 3
+    // })
+    // timer_transfer_task({
+    //     "type": "native",
+    //     "amount": "100000000000000000",
+    //     "chain": "okc_testnet",
+    //     "receiver": "0x39ACD9CC975D792D8160215Dc84fa00E4934F076",
+    //     "withdrawId": 4
+    // })
+
+
+    /*** main */
+    //bsc
+    // timer_transfer_task({
+    //     "type": "erc20",
+    //     "contractAddress": "0x9984086CB9d93dbe47C4e70890aAD5454bBc2518",
+    //     "amount": "123000000000000000000",
+    //     "chain": "bsc_mainnet",
+    //     "receiver": "0x0001Df2b3c3cde767343e4e54Ab083e083CD1C50",
+    //     "withdrawId": 5
+    // })
+    // timer_transfer_task({
+    //     "type": "native",
+    //     "amount": "1000000000000000",
+    //     "chain": "bsc_mainnet",
+    //     "receiver": "0x0001Df2b3c3cde767343e4e54Ab083e083CD1C50",
+    //     "withdrawId": 6
+    // })
+
+    //czz
+    // timer_transfer_task({
+    //     "type": "erc20",
+    //     "contractAddress": "0xfb16179d5e84b0e3e7524ed61a9cf7b98d039b20",
+    //     "amount": "100000000000000000000",
+    //     "chain": "czz",
+    //     "receiver": "0x0001Df2b3c3cde767343e4e54Ab083e083CD1C50",
+    //     "withdrawId": 5
+    // })
+    // timer_transfer_task({
+    //     "type": "native",
+    //     "amount": "1000000000000000",
+    //     "chain": "czz",
+    //     "receiver": "0x0001Df2b3c3cde767343e4e54Ab083e083CD1C50",
+    //     "withdrawId": 6
+    // })
+
+    //kcc
+    // timer_transfer_task({
+    //     "type": "erc20",
+    //     "contractAddress": "0x9984086cb9d93dbe47c4e70890aad5454bbc2518",
+    //     "amount": "1300000000000000000000",
+    //     "chain": "kcc_mainnet",
+    //     "receiver": "0x0001Df2b3c3cde767343e4e54Ab083e083CD1C50",
     //     "withdrawId": 1
     // })
-    // timer_transfer_czz_task()
-    // timer_collect_conis_bsc_task()
-    // timer_collect_conis_czz_task()
-    timer_collect_conis_task('kcc_testnet','0x39ACD9CC975D792D8160215Dc84fa00E4934F076')
+    // timer_transfer_task({
+    //     "type": "native",
+    //     "amount": "110000000000000000",
+    //     "chain": "kcc_mainnet",
+    //     "receiver": "0x0001Df2b3c3cde767343e4e54Ab083e083CD1C50",
+    //     "withdrawId": 2
+    // })
+
+    //okc
+    // timer_transfer_task({
+    //     "type": "erc20",
+    //     "contractAddress": "0x9984086CB9d93dbe47C4e70890aAD5454bBc2518",
+    //     "amount": "1200000000000000000000",
+    //     "chain": "okc_mainnet",
+    //     "receiver": "0x0001Df2b3c3cde767343e4e54Ab083e083CD1C50",
+    //     "withdrawId": 3
+    // })
+    // timer_transfer_task({
+    //     "type": "native",
+    //     "amount": "100000000000000000",
+    //     "chain": "okc_mainnet",
+    //     "receiver": "0x0001Df2b3c3cde767343e4e54Ab083e083CD1C50",
+    //     "withdrawId": 4
+    // })
+
+
+
+    // timer_collect_conis_task('okc_testnet','0x39ACD9CC975D792D8160215Dc84fa00E4934F076')
+    // timer_collect_conis_task('kcc_testnet','0x39ACD9CC975D792D8160215Dc84fa00E4934F076')
+    // timer_collect_conis_task('bsc_testnet','0x39ACD9CC975D792D8160215Dc84fa00E4934F076')
+    // timer_collect_conis_task('czz','0x39ACD9CC975D792D8160215Dc84fa00E4934F076')
+
+    // timer_collect_conis_task('okc_testnet','0x0001Df2b3c3cde767343e4e54Ab083e083CD1C50')
+    // timer_collect_conis_task('kcc_mainnet','0x0001Df2b3c3cde767343e4e54Ab083e083CD1C50')
+    // timer_collect_conis_task('bsc_testnet','0x0001Df2b3c3cde767343e4e54Ab083e083CD1C50')
 }
 
 module.exports = router