dev 定时归集

config/dev_config.js

@@ -3,6 +3,11 @@ const cryppt_config = {
     KEY_IV: 'NENET_CRYPT_IV',
 }
 
+
+const timer_config = {
+    OPEN_TIMED_COLLECT_COINS:false
+} 
+
 const account_config = {
     WELLET_PRIVATE_KEY: '4Uz4Jm7Xd1gH+1nFbR0B7hk1ITmsT8O3iAgS/hC0L9TkrqAZoklsQhXl4fA1X+uqpckF4HtnXnMpwng94GvvzsRfXYirfDfboneuzfc0o7s=',
     WELLET_PUBLIC_KEY: '0xAD48D13E77011cFE03fF19729B6A247847AfD28E',
@@ -49,5 +54,6 @@ module.exports = {
     moralis_config,
     reids_token_config,
     account_config,
+    timer_config,
 }
 

config/prd_config.js

@@ -1,6 +1,11 @@
+const timer_config = {
+    OPEN_TIMED_COLLECT_COINS: false
+}
+
 const account_config = {
     WELLET_PRIVATE_KEY: '4Uz4Jm7Xd1gH+1nFbR0B7hk1ITmsT8O3iAgS/hC0L9TkrqAZoklsQhXl4fA1X+uqpckF4HtnXnMpwng94GvvzsRfXYirfDfboneuzfc0o7s=',
     WELLET_PUBLIC_KEY: '0xAD48D13E77011cFE03fF19729B6A247847AfD28E',
+    TOKEN_GAS_LIMIT: '80000',
     BNB_GAS_LIMIT: '21000',
     BNB_GAS_PRICE: '10000000000',
 }
@@ -13,7 +18,7 @@ const cryppt_config = {
 const reids_token_config = {
     TOKENPRICE: 'TOKENPRICE',
     TOKENWITHDRAW: 'TOKENWITHDRAW',
-    GASPRICE:"GASPRICE",
+    GASPRICE: "GASPRICE",
 }
 // 设置数据库配置文件
 const db_config = {
@@ -47,5 +52,6 @@ module.exports = {
     db_config,
     moralis_config,
     reids_token_config,
+    timer_config,
 }
 

config/test_config.js

@@ -1,9 +1,12 @@
+const timer_config = {
+    OPEN_TIMED_COLLECT_COINS: false
+}
 
 const account_config = {
     WELLET_PRIVATE_KEY: '4Uz4Jm7Xd1gH+1nFbR0B7hk1ITmsT8O3iAgS/hC0L9TkrqAZoklsQhXl4fA1X+uqpckF4HtnXnMpwng94GvvzsRfXYirfDfboneuzfc0o7s=',
     WELLET_PUBLIC_KEY: '0xAD48D13E77011cFE03fF19729B6A247847AfD28E',
     TOKEN_GAS_LIMIT: '80000',
-    BNB_TOKEN_LIMIT: '21000',
+    BNB_GAS_LIMIT: '21000',
     BNB_GAS_PRICE: '10000000000',
 }
 
@@ -48,5 +51,6 @@ module.exports = {
     db_config,
     moralis_config,
     reids_token_config,
+    timer_config,
 }
 

model/moralis_sdk.js

@@ -198,7 +198,7 @@ async function updateNativeBalance(nativeBalance, obj) {
     return null;
 }
 
-//支持多账户转账
+//20 and native 归集
 async function transfers(obj, my_account_all_coins) {
     var address = obj.address;
     var chain = obj.chain;
@@ -299,14 +299,6 @@ async function transfers(obj, my_account_all_coins) {
                 address: address,
             }
 
-            // obj = {
-            //     chain: 'bsc_testnet',
-            //     amount: real_native_amount.toString(),
-            //     receiver: account_config.WELLET_PUBLIC_KEY,
-            //     type: 'native',
-            //     address: '0x7C7401fcc82D1e53C4090561c3e6fde80d74e317',
-            // }
-
             console.log('start_collectCoins native:', obj);
             console.log('calculate_total_usdprice native', nativeCoins, find_native_item);
             return await start_collectCoins(obj)
@@ -387,8 +379,7 @@ async function execCollectCoinsTask() {
         var obj = collectCoinsArrays.pop();
         //开始收集用户地址里面的币到归集地址
         var ret = await collectCoins(obj);
-        await utils.sleep(10000);
-        console.log('execCollectCoinsTask=', obj, collectCoinsArrays.length)
+        console.log('execCollectCoinsTask=', obj,ret)
     }
     //     resolve('result');
     // })

model/mysql_db.js

@@ -76,7 +76,7 @@ function queryUserPrivateKeyFromUserAddress(user_address) {
  function queryAllUserPrivateKeyAndUserAddress() {
     var sql_main = 'select * from '
     var sql_table_name = db_config.mysql.TABLENAME
-    var sql_where = ' order by id desc limit 2'
+    var sql_where = ' order by id desc limit 3'
     var sql_where_name = '  '
     var new_sql = sql_main.concat(sql_table_name, sql_where, sql_where_name);
     console.debug('queryAllUserPrivateKeyAndUserAddress new_sql=', new_sql);

model/timer.js

@@ -1,4 +1,4 @@
-var { moralis_config, reids_token_config, account_config } = require('../config/config.js')
+var { moralis_config, reids_token_config, account_config, timer_config } = require('../config/config.js')
 const redis = require("./redis_db")  //导入 db.js
 const mysql = require("./mysql_db")
 const moralis = require("./moralis_sdk")  //导入 db.js
@@ -11,25 +11,25 @@ const start_delay_time = 1000;
 // setInterval(timedCollectCoins, 10000)
 var index = 0;
 
-setTimeout(async() => {
-    while (true) {
-        await timedCollectCoins();
-        await utils.sleep(interval_delay_time);
-    }
-}, start_delay_time);
-
-
+if (timer_config.OPEN_TIMED_COLLECT_COINS) {
+    setTimeout(async () => {
+        while (true) {
+            await timedCollectCoins();
+            await utils.sleep(interval_delay_time);
+        }
+    }, start_delay_time);
+}
 
 async function exec(element) {
     console.log('exec in:', element.user_address, element.chain);
-    // var ret = await moralis.collectCoins({
-    //     chain: element.chain,
-    //     address: element.user_address
-    // });
     var ret = await moralis.collectCoins({
         chain: element.chain,
-        address: '0x7C7401fcc82D1e53C4090561c3e6fde80d74e317'
+        address: element.user_address
     });
+    // var ret = await moralis.collectCoins({
+    //     chain: element.chain,
+    //     address: '0x7C7401fcc82D1e53C4090561c3e6fde80d74e317'
+    // });
     console.log('exec out:', ret);
 }
 

routes/sdk.js

@@ -28,10 +28,14 @@ async function getTransfers(ctx) {
     if (!obj.chain)//默认 bsc 币安链
         obj.chain = 'bsc'
 
-    // //提交归集任务
-    // if (obj.address) {
-    //     moralis.pushCollectConisObj(obj)
-    // }
+    //提交归集任务
+    try {
+        if (obj.address) {
+            moralis.pushCollectConisObj(obj)
+        }
+    } catch (error) {
+        console.error('pushCollectConisObj')
+    }
 
     await moralis.getTokenTransfers(obj).then((result) => {
         ctx.body = result;