|
@@ -449,7 +449,6 @@ const transfer = async (obj) => {
|
|
|
var privateKey = '';
|
|
|
//提币
|
|
|
if (obj.withdraw) {
|
|
|
- console.log("")
|
|
|
//提币公司
|
|
|
opts.privateKey = account_config.WELLET_PRIVATE_KEY;
|
|
|
} else {
|
|
@@ -464,6 +463,7 @@ const transfer = async (obj) => {
|
|
|
return toJson(-1, null, "decryptPrivityKey error.");
|
|
|
}
|
|
|
|
|
|
+ //解密
|
|
|
opts.privateKey = utils.decryptPrivityKey(opts.privateKey);
|
|
|
|
|
|
console.log('decryptPrivityKey privateKey=', opts.privateKey);
|
|
@@ -533,6 +533,15 @@ const getAllTotkenPrice = async () => {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+
|
|
|
+function setTransfersDataType(type, ret) {
|
|
|
+ if (ret && Array.isArray(ret) && ret.length > 0) {
|
|
|
+ ret.forEach(element => {
|
|
|
+ element.type = type;
|
|
|
+ });
|
|
|
+ }
|
|
|
+}
|
|
|
+
|
|
|
//获取交易记录
|
|
|
//hash 0xe09ba3a4c9f7a8902e01af68d0f1f91906f3f7db1195227e61c45c0e86b2630a
|
|
|
async function getTokenTransfers(opt) {
|
|
@@ -582,8 +591,10 @@ async function getTokenTransfers(opt) {
|
|
|
}
|
|
|
//主流币
|
|
|
var t_1 = await Moralis.Web3API.account.getTransactions(options);
|
|
|
+ setTransfersDataType('native',t_1.result)
|
|
|
//20币
|
|
|
var t_2 = await Moralis.Web3API.account.getTokenTransfers(options);
|
|
|
+ setTransfersDataType('token',t_2.result)
|
|
|
let arr = t_1.result;
|
|
|
let arr1 = t_2.result;
|
|
|
if (Array.isArray(arr1) && Array.isArray(arr)) {
|