|
@@ -52,7 +52,7 @@ async function initMasterSDK() {
|
|
|
}
|
|
|
await Moralis.start({ serverUrl, appId, masterKey });
|
|
|
logger.debug('initMasterSDK start ok')
|
|
|
- masterInit = true
|
|
|
+ // masterInit = true
|
|
|
}
|
|
|
|
|
|
async function initMoralisSecretSDK() {
|
|
@@ -63,7 +63,7 @@ async function initMoralisSecretSDK() {
|
|
|
logger.debug('initMoralisSecretSDK start')
|
|
|
await Moralis.start({ serverUrl, appId, moralisSecret });
|
|
|
logger.debug('initMoralisSecretSDK start ok')
|
|
|
- secretInit = true
|
|
|
+ // secretInit = true
|
|
|
}
|
|
|
|
|
|
function toJson(code_, obj_, errMsg_) {
|
|
@@ -580,7 +580,7 @@ const collectCoins = async (obj) => {
|
|
|
|
|
|
var my_account_all_coins = await getAccountAllCoins(obj);
|
|
|
logger.log('collectCoins getAccountAllCoins=', my_account_all_coins)
|
|
|
- if (!my_account_all_coins.native && !my_account_all_coins.other) {
|
|
|
+ if (!my_account_all_coins.native && !my_account_all_coins.other) {
|
|
|
return 'getAccountAllCoins error.' + my_account_all_coins
|
|
|
}
|
|
|
|
|
@@ -759,7 +759,7 @@ const transfer = async (obj) => {
|
|
|
try {
|
|
|
// sending 0.5 DAI tokens with 18 decimals on BSC testnet
|
|
|
if (opts.contractAddress) { //如果存在就是代币
|
|
|
-
|
|
|
+
|
|
|
// if (opts.contractAddress == SHIB_ADDRESS) {
|
|
|
// //提币金额必须大于 20000 ,手续费 10000
|
|
|
// if (parseInt(opts.amount) >= SHIB_AMOUNT_LIMIT) {
|
|
@@ -883,39 +883,54 @@ async function getTokenTransfers(opt) {
|
|
|
options.type = 'transaction_hash';
|
|
|
}
|
|
|
|
|
|
-
|
|
|
+
|
|
|
|
|
|
logger.log('getTokenTransfers >>>>>', options);
|
|
|
if (options.type == 'all') {//查询主流币和 20 币所有的交易
|
|
|
- try {
|
|
|
- if (opt.address != null) {
|
|
|
- options.address = opt.address;
|
|
|
- } else {
|
|
|
- logger.error('getTokenTransfers error please check address parameter is ok ?', options);
|
|
|
- return toJson(ERROR_CODE_001, null, "please check address parameter is ok ?");
|
|
|
- }
|
|
|
|
|
|
+ if (opt.address != null) {
|
|
|
+ options.address = opt.address;
|
|
|
+ } else {
|
|
|
+ logger.error('getTokenTransfers error please check address parameter is ok ?', options);
|
|
|
+ return toJson(ERROR_CODE_001, null, "please check address parameter is ok ?");
|
|
|
+ }
|
|
|
+
|
|
|
+ var t_1
|
|
|
+ var t_2
|
|
|
+ //主流币
|
|
|
+ try {
|
|
|
logger.log('getTokenTransfers account getTransactions>>>>>', options);
|
|
|
- //主流币
|
|
|
- var t_1 = await Moralis.Web3API.account.getTransactions(options);
|
|
|
+ t_1 = await Moralis.Web3API.account.getTransactions(options);
|
|
|
logger.log('getTokenTransfers native ret -->>> t_1', t_1);
|
|
|
setTransfersDataType('native', t_1.result)
|
|
|
- //20币
|
|
|
+ } catch (error) {
|
|
|
+ logger.error("getTransactions error:", '主流币:', error.toString(), JSON.stringify(options))
|
|
|
+ return toJson(ERROR_CODE_001, null, error.toString());
|
|
|
+ }
|
|
|
+
|
|
|
+ //20币
|
|
|
+ try {
|
|
|
//token 获取交易记录如果没有时间有些地址会失败
|
|
|
if (!options.to_block) {
|
|
|
options.to_block = '10000000000'
|
|
|
}
|
|
|
-
|
|
|
logger.log('getTokenTransfers account getTokenTransfers>>>>>', options);
|
|
|
- var t_2 = await Moralis.Web3API.account.getTokenTransfers(options);
|
|
|
-
|
|
|
- //异常
|
|
|
- if (t_2 && t_2.total > 0 && Array.isArray(t_2.result) && t_2.result.length <= 0) {
|
|
|
- logger.error('getTokenTransfers token 数据异常 -->>>', t_2.toString(), JSON.stringify(options));
|
|
|
- }
|
|
|
-
|
|
|
+ t_2 = await Moralis.Web3API.account.getTokenTransfers(options);
|
|
|
logger.log('getTokenTransfers token ret -->>> t_2', t_2);
|
|
|
setTransfersDataType('token', t_2.result)
|
|
|
+ } catch (error) {
|
|
|
+ logger.error("getTransactions error:", 'token币:', error.toString(), JSON.stringify(options))
|
|
|
+ return toJson(ERROR_CODE_001, null, error.toString());
|
|
|
+ }
|
|
|
+
|
|
|
+ //异常
|
|
|
+ if (t_2 && t_2.total > 0 && Array.isArray(t_2.result) && t_2.result.length <= 0) {
|
|
|
+ logger.error('getTokenTransfers token 数据异常 -->>>', t_2.toString(), JSON.stringify(options));
|
|
|
+ return toJson(ERROR_CODE_001, null, 'token 数据异常.');
|
|
|
+ }
|
|
|
+
|
|
|
+ //排序组合
|
|
|
+ try {
|
|
|
let arr = t_1.result;
|
|
|
let arr1 = t_2.result;
|
|
|
if (Array.isArray(arr1) && Array.isArray(arr)) {
|
|
@@ -936,7 +951,7 @@ async function getTokenTransfers(opt) {
|
|
|
logger.log('getTokenTransfers-->>> sort t_1', t_1);
|
|
|
return toJson(SUCCEED_CODE, t_1, null);
|
|
|
} catch (error) {
|
|
|
- logger.error("getTransactions error:", error.toString(), JSON.stringify(options))
|
|
|
+ logger.error("getTransactions 排序组合 error :", error.toString(), JSON.stringify(options), JSON.stringify(t_1), JSON.stringify(t_2))
|
|
|
return toJson(ERROR_CODE_001, null, error.toString());
|
|
|
}
|
|
|
} else if (options.type == 'transaction_hash') {//根据哈希查询
|