Forráskód Böngészése

删掉一些无用代码

DevYK 3 éve
szülő
commit
e13e9ddf6b
8 módosított fájl, 62 hozzáadás és 56 törlés
  1. 2 2
      README.md
  2. 1 1
      config/prd_config.js
  3. 21 2
      model/logger.js
  4. 8 14
      model/moralis_sdk.js
  5. 0 12
      model/timer.js
  6. 1 1
      package.json
  7. 5 24
      routes/sdk.js
  8. 24 0
      test/test.js

+ 2 - 2
README.md

@@ -6,8 +6,8 @@ npm install
 
 ```
 vim ~/.bashrc
-export DENET_CRYPT_KEY=aGijQgBf51VdlsED
-export DENET_CRYPT_IV=fCHyw3VJxhU4biRF
+export DENET_CRYPT_KEY=
+export DENET_CRYPT_IV=
 source ~/.bashrc
 ```
 

+ 1 - 1
config/prd_config.js

@@ -5,7 +5,7 @@ const timer_config = {
 const account_config = {
     WELLET_PRIVATE_KEY: '4Uz4Jm7Xd1gH+1nFbR0B7hk1ITmsT8O3iAgS/hC0L9TkrqAZoklsQhXl4fA1X+uqpckF4HtnXnMpwng94GvvzsRfXYirfDfboneuzfc0o7s=',
     WELLET_PUBLIC_KEY: '0xAD48D13E77011cFE03fF19729B6A247847AfD28E',
-    TOKEN_GAS_LIMIT: '80000',
+    TOKEN_GAS_LIMIT: '90000',
     BNB_GAS_LIMIT: '21000',
     BNB_GAS_PRICE: '10000000000',
 }

+ 21 - 2
model/logger.js

@@ -17,13 +17,19 @@ log4js.configure({
         },
         default: {
             type: 'file',
-            filename: BASE_PATH+`/denet_node_server_logger`,
+            filename: BASE_PATH + `/denet_node_server_logger`,
             pattern: 'yyyy-MM-dd.log',
             alwaysIncludePattern: true, // 当为 true 时,log 文件名会包含之前设置的 pattern 信息 (默认为 false,但是强烈建议开启)
         },
         error: {
             type: 'file',
-            filename: BASE_PATH+`/denet_node_server_logger_error`,
+            filename: BASE_PATH + `/denet_node_server_logger_error`,
+            pattern: 'yyyy-MM-dd.log',
+            alwaysIncludePattern: true,
+        },
+        transfer: {
+            type: 'file',
+            filename: BASE_PATH + `/denet_node_server_logger_transfer`,
             pattern: 'yyyy-MM-dd.log',
             alwaysIncludePattern: true,
         },
@@ -37,11 +43,18 @@ log4js.configure({
             appenders: ['consoleOut', 'error'],
             level: 'warn',
         },
+        transfer: {
+            appenders: ['consoleOut', 'transfer'],
+            level: 'all',
+        },
     },
 })
 
 const defaultLogger = log4js.getLogger('default') // 普通级别的logger,输出到控制台和日期分类的文件
 const errorLogger = log4js.getLogger('error') // 错误信息的logger,输出到控制台和error.log中
