@lifi/sdk-provider-tron 4.0.0-alpha.21 → 4.0.0-alpha.23
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/dist/cjs/actions/getMulticallAddress.d.ts +2 -0
- package/dist/cjs/actions/getMulticallAddress.js +10 -0
- package/dist/cjs/actions/getMulticallAddress.js.map +1 -0
- package/dist/cjs/actions/getTronBalance.js +69 -50
- package/dist/cjs/actions/getTronBalance.js.map +1 -1
- package/dist/cjs/actions/resolveTronAddress.d.ts +1 -1
- package/dist/cjs/actions/resolveTronAddress.js +2 -2
- package/dist/cjs/actions/resolveTronAddress.js.map +1 -1
- package/dist/cjs/core/TronStepExecutor.js +20 -3
- package/dist/cjs/core/TronStepExecutor.js.map +1 -1
- package/dist/cjs/core/constants.d.ts +2 -0
- package/dist/cjs/core/constants.js +6 -0
- package/dist/cjs/core/constants.js.map +1 -0
- package/dist/cjs/core/tasks/TronCheckAllowanceTask.d.ts +6 -0
- package/dist/cjs/core/tasks/TronCheckAllowanceTask.js +45 -0
- package/dist/cjs/core/tasks/TronCheckAllowanceTask.js.map +1 -0
- package/dist/cjs/core/tasks/TronSetAllowanceTask.d.ts +6 -0
- package/dist/cjs/core/tasks/TronSetAllowanceTask.js +78 -0
- package/dist/cjs/core/tasks/TronSetAllowanceTask.js.map +1 -0
- package/dist/cjs/core/tasks/TronSignAndExecuteTask.js +22 -4
- package/dist/cjs/core/tasks/TronSignAndExecuteTask.js.map +1 -1
- package/dist/cjs/core/tasks/TronWaitForTransactionTask.js +14 -12
- package/dist/cjs/core/tasks/TronWaitForTransactionTask.js.map +1 -1
- package/dist/cjs/errors/parseTronErrors.js +8 -0
- package/dist/cjs/errors/parseTronErrors.js.map +1 -1
- package/dist/cjs/rpc/callTronRpcsWithRetry.d.ts +3 -0
- package/dist/cjs/rpc/callTronRpcsWithRetry.js +22 -0
- package/dist/cjs/rpc/callTronRpcsWithRetry.js.map +1 -0
- package/dist/cjs/types.d.ts +2 -2
- package/dist/cjs/types.js.map +1 -1
- package/dist/cjs/utils/address.d.ts +2 -0
- package/dist/cjs/utils/address.js +13 -0
- package/dist/cjs/utils/address.js.map +1 -0
- package/dist/cjs/utils/isZeroAddress.d.ts +3 -0
- package/dist/cjs/utils/isZeroAddress.js +8 -0
- package/dist/cjs/utils/isZeroAddress.js.map +1 -0
- package/dist/cjs/utils/multicall3Abi.d.ts +2 -0
- package/dist/cjs/utils/multicall3Abi.js +41 -0
- package/dist/cjs/utils/multicall3Abi.js.map +1 -0
- package/dist/cjs/utils/stripHexPrefix.d.ts +1 -0
- package/dist/cjs/utils/stripHexPrefix.js +6 -0
- package/dist/cjs/utils/stripHexPrefix.js.map +1 -0
- package/dist/cjs/version.d.ts +1 -1
- package/dist/cjs/version.js +1 -1
- package/dist/esm/actions/getMulticallAddress.d.ts +2 -0
- package/dist/esm/actions/getMulticallAddress.js +6 -0
- package/dist/esm/actions/getMulticallAddress.js.map +1 -0
- package/dist/esm/actions/getTronBalance.js +71 -51
- package/dist/esm/actions/getTronBalance.js.map +1 -1
- package/dist/esm/actions/resolveTronAddress.d.ts +1 -1
- package/dist/esm/actions/resolveTronAddress.js +3 -3
- package/dist/esm/actions/resolveTronAddress.js.map +1 -1
- package/dist/esm/core/TronStepExecutor.js +20 -3
- package/dist/esm/core/TronStepExecutor.js.map +1 -1
- package/dist/esm/core/constants.d.ts +2 -0
- package/dist/esm/core/constants.js +3 -0
- package/dist/esm/core/constants.js.map +1 -0
- package/dist/esm/core/tasks/TronCheckAllowanceTask.d.ts +6 -0
- package/dist/esm/core/tasks/TronCheckAllowanceTask.js +41 -0
- package/dist/esm/core/tasks/TronCheckAllowanceTask.js.map +1 -0
- package/dist/esm/core/tasks/TronSetAllowanceTask.d.ts +6 -0
- package/dist/esm/core/tasks/TronSetAllowanceTask.js +75 -0
- package/dist/esm/core/tasks/TronSetAllowanceTask.js.map +1 -0
- package/dist/esm/core/tasks/TronSignAndExecuteTask.js +23 -5
- package/dist/esm/core/tasks/TronSignAndExecuteTask.js.map +1 -1
- package/dist/esm/core/tasks/TronWaitForTransactionTask.js +14 -12
- package/dist/esm/core/tasks/TronWaitForTransactionTask.js.map +1 -1
- package/dist/esm/errors/parseTronErrors.js +9 -0
- package/dist/esm/errors/parseTronErrors.js.map +1 -1
- package/dist/esm/rpc/callTronRpcsWithRetry.d.ts +3 -0
- package/dist/esm/rpc/callTronRpcsWithRetry.js +19 -0
- package/dist/esm/rpc/callTronRpcsWithRetry.js.map +1 -0
- package/dist/esm/types.d.ts +2 -2
- package/dist/esm/types.js.map +1 -1
- package/dist/esm/utils/address.d.ts +2 -0
- package/dist/esm/utils/address.js +10 -0
- package/dist/esm/utils/address.js.map +1 -0
- package/dist/esm/utils/isZeroAddress.d.ts +3 -0
- package/dist/esm/utils/isZeroAddress.js +4 -0
- package/dist/esm/utils/isZeroAddress.js.map +1 -0
- package/dist/esm/utils/multicall3Abi.d.ts +2 -0
- package/dist/esm/utils/multicall3Abi.js +38 -0
- package/dist/esm/utils/multicall3Abi.js.map +1 -0
- package/dist/esm/utils/stripHexPrefix.d.ts +1 -0
- package/dist/esm/utils/stripHexPrefix.js +2 -0
- package/dist/esm/utils/stripHexPrefix.js.map +1 -0
- package/dist/esm/version.d.ts +1 -1
- package/dist/esm/version.js +1 -1
- package/dist/types/actions/getMulticallAddress.d.ts +3 -0
- package/dist/types/actions/getMulticallAddress.d.ts.map +1 -0
- package/dist/types/actions/getTronBalance.d.ts.map +1 -1
- package/dist/types/actions/resolveTronAddress.d.ts +1 -1
- package/dist/types/actions/resolveTronAddress.d.ts.map +1 -1
- package/dist/types/core/TronStepExecutor.d.ts.map +1 -1
- package/dist/types/core/constants.d.ts +3 -0
- package/dist/types/core/constants.d.ts.map +1 -0
- package/dist/types/core/tasks/TronCheckAllowanceTask.d.ts +7 -0
- package/dist/types/core/tasks/TronCheckAllowanceTask.d.ts.map +1 -0
- package/dist/types/core/tasks/TronSetAllowanceTask.d.ts +7 -0
- package/dist/types/core/tasks/TronSetAllowanceTask.d.ts.map +1 -0
- package/dist/types/core/tasks/TronSignAndExecuteTask.d.ts.map +1 -1
- package/dist/types/core/tasks/TronWaitForTransactionTask.d.ts.map +1 -1
- package/dist/types/errors/parseTronErrors.d.ts.map +1 -1
- package/dist/types/rpc/callTronRpcsWithRetry.d.ts +4 -0
- package/dist/types/rpc/callTronRpcsWithRetry.d.ts.map +1 -0
- package/dist/types/types.d.ts +2 -2
- package/dist/types/types.d.ts.map +1 -1
- package/dist/types/utils/address.d.ts +3 -0
- package/dist/types/utils/address.d.ts.map +1 -0
- package/dist/types/utils/isZeroAddress.d.ts +4 -0
- package/dist/types/utils/isZeroAddress.d.ts.map +1 -0
- package/dist/types/utils/multicall3Abi.d.ts +3 -0
- package/dist/types/utils/multicall3Abi.d.ts.map +1 -0
- package/dist/types/utils/stripHexPrefix.d.ts +2 -0
- package/dist/types/utils/stripHexPrefix.d.ts.map +1 -0
- package/dist/types/version.d.ts +1 -1
- package/package.json +2 -2
- package/src/actions/getMulticallAddress.ts +11 -0
- package/src/actions/getTronBalance.ts +100 -62
- package/src/actions/resolveTronAddress.ts +3 -5
- package/src/core/TronStepExecutor.ts +26 -6
- package/src/core/constants.ts +2 -0
- package/src/core/tasks/TronCheckAllowanceTask.ts +61 -0
- package/src/core/tasks/TronSetAllowanceTask.ts +131 -0
- package/src/core/tasks/TronSignAndExecuteTask.ts +35 -15
- package/src/core/tasks/TronWaitForTransactionTask.ts +28 -18
- package/src/errors/parseTronErrors.ts +20 -0
- package/src/rpc/callTronRpcsWithRetry.ts +24 -0
- package/src/types.ts +5 -2
- package/src/utils/address.ts +14 -0
- package/src/utils/isZeroAddress.ts +5 -0
- package/src/utils/multicall3Abi.ts +39 -0
- package/src/utils/stripHexPrefix.ts +2 -0
- package/src/version.ts +1 -1
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.getMulticallAddress = void 0;
|
|
4
|
+
const sdk_1 = require("@lifi/sdk");
|
|
5
|
+
const getMulticallAddress = async (client, chainId) => {
|
|
6
|
+
const chains = await client.getChains();
|
|
7
|
+
return chains?.find((chain) => chain.id === chainId && chain.chainType === sdk_1.ChainType.TVM)?.multicallAddress;
|
|
8
|
+
};
|
|
9
|
+
exports.getMulticallAddress = getMulticallAddress;
|
|
10
|
+
//# sourceMappingURL=getMulticallAddress.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"getMulticallAddress.js","sourceRoot":"","sources":["../../../src/actions/getMulticallAddress.ts"],"names":[],"mappings":";;;AAAA,mCAAmE;AAE5D,MAAM,mBAAmB,GAAG,KAAK,EACtC,MAAiB,EACjB,OAAgB,EACa,EAAE;IAC/B,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,SAAS,EAAE,CAAA;IACvC,OAAO,MAAM,EAAE,IAAI,CACjB,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,EAAE,KAAK,OAAO,IAAI,KAAK,CAAC,SAAS,KAAK,eAAS,CAAC,GAAG,CACrE,EAAE,gBAAgB,CAAA;AACrB,CAAC,CAAA;AARY,QAAA,mBAAmB,uBAQ/B"}
|
|
@@ -3,6 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.getTronBalance = void 0;
|
|
4
4
|
const sdk_1 = require("@lifi/sdk");
|
|
5
5
|
const tronweb_1 = require("tronweb");
|
|
6
|
+
const callTronRpcsWithRetry_js_1 = require("../rpc/callTronRpcsWithRetry.js");
|
|
7
|
+
const address_js_1 = require("../utils/address.js");
|
|
8
|
+
const isZeroAddress_js_1 = require("../utils/isZeroAddress.js");
|
|
9
|
+
const multicall3Abi_js_1 = require("../utils/multicall3Abi.js");
|
|
10
|
+
const getMulticallAddress_js_1 = require("./getMulticallAddress.js");
|
|
11
|
+
const BALANCE_OF_SELECTOR = tronweb_1.TronWeb.sha3('balanceOf(address)').slice(2, 10);
|
|
12
|
+
const GET_ETH_BALANCE_SELECTOR = tronweb_1.TronWeb.sha3('getEthBalance(address)').slice(2, 10);
|
|
6
13
|
const getTronBalance = async (client, walletAddress, tokens) => {
|
|
7
14
|
if (tokens.length === 0) {
|
|
8
15
|
return [];
|
|
@@ -13,62 +20,74 @@ const getTronBalance = async (client, walletAddress, tokens) => {
|
|
|
13
20
|
console.warn('Requested tokens have to be on the same chain.');
|
|
14
21
|
}
|
|
15
22
|
}
|
|
23
|
+
const multicallAddress = await (0, getMulticallAddress_js_1.getMulticallAddress)(client, chainId);
|
|
24
|
+
if (multicallAddress && tokens.length > 1) {
|
|
25
|
+
return getTronBalanceMulticall(client, tokens, walletAddress, multicallAddress);
|
|
26
|
+
}
|
|
16
27
|
return getTronBalanceDefault(client, tokens, walletAddress);
|
|
17
28
|
};
|
|
18
29
|
exports.getTronBalance = getTronBalance;
|
|
30
|
+
const getTronBalanceMulticall = async (client, tokens, walletAddress, multicallAddress) => {
|
|
31
|
+
const walletHex = (0, address_js_1.toEvmHex)(walletAddress);
|
|
32
|
+
const multicallHex = (0, address_js_1.toEvmHex)(multicallAddress);
|
|
33
|
+
const [blockNumber, results] = await (0, callTronRpcsWithRetry_js_1.callTronRpcsWithRetry)(client, async (tronWeb) => {
|
|
34
|
+
const contract = tronWeb.contract(multicall3Abi_js_1.multicall3Abi, multicallAddress);
|
|
35
|
+
const calls = tokens.map((token) => {
|
|
36
|
+
const isNative = (0, isZeroAddress_js_1.isZeroAddress)(token.address);
|
|
37
|
+
return [
|
|
38
|
+
isNative ? multicallHex : (0, address_js_1.toEvmHex)(token.address),
|
|
39
|
+
true,
|
|
40
|
+
(0, address_js_1.encodeAddressCalldata)(isNative ? GET_ETH_BALANCE_SELECTOR : BALANCE_OF_SELECTOR, walletHex),
|
|
41
|
+
];
|
|
42
|
+
});
|
|
43
|
+
const [block, aggregateResult] = await Promise.all([
|
|
44
|
+
tronWeb.trx.getCurrentBlock(),
|
|
45
|
+
contract.aggregate3(calls).call({ from: walletAddress }),
|
|
46
|
+
]);
|
|
47
|
+
return [
|
|
48
|
+
BigInt(block.block_header?.raw_data?.number ?? 0),
|
|
49
|
+
aggregateResult[0],
|
|
50
|
+
];
|
|
51
|
+
});
|
|
52
|
+
return tokens.map((token, i) => {
|
|
53
|
+
const [success, returnData] = results[i];
|
|
54
|
+
if (!success) {
|
|
55
|
+
return { ...token, blockNumber };
|
|
56
|
+
}
|
|
57
|
+
return { ...token, amount: BigInt(returnData), blockNumber };
|
|
58
|
+
});
|
|
59
|
+
};
|
|
19
60
|
const getTronBalanceDefault = async (client, tokens, walletAddress) => {
|
|
20
|
-
const
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
id: `${getTronBalanceDefault.name}.getBalance`,
|
|
26
|
-
}),
|
|
27
|
-
(0, sdk_1.withDedupe)(() => tronWeb.trx.getCurrentBlock(), {
|
|
28
|
-
id: `${getTronBalanceDefault.name}.getCurrentBlock`,
|
|
29
|
-
}),
|
|
30
|
-
]);
|
|
31
|
-
const nativeBalance = trxBalance.status === 'fulfilled' ? BigInt(trxBalance.value) : 0n;
|
|
32
|
-
const blockNumber = currentBlock.status === 'fulfilled'
|
|
33
|
-
? BigInt(currentBlock.value.block_header?.raw_data?.number ?? 0)
|
|
34
|
-
: 0n;
|
|
35
|
-
const walletTokenAmounts = {};
|
|
36
|
-
const nativeTokens = tokens.filter((token) => token.address === 'T9yD14Nj9j7xAB4dbGeiX9h8unkKHxuWwb' ||
|
|
37
|
-
token.address === '0x0000000000000000000000000000000000000000');
|
|
38
|
-
const trc20Tokens = tokens.filter((token) => token.address !== 'T9yD14Nj9j7xAB4dbGeiX9h8unkKHxuWwb' &&
|
|
39
|
-
token.address !== '0x0000000000000000000000000000000000000000');
|
|
40
|
-
for (const token of nativeTokens) {
|
|
41
|
-
walletTokenAmounts[token.address] = nativeBalance;
|
|
42
|
-
}
|
|
43
|
-
if (trc20Tokens.length > 0) {
|
|
44
|
-
const trc20Balances = await Promise.allSettled(trc20Tokens.map((token) => (0, sdk_1.withDedupe)(async () => {
|
|
45
|
-
const contract = await tronWeb.contract().at(token.address);
|
|
46
|
-
const balance = await contract.balanceOf(walletAddress).call();
|
|
47
|
-
return {
|
|
48
|
-
address: token.address,
|
|
49
|
-
balance: BigInt(balance.toString()),
|
|
50
|
-
};
|
|
51
|
-
}, {
|
|
52
|
-
id: `${getTronBalanceDefault.name}.balanceOf.${token.address}`,
|
|
53
|
-
})));
|
|
54
|
-
for (const result of trc20Balances) {
|
|
55
|
-
if (result.status === 'fulfilled' && result.value.balance > 0n) {
|
|
56
|
-
walletTokenAmounts[result.value.address] = result.value.balance;
|
|
61
|
+
const [blockNumber, results] = await (0, callTronRpcsWithRetry_js_1.callTronRpcsWithRetry)(client, async (tronWeb) => {
|
|
62
|
+
const host = tronWeb.fullNode.host;
|
|
63
|
+
const queue = tokens.map((token) => {
|
|
64
|
+
if ((0, isZeroAddress_js_1.isZeroAddress)(token.address)) {
|
|
65
|
+
return (0, sdk_1.withDedupe)(async () => BigInt(await tronWeb.trx.getBalance(walletAddress)), { id: `${getTronBalanceDefault.name}.getBalance.${host}` });
|
|
57
66
|
}
|
|
67
|
+
return (0, sdk_1.withDedupe)(async () => {
|
|
68
|
+
const contract = await tronWeb.contract().at(token.address);
|
|
69
|
+
const balance = await contract
|
|
70
|
+
.balanceOf(walletAddress)
|
|
71
|
+
.call({ from: walletAddress });
|
|
72
|
+
return BigInt(balance.toString());
|
|
73
|
+
}, {
|
|
74
|
+
id: `${getTronBalanceDefault.name}.balanceOf.${token.address}.${host}`,
|
|
75
|
+
});
|
|
76
|
+
});
|
|
77
|
+
return Promise.all([
|
|
78
|
+
(0, sdk_1.withDedupe)(async () => {
|
|
79
|
+
const block = await tronWeb.trx.getCurrentBlock();
|
|
80
|
+
return BigInt(block.block_header?.raw_data?.number ?? 0);
|
|
81
|
+
}, { id: `${getTronBalanceDefault.name}.getCurrentBlock.${host}` }),
|
|
82
|
+
Promise.allSettled(queue),
|
|
83
|
+
]);
|
|
84
|
+
});
|
|
85
|
+
const tokenAmounts = tokens.map((token, index) => {
|
|
86
|
+
const result = results[index];
|
|
87
|
+
if (result.status === 'rejected') {
|
|
88
|
+
return { ...token, blockNumber };
|
|
58
89
|
}
|
|
59
|
-
|
|
60
|
-
const tokenAmounts = tokens.map((token) => {
|
|
61
|
-
if (walletTokenAmounts[token.address]) {
|
|
62
|
-
return {
|
|
63
|
-
...token,
|
|
64
|
-
amount: walletTokenAmounts[token.address],
|
|
65
|
-
blockNumber,
|
|
66
|
-
};
|
|
67
|
-
}
|
|
68
|
-
return {
|
|
69
|
-
...token,
|
|
70
|
-
blockNumber,
|
|
71
|
-
};
|
|
90
|
+
return { ...token, amount: result.value, blockNumber };
|
|
72
91
|
});
|
|
73
92
|
return tokenAmounts;
|
|
74
93
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getTronBalance.js","sourceRoot":"","sources":["../../../src/actions/getTronBalance.ts"],"names":[],"mappings":";;;AACA,mCAAsC;AACtC,qCAAiC;
|
|
1
|
+
{"version":3,"file":"getTronBalance.js","sourceRoot":"","sources":["../../../src/actions/getTronBalance.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
export declare function resolveTronAddress(
|
|
1
|
+
export declare function resolveTronAddress(name: string): Promise<string>;
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.resolveTronAddress = resolveTronAddress;
|
|
4
|
-
async function resolveTronAddress(
|
|
5
|
-
return
|
|
4
|
+
async function resolveTronAddress(name) {
|
|
5
|
+
return name;
|
|
6
6
|
}
|
|
7
7
|
//# sourceMappingURL=resolveTronAddress.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolveTronAddress.js","sourceRoot":"","sources":["../../../src/actions/resolveTronAddress.ts"],"names":[],"mappings":";;AAAA,
|
|
1
|
+
{"version":3,"file":"resolveTronAddress.js","sourceRoot":"","sources":["../../../src/actions/resolveTronAddress.ts"],"names":[],"mappings":";;AAAA,gDAGC;AAHM,KAAK,UAAU,kBAAkB,CAAC,IAAY;IAEnD,OAAO,IAAI,CAAA;AACb,CAAC"}
|
|
@@ -3,6 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.TronStepExecutor = void 0;
|
|
4
4
|
const sdk_1 = require("@lifi/sdk");
|
|
5
5
|
const parseTronErrors_js_1 = require("../errors/parseTronErrors.js");
|
|
6
|
+
const isZeroAddress_js_1 = require("../utils/isZeroAddress.js");
|
|
7
|
+
const TronCheckAllowanceTask_js_1 = require("./tasks/TronCheckAllowanceTask.js");
|
|
8
|
+
const TronSetAllowanceTask_js_1 = require("./tasks/TronSetAllowanceTask.js");
|
|
6
9
|
const TronSignAndExecuteTask_js_1 = require("./tasks/TronSignAndExecuteTask.js");
|
|
7
10
|
const TronWaitForTransactionTask_js_1 = require("./tasks/TronWaitForTransactionTask.js");
|
|
8
11
|
class TronStepExecutor extends sdk_1.BaseStepExecutor {
|
|
@@ -27,7 +30,10 @@ class TronStepExecutor extends sdk_1.BaseStepExecutor {
|
|
|
27
30
|
};
|
|
28
31
|
createPipeline = (context) => {
|
|
29
32
|
const { step, isBridgeExecution } = context;
|
|
33
|
+
const isFromNativeToken = (0, isZeroAddress_js_1.isZeroAddress)(step.action.fromToken.address);
|
|
30
34
|
const tasks = [
|
|
35
|
+
new TronCheckAllowanceTask_js_1.TronCheckAllowanceTask(),
|
|
36
|
+
new TronSetAllowanceTask_js_1.TronSetAllowanceTask(),
|
|
31
37
|
new sdk_1.CheckBalanceTask(),
|
|
32
38
|
new sdk_1.PrepareTransactionTask(),
|
|
33
39
|
new TronSignAndExecuteTask_js_1.TronSignAndExecuteTask(),
|
|
@@ -35,9 +41,20 @@ class TronStepExecutor extends sdk_1.BaseStepExecutor {
|
|
|
35
41
|
new sdk_1.WaitForTransactionStatusTask(isBridgeExecution ? 'RECEIVING_CHAIN' : 'SWAP'),
|
|
36
42
|
];
|
|
37
43
|
const swapOrBridgeAction = this.statusManager.findAction(step, isBridgeExecution ? 'CROSS_CHAIN' : 'SWAP');
|
|
38
|
-
const
|
|
39
|
-
|
|
40
|
-
|
|
44
|
+
const doCheckAllowance = !swapOrBridgeAction?.txHash &&
|
|
45
|
+
!isFromNativeToken &&
|
|
46
|
+
!!step.estimate.approvalAddress &&
|
|
47
|
+
!step.estimate.skipApproval;
|
|
48
|
+
let taskName;
|
|
49
|
+
if (doCheckAllowance) {
|
|
50
|
+
taskName = TronCheckAllowanceTask_js_1.TronCheckAllowanceTask.name;
|
|
51
|
+
}
|
|
52
|
+
else {
|
|
53
|
+
taskName =
|
|
54
|
+
swapOrBridgeAction?.txHash && swapOrBridgeAction?.status === 'DONE'
|
|
55
|
+
? sdk_1.WaitForTransactionStatusTask.name
|
|
56
|
+
: sdk_1.CheckBalanceTask.name;
|
|
57
|
+
}
|
|
41
58
|
const firstTaskIndex = tasks.findIndex((task) => task.constructor.name === taskName);
|
|
42
59
|
const tasksToRun = tasks.slice(firstTaskIndex);
|
|
43
60
|
return new sdk_1.TaskPipeline(tasksToRun);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TronStepExecutor.js","sourceRoot":"","sources":["../../../src/core/TronStepExecutor.ts"],"names":[],"mappings":";;;AAAA,mCAYkB;AAElB,qEAA8D;AAK9D,iFAA0E;AAC1E,yFAAkF;AAElF,MAAa,gBAAiB,SAAQ,sBAAgB;IAC5C,MAAM,CAAS;IAEvB,YAAY,OAAgC;QAC1C,KAAK,CAAC,OAAO,CAAC,CAAA;QACd,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAA;IAC9B,CAAC;IAED,WAAW,GAAG,CAAC,IAAsB,
|
|
1
|
+
{"version":3,"file":"TronStepExecutor.js","sourceRoot":"","sources":["../../../src/core/TronStepExecutor.ts"],"names":[],"mappings":";;;AAAA,mCAYkB;AAElB,qEAA8D;AAK9D,gEAAyD;AACzD,iFAA0E;AAC1E,6EAAsE;AACtE,iFAA0E;AAC1E,yFAAkF;AAElF,MAAa,gBAAiB,SAAQ,sBAAgB;IAC5C,MAAM,CAAS;IAEvB,YAAY,OAAgC;QAC1C,KAAK,CAAC,OAAO,CAAC,CAAA;QACd,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAA;IAC9B,CAAC;IAED,WAAW,GAAG,CAAC,IAAsB,EAAQ,EAAE;QAC7C,MAAM,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAA;QACnC,IAAI,OAAO,IAAI,OAAO,KAAK,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC;YACnD,MAAM,IAAI,sBAAgB,CACxB,mBAAa,CAAC,4BAA4B,EAC1C,mHAAmH,CACpH,CAAA;QACH,CAAC;IACH,CAAC,CAAA;IAEQ,WAAW,GAAG,CACrB,KAAY,EACZ,IAAuB,EACvB,MAAwB,EACL,EAAE,CAAC,IAAA,oCAAe,EAAC,KAAK,EAAE,IAAI,EAAE,MAAM,CAAC,CAAA;IAEnD,aAAa,GAAG,KAAK,EAC5B,WAAoC,EACF,EAAE;QACpC,OAAO;YACL,GAAG,WAAW;YACd,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,WAAW,EAAE,IAAI,CAAC,WAAW;SAC9B,CAAA;IACH,CAAC,CAAA;IAEQ,cAAc,GAAG,CACxB,OAAgC,EAClB,EAAE;QAChB,MAAM,EAAE,IAAI,EAAE,iBAAiB,EAAE,GAAG,OAAO,CAAA;QAE3C,MAAM,iBAAiB,GAAG,IAAA,gCAAa,EAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,CAAA;QAEtE,MAAM,KAAK,GAAG;YACZ,IAAI,kDAAsB,EAAE;YAC5B,IAAI,8CAAoB,EAAE;YAC1B,IAAI,sBAAgB,EAAE;YACtB,IAAI,4BAAsB,EAAE;YAC5B,IAAI,kDAAsB,EAAE;YAC5B,IAAI,0DAA0B,EAAE;YAChC,IAAI,kCAA4B,CAC9B,iBAAiB,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,MAAM,CAC/C;SACF,CAAA;QAED,MAAM,kBAAkB,GAAG,IAAI,CAAC,aAAa,CAAC,UAAU,CACtD,IAAI,EACJ,iBAAiB,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,MAAM,CAC3C,CAAA;QAED,MAAM,gBAAgB,GACpB,CAAC,kBAAkB,EAAE,MAAM;YAC3B,CAAC,iBAAiB;YAClB,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,eAAe;YAC/B,CAAC,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAA;QAE7B,IAAI,QAAgB,CAAA;QACpB,IAAI,gBAAgB,EAAE,CAAC;YACrB,QAAQ,GAAG,kDAAsB,CAAC,IAAI,CAAA;QACxC,CAAC;aAAM,CAAC;YACN,QAAQ;gBACN,kBAAkB,EAAE,MAAM,IAAI,kBAAkB,EAAE,MAAM,KAAK,MAAM;oBACjE,CAAC,CAAC,kCAA4B,CAAC,IAAI;oBACnC,CAAC,CAAC,sBAAgB,CAAC,IAAI,CAAA;QAC7B,CAAC;QAED,MAAM,cAAc,GAAG,KAAK,CAAC,SAAS,CACpC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,KAAK,QAAQ,CAC7C,CAAA;QAED,MAAM,UAAU,GAAG,KAAK,CAAC,KAAK,CAAC,cAAc,CAAC,CAAA;QAE9C,OAAO,IAAI,kBAAY,CAAC,UAAU,CAAC,CAAA;IACrC,CAAC,CAAA;CACF;AAlFD,4CAkFC"}
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.TRON_POLL_MAX_RETRIES = exports.TRON_POLL_INTERVAL_MS = void 0;
|
|
4
|
+
exports.TRON_POLL_INTERVAL_MS = 3000;
|
|
5
|
+
exports.TRON_POLL_MAX_RETRIES = 20;
|
|
6
|
+
//# sourceMappingURL=constants.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/core/constants.ts"],"names":[],"mappings":";;;AAAa,QAAA,qBAAqB,GAAG,IAAI,CAAA;AAC5B,QAAA,qBAAqB,GAAG,EAAE,CAAA"}
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
import { BaseStepExecutionTask, type TaskResult } from '@lifi/sdk';
|
|
2
|
+
import type { TronStepExecutorContext } from '../../types.js';
|
|
3
|
+
export declare class TronCheckAllowanceTask extends BaseStepExecutionTask {
|
|
4
|
+
shouldRun(context: TronStepExecutorContext): Promise<boolean>;
|
|
5
|
+
run(context: TronStepExecutorContext): Promise<TaskResult>;
|
|
6
|
+
}
|
|
@@ -0,0 +1,45 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.TronCheckAllowanceTask = void 0;
|
|
4
|
+
const sdk_1 = require("@lifi/sdk");
|
|
5
|
+
const callTronRpcsWithRetry_js_1 = require("../../rpc/callTronRpcsWithRetry.js");
|
|
6
|
+
class TronCheckAllowanceTask extends sdk_1.BaseStepExecutionTask {
|
|
7
|
+
async shouldRun(context) {
|
|
8
|
+
return !context.hasSufficientAllowance;
|
|
9
|
+
}
|
|
10
|
+
async run(context) {
|
|
11
|
+
const { step, client, wallet, statusManager } = context;
|
|
12
|
+
const action = statusManager.initializeAction({
|
|
13
|
+
step,
|
|
14
|
+
type: 'CHECK_ALLOWANCE',
|
|
15
|
+
chainId: step.action.fromChainId,
|
|
16
|
+
status: 'STARTED',
|
|
17
|
+
});
|
|
18
|
+
if (!wallet.address) {
|
|
19
|
+
throw new sdk_1.TransactionError(sdk_1.LiFiErrorCode.WalletChangedDuringExecution, 'Wallet address is not available. Wallet may have been disconnected.');
|
|
20
|
+
}
|
|
21
|
+
if (!step.estimate.approvalAddress) {
|
|
22
|
+
throw new sdk_1.TransactionError(sdk_1.LiFiErrorCode.TransactionUnprepared, 'Approval address is not available.');
|
|
23
|
+
}
|
|
24
|
+
const ownerAddress = wallet.address;
|
|
25
|
+
const tokenAddress = step.action.fromToken.address;
|
|
26
|
+
const spenderAddress = step.estimate.approvalAddress;
|
|
27
|
+
const fromAmount = BigInt(step.action.fromAmount);
|
|
28
|
+
const allowance = await (0, callTronRpcsWithRetry_js_1.callTronRpcsWithRetry)(client, async (tronWeb) => {
|
|
29
|
+
const contract = await tronWeb.contract().at(tokenAddress);
|
|
30
|
+
const result = await contract
|
|
31
|
+
.allowance(ownerAddress, spenderAddress)
|
|
32
|
+
.call({ from: ownerAddress });
|
|
33
|
+
return BigInt(result.toString());
|
|
34
|
+
});
|
|
35
|
+
statusManager.updateAction(step, action.type, 'DONE');
|
|
36
|
+
return {
|
|
37
|
+
status: 'COMPLETED',
|
|
38
|
+
context: {
|
|
39
|
+
hasSufficientAllowance: fromAmount <= allowance,
|
|
40
|
+
},
|
|
41
|
+
};
|
|
42
|
+
}
|
|
43
|
+
}
|
|
44
|
+
exports.TronCheckAllowanceTask = TronCheckAllowanceTask;
|
|
45
|
+
//# sourceMappingURL=TronCheckAllowanceTask.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"TronCheckAllowanceTask.js","sourceRoot":"","sources":["../../../../src/core/tasks/TronCheckAllowanceTask.ts"],"names":[],"mappings":";;;AAAA,mCAKkB;AAClB,iFAA0E;AAG1E,MAAa,sBAAuB,SAAQ,2BAAqB;IACtD,KAAK,CAAC,SAAS,CAAC,OAAgC;QACvD,OAAO,CAAC,OAAO,CAAC,sBAAsB,CAAA;IACxC,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,OAAgC;QACxC,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,GAAG,OAAO,CAAA;QAEvD,MAAM,MAAM,GAAG,aAAa,CAAC,gBAAgB,CAAC;YAC5C,IAAI;YACJ,IAAI,EAAE,iBAAiB;YACvB,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,WAAW;YAChC,MAAM,EAAE,SAAS;SAClB,CAAC,CAAA;QAEF,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;YACpB,MAAM,IAAI,sBAAgB,CACxB,mBAAa,CAAC,4BAA4B,EAC1C,qEAAqE,CACtE,CAAA;QACH,CAAC;QAED,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,eAAe,EAAE,CAAC;YACnC,MAAM,IAAI,sBAAgB,CACxB,mBAAa,CAAC,qBAAqB,EACnC,oCAAoC,CACrC,CAAA;QACH,CAAC;QAED,MAAM,YAAY,GAAG,MAAM,CAAC,OAAO,CAAA;QACnC,MAAM,YAAY,GAAG,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,OAAO,CAAA;QAClD,MAAM,cAAc,GAAG,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAA;QACpD,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAA;QAEjD,MAAM,SAAS,GAAG,MAAM,IAAA,gDAAqB,EAAC,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE;YACtE,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,QAAQ,EAAE,CAAC,EAAE,CAAC,YAAY,CAAC,CAAA;YAC1D,MAAM,MAAM,GAAG,MAAM,QAAQ;iBAC1B,SAAS,CAAC,YAAY,EAAE,cAAc,CAAC;iBACvC,IAAI,CAAC,EAAE,IAAI,EAAE,YAAY,EAAE,CAAC,CAAA;YAC/B,OAAO,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAA;QAClC,CAAC,CAAC,CAAA;QAEF,aAAa,CAAC,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;QAErD,OAAO;YACL,MAAM,EAAE,WAAW;YACnB,OAAO,EAAE;gBACP,sBAAsB,EAAE,UAAU,IAAI,SAAS;aAChD;SACF,CAAA;IACH,CAAC;CACF;AAnDD,wDAmDC"}
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
import { BaseStepExecutionTask, type TaskResult } from '@lifi/sdk';
|
|
2
|
+
import type { TronStepExecutorContext } from '../../types.js';
|
|
3
|
+
export declare class TronSetAllowanceTask extends BaseStepExecutionTask {
|
|
4
|
+
shouldRun(context: TronStepExecutorContext): Promise<boolean>;
|
|
5
|
+
run(context: TronStepExecutorContext): Promise<TaskResult>;
|
|
6
|
+
}
|
|
@@ -0,0 +1,78 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.TronSetAllowanceTask = void 0;
|
|
4
|
+
const sdk_1 = require("@lifi/sdk");
|
|
5
|
+
const callTronRpcsWithRetry_js_1 = require("../../rpc/callTronRpcsWithRetry.js");
|
|
6
|
+
const stripHexPrefix_js_1 = require("../../utils/stripHexPrefix.js");
|
|
7
|
+
const constants_js_1 = require("../constants.js");
|
|
8
|
+
const DEFAULT_APPROVE_FEE_LIMIT = 100_000_000;
|
|
9
|
+
class TronSetAllowanceTask extends sdk_1.BaseStepExecutionTask {
|
|
10
|
+
async shouldRun(context) {
|
|
11
|
+
return !context.hasSufficientAllowance;
|
|
12
|
+
}
|
|
13
|
+
async run(context) {
|
|
14
|
+
const { step, client, wallet, statusManager, fromChain } = context;
|
|
15
|
+
const action = statusManager.initializeAction({
|
|
16
|
+
step,
|
|
17
|
+
type: 'SET_ALLOWANCE',
|
|
18
|
+
chainId: step.action.fromChainId,
|
|
19
|
+
status: 'STARTED',
|
|
20
|
+
});
|
|
21
|
+
statusManager.updateAction(step, action.type, 'ACTION_REQUIRED');
|
|
22
|
+
if (!wallet.address) {
|
|
23
|
+
throw new sdk_1.TransactionError(sdk_1.LiFiErrorCode.WalletChangedDuringExecution, 'Wallet address is not available. Wallet may have been disconnected.');
|
|
24
|
+
}
|
|
25
|
+
if (!step.estimate.approvalAddress) {
|
|
26
|
+
throw new sdk_1.TransactionError(sdk_1.LiFiErrorCode.TransactionUnprepared, 'Approval address is not available.');
|
|
27
|
+
}
|
|
28
|
+
const tokenAddress = step.action.fromToken.address;
|
|
29
|
+
const spenderAddress = step.estimate.approvalAddress;
|
|
30
|
+
const ownerAddress = wallet.address;
|
|
31
|
+
const approveAmount = BigInt(step.action.fromAmount).toString();
|
|
32
|
+
const approveGasCost = step.estimate.gasCosts?.find((gc) => gc.type === 'APPROVE');
|
|
33
|
+
const feeLimit = approveGasCost?.limit
|
|
34
|
+
? parseInt(approveGasCost.limit, 10)
|
|
35
|
+
: DEFAULT_APPROVE_FEE_LIMIT;
|
|
36
|
+
const transaction = await (0, callTronRpcsWithRetry_js_1.callTronRpcsWithRetry)(client, async (tronWeb) => {
|
|
37
|
+
const { transaction } = await tronWeb.transactionBuilder.triggerSmartContract(tokenAddress, 'approve(address,uint256)', { feeLimit }, [
|
|
38
|
+
{ type: 'address', value: spenderAddress },
|
|
39
|
+
{ type: 'uint256', value: approveAmount },
|
|
40
|
+
], ownerAddress);
|
|
41
|
+
return transaction;
|
|
42
|
+
});
|
|
43
|
+
const signedTransaction = await wallet.signTransaction(transaction);
|
|
44
|
+
statusManager.updateAction(step, action.type, 'PENDING');
|
|
45
|
+
const broadcastResult = await (0, callTronRpcsWithRetry_js_1.callTronRpcsWithRetry)(client, async (tronWeb) => {
|
|
46
|
+
const result = await tronWeb.trx.sendRawTransaction(signedTransaction);
|
|
47
|
+
if (!result.result && String(result.code) !== 'DUP_TRANSACTION_ERROR') {
|
|
48
|
+
throw new sdk_1.TransactionError(sdk_1.LiFiErrorCode.TransactionFailed, `Approval broadcast failed: ${result.code || 'Unknown error'}`);
|
|
49
|
+
}
|
|
50
|
+
return result;
|
|
51
|
+
});
|
|
52
|
+
const txHash = (0, stripHexPrefix_js_1.stripHexPrefix)(broadcastResult.transaction.txID);
|
|
53
|
+
statusManager.updateAction(step, action.type, 'PENDING', {
|
|
54
|
+
txHash,
|
|
55
|
+
txLink: `${fromChain.metamask.blockExplorerUrls[0]}#/transaction/${txHash}`,
|
|
56
|
+
});
|
|
57
|
+
await (0, sdk_1.waitForResult)(async () => {
|
|
58
|
+
const txInfo = await (0, callTronRpcsWithRetry_js_1.callTronRpcsWithRetry)(client, (tronWeb) => tronWeb.trx.getTransactionInfo(txHash));
|
|
59
|
+
if (txInfo?.id) {
|
|
60
|
+
if (txInfo.receipt?.result === 'FAILED') {
|
|
61
|
+
throw new sdk_1.TransactionError(sdk_1.LiFiErrorCode.TransactionFailed, 'Approval transaction failed on-chain.');
|
|
62
|
+
}
|
|
63
|
+
return txInfo;
|
|
64
|
+
}
|
|
65
|
+
return undefined;
|
|
66
|
+
}, constants_js_1.TRON_POLL_INTERVAL_MS, constants_js_1.TRON_POLL_MAX_RETRIES);
|
|
67
|
+
statusManager.updateAction(step, action.type, 'DONE', {
|
|
68
|
+
txHash,
|
|
69
|
+
txLink: `${fromChain.metamask.blockExplorerUrls[0]}#/transaction/${txHash}`,
|
|
70
|
+
});
|
|
71
|
+
return {
|
|
72
|
+
status: 'COMPLETED',
|
|
73
|
+
context: { hasSufficientAllowance: true },
|
|
74
|
+
};
|
|
75
|
+
}
|
|
76
|
+
}
|
|
77
|
+
exports.TronSetAllowanceTask = TronSetAllowanceTask;
|
|
78
|
+
//# sourceMappingURL=TronSetAllowanceTask.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"TronSetAllowanceTask.js","sourceRoot":"","sources":["../../../../src/core/tasks/TronSetAllowanceTask.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,17 +2,35 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.TronSignAndExecuteTask = void 0;
|
|
4
4
|
const sdk_1 = require("@lifi/sdk");
|
|
5
|
+
const tronweb_1 = require("tronweb");
|
|
6
|
+
const stripHexPrefix_js_1 = require("../../utils/stripHexPrefix.js");
|
|
5
7
|
class TronSignAndExecuteTask extends sdk_1.BaseStepExecutionTask {
|
|
6
8
|
async run(context) {
|
|
7
|
-
const { step, wallet, statusManager,
|
|
9
|
+
const { step, wallet, statusManager, isBridgeExecution, checkWallet } = context;
|
|
8
10
|
const action = statusManager.findAction(step, isBridgeExecution ? 'CROSS_CHAIN' : 'SWAP');
|
|
9
11
|
if (!action) {
|
|
10
12
|
throw new sdk_1.TransactionError(sdk_1.LiFiErrorCode.TransactionUnprepared, 'Unable to prepare transaction. Action not found.');
|
|
11
13
|
}
|
|
12
|
-
const transactionRequestData = await (0, sdk_1.getTransactionRequestData)(step, executionOptions);
|
|
13
14
|
checkWallet(step);
|
|
14
|
-
|
|
15
|
-
|
|
15
|
+
if (!step.transactionRequest?.data) {
|
|
16
|
+
throw new sdk_1.TransactionError(sdk_1.LiFiErrorCode.TransactionUnprepared, 'Unable to prepare transaction. Transaction request is not found.');
|
|
17
|
+
}
|
|
18
|
+
const rawDataHex = (0, stripHexPrefix_js_1.stripHexPrefix)(step.transactionRequest.data);
|
|
19
|
+
const contractType = step.transactionRequest.customData?.contractType ??
|
|
20
|
+
'TriggerSmartContract';
|
|
21
|
+
const raw_data = tronweb_1.utils.deserializeTx.deserializeTransaction(contractType, rawDataHex);
|
|
22
|
+
const transactionPb = tronweb_1.utils.transaction.txJsonToPb({
|
|
23
|
+
visible: false,
|
|
24
|
+
raw_data,
|
|
25
|
+
});
|
|
26
|
+
const txID = (0, stripHexPrefix_js_1.stripHexPrefix)(tronweb_1.utils.transaction.txPbToTxID(transactionPb));
|
|
27
|
+
const transaction = {
|
|
28
|
+
visible: false,
|
|
29
|
+
txID,
|
|
30
|
+
raw_data,
|
|
31
|
+
raw_data_hex: rawDataHex,
|
|
32
|
+
};
|
|
33
|
+
const signedTransaction = await wallet.signTransaction(transaction);
|
|
16
34
|
statusManager.updateAction(step, action.type, 'PENDING', {
|
|
17
35
|
signedAt: Date.now(),
|
|
18
36
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TronSignAndExecuteTask.js","sourceRoot":"","sources":["../../../../src/core/tasks/TronSignAndExecuteTask.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"TronSignAndExecuteTask.js","sourceRoot":"","sources":["../../../../src/core/tasks/TronSignAndExecuteTask.ts"],"names":[],"mappings":";;;AAAA,mCAKkB;AAElB,qCAA+B;AAE/B,qEAA8D;AAE9D,MAAa,sBAAuB,SAAQ,2BAAqB;IAC/D,KAAK,CAAC,GAAG,CAAC,OAAgC;QACxC,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,aAAa,EAAE,iBAAiB,EAAE,WAAW,EAAE,GACnE,OAAO,CAAA;QAET,MAAM,MAAM,GAAG,aAAa,CAAC,UAAU,CACrC,IAAI,EACJ,iBAAiB,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,MAAM,CAC3C,CAAA;QAED,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,MAAM,IAAI,sBAAgB,CACxB,mBAAa,CAAC,qBAAqB,EACnC,kDAAkD,CACnD,CAAA;QACH,CAAC;QAED,WAAW,CAAC,IAAI,CAAC,CAAA;QAEjB,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,IAAI,EAAE,CAAC;YACnC,MAAM,IAAI,sBAAgB,CACxB,mBAAa,CAAC,qBAAqB,EACnC,kEAAkE,CACnE,CAAA;QACH,CAAC;QAED,MAAM,UAAU,GAAG,IAAA,kCAAc,EAAC,IAAI,CAAC,kBAAkB,CAAC,IAAc,CAAC,CAAA;QAEzE,MAAM,YAAY,GACf,IAAI,CAAC,kBAAkB,CAAC,UAAU,EAAE,YAAuB;YAC5D,sBAAsB,CAAA;QAExB,MAAM,QAAQ,GAAG,eAAK,CAAC,aAAa,CAAC,sBAAsB,CACzD,YAAY,EACZ,UAAU,CACX,CAAA;QAED,MAAM,aAAa,GAAG,eAAK,CAAC,WAAW,CAAC,UAAU,CAAC;YACjD,OAAO,EAAE,KAAK;YACd,QAAQ;SACT,CAAC,CAAA;QACF,MAAM,IAAI,GAAG,IAAA,kCAAc,EAAC,eAAK,CAAC,WAAW,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC,CAAA;QAExE,MAAM,WAAW,GAAgB;YAC/B,OAAO,EAAE,KAAK;YACd,IAAI;YACJ,QAAQ;YACR,YAAY,EAAE,UAAU;SACzB,CAAA;QAED,MAAM,iBAAiB,GAAG,MAAM,MAAM,CAAC,eAAe,CAAC,WAAW,CAAC,CAAA;QAEnE,aAAa,CAAC,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,SAAS,EAAE;YACvD,QAAQ,EAAE,IAAI,CAAC,GAAG,EAAE;SACrB,CAAC,CAAA;QAEF,OAAO;YACL,MAAM,EAAE,WAAW;YACnB,OAAO,EAAE,EAAE,iBAAiB,EAAE;SAC/B,CAAA;IACH,CAAC;CACF;AA7DD,wDA6DC"}
|
|
@@ -2,7 +2,9 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.TronWaitForTransactionTask = void 0;
|
|
4
4
|
const sdk_1 = require("@lifi/sdk");
|
|
5
|
-
const
|
|
5
|
+
const callTronRpcsWithRetry_js_1 = require("../../rpc/callTronRpcsWithRetry.js");
|
|
6
|
+
const stripHexPrefix_js_1 = require("../../utils/stripHexPrefix.js");
|
|
7
|
+
const constants_js_1 = require("../constants.js");
|
|
6
8
|
class TronWaitForTransactionTask extends sdk_1.BaseStepExecutionTask {
|
|
7
9
|
async run(context) {
|
|
8
10
|
const { client, step, statusManager, fromChain, isBridgeExecution, signedTransaction, } = context;
|
|
@@ -13,19 +15,19 @@ class TronWaitForTransactionTask extends sdk_1.BaseStepExecutionTask {
|
|
|
13
15
|
if (!action) {
|
|
14
16
|
throw new sdk_1.TransactionError(sdk_1.LiFiErrorCode.TransactionUnprepared, 'Unable to prepare transaction. Action not found.');
|
|
15
17
|
}
|
|
16
|
-
const
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
}
|
|
23
|
-
const txHash = broadcastResult.transaction.txID;
|
|
18
|
+
const broadcastResult = await (0, callTronRpcsWithRetry_js_1.callTronRpcsWithRetry)(client, async (tronWeb) => {
|
|
19
|
+
const result = await tronWeb.trx.sendRawTransaction(signedTransaction);
|
|
20
|
+
if (!result.result && String(result.code) !== 'DUP_TRANSACTION_ERROR') {
|
|
21
|
+
throw new sdk_1.TransactionError(sdk_1.LiFiErrorCode.TransactionFailed, `Transaction broadcast failed: ${result.code || 'Unknown error'}`);
|
|
22
|
+
}
|
|
23
|
+
return result;
|
|
24
|
+
});
|
|
25
|
+
const txHash = (0, stripHexPrefix_js_1.stripHexPrefix)(broadcastResult.transaction?.txID ?? signedTransaction.txID);
|
|
24
26
|
statusManager.updateAction(step, action.type, 'PENDING', {
|
|
25
27
|
txHash,
|
|
26
28
|
txLink: `${fromChain.metamask.blockExplorerUrls[0]}#/transaction/${txHash}`,
|
|
27
29
|
});
|
|
28
|
-
await waitForTronConfirmation(
|
|
30
|
+
await waitForTronConfirmation(client, txHash);
|
|
29
31
|
if (isBridgeExecution) {
|
|
30
32
|
statusManager.updateAction(step, action.type, 'DONE');
|
|
31
33
|
}
|
|
@@ -33,10 +35,10 @@ class TronWaitForTransactionTask extends sdk_1.BaseStepExecutionTask {
|
|
|
33
35
|
}
|
|
34
36
|
}
|
|
35
37
|
exports.TronWaitForTransactionTask = TronWaitForTransactionTask;
|
|
36
|
-
async function waitForTronConfirmation(
|
|
38
|
+
async function waitForTronConfirmation(client, txHash, maxRetries = constants_js_1.TRON_POLL_MAX_RETRIES, intervalMs = constants_js_1.TRON_POLL_INTERVAL_MS) {
|
|
37
39
|
for (let i = 0; i < maxRetries; i++) {
|
|
38
40
|
try {
|
|
39
|
-
const txInfo = await tronWeb.trx.getTransactionInfo(txHash);
|
|
41
|
+
const txInfo = await (0, callTronRpcsWithRetry_js_1.callTronRpcsWithRetry)(client, (tronWeb) => tronWeb.trx.getTransactionInfo(txHash));
|
|
40
42
|
if (txInfo?.id) {
|
|
41
43
|
if (txInfo.receipt?.result === 'FAILED') {
|
|
42
44
|
throw new sdk_1.TransactionError(sdk_1.LiFiErrorCode.TransactionFailed, `Transaction failed on-chain: ${txInfo.receipt.result}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TronWaitForTransactionTask.js","sourceRoot":"","sources":["../../../../src/core/tasks/TronWaitForTransactionTask.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"TronWaitForTransactionTask.js","sourceRoot":"","sources":["../../../../src/core/tasks/TronWaitForTransactionTask.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,8 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.parseTronErrors = void 0;
|
|
4
4
|
const sdk_1 = require("@lifi/sdk");
|
|
5
5
|
const tronwallet_abstract_adapter_1 = require("@tronweb3/tronwallet-abstract-adapter");
|
|
6
|
+
const isBandwidthError = (message) => !!message?.includes('BANDWITH_ERROR');
|
|
6
7
|
const parseTronErrors = async (e, step, action) => {
|
|
7
8
|
if (e instanceof sdk_1.SDKError) {
|
|
9
|
+
if (isBandwidthError(e.message)) {
|
|
10
|
+
const baseError = new sdk_1.TransactionError(sdk_1.LiFiErrorCode.InsufficientFunds, 'Insufficient TRX for network bandwidth. The account needs more TRX to cover transaction fees.', e);
|
|
11
|
+
return new sdk_1.SDKError(baseError, step ?? e.step, action ?? e.action);
|
|
12
|
+
}
|
|
8
13
|
e.step = e.step ?? step;
|
|
9
14
|
e.action = e.action ?? action;
|
|
10
15
|
return e;
|
|
@@ -35,6 +40,9 @@ const handleSpecificErrors = (e) => {
|
|
|
35
40
|
if (message === 'Private key does not match address in transaction') {
|
|
36
41
|
return new sdk_1.TransactionError(sdk_1.LiFiErrorCode.WalletChangedDuringExecution, message, e);
|
|
37
42
|
}
|
|
43
|
+
if (isBandwidthError(message)) {
|
|
44
|
+
return new sdk_1.TransactionError(sdk_1.LiFiErrorCode.InsufficientFunds, 'Insufficient TRX for network bandwidth. The account needs more TRX to cover transaction fees.', e);
|
|
45
|
+
}
|
|
38
46
|
if (e instanceof sdk_1.BaseError) {
|
|
39
47
|
return e;
|
|
40
48
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parseTronErrors.js","sourceRoot":"","sources":["../../../src/errors/parseTronErrors.ts"],"names":[],"mappings":";;;AAAA,mCASkB;AAClB,uFAM8C;
|
|
1
|
+
{"version":3,"file":"parseTronErrors.js","sourceRoot":"","sources":["../../../src/errors/parseTronErrors.ts"],"names":[],"mappings":";;;AAAA,mCASkB;AAClB,uFAM8C;AAG9C,MAAM,gBAAgB,GAAG,CAAC,OAAgB,EAAW,EAAE,CACrD,CAAC,CAAC,OAAO,EAAE,QAAQ,CAAC,gBAAgB,CAAC,CAAA;AAEhC,MAAM,eAAe,GAAG,KAAK,EAClC,CAAQ,EACR,IAAe,EACf,MAAwB,EACL,EAAE;IACrB,IAAI,CAAC,YAAY,cAAQ,EAAE,CAAC;QAC1B,IAAI,gBAAgB,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC;YAChC,MAAM,SAAS,GAAG,IAAI,sBAAgB,CACpC,mBAAa,CAAC,iBAAiB,EAC/B,+FAA+F,EAC/F,CAAC,CACF,CAAA;YACD,OAAO,IAAI,cAAQ,CAAC,SAAS,EAAE,IAAI,IAAI,CAAC,CAAC,IAAI,EAAE,MAAM,IAAI,CAAC,CAAC,MAAM,CAAC,CAAA;QACpE,CAAC;QACD,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC,IAAI,IAAI,IAAI,CAAA;QACvB,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,MAAM,IAAI,MAAM,CAAA;QAC7B,OAAO,CAAC,CAAA;IACV,CAAC;IAED,MAAM,SAAS,GAAG,oBAAoB,CAAC,CAAC,CAAC,CAAA;IAEzC,OAAO,IAAI,cAAQ,CAAC,SAAS,EAAE,IAAI,EAAE,MAAM,CAAC,CAAA;AAC9C,CAAC,CAAA;AAtBY,QAAA,eAAe,mBAsB3B;AAED,MAAM,oBAAoB,GAAG,CAAC,CAAM,EAAE,EAAE;IACtC,MAAM,OAAO,GAAW,OAAO,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,IAAI,EAAE,CAAA;IAEnE,IACE,CAAC,YAAY,wDAA0B;QACvC,CAAC,YAAY,qDAAuB,EACpC,CAAC;QACD,OAAO,IAAI,sBAAgB,CAAC,mBAAa,CAAC,iBAAiB,EAAE,OAAO,EAAE,CAAC,CAAC,CAAA;IAC1E,CAAC;IAED,IACE,CAAC,YAAY,iDAAmB;QAChC,CAAC,YAAY,oDAAsB;QACnC,CAAC,YAAY,qDAAuB,EACpC,CAAC;QACD,OAAO,IAAI,sBAAgB,CACzB,mBAAa,CAAC,4BAA4B,EAC1C,OAAO,EACP,CAAC,CACF,CAAA;IACH,CAAC;IAGD,IACE,OAAO,KAAK,8BAA8B;QAC1C,OAAO,KAAK,qBAAqB;QACjC,OAAO,KAAK,2BAA2B,EACvC,CAAC;QACD,OAAO,IAAI,sBAAgB,CAAC,mBAAa,CAAC,qBAAqB,EAAE,OAAO,EAAE,CAAC,CAAC,CAAA;IAC9E,CAAC;IAED,IAAI,OAAO,KAAK,+BAA+B,EAAE,CAAC;QAChD,OAAO,IAAI,sBAAgB,CAAC,mBAAa,CAAC,iBAAiB,EAAE,OAAO,EAAE,CAAC,CAAC,CAAA;IAC1E,CAAC;IAED,IAAI,OAAO,KAAK,mDAAmD,EAAE,CAAC;QACpE,OAAO,IAAI,sBAAgB,CACzB,mBAAa,CAAC,4BAA4B,EAC1C,OAAO,EACP,CAAC,CACF,CAAA;IACH,CAAC;IAED,IAAI,gBAAgB,CAAC,OAAO,CAAC,EAAE,CAAC;QAC9B,OAAO,IAAI,sBAAgB,CACzB,mBAAa,CAAC,iBAAiB,EAC/B,+FAA+F,EAC/F,CAAC,CACF,CAAA;IACH,CAAC;IAED,IAAI,CAAC,YAAY,eAAS,EAAE,CAAC;QAC3B,OAAO,CAAC,CAAA;IACV,CAAC;IAED,OAAO,IAAI,kBAAY,CAAC,OAAO,IAAI,kBAAY,CAAC,YAAY,EAAE,CAAC,CAAC,CAAA;AAClE,CAAC,CAAA"}
|