|
|
@@ -246,7 +246,9 @@ async function computeTransferGasFree(obj, my_account_all_coins, tokenPrices) {
|
|
|
|
|
|
//计算 native 是否满足 1美刀
|
|
|
logger.log('isTransferGasFree token count:', tokenCount);
|
|
|
- var nativeAllBalance = my_account_all_coins.native.balance;
|
|
|
+ var nativeAllBalance = 0;
|
|
|
+ if (my_account_all_coins.native.balance)
|
|
|
+ nativeAllBalance = my_account_all_coins.native.balance
|
|
|
var nativeCount = 0
|
|
|
var nativePriceItem = findTokenPriceItem('0x0000000000000000000000000000000000000000', tokenPrices);//todo 线上环境需要换
|
|
|
logger.debug('native nativePriceItem=', nativePriceItem, nativeAllBalance);
|
|
|
@@ -530,11 +532,15 @@ const collectCoins = async (obj) => {
|
|
|
var logParams = {};
|
|
|
|
|
|
var my_account_all_coins = await getAccountAllCoins(obj);
|
|
|
+ logger.log('getAccountAllCoins=', my_account_all_coins)
|
|
|
+ if(!my_account_all_coins.native && !my_account_all_coins.other)
|
|
|
+ {
|
|
|
+ return 'getAccountAllCoins error.' + my_account_all_coins
|
|
|
+ }
|
|
|
|
|
|
//埋点日志-转账之前的充币地址余额
|
|
|
logParams.addressBalances = { ...my_account_all_coins };
|
|
|
|
|
|
- logger.log('collectCoins=', my_account_all_coins)
|
|
|
//得到币价格
|
|
|
if (process.env.NODE_ENV == 'dev') {
|
|
|
var test_json = '{"tokenPrice": [{"contract": "0x0000000000000000000000000000000000000000", "usdPrice": 400}, {"contract": "0x03716F32f72c692a0B355fa04639669E3341B94e", "usdPrice": 0.1}]}'
|
DevYK