@ledgerhq/coin-tron 0.2.2 → 0.2.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.turbo/turbo-build.log +2 -2
- package/CHANGELOG.md +14 -0
- package/lib/bridge/broadcast.js +3 -12
- package/lib/bridge/broadcast.js.map +1 -1
- package/lib/bridge/estimateMaxSpendable.js +9 -12
- package/lib/bridge/estimateMaxSpendable.js.map +1 -1
- package/lib/bridge/getEstimateFees.js +7 -17
- package/lib/bridge/getEstimateFees.js.map +1 -1
- package/lib/bridge/getTransactionStatus.js +18 -26
- package/lib/bridge/getTransactionStatus.js.map +1 -1
- package/lib/bridge/preload.js +3 -12
- package/lib/bridge/preload.js.map +1 -1
- package/lib/bridge/prepareTransaction.js +4 -13
- package/lib/bridge/prepareTransaction.js.map +1 -1
- package/lib/bridge/serialization.js +8 -8
- package/lib/bridge/serialization.js.map +1 -1
- package/lib/bridge/signOperation.js +39 -53
- package/lib/bridge/signOperation.js.map +1 -1
- package/lib/bridge/synchronization.integ.test.js +10 -15
- package/lib/bridge/synchronization.integ.test.js.map +1 -1
- package/lib/bridge/synchronization.js +25 -23
- package/lib/bridge/synchronization.js.map +1 -1
- package/lib/bridge/transaction.js +20 -4
- package/lib/bridge/transaction.js.map +1 -1
- package/lib/logic/utils.test.js +21 -10
- package/lib/logic/utils.test.js.map +1 -1
- package/lib/network/format.js +4 -5
- package/lib/network/format.js.map +1 -1
- package/lib/network/index.integ.test.js +3 -12
- package/lib/network/index.integ.test.js.map +1 -1
- package/lib/network/index.js +296 -321
- package/lib/network/index.js.map +1 -1
- package/lib/network/index.test.js +4 -14
- package/lib/network/index.test.js.map +1 -1
- package/lib/signer/getAddress.js +4 -13
- package/lib/signer/getAddress.js.map +1 -1
- package/lib/test/bridgeDatasetTest.js +33 -7
- package/lib/test/bridgeDatasetTest.js.map +1 -1
- package/lib/test/cli.js +7 -2
- package/lib/test/cli.js.map +1 -1
- package/lib-es/bridge/broadcast.js +3 -12
- package/lib-es/bridge/broadcast.js.map +1 -1
- package/lib-es/bridge/estimateMaxSpendable.js +9 -12
- package/lib-es/bridge/estimateMaxSpendable.js.map +1 -1
- package/lib-es/bridge/getEstimateFees.js +7 -17
- package/lib-es/bridge/getEstimateFees.js.map +1 -1
- package/lib-es/bridge/getTransactionStatus.js +18 -26
- package/lib-es/bridge/getTransactionStatus.js.map +1 -1
- package/lib-es/bridge/preload.js +3 -12
- package/lib-es/bridge/preload.js.map +1 -1
- package/lib-es/bridge/prepareTransaction.js +4 -13
- package/lib-es/bridge/prepareTransaction.js.map +1 -1
- package/lib-es/bridge/serialization.js +8 -8
- package/lib-es/bridge/serialization.js.map +1 -1
- package/lib-es/bridge/signOperation.js +39 -53
- package/lib-es/bridge/signOperation.js.map +1 -1
- package/lib-es/bridge/synchronization.integ.test.js +10 -15
- package/lib-es/bridge/synchronization.integ.test.js.map +1 -1
- package/lib-es/bridge/synchronization.js +25 -23
- package/lib-es/bridge/synchronization.js.map +1 -1
- package/lib-es/bridge/transaction.js +20 -4
- package/lib-es/bridge/transaction.js.map +1 -1
- package/lib-es/logic/utils.test.js +21 -10
- package/lib-es/logic/utils.test.js.map +1 -1
- package/lib-es/network/format.js +4 -5
- package/lib-es/network/format.js.map +1 -1
- package/lib-es/network/index.integ.test.js +3 -12
- package/lib-es/network/index.integ.test.js.map +1 -1
- package/lib-es/network/index.js +296 -321
- package/lib-es/network/index.js.map +1 -1
- package/lib-es/network/index.test.js +4 -14
- package/lib-es/network/index.test.js.map +1 -1
- package/lib-es/signer/getAddress.js +4 -13
- package/lib-es/signer/getAddress.js.map +1 -1
- package/lib-es/test/bridgeDatasetTest.js +33 -7
- package/lib-es/test/bridgeDatasetTest.js.map +1 -1
- package/lib-es/test/cli.js +7 -2
- package/lib-es/test/cli.js.map +1 -1
- package/package.json +4 -4
- package/tsconfig.json +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"signOperation.js","sourceRoot":"","sources":["../../src/bridge/signOperation.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"signOperation.js","sourceRoot":"","sources":["../../src/bridge/signOperation.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,13 +1,4 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
-
});
|
|
10
|
-
};
|
|
11
2
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
12
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
4
|
};
|
|
@@ -74,10 +65,10 @@ describe("Sync Accounts", () => {
|
|
|
74
65
|
});
|
|
75
66
|
bridge = (0, index_2.createBridges)(signer, coinConfig);
|
|
76
67
|
});
|
|
77
|
-
test("should always have tronResources", () =>
|
|
78
|
-
const account =
|
|
68
|
+
test("should always have tronResources", async () => {
|
|
69
|
+
const account = await syncAccount(bridge.accountBridge, dummyAccount, defaultSyncConfig);
|
|
79
70
|
expect(account.tronResources).toEqual(utils_1.defaultTronResources);
|
|
80
|
-
})
|
|
71
|
+
});
|
|
81
72
|
test.each([
|
|
82
73
|
"TL24LCps5FKwp3PoU1MvrYrwhi5LU1tHre",
|
|
83
74
|
"TAVrrARNdnjHgCGMQYeQV7hv4PSu7mVsMj",
|
|
@@ -85,9 +76,13 @@ describe("Sync Accounts", () => {
|
|
|
85
76
|
"TRqkRnAj6ceJFYAn2p1eE7aWrgBBwtdhS9",
|
|
86
77
|
"TUxd6v64YTWkfpFpNDdtgc5Ps4SfGxwizT",
|
|
87
78
|
"TY2ksFgpvb82TgGPwUSa7iseqPW5weYQyh",
|
|
88
|
-
])("should always be sync without error for address %s", (accountId) =>
|
|
89
|
-
const account =
|
|
79
|
+
])("should always be sync without error for address %s", async (accountId) => {
|
|
80
|
+
const account = await syncAccount(bridge.accountBridge, {
|
|
81
|
+
...dummyAccount,
|
|
82
|
+
id: `js:2:tron:${accountId}:`,
|
|
83
|
+
freshAddress: accountId,
|
|
84
|
+
});
|
|
90
85
|
expect(account.id).toEqual(`js:2:tron:${accountId}:`);
|
|
91
|
-
}
|
|
86
|
+
}, 15 * 1_000);
|
|
92
87
|
});
|
|
93
88
|
//# sourceMappingURL=synchronization.integ.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"synchronization.integ.test.js","sourceRoot":"","sources":["../../src/bridge/synchronization.integ.test.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"synchronization.integ.test.js","sourceRoot":"","sources":["../../src/bridge/synchronization.integ.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,13 +1,4 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
-
});
|
|
10
|
-
};
|
|
11
2
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
12
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
4
|
};
|
|
@@ -25,10 +16,9 @@ const utils_1 = require("../logic/utils");
|
|
|
25
16
|
const network_1 = require("../network");
|
|
26
17
|
// the balance does not update straightaway so we should ignore recent operations if they are in pending for a bit
|
|
27
18
|
const PREFER_PENDING_OPERATIONS_UNTIL_BLOCK_VALIDATION = 35;
|
|
28
|
-
const getAccountShape =
|
|
29
|
-
|
|
30
|
-
const
|
|
31
|
-
const tronAcc = yield (0, network_1.fetchTronAccount)(address);
|
|
19
|
+
const getAccountShape = async ({ initialAccount, currency, address, derivationMode }, syncConfig) => {
|
|
20
|
+
const blockHeight = await (0, network_1.fetchCurrentBlockHeight)();
|
|
21
|
+
const tronAcc = await (0, network_1.fetchTronAccount)(address);
|
|
32
22
|
const accountId = (0, account_1.encodeAccountId)({
|
|
33
23
|
type: "js",
|
|
34
24
|
version: "2",
|
|
@@ -37,7 +27,7 @@ const getAccountShape = (_a, syncConfig_1) => __awaiter(void 0, [_a, syncConfig_
|
|
|
37
27
|
derivationMode: derivationMode,
|
|
38
28
|
});
|
|
39
29
|
if (tronAcc.length === 0) {
|
|
40
|
-
const defaultTronResources =
|
|
30
|
+
const defaultTronResources = await (0, network_1.getTronResources)();
|
|
41
31
|
return {
|
|
42
32
|
id: accountId,
|
|
43
33
|
blockHeight,
|
|
@@ -48,12 +38,15 @@ const getAccountShape = (_a, syncConfig_1) => __awaiter(void 0, [_a, syncConfig_
|
|
|
48
38
|
const acc = tronAcc[0];
|
|
49
39
|
const spendableBalance = acc.balance ? new bignumber_js_1.default(acc.balance) : new bignumber_js_1.default(0);
|
|
50
40
|
const cacheTransactionInfoById = initialAccount
|
|
51
|
-
?
|
|
41
|
+
? {
|
|
42
|
+
...(initialAccount?.tronResources?.cacheTransactionInfoById || {}),
|
|
43
|
+
}
|
|
44
|
+
: {};
|
|
52
45
|
const operationsPageSize = Math.min(1000, (0, pagination_1.getOperationsPageSize)(initialAccount && initialAccount.id, syncConfig));
|
|
53
46
|
// FIXME: this is not optional especially that we might already have initialAccount
|
|
54
47
|
// use minimalOperationsBuilderSync to reconciliate and KEEP REF
|
|
55
|
-
const txs =
|
|
56
|
-
const tronResources =
|
|
48
|
+
const txs = await (0, network_1.fetchTronAccountTxs)(address, txs => txs.length < operationsPageSize, cacheTransactionInfoById);
|
|
49
|
+
const tronResources = await (0, network_1.getTronResources)(acc, txs, cacheTransactionInfoById);
|
|
57
50
|
const balance = spendableBalance
|
|
58
51
|
.plus(tronResources.frozen.bandwidth ? tronResources.frozen.bandwidth.amount : new bignumber_js_1.default(0))
|
|
59
52
|
.plus(tronResources.frozen.energy ? tronResources.frozen.energy.amount : new bignumber_js_1.default(0))
|
|
@@ -108,7 +101,6 @@ const getAccountShape = (_a, syncConfig_1) => __awaiter(void 0, [_a, syncConfig_
|
|
|
108
101
|
}, []);
|
|
109
102
|
const { blacklistedTokenIds = [] } = syncConfig;
|
|
110
103
|
const subAccounts = (0, compact_1.default)(trc10Tokens.concat(trc20Tokens).map(({ key, tokenId, balance }) => {
|
|
111
|
-
var _a;
|
|
112
104
|
const { blacklistedTokenIds = [] } = syncConfig;
|
|
113
105
|
const token = (0, index_1.findTokenById)(tokenId);
|
|
114
106
|
if (!token || blacklistedTokenIds.includes(tokenId))
|
|
@@ -116,7 +108,7 @@ const getAccountShape = (_a, syncConfig_1) => __awaiter(void 0, [_a, syncConfig_
|
|
|
116
108
|
const id = (0, account_1.encodeTokenAccountId)(accountId, token);
|
|
117
109
|
const tokenTxs = txs.filter(tx => tx.tokenId === key);
|
|
118
110
|
const operations = (0, compact_1.default)(tokenTxs.map(tx => (0, utils_1.txInfoToOperation)(id, address, tx)));
|
|
119
|
-
const maybeExistingSubAccount =
|
|
111
|
+
const maybeExistingSubAccount = initialAccount?.subAccounts?.find(a => a.id === id);
|
|
120
112
|
const bnBalance = new bignumber_js_1.default(balance);
|
|
121
113
|
const sub = {
|
|
122
114
|
type: "TokenAccount",
|
|
@@ -136,14 +128,20 @@ const getAccountShape = (_a, syncConfig_1) => __awaiter(void 0, [_a, syncConfig_
|
|
|
136
128
|
}));
|
|
137
129
|
// Filter blacklisted tokens from the initial account's subAccounts
|
|
138
130
|
// Could be use to filter out tokens that got their CAL id changed
|
|
139
|
-
const filteredInitialSubAccounts = (
|
|
131
|
+
const filteredInitialSubAccounts = (initialAccount?.subAccounts || []).filter(subAccount => !blacklistedTokenIds.includes(subAccount.token.id));
|
|
140
132
|
// keep old account with emptyBalance and a history not returned by the BE fixes LIVE-12797
|
|
141
133
|
const mergedSubAccounts = mergeSubAccounts(subAccounts, filteredInitialSubAccounts);
|
|
142
134
|
// get 'OUT' token operations with fee
|
|
143
135
|
const subOutOperationsWithFee = subAccounts
|
|
144
136
|
.flatMap(s => s.operations)
|
|
145
137
|
.filter(o => o.type === "OUT" && o.fee.isGreaterThan(0))
|
|
146
|
-
.map((o) => (
|
|
138
|
+
.map((o) => ({
|
|
139
|
+
...o,
|
|
140
|
+
accountId,
|
|
141
|
+
value: o.fee,
|
|
142
|
+
id: (0, operation_1.encodeOperationId)(accountId, o.hash, "OUT"),
|
|
143
|
+
extra: o.extra,
|
|
144
|
+
}));
|
|
147
145
|
// add them to the parent operations and sort by date desc
|
|
148
146
|
/**
|
|
149
147
|
* FIXME
|
|
@@ -165,7 +163,7 @@ const getAccountShape = (_a, syncConfig_1) => __awaiter(void 0, [_a, syncConfig_
|
|
|
165
163
|
tronResources,
|
|
166
164
|
blockHeight,
|
|
167
165
|
};
|
|
168
|
-
}
|
|
166
|
+
};
|
|
169
167
|
exports.getAccountShape = getAccountShape;
|
|
170
168
|
const postSync = (initial, parent) => {
|
|
171
169
|
function evictRecentOpsIfPending(a) {
|
|
@@ -203,7 +201,11 @@ const mergeSubAccounts = (subAccounts1, subAccounts2) => {
|
|
|
203
201
|
}
|
|
204
202
|
else {
|
|
205
203
|
// Set balance and spendableBalance to 0 has if they are not here it means balance is 0
|
|
206
|
-
return
|
|
204
|
+
return {
|
|
205
|
+
...subAccount,
|
|
206
|
+
balance: new bignumber_js_1.default(0),
|
|
207
|
+
spendableBalance: new bignumber_js_1.default(0),
|
|
208
|
+
};
|
|
207
209
|
}
|
|
208
210
|
})
|
|
209
211
|
.filter((elt) => elt !== null);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"synchronization.js","sourceRoot":"","sources":["../../src/bridge/synchronization.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"synchronization.js","sourceRoot":"","sources":["../../src/bridge/synchronization.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,7 +9,9 @@ const currencies_1 = require("@ledgerhq/coin-framework/currencies");
|
|
|
9
9
|
const fromTransactionRaw = (tr) => {
|
|
10
10
|
const common = (0, serialization_1.fromTransactionCommonRaw)(tr);
|
|
11
11
|
const { networkInfo } = tr;
|
|
12
|
-
return
|
|
12
|
+
return {
|
|
13
|
+
...common,
|
|
14
|
+
networkInfo: networkInfo && {
|
|
13
15
|
family: "tron",
|
|
14
16
|
freeNetUsed: new bignumber_js_1.BigNumber(networkInfo.freeNetUsed),
|
|
15
17
|
freeNetLimit: new bignumber_js_1.BigNumber(networkInfo.freeNetLimit),
|
|
@@ -17,13 +19,21 @@ const fromTransactionRaw = (tr) => {
|
|
|
17
19
|
netLimit: new bignumber_js_1.BigNumber(networkInfo.netLimit),
|
|
18
20
|
energyUsed: new bignumber_js_1.BigNumber(networkInfo.energyUsed),
|
|
19
21
|
energyLimit: new bignumber_js_1.BigNumber(networkInfo.energyLimit),
|
|
20
|
-
},
|
|
22
|
+
},
|
|
23
|
+
family: tr.family,
|
|
24
|
+
mode: tr.mode,
|
|
25
|
+
resource: tr.resource || null,
|
|
26
|
+
duration: tr.duration || 3,
|
|
27
|
+
votes: tr.votes,
|
|
28
|
+
};
|
|
21
29
|
};
|
|
22
30
|
exports.fromTransactionRaw = fromTransactionRaw;
|
|
23
31
|
const toTransactionRaw = (t) => {
|
|
24
32
|
const common = (0, serialization_1.toTransactionCommonRaw)(t);
|
|
25
33
|
const { networkInfo } = t;
|
|
26
|
-
return
|
|
34
|
+
return {
|
|
35
|
+
...common,
|
|
36
|
+
networkInfo: networkInfo && {
|
|
27
37
|
family: "tron",
|
|
28
38
|
freeNetUsed: networkInfo.freeNetUsed.toString(),
|
|
29
39
|
freeNetLimit: networkInfo.freeNetLimit.toString(),
|
|
@@ -31,7 +41,13 @@ const toTransactionRaw = (t) => {
|
|
|
31
41
|
netLimit: networkInfo.netLimit.toString(),
|
|
32
42
|
energyUsed: networkInfo.energyUsed.toString(),
|
|
33
43
|
energyLimit: networkInfo.energyLimit.toString(),
|
|
34
|
-
},
|
|
44
|
+
},
|
|
45
|
+
family: t.family,
|
|
46
|
+
mode: t.mode,
|
|
47
|
+
resource: t.resource || null,
|
|
48
|
+
duration: t.duration || 3,
|
|
49
|
+
votes: t.votes,
|
|
50
|
+
};
|
|
35
51
|
};
|
|
36
52
|
exports.toTransactionRaw = toTransactionRaw;
|
|
37
53
|
const formatTransaction = (t, mainAccount) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transaction.js","sourceRoot":"","sources":["../../src/bridge/transaction.ts"],"names":[],"mappings":";;;AAAA,+CAAyC;AAEzC,oEAA8E;AAC9E,0EAKgD;AAEhD,8DAAsE;AACtE,oEAAyE;AAElE,MAAM,kBAAkB,GAAG,CAAC,EAAkB,EAAe,EAAE;IACpE,MAAM,MAAM,GAAG,IAAA,wCAAwB,EAAC,EAAE,CAAC,CAAC;IAC5C,MAAM,EAAE,WAAW,EAAE,GAAG,EAAE,CAAC;IAC3B,
|
|
1
|
+
{"version":3,"file":"transaction.js","sourceRoot":"","sources":["../../src/bridge/transaction.ts"],"names":[],"mappings":"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"}
|
package/lib/logic/utils.test.js
CHANGED
|
@@ -25,23 +25,34 @@ describe("txInfoToOperation", () => {
|
|
|
25
25
|
mockTx = {};
|
|
26
26
|
});
|
|
27
27
|
it.each(Object.keys(testingMap))(`should return correct operation type for %p trongrid tx type`, trongridTxType => {
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
28
|
+
const tx = {
|
|
29
|
+
...mockTx,
|
|
30
|
+
type: trongridTxType,
|
|
31
|
+
};
|
|
32
|
+
expect((0, utils_1.txInfoToOperation)("accountId", "address", tx)?.type).toEqual(testingMap[trongridTxType]);
|
|
31
33
|
});
|
|
32
34
|
it.each(["TransferContract", "TransferAssetContract", "TriggerSmartContract"])("should return OUT operation type when from is equal to user address for %p trongrid tx type", trongridTxType => {
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
35
|
+
const tx = {
|
|
36
|
+
...mockTx,
|
|
37
|
+
type: trongridTxType,
|
|
38
|
+
from: "address",
|
|
39
|
+
};
|
|
40
|
+
expect((0, utils_1.txInfoToOperation)("accountId", "address", tx)?.type).toEqual("OUT");
|
|
36
41
|
});
|
|
37
42
|
it("should return undefined operation type for unknown tx type", () => {
|
|
38
|
-
const tx =
|
|
43
|
+
const tx = {
|
|
44
|
+
...mockTx,
|
|
45
|
+
type: "Unknown",
|
|
46
|
+
};
|
|
39
47
|
expect((0, utils_1.txInfoToOperation)("accountId", "address", tx)).toBeUndefined();
|
|
40
48
|
});
|
|
41
49
|
it("should return correct encoded operation id", () => {
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
50
|
+
const tx = {
|
|
51
|
+
...mockTx,
|
|
52
|
+
type: "TransferContract",
|
|
53
|
+
txID: "txId",
|
|
54
|
+
};
|
|
55
|
+
expect((0, utils_1.txInfoToOperation)("accountId", "address", tx)?.id).toEqual("encodedOpId");
|
|
45
56
|
});
|
|
46
57
|
});
|
|
47
58
|
//# sourceMappingURL=utils.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.test.js","sourceRoot":"","sources":["../../src/logic/utils.test.ts"],"names":[],"mappings":";;AAEA,mCAA4C;AAE5C,IAAI,CAAC,IAAI,CAAC,oCAAoC,EAAE,GAAG,EAAE,CAAC,CAAC;IACrD,iBAAiB,EAAE,IAAI,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC,aAAa,CAAC;CAChD,CAAC,CAAC,CAAC;AAEJ,IAAI,MAAsB,CAAC;AAE3B,MAAM,UAAU,GAA0C;IACxD,gBAAgB,EAAE,IAAI;IACtB,qBAAqB,EAAE,IAAI;IAC3B,oBAAoB,EAAE,IAAI;IAC1B,gBAAgB,EAAE,SAAS;IAC3B,2BAA2B,EAAE,KAAK;IAClC,mBAAmB,EAAE,MAAM;IAC3B,uBAAuB,EAAE,QAAQ;IACjC,qBAAqB,EAAE,QAAQ;IAC/B,uBAAuB,EAAE,QAAQ;IACjC,yBAAyB,EAAE,UAAU;IACrC,8BAA8B,EAAE,0BAA0B;IAC1D,0BAA0B,EAAE,qBAAqB;IACjD,uBAAuB,EAAE,iBAAiB;CAC3C,CAAC;AAEF,QAAQ,CAAC,mBAAmB,EAAE,GAAG,EAAE;IACjC,UAAU,CAAC,GAAG,EAAE;QACd,MAAM,GAAG,EAAoB,CAAC;IAChC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAC9B,8DAA8D,EAC9D,cAAc,CAAC,EAAE
|
|
1
|
+
{"version":3,"file":"utils.test.js","sourceRoot":"","sources":["../../src/logic/utils.test.ts"],"names":[],"mappings":";;AAEA,mCAA4C;AAE5C,IAAI,CAAC,IAAI,CAAC,oCAAoC,EAAE,GAAG,EAAE,CAAC,CAAC;IACrD,iBAAiB,EAAE,IAAI,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC,aAAa,CAAC;CAChD,CAAC,CAAC,CAAC;AAEJ,IAAI,MAAsB,CAAC;AAE3B,MAAM,UAAU,GAA0C;IACxD,gBAAgB,EAAE,IAAI;IACtB,qBAAqB,EAAE,IAAI;IAC3B,oBAAoB,EAAE,IAAI;IAC1B,gBAAgB,EAAE,SAAS;IAC3B,2BAA2B,EAAE,KAAK;IAClC,mBAAmB,EAAE,MAAM;IAC3B,uBAAuB,EAAE,QAAQ;IACjC,qBAAqB,EAAE,QAAQ;IAC/B,uBAAuB,EAAE,QAAQ;IACjC,yBAAyB,EAAE,UAAU;IACrC,8BAA8B,EAAE,0BAA0B;IAC1D,0BAA0B,EAAE,qBAAqB;IACjD,uBAAuB,EAAE,iBAAiB;CAC3C,CAAC;AAEF,QAAQ,CAAC,mBAAmB,EAAE,GAAG,EAAE;IACjC,UAAU,CAAC,GAAG,EAAE;QACd,MAAM,GAAG,EAAoB,CAAC;IAChC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAC9B,8DAA8D,EAC9D,cAAc,CAAC,EAAE;QACf,MAAM,EAAE,GAAmB;YACzB,GAAG,MAAM;YACT,IAAI,EAAE,cAAgC;SACvC,CAAC;QAEF,MAAM,CAAC,IAAA,yBAAiB,EAAC,WAAW,EAAE,SAAS,EAAE,EAAE,CAAC,EAAE,IAAI,CAAC,CAAC,OAAO,CACjE,UAAU,CAAC,cAA6D,CAAC,CAC1E,CAAC;IACJ,CAAC,CACF,CAAC;IAEF,EAAE,CAAC,IAAI,CAAC,CAAC,kBAAkB,EAAE,uBAAuB,EAAE,sBAAsB,CAAC,CAAC,CAC5E,6FAA6F,EAC7F,cAAc,CAAC,EAAE;QACf,MAAM,EAAE,GAAmB;YACzB,GAAG,MAAM;YACT,IAAI,EAAE,cAAgC;YACtC,IAAI,EAAE,SAAS;SAChB,CAAC;QAEF,MAAM,CAAC,IAAA,yBAAiB,EAAC,WAAW,EAAE,SAAS,EAAE,EAAE,CAAC,EAAE,IAAI,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAC7E,CAAC,CACF,CAAC;IAEF,EAAE,CAAC,4DAA4D,EAAE,GAAG,EAAE;QACpE,MAAM,EAAE,GAAmB;YACzB,GAAG,MAAM;YACT,IAAI,EAAE,SAA2B;SAClC,CAAC;QAEF,MAAM,CAAC,IAAA,yBAAiB,EAAC,WAAW,EAAE,SAAS,EAAE,EAAE,CAAC,CAAC,CAAC,aAAa,EAAE,CAAC;IACxE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,4CAA4C,EAAE,GAAG,EAAE;QACpD,MAAM,EAAE,GAAmB;YACzB,GAAG,MAAM;YACT,IAAI,EAAE,kBAAkB;YACxB,IAAI,EAAE,MAAM;SACb,CAAC;QAEF,MAAM,CAAC,IAAA,yBAAiB,EAAC,WAAW,EAAE,SAAS,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;IACnF,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
package/lib/network/format.js
CHANGED
|
@@ -13,7 +13,6 @@ exports.decode58Check = decode58Check;
|
|
|
13
13
|
const encode58Check = (hex) => bs58check_1.default.encode(Buffer.from(hex, "hex"));
|
|
14
14
|
exports.encode58Check = encode58Check;
|
|
15
15
|
const formatTrongridTrc20TxResponse = (tx) => {
|
|
16
|
-
var _a;
|
|
17
16
|
try {
|
|
18
17
|
const { from, to, block_timestamp, detail, value, transaction_id, token_info, type } = tx;
|
|
19
18
|
const txID = transaction_id;
|
|
@@ -29,7 +28,7 @@ const formatTrongridTrc20TxResponse = (tx) => {
|
|
|
29
28
|
break;
|
|
30
29
|
default:
|
|
31
30
|
txType = "TriggerSmartContract";
|
|
32
|
-
tokenId =
|
|
31
|
+
tokenId = token_info.address ?? undefined;
|
|
33
32
|
formattedValue = value ? new bignumber_js_1.default(value) : new bignumber_js_1.default(0);
|
|
34
33
|
break;
|
|
35
34
|
}
|
|
@@ -71,7 +70,7 @@ const formatTrongridTxResponse = (tx) => {
|
|
|
71
70
|
const getValue = () => {
|
|
72
71
|
switch (type) {
|
|
73
72
|
case "WithdrawBalanceContract":
|
|
74
|
-
return new bignumber_js_1.default(withdraw_amount ||
|
|
73
|
+
return new bignumber_js_1.default(withdraw_amount || detail?.withdraw_amount || 0);
|
|
75
74
|
case "ExchangeTransactionContract":
|
|
76
75
|
return new bignumber_js_1.default(quant || 0);
|
|
77
76
|
default:
|
|
@@ -80,7 +79,7 @@ const formatTrongridTxResponse = (tx) => {
|
|
|
80
79
|
};
|
|
81
80
|
const value = getValue();
|
|
82
81
|
const fee = (0, get_1.default)(tx, "ret[0].fee", detail && detail.fee ? detail.fee : undefined);
|
|
83
|
-
const blockHeight = blockNumber ||
|
|
82
|
+
const blockHeight = blockNumber || detail?.blockNumber;
|
|
84
83
|
const txInfo = {
|
|
85
84
|
txID,
|
|
86
85
|
date,
|
|
@@ -97,7 +96,7 @@ const formatTrongridTxResponse = (tx) => {
|
|
|
97
96
|
switch (type) {
|
|
98
97
|
case "VoteWitnessContract":
|
|
99
98
|
return {
|
|
100
|
-
votes: votes
|
|
99
|
+
votes: votes?.map(v => ({
|
|
101
100
|
address: (0, exports.encode58Check)(v.vote_address),
|
|
102
101
|
voteCount: v.vote_count,
|
|
103
102
|
})),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"format.js","sourceRoot":"","sources":["../../src/network/format.ts"],"names":[],"mappings":";;;;;;AAAA,qDAA6B;AAG7B,gEAAqC;AACrC,yCAAqC;AACrC,0DAAkC;AAE3B,MAAM,aAAa,GAAG,CAAC,MAAc,EAAU,EAAE,CACtD,MAAM,CAAC,IAAI,CAAC,mBAAS,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;AAD3C,QAAA,aAAa,iBAC8B;AAEjD,MAAM,aAAa,GAAG,CAAC,GAAW,EAAU,EAAE,CAAC,mBAAS,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC;AAAnF,QAAA,aAAa,iBAAsE;AAEzF,MAAM,6BAA6B,GAAG,CAAC,EAAY,EAAqC,EAAE
|
|
1
|
+
{"version":3,"file":"format.js","sourceRoot":"","sources":["../../src/network/format.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,13 +1,4 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
-
});
|
|
10
|
-
};
|
|
11
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
3
|
const _1 = require(".");
|
|
13
4
|
const config_1 = require("../config");
|
|
@@ -22,7 +13,7 @@ describe("fetchTronAccountTxs", () => {
|
|
|
22
13
|
},
|
|
23
14
|
}));
|
|
24
15
|
});
|
|
25
|
-
it("maps all fields correctly", () =>
|
|
16
|
+
it("maps all fields correctly", async () => {
|
|
26
17
|
// WHEN
|
|
27
18
|
// const addr = "TL24LCps5FKwp3PoU1MvrYrwhi5LU1tHre";
|
|
28
19
|
// const addr = "TAVrrARNdnjHgCGMQYeQV7hv4PSu7mVsMj";
|
|
@@ -30,9 +21,9 @@ describe("fetchTronAccountTxs", () => {
|
|
|
30
21
|
// const addr = "TRqkRnAj6ceJFYAn2p1eE7aWrgBBwtdhS9";
|
|
31
22
|
// const addr = "TUxd6v64YTWkfpFpNDdtgc5Ps4SfGxwizT";
|
|
32
23
|
const addr = "TY2ksFgpvb82TgGPwUSa7iseqPW5weYQyh";
|
|
33
|
-
const results =
|
|
24
|
+
const results = await (0, _1.fetchTronAccountTxs)(addr, txs => txs.length < 100, {});
|
|
34
25
|
// THEN
|
|
35
26
|
expect(results).not.toHaveLength(0);
|
|
36
|
-
}
|
|
27
|
+
}, 10 * 1000);
|
|
37
28
|
});
|
|
38
29
|
//# sourceMappingURL=index.integ.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.integ.test.js","sourceRoot":"","sources":["../../src/network/index.integ.test.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.integ.test.js","sourceRoot":"","sources":["../../src/network/index.integ.test.ts"],"names":[],"mappings":";;AAAA,wBAAwC;AACxC,sCAA0C;AAE1C,QAAQ,CAAC,qBAAqB,EAAE,GAAG,EAAE;IACnC,SAAS,CAAC,GAAG,EAAE;QACb,IAAA,sBAAa,EAAC,GAAG,EAAE,CAAC,CAAC;YACnB,MAAM,EAAE;gBACN,IAAI,EAAE,QAAQ;aACf;YACD,QAAQ,EAAE;gBACR,GAAG,EAAE,8BAA8B;aACpC;SACF,CAAC,CAAC,CAAC;IACN,CAAC,CAAC,CAAC;IAEH,EAAE,CACA,2BAA2B,EAC3B,KAAK,IAAI,EAAE;QACT,OAAO;QACP,qDAAqD;QACrD,qDAAqD;QACrD,qDAAqD;QACrD,qDAAqD;QACrD,qDAAqD;QACrD,MAAM,IAAI,GAAG,oCAAoC,CAAC;QAClD,MAAM,OAAO,GAAG,MAAM,IAAA,sBAAmB,EAAC,IAAI,EAAE,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,MAAM,GAAG,GAAG,EAAE,EAAE,CAAC,CAAC;QAE7E,OAAO;QACP,MAAM,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;IACtC,CAAC,EACD,EAAE,GAAG,IAAI,CACV,CAAC;AACJ,CAAC,CAAC,CAAC"}
|