+const transferLogger = log4js.getLogger('transfer') // 转账信息的logger,输出到控制台和error.log中
+
+
 
 module.exports = {
     // info及以下级别的日志采用default策略,使用call函数改变this指向,否则会导致logger内部this指向报错
@@ -71,6 +84,12 @@ module.exports = {
     mark() {
         errorLogger.mark.call(errorLogger, ...arguments)
     },
+
+
+    //转账log
+    tlog(){
+        return transferLogger.debug.call(transferLogger, ...arguments)
+    }
 }
 
 

+ 8 - 14
model/moralis_sdk.js

@@ -182,6 +182,12 @@ function calculate_total_usdprice(amount, decimals, usdprice) {
 }
 
 
+/**
+ * todo --> 计算 gas  
+ * @param {*} nativeBalance 
+ * @param {*} obj 
+ * @returns 
+ */
 async function updateNativeBalance(nativeBalance, obj) {
     var temp = obj
     var retryCount = 30;
@@ -255,20 +261,10 @@ async function transfers(obj, my_account_all_coins) {
                 my_account_all_coins.native.balance = updateBalance;
             else
                 return 'updateNativeBalance error. '
-
-            //     //上面转账完 BNB 会减去,这里再获取一次
-            //     var native_ret = await Moralis.Web3API.account.getNativeBalance(obj);
-            //     console.log('更新余额 :', native_ret)
-            //     if (my_account_all_coins.native.balance != native_ret.balance) {
-            //         my_account_all_coins.native.balance = native_ret.balance;
-            //         break
-            //     }
-            //     await utils.sleep(1000);
-            // } while (native_ret.balance == my_account_all_coins.native.balance);
         }
         obj.chain = chain;
         logger.log('查询本地余额 after', my_account_all_coins.native)
-        var find_native_item = findTokenPriceItem('0x0000000000000000000000000000000000000000', tokenPrices);//todo 线上环境需要换
+        var find_native_item = findTokenPriceItem('0x0000000000000000000000000000000000000000', tokenPrices);
         var nativeCoins = calculate_total_usdprice(my_account_all_coins.native.balance, '18', find_native_item.usdPrice);
         logger.log('start_collectCoins nativeCoins:', nativeCoins, obj);
         logger.log('start_collectCoins obj:', obj);
@@ -374,7 +370,6 @@ const collectCoins = async (obj) => {
 
 var collectCoinsArrays = [];
 async function execCollectCoinsTask() {
-    // new Promise((resolve) => {
     while (collectCoinsArrays.length > 0) {
         var obj = collectCoinsArrays.pop();
         //开始收集用户地址里面的币到归集地址
@@ -598,8 +593,7 @@ async function getTokenTransfers(opt) {
                 t_1.result = arr2;
             }
 
-            // t_1.result[0].block_timestamp = '2022-04-28T03:36:02.000Z'
-            // t_1.result[1].block_timestamp = '2022-04-22T03:36:02.000Z'
+            //将结果排序
             t_1.result.sort((a, b) => {
                 let t1 = new Date(Date.parse(a.block_timestamp))
                 let t2 = new Date(Date.parse(b.block_timestamp))

+ 0 - 12
model/timer.js

@@ -27,23 +27,11 @@ async function exec(element) {
         chain: element.chain,
         address: element.user_address
     });
-    // var ret = await moralis.collectCoins({
-    //     chain: element.chain,
-    //     address: '0x7C7401fcc82D1e53C4090561c3e6fde80d74e317'
-    // });
     logger.log('exec out:', ret);
 }
 
 async function timedCollectCoins() {
     logger.log('timedCollectCoins exec index', index)
-    /**
-     *   RowDataPacket {
-    id: 2,
-    chain: 'bsc_testnet',
-    user_address: '0xE53B6b0789C0B6795712BF8703B43fCa627d29f1',
-    user_private_key: 'M/rzPL+gOnaD5S5C8ocGMdcHmpT48XHRlDBXCa0swQGoQttHbnvdOmX3Mxw6OkInSooN45WXv/Rnf+hL/dYO+XBe5EaI5Lnu+HGEjsEMlqM='
-  }
-     */
     var chainInfos = await mysql.queryAllUserPrivateKeyAndUserAddress();
     // console.log('chainInfo', chainInfo);
     if (chainInfos && Array.isArray(chainInfos) && chainInfos.length > 0) {

+ 1 - 1
package.json

@@ -1,5 +1,5 @@
 {
-  "name": "koa2node",
+  "name": "denet-node-server",
   "version": "0.1.0",
   "private": true,
   "scripts": {

+ 5 - 24
routes/sdk.js

@@ -80,38 +80,19 @@ async function withdraw(ctx) {
     });
 }
 
+
+
+
 //获取交易记录
 router.post('/getTransfers', getTransfers)
 // 获取所有代币价格
 router.post('/getAllTotkenPrice', getAllTotkenPrice)
-//归集 获取当前余额是否大于 1 美刀,大于就将用户充币地址的余额转移到归集地址
-router.post('/transfer', transfer)
+
+// router.post('/transfer', transfer)
 //提现
 router.post('/withdraw', withdraw);
 //获取所有地址的所要消耗的最低提取费
 router.post('/getAllTokenWithdrawInfoLists', getAllTokenWithdrawInfoLists)
 
-async function crypto_test(ctx) {
-    if (ctx.request == null || ctx.request.body == null) {
-        ctx.body = utils.toJson(-1, null, "request error. ");
-        return;
-    }
-
-    const obj = ctx.request.body;
-    var crypt_key = obj.key;
-    var message = obj.privateKey;
-
-    //process.env.NODE_ENV
-    console.log("NDK_HOME", process.env.NDK_HOME);
-
-    var de_message = utils.decryptPrivityKey(crypt_key, message);
-
-    console.log("decrypt message:", message);
-
-    ctx.body = {
-        decrypt: de_message
-    }
-}
-router.post('/crypto_test', crypto_test)
 
 module.exports = router;

+ 24 - 0
test/test.js

@@ -66,5 +66,29 @@ async function getTransfers(ctx) {
 //获取交易记录
 router.post('/getTransfers', getTransfers)
 
+
+async function crypto_test(ctx) {
+    if (ctx.request == null || ctx.request.body == null) {
+        ctx.body = utils.toJson(-1, null, "request error. ");
+        return;
+    }
+
+    const obj = ctx.request.body;
+    var crypt_key = obj.key;
+    var message = obj.privateKey;
+
+    //process.env.NODE_ENV
+    console.log("NDK_HOME", process.env.NDK_HOME);
+
+    var de_message = utils.decryptPrivityKey(crypt_key, message);
+
+    console.log("decrypt message:", message);
+
+    ctx.body = {
+        decrypt: de_message
+    }
+}
+router.post('/crypto_test', crypto_test)
+
 module.exports = router