@lifi/sdk 3.0.0-beta.2 → 3.0.1
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/README.md +58 -7
- package/package.json +6 -6
- package/src/_cjs/config.js +2 -1
- package/src/_cjs/config.js.map +1 -1
- package/src/_cjs/core/EVM/EVMStepExecutor.js +9 -16
- package/src/_cjs/core/EVM/EVMStepExecutor.js.map +1 -1
- package/src/_cjs/core/EVM/checkAllowance.js +8 -17
- package/src/_cjs/core/EVM/checkAllowance.js.map +1 -1
- package/src/_cjs/core/EVM/utils.js +1 -1
- package/src/_cjs/core/EVM/waitForTransactionReceipt.js +42 -0
- package/src/_cjs/core/EVM/waitForTransactionReceipt.js.map +1 -0
- package/src/_cjs/core/Solana/KeypairWalletAdapter.js +3 -3
- package/src/_cjs/core/Solana/KeypairWalletAdapter.js.map +1 -1
- package/src/_cjs/version.js +1 -1
- package/src/_cjs/version.js.map +1 -1
- package/src/_esm/config.js +2 -1
- package/src/_esm/config.js.map +1 -1
- package/src/_esm/core/EVM/EVMStepExecutor.js +12 -17
- package/src/_esm/core/EVM/EVMStepExecutor.js.map +1 -1
- package/src/_esm/core/EVM/checkAllowance.js +9 -18
- package/src/_esm/core/EVM/checkAllowance.js.map +1 -1
- package/src/_esm/core/EVM/utils.js +1 -1
- package/src/_esm/core/EVM/waitForTransactionReceipt.js +40 -0
- package/src/_esm/core/EVM/waitForTransactionReceipt.js.map +1 -0
- package/src/_esm/core/Solana/KeypairWalletAdapter.js +1 -1
- package/src/_esm/core/Solana/KeypairWalletAdapter.js.map +1 -1
- package/src/_esm/version.js +1 -1
- package/src/_esm/version.js.map +1 -1
- package/src/_types/config.d.ts.map +1 -1
- package/src/_types/core/EVM/EVMStepExecutor.d.ts.map +1 -1
- package/src/_types/core/EVM/checkAllowance.d.ts.map +1 -1
- package/src/_types/core/EVM/utils.d.ts +1 -1
- package/src/_types/core/EVM/waitForTransactionReceipt.d.ts +11 -0
- package/src/_types/core/EVM/waitForTransactionReceipt.d.ts.map +1 -0
- package/src/_types/version.d.ts +1 -1
- package/src/_types/version.d.ts.map +1 -1
- package/src/config.ts +4 -1
- package/src/core/EVM/EVMStepExecutor.ts +21 -32
- package/src/core/EVM/checkAllowance.ts +10 -27
- package/src/core/EVM/utils.ts +1 -1
- package/src/core/EVM/waitForTransactionReceipt.ts +86 -0
- package/src/core/Solana/KeypairWalletAdapter.ts +1 -1
- package/src/version.ts +1 -1
package/README.md
CHANGED
|
@@ -7,10 +7,20 @@
|
|
|
7
7
|
|
|
8
8
|
</div>
|
|
9
9
|
|
|
10
|
-
|
|
10
|
+
<h1 align="center">LI.FI SDK</h1>
|
|
11
11
|
|
|
12
|
-
LI.FI
|
|
13
|
-
|
|
12
|
+
[**LI.FI SDK**](https://docs.li.fi/integrate-li.fi-sdk/li.fi-sdk-overview) provides a powerful toolkit for developers to enable seamless cross-chain and on-chain swaps and bridging within their applications. Our JavaScript/TypeScript SDK can be implemented in front-end or back-end environments, allowing you to build robust UX/UI around our advanced bridge and swap functionalities. LI.FI SDK efficiently manages all communications between our smart routing API and smart contracts and ensures optimal performance, security, and scalability for your cross-chain and on-chain needs.
|
|
13
|
+
|
|
14
|
+
[**LI.FI SDK**](https://docs.li.fi/integrate-li.fi-sdk/li.fi-sdk-overview) features include:
|
|
15
|
+
|
|
16
|
+
- All ecosystems, chains, bridges, exchanges, and solvers that [LI.FI](https://docs.li.fi/list-chains-bridges-dexs-solvers) supports
|
|
17
|
+
- Complete functionality covering full-cycle from obtaining routes/quotes to executing transactions
|
|
18
|
+
- Easy tracking of the route and quote execution through the robust event and hooks handling
|
|
19
|
+
- Highly customizable settings to tailor the SDK to your specific needs including configuration of RPCs and options to allow or deny certain chains, tokens, bridges, exchanges, solvers
|
|
20
|
+
- SDK ecosystem providers are based on industry-standard libraries (Viem, Solana Wallet Standard)
|
|
21
|
+
- Support for arbitrary contract calls on the destination chain
|
|
22
|
+
- Designed for optimal performance with tree-shaking and dead-code elimination, ensuring minimal bundle sizes and faster page load times in front-end environments
|
|
23
|
+
- Compatibility tested with Node.js and popular front-end tools like Vite
|
|
14
24
|
|
|
15
25
|
## Installation
|
|
16
26
|
|
|
@@ -24,9 +34,50 @@ or
|
|
|
24
34
|
npm install --save @lifi/sdk
|
|
25
35
|
```
|
|
26
36
|
|
|
27
|
-
##
|
|
37
|
+
## Quick Start
|
|
38
|
+
|
|
39
|
+
### Set up the SDK
|
|
40
|
+
|
|
41
|
+
Firstly, create SDK config with your integrator string.
|
|
42
|
+
|
|
43
|
+
```ts
|
|
44
|
+
import { createConfig } from '@lifi/sdk'
|
|
45
|
+
|
|
46
|
+
createConfig({
|
|
47
|
+
integrator: 'Your dApp/company name',
|
|
48
|
+
})
|
|
49
|
+
```
|
|
50
|
+
|
|
51
|
+
### Request a Quote
|
|
52
|
+
|
|
53
|
+
Now you can interact with the SDK and for example request a quote.
|
|
54
|
+
|
|
55
|
+
```ts
|
|
56
|
+
import { ChainId, getQuote } from '@lifi/sdk'
|
|
57
|
+
|
|
58
|
+
const quote = await getQuote({
|
|
59
|
+
fromAddress: '0xd8dA6BF26964aF9D7eEd9e03E53415D37aA96045',
|
|
60
|
+
fromChain: ChainId.ARB,
|
|
61
|
+
toChain: ChainId.OPT,
|
|
62
|
+
fromToken: '0x0000000000000000000000000000000000000000',
|
|
63
|
+
toToken: '0x0000000000000000000000000000000000000000',
|
|
64
|
+
fromAmount: '1000000000000000000',
|
|
65
|
+
})
|
|
66
|
+
```
|
|
67
|
+
|
|
68
|
+
## Examples
|
|
69
|
+
|
|
70
|
+
See [examples](/examples) folder in this repository.
|
|
71
|
+
|
|
72
|
+
## Documentation
|
|
73
|
+
|
|
74
|
+
Please checkout the [SDK documentation](https://docs.li.fi/integrate-li.fi-sdk/li.fi-sdk-overview) and our [API reference](https://apidocs.li.fi) for further information.
|
|
75
|
+
|
|
76
|
+
## Changelog
|
|
77
|
+
|
|
78
|
+
The [changelog](/CHANGELOG.md) is regularly updated to reflect what's changed in each new release.
|
|
28
79
|
|
|
29
|
-
|
|
30
|
-
then be executed via the SDK. Learn more about LI.FI on (https://li.fi).
|
|
80
|
+
## License
|
|
31
81
|
|
|
32
|
-
|
|
82
|
+
This project is licensed under the terms of the
|
|
83
|
+
[Apache-2.0](/LICENSE.md).
|
package/package.json
CHANGED
|
@@ -2,18 +2,18 @@
|
|
|
2
2
|
"name": "@lifi/sdk",
|
|
3
3
|
"description": "LI.FI Any-to-Any Cross-Chain-Swap SDK",
|
|
4
4
|
"dependencies": {
|
|
5
|
-
"@lifi/types": "^13.
|
|
5
|
+
"@lifi/types": "^13.18.0",
|
|
6
6
|
"@solana/wallet-adapter-base": "^0.9.23",
|
|
7
|
-
"@solana/web3.js": "^1.
|
|
7
|
+
"@solana/web3.js": "^1.95.0",
|
|
8
8
|
"eth-rpc-errors": "^4.0.3",
|
|
9
|
-
"viem": "^2.
|
|
9
|
+
"viem": "^2.17.4"
|
|
10
10
|
},
|
|
11
11
|
"peerDependencies": {
|
|
12
12
|
"@solana/wallet-adapter-base": "^0.9.0",
|
|
13
|
-
"@solana/web3.js": "^1.
|
|
14
|
-
"viem": "^2.
|
|
13
|
+
"@solana/web3.js": "^1.93.0",
|
|
14
|
+
"viem": "^2.16.0"
|
|
15
15
|
},
|
|
16
|
-
"version": "3.0.
|
|
16
|
+
"version": "3.0.1",
|
|
17
17
|
"files": [
|
|
18
18
|
"src",
|
|
19
19
|
"!src/**/*.test.ts",
|
package/src/_cjs/config.js
CHANGED
|
@@ -75,7 +75,8 @@ exports.config = (() => {
|
|
|
75
75
|
_config.rpcUrls[chainId] = Array.from(urls);
|
|
76
76
|
}
|
|
77
77
|
else {
|
|
78
|
-
_config.rpcUrls[chainId]?.
|
|
78
|
+
const filteredUrls = urls.filter((url) => !_config.rpcUrls[chainId]?.includes(url));
|
|
79
|
+
_config.rpcUrls[chainId]?.push(...filteredUrls);
|
|
79
80
|
}
|
|
80
81
|
}
|
|
81
82
|
},
|
package/src/_cjs/config.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../config.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../config.ts"],"names":[],"mappings":";;;AAIa,QAAA,MAAM,GAAG,CAAC,GAAG,EAAE;IAC1B,MAAM,OAAO,GAAkB;QAC7B,UAAU,EAAE,UAAU;QACtB,MAAM,EAAE,qBAAqB;QAC7B,OAAO,EAAE,EAAE;QACX,MAAM,EAAE,EAAE;QACV,SAAS,EAAE,EAAE;QACb,aAAa,EAAE,IAAI;KACpB,CAAA;IACD,IAAI,QAAmC,CAAA;IACvC,OAAO;QACL,IAAI,OAAO,CAAC,OAAsB;YAChC,QAAQ,GAAG,OAAO,CAAA;QACpB,CAAC;QACD,GAAG;YACD,OAAO,OAAO,CAAA;QAChB,CAAC;QACD,GAAG,CAAC,OAAkB;YACpB,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,GAAG,YAAY,EAAE,GAAG,OAAO,CAAA;YAC/D,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,YAAY,CAAC,CAAA;YACpC,IAAI,MAAM,EAAE,CAAC;gBACX,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAA;YACxB,CAAC;YACD,IAAI,SAAS,EAAE,CAAC;gBACd,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,CAAA;YAC9B,CAAC;YACD,IAAI,OAAO,EAAE,CAAC;gBACZ,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAA;YAC1B,CAAC;YACD,OAAO,OAAO,CAAA;QAChB,CAAC;QACD,YAAY,CAAC,SAAwB;YACnC,MAAM,WAAW,GAAG,IAAI,GAAG,CACzB,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,CAC/D,CAAA;YACD,SAAS,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,WAAW,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAA;YACzE,OAAO,CAAC,SAAS,GAAG,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,CAAC,CAAA;QACtD,CAAC;QACD,SAAS,CAAC,MAAuB;YAC/B,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,KAAK,EAAE,EAAE;gBAC/C,IAAI,KAAK,CAAC,QAAQ,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC;oBACpC,OAAO,CAAC,KAAK,CAAC,EAAa,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAA;gBACvD,CAAC;gBACD,OAAO,OAAO,CAAA;YAChB,CAAC,EAAE,EAAa,CAAC,CAAA;YACjB,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAA;YACxB,OAAO,CAAC,MAAM,GAAG,MAAM,CAAA;YACvB,QAAQ,GAAG,SAAS,CAAA;QACtB,CAAC;QACD,KAAK,CAAC,SAAS;YACb,IAAI,QAAQ,EAAE,CAAC;gBACb,MAAM,QAAQ,CAAA;YAChB,CAAC;YACD,OAAO,OAAO,CAAC,MAAM,CAAA;QACvB,CAAC;QACD,KAAK,CAAC,YAAY,CAAC,OAAgB;YACjC,IAAI,QAAQ,EAAE,CAAC;gBACb,MAAM,QAAQ,CAAA;YAChB,CAAC;YACD,MAAM,KAAK,GAAG,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,EAAE,KAAK,OAAO,CAAC,CAAA;YACnE,IAAI,CAAC,KAAK,EAAE,CAAC;gBACX,MAAM,IAAI,KAAK,CAAC,WAAW,OAAO,YAAY,CAAC,CAAA;YACjD,CAAC;YACD,OAAO,KAAK,CAAA;QACd,CAAC;QACD,UAAU,CAAC,OAAgB;YACzB,KAAK,MAAM,UAAU,IAAI,OAAO,EAAE,CAAC;gBACjC,MAAM,OAAO,GAAG,UAAgC,CAAA;gBAChD,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC,CAAA;gBAC7B,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC;oBAClB,SAAQ;gBACV,CAAC;gBACD,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;oBACtC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;gBAC7C,CAAC;qBAAM,CAAC;oBACN,MAAM,YAAY,GAAG,IAAI,CAAC,MAAM,CAC9B,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,QAAQ,CAAC,GAAG,CAAC,CAClD,CAAA;oBACD,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC,GAAG,YAAY,CAAC,CAAA;gBACjD,CAAC;YACH,CAAC;QACH,CAAC;QACD,KAAK,CAAC,UAAU;YACd,IAAI,QAAQ,EAAE,CAAC;gBACb,MAAM,QAAQ,CAAA;YAChB,CAAC;YACD,OAAO,OAAO,CAAC,OAAO,CAAA;QACxB,CAAC;KACF,CAAA;AACH,CAAC,CAAC,EAAE,CAAA"}
|
|
@@ -14,6 +14,7 @@ const checkAllowance_js_1 = require("./checkAllowance.js");
|
|
|
14
14
|
const multisig_js_1 = require("./multisig.js");
|
|
15
15
|
const switchChain_js_1 = require("./switchChain.js");
|
|
16
16
|
const utils_js_2 = require("./utils.js");
|
|
17
|
+
const waitForTransactionReceipt_js_1 = require("./waitForTransactionReceipt.js");
|
|
17
18
|
class EVMStepExecutor extends BaseStepExecutor_js_1.BaseStepExecutor {
|
|
18
19
|
constructor(options) {
|
|
19
20
|
super(options);
|
|
@@ -198,31 +199,23 @@ class EVMStepExecutor extends BaseStepExecutor_js_1.BaseStepExecutor {
|
|
|
198
199
|
});
|
|
199
200
|
}
|
|
200
201
|
}
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
.
|
|
204
|
-
|
|
205
|
-
hash: txHash,
|
|
202
|
+
const transactionReceipt = await (0, waitForTransactionReceipt_js_1.waitForTransactionReceipt)({
|
|
203
|
+
walletClient: this.walletClient,
|
|
204
|
+
chainId: fromChain.id,
|
|
205
|
+
txHash,
|
|
206
206
|
onReplaced: (response) => {
|
|
207
|
-
replacementReason = response.reason;
|
|
208
207
|
this.statusManager.updateProcess(step, process.type, 'PENDING', {
|
|
209
208
|
txHash: response.transaction.hash,
|
|
210
209
|
txLink: `${fromChain.metamask.blockExplorerUrls[0]}tx/${response.transaction.hash}`,
|
|
211
210
|
});
|
|
212
211
|
},
|
|
213
|
-
retryCount: utils_js_2.retryCount,
|
|
214
|
-
retryDelay: utils_js_2.retryDelay,
|
|
215
212
|
});
|
|
216
|
-
if (transactionReceipt.status === 'reverted') {
|
|
217
|
-
throw new index_js_1.TransactionError(index_js_1.LiFiErrorCode.TransactionFailed, 'Transaction was reverted.');
|
|
218
|
-
}
|
|
219
|
-
if (replacementReason === 'cancelled') {
|
|
220
|
-
throw new index_js_1.TransactionError(index_js_1.LiFiErrorCode.TransactionCanceled, 'User canceled transaction.');
|
|
221
|
-
}
|
|
222
213
|
if (isMultisigWalletClient && process.status === 'ACTION_REQUIRED') {
|
|
223
|
-
await (0, multisig_js_1.updateMultisigRouteProcess)(transactionReceipt
|
|
214
|
+
await (0, multisig_js_1.updateMultisigRouteProcess)(transactionReceipt?.transactionHash || txHash, step, process.type, fromChain, this.statusManager, this.multisig);
|
|
224
215
|
}
|
|
225
|
-
if (!isMultisigWalletClient
|
|
216
|
+
if (!isMultisigWalletClient &&
|
|
217
|
+
transactionReceipt?.transactionHash &&
|
|
218
|
+
transactionReceipt.transactionHash !== txHash) {
|
|
226
219
|
process = this.statusManager.updateProcess(step, process.type, 'PENDING', {
|
|
227
220
|
txHash: transactionReceipt.transactionHash,
|
|
228
221
|
txLink: `${fromChain.metamask.blockExplorerUrls[0]}tx/${transactionReceipt.transactionHash}`,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EVMStepExecutor.js","sourceRoot":"","sources":["../../../core/EVM/EVMStepExecutor.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"EVMStepExecutor.js","sourceRoot":"","sources":["../../../core/EVM/EVMStepExecutor.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,11 +2,10 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.checkAllowance = void 0;
|
|
4
4
|
const viem_1 = require("viem");
|
|
5
|
-
const index_js_1 = require("../../utils/index.js");
|
|
6
5
|
const parseError_js_1 = require("../../utils/parseError.js");
|
|
7
6
|
const getAllowance_js_1 = require("./getAllowance.js");
|
|
8
7
|
const setAllowance_js_1 = require("./setAllowance.js");
|
|
9
|
-
const
|
|
8
|
+
const waitForTransactionReceipt_js_1 = require("./waitForTransactionReceipt.js");
|
|
10
9
|
const checkAllowance = async (chain, step, walletClient, statusManager, settings, allowUserInteraction = false, shouldBatchTransactions = false) => {
|
|
11
10
|
let allowanceProcess = statusManager.findOrCreateProcess(step, 'TOKEN_ALLOWANCE');
|
|
12
11
|
try {
|
|
@@ -52,33 +51,25 @@ const checkAllowance = async (chain, step, walletClient, statusManager, settings
|
|
|
52
51
|
};
|
|
53
52
|
exports.checkAllowance = checkAllowance;
|
|
54
53
|
const waitForApprovalTransaction = async (walletClient, txHash, processType, step, chain, statusManager) => {
|
|
55
|
-
const client = walletClient.extend(viem_1.publicActions);
|
|
56
54
|
statusManager.updateProcess(step, processType, 'PENDING', {
|
|
57
55
|
txHash,
|
|
58
56
|
txLink: `${chain.metamask.blockExplorerUrls[0]}tx/${txHash}`,
|
|
59
57
|
});
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
58
|
+
const transactionReceipt = await (0, waitForTransactionReceipt_js_1.waitForTransactionReceipt)({
|
|
59
|
+
walletClient,
|
|
60
|
+
chainId: chain.id,
|
|
61
|
+
txHash: txHash,
|
|
63
62
|
onReplaced(response) {
|
|
64
|
-
replacementReason = response.reason;
|
|
65
63
|
statusManager.updateProcess(step, processType, 'PENDING', {
|
|
66
64
|
txHash: response.transaction.hash,
|
|
67
65
|
txLink: `${chain.metamask.blockExplorerUrls[0]}tx/${response.transaction.hash}`,
|
|
68
66
|
});
|
|
69
67
|
},
|
|
70
|
-
retryCount: utils_js_1.retryCount,
|
|
71
|
-
retryDelay: utils_js_1.retryDelay,
|
|
72
68
|
});
|
|
73
|
-
|
|
74
|
-
throw new index_js_1.TransactionError(index_js_1.LiFiErrorCode.TransactionFailed, 'Transaction was reverted.');
|
|
75
|
-
}
|
|
76
|
-
if (replacementReason === 'cancelled') {
|
|
77
|
-
throw new index_js_1.TransactionError(index_js_1.LiFiErrorCode.TransactionCanceled, 'User canceled transaction.');
|
|
78
|
-
}
|
|
69
|
+
const transactionHash = transactionReceipt?.transactionHash || txHash;
|
|
79
70
|
statusManager.updateProcess(step, processType, 'DONE', {
|
|
80
|
-
txHash:
|
|
81
|
-
txLink: `${chain.metamask.blockExplorerUrls[0]}tx/${
|
|
71
|
+
txHash: transactionHash,
|
|
72
|
+
txLink: `${chain.metamask.blockExplorerUrls[0]}tx/${transactionHash}`,
|
|
82
73
|
});
|
|
83
74
|
};
|
|
84
75
|
//# sourceMappingURL=checkAllowance.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"checkAllowance.js","sourceRoot":"","sources":["../../../core/EVM/checkAllowance.ts"],"names":[],"mappings":";;;AAEA,+
|
|
1
|
+
{"version":3,"file":"checkAllowance.js","sourceRoot":"","sources":["../../../core/EVM/checkAllowance.ts"],"names":[],"mappings":"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"}
|
|
@@ -28,5 +28,5 @@ const getMulticallAddress = async (chainId) => {
|
|
|
28
28
|
exports.getMulticallAddress = getMulticallAddress;
|
|
29
29
|
const retryDelay = ({ count }) => Math.min(~~(1 << count) * 200, 3000);
|
|
30
30
|
exports.retryDelay = retryDelay;
|
|
31
|
-
exports.retryCount =
|
|
31
|
+
exports.retryCount = 30;
|
|
32
32
|
//# sourceMappingURL=utils.js.map
|
|
@@ -0,0 +1,42 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.waitForTransactionReceipt = waitForTransactionReceipt;
|
|
4
|
+
const viem_1 = require("viem");
|
|
5
|
+
const index_js_1 = require("../../utils/index.js");
|
|
6
|
+
const publicClient_js_1 = require("./publicClient.js");
|
|
7
|
+
const utils_js_1 = require("./utils.js");
|
|
8
|
+
async function waitForTransactionReceipt({ walletClient, chainId, txHash, onReplaced, }) {
|
|
9
|
+
let { transactionReceipt, replacementReason } = await waitForReceipt(walletClient.extend(viem_1.publicActions), txHash, onReplaced);
|
|
10
|
+
if (!transactionReceipt?.status) {
|
|
11
|
+
const publicClient = await (0, publicClient_js_1.getPublicClient)(chainId);
|
|
12
|
+
const result = await waitForReceipt(publicClient, txHash, onReplaced);
|
|
13
|
+
transactionReceipt = result.transactionReceipt;
|
|
14
|
+
replacementReason = result.replacementReason;
|
|
15
|
+
}
|
|
16
|
+
if (transactionReceipt?.status === 'reverted') {
|
|
17
|
+
throw new index_js_1.TransactionError(index_js_1.LiFiErrorCode.TransactionFailed, 'Transaction was reverted.');
|
|
18
|
+
}
|
|
19
|
+
if (replacementReason === 'cancelled') {
|
|
20
|
+
throw new index_js_1.TransactionError(index_js_1.LiFiErrorCode.TransactionCanceled, 'User canceled transaction.');
|
|
21
|
+
}
|
|
22
|
+
return transactionReceipt;
|
|
23
|
+
}
|
|
24
|
+
async function waitForReceipt(client, txHash, onReplaced) {
|
|
25
|
+
let replacementReason;
|
|
26
|
+
let transactionReceipt;
|
|
27
|
+
try {
|
|
28
|
+
transactionReceipt = await client.waitForTransactionReceipt({
|
|
29
|
+
hash: txHash,
|
|
30
|
+
onReplaced: (response) => {
|
|
31
|
+
replacementReason = response.reason;
|
|
32
|
+
onReplaced?.(response);
|
|
33
|
+
},
|
|
34
|
+
retryCount: utils_js_1.retryCount,
|
|
35
|
+
retryDelay: utils_js_1.retryDelay,
|
|
36
|
+
});
|
|
37
|
+
}
|
|
38
|
+
catch (error) {
|
|
39
|
+
}
|
|
40
|
+
return { transactionReceipt, replacementReason };
|
|
41
|
+
}
|
|
42
|
+
//# sourceMappingURL=waitForTransactionReceipt.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"waitForTransactionReceipt.js","sourceRoot":"","sources":["../../../core/EVM/waitForTransactionReceipt.ts"],"names":[],"mappings":";;AAsBA,8DAiCC;AA7CD,+BAAoC;AACpC,mDAAsE;AACtE,uDAAmD;AACnD,yCAAmD;AAS5C,KAAK,UAAU,yBAAyB,CAAC,EAC9C,YAAY,EACZ,OAAO,EACP,MAAM,EACN,UAAU,GACqB;IAC/B,IAAI,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,GAAG,MAAM,cAAc,CAClE,YAAY,CAAC,MAAM,CAAC,oBAAa,CAAC,EAClC,MAAM,EACN,UAAU,CACX,CAAA;IAED,IAAI,CAAC,kBAAkB,EAAE,MAAM,EAAE,CAAC;QAChC,MAAM,YAAY,GAAG,MAAM,IAAA,iCAAe,EAAC,OAAO,CAAC,CAAA;QACnD,MAAM,MAAM,GAAG,MAAM,cAAc,CAAC,YAAY,EAAE,MAAM,EAAE,UAAU,CAAC,CAAA;QACrE,kBAAkB,GAAG,MAAM,CAAC,kBAAkB,CAAA;QAC9C,iBAAiB,GAAG,MAAM,CAAC,iBAAiB,CAAA;IAC9C,CAAC;IAED,IAAI,kBAAkB,EAAE,MAAM,KAAK,UAAU,EAAE,CAAC;QAC9C,MAAM,IAAI,2BAAgB,CACxB,wBAAa,CAAC,iBAAiB,EAC/B,2BAA2B,CAC5B,CAAA;IACH,CAAC;IACD,IAAI,iBAAiB,KAAK,WAAW,EAAE,CAAC;QACtC,MAAM,IAAI,2BAAgB,CACxB,wBAAa,CAAC,mBAAmB,EACjC,4BAA4B,CAC7B,CAAA;IACH,CAAC;IAED,OAAO,kBAAkB,CAAA;AAC3B,CAAC;AAED,KAAK,UAAU,cAAc,CAC3B,MAAmC,EACnC,MAAY,EACZ,UAAyE;IAKzE,IAAI,iBAAgD,CAAA;IACpD,IAAI,kBAAkD,CAAA;IAEtD,IAAI,CAAC;QACH,kBAAkB,GAAG,MACnB,MACD,CAAC,yBAAyB,CAAC;YAC1B,IAAI,EAAE,MAAM;YACZ,UAAU,EAAE,CAAC,QAAQ,EAAE,EAAE;gBACvB,iBAAiB,GAAG,QAAQ,CAAC,MAAM,CAAA;gBACnC,UAAU,EAAE,CAAC,QAAQ,CAAC,CAAA;YACxB,CAAC;YACD,UAAU,EAAV,qBAAU;YACV,UAAU,EAAV,qBAAU;SACX,CAAC,CAAA;IACJ,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;IAEjB,CAAC;IAED,OAAO,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,CAAA;AAClD,CAAC"}
|
|
@@ -4,7 +4,7 @@ exports.KeypairWalletAdapter = exports.KeypairWalletName = void 0;
|
|
|
4
4
|
const ed25519_1 = require("@noble/curves/ed25519");
|
|
5
5
|
const wallet_adapter_base_1 = require("@solana/wallet-adapter-base");
|
|
6
6
|
const web3_js_1 = require("@solana/web3.js");
|
|
7
|
-
const
|
|
7
|
+
const bs58_1 = require("bs58");
|
|
8
8
|
exports.KeypairWalletName = 'Keypair Wallet';
|
|
9
9
|
class KeypairWalletAdapter extends wallet_adapter_base_1.BaseSignerWalletAdapter {
|
|
10
10
|
constructor(privateKey) {
|
|
@@ -45,7 +45,7 @@ class KeypairWalletAdapter extends wallet_adapter_base_1.BaseSignerWalletAdapter
|
|
|
45
45
|
writable: true,
|
|
46
46
|
value: void 0
|
|
47
47
|
});
|
|
48
|
-
this._keypair = web3_js_1.Keypair.fromSecretKey(
|
|
48
|
+
this._keypair = web3_js_1.Keypair.fromSecretKey(bs58_1.default.decode(privateKey));
|
|
49
49
|
}
|
|
50
50
|
get connecting() {
|
|
51
51
|
return false;
|
|
@@ -60,7 +60,7 @@ class KeypairWalletAdapter extends wallet_adapter_base_1.BaseSignerWalletAdapter
|
|
|
60
60
|
if (!privateKey) {
|
|
61
61
|
throw new wallet_adapter_base_1.WalletConfigError();
|
|
62
62
|
}
|
|
63
|
-
this._keypair = web3_js_1.Keypair.fromSecretKey(
|
|
63
|
+
this._keypair = web3_js_1.Keypair.fromSecretKey(bs58_1.default.decode(privateKey));
|
|
64
64
|
}
|
|
65
65
|
async disconnect() {
|
|
66
66
|
this._keypair = undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"KeypairWalletAdapter.js","sourceRoot":"","sources":["../../../core/Solana/KeypairWalletAdapter.ts"],"names":[],"mappings":";;;AAAA,mDAA+C;AAK/C,qEAMoC;AAMpC,6CAAyC;AACzC
|
|
1
|
+
{"version":3,"file":"KeypairWalletAdapter.js","sourceRoot":"","sources":["../../../core/Solana/KeypairWalletAdapter.ts"],"names":[],"mappings":";;;AAAA,mDAA+C;AAK/C,qEAMoC;AAMpC,6CAAyC;AACzC,+BAAuB;AAEV,QAAA,iBAAiB,GAC5B,gBAAgD,CAAA;AAMlD,MAAa,oBACX,SAAQ,6CAAuB;IAiB/B,YAAY,UAAkB;QAC5B,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,MAAM,IAAI,uCAAiB,EAAE,CAAA;QAC/B,CAAC;QACD,KAAK,EAAE,CAAA;QAlBT;;;;mBAAO,yBAAiB;WAAA;QACxB;;;;mBAAM,4CAA4C;WAAA;QAClD;;;;mBAAO,EAAE;WAAA;QACT;;;;mBAAgE,IAAI,GAAG,CAAC;gBACtE,QAAQ;gBACR,CAAC;aACF,CAAC;WAAA;QAMM;;;;;WAA6B;QAOnC,IAAI,CAAC,QAAQ,GAAG,iBAAO,CAAC,aAAa,CAAC,cAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAA;IAChE,CAAC;IAED,IAAI,UAAU;QACZ,OAAO,KAAK,CAAA;IACd,CAAC;IAED,IAAI,SAAS;QACX,OAAO,IAAI,CAAC,QAAQ,EAAE,SAAS,IAAI,IAAI,CAAA;IACzC,CAAC;IAED,IAAI,UAAU;QACZ,OAAO,sCAAgB,CAAC,QAAQ,CAAA;IAClC,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,UAAmB;QAC/B,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,MAAM,IAAI,uCAAiB,EAAE,CAAA;QAC/B,CAAC;QACD,IAAI,CAAC,QAAQ,GAAG,iBAAO,CAAC,aAAa,CAAC,cAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAA;IAChE,CAAC;IAED,KAAK,CAAC,UAAU;QACd,IAAI,CAAC,QAAQ,GAAG,SAAS,CAAA;IAC3B,CAAC;IAED,KAAK,CAAC,eAAe,CACnB,WAAc;QAEd,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACnB,MAAM,IAAI,6CAAuB,EAAE,CAAA;QACrC,CAAC;QAED,IAAI,IAAA,4CAAsB,EAAC,WAAW,CAAC,EAAE,CAAC;YACxC,WAAW,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAA;QACnC,CAAC;aAAM,CAAC;YACN,WAAW,CAAC,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;QACxC,CAAC;QAED,OAAO,WAAW,CAAA;IACpB,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,OAAmB;QACnC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACnB,MAAM,IAAI,6CAAuB,EAAE,CAAA;QACrC,CAAC;QAED,OAAO,iBAAO,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAA;IACpE,CAAC;CACF;AAxED,oDAwEC"}
|
package/src/_cjs/version.js
CHANGED
package/src/_cjs/version.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"version.js","sourceRoot":"","sources":["../version.ts"],"names":[],"mappings":";;;AAAa,QAAA,IAAI,GAAG,WAAW,CAAA;AAClB,QAAA,OAAO,GAAG,
|
|
1
|
+
{"version":3,"file":"version.js","sourceRoot":"","sources":["../version.ts"],"names":[],"mappings":";;;AAAa,QAAA,IAAI,GAAG,WAAW,CAAA;AAClB,QAAA,OAAO,GAAG,OAAO,CAAA"}
|
package/src/_esm/config.js
CHANGED
|
@@ -72,7 +72,8 @@ export const config = (() => {
|
|
|
72
72
|
_config.rpcUrls[chainId] = Array.from(urls);
|
|
73
73
|
}
|
|
74
74
|
else {
|
|
75
|
-
_config.rpcUrls[chainId]?.
|
|
75
|
+
const filteredUrls = urls.filter((url) => !_config.rpcUrls[chainId]?.includes(url));
|
|
76
|
+
_config.rpcUrls[chainId]?.push(...filteredUrls);
|
|
76
77
|
}
|
|
77
78
|
}
|
|
78
79
|
},
|
package/src/_esm/config.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../config.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../config.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,7 +10,8 @@ import { waitForReceivingTransaction } from '../waitForReceivingTransaction.js';
|
|
|
10
10
|
import { checkAllowance } from './checkAllowance.js';
|
|
11
11
|
import { updateMultisigRouteProcess } from './multisig.js';
|
|
12
12
|
import { switchChain } from './switchChain.js';
|
|
13
|
-
import { getMaxPriorityFeePerGas
|
|
13
|
+
import { getMaxPriorityFeePerGas } from './utils.js';
|
|
14
|
+
import { waitForTransactionReceipt } from './waitForTransactionReceipt.js';
|
|
14
15
|
export class EVMStepExecutor extends BaseStepExecutor {
|
|
15
16
|
constructor(options) {
|
|
16
17
|
super(options);
|
|
@@ -220,33 +221,27 @@ export class EVMStepExecutor extends BaseStepExecutor {
|
|
|
220
221
|
});
|
|
221
222
|
}
|
|
222
223
|
}
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
.
|
|
226
|
-
|
|
227
|
-
hash: txHash,
|
|
224
|
+
const transactionReceipt = await waitForTransactionReceipt({
|
|
225
|
+
walletClient: this.walletClient,
|
|
226
|
+
chainId: fromChain.id,
|
|
227
|
+
txHash,
|
|
228
228
|
onReplaced: (response) => {
|
|
229
|
-
replacementReason = response.reason;
|
|
230
229
|
this.statusManager.updateProcess(step, process.type, 'PENDING', {
|
|
231
230
|
txHash: response.transaction.hash,
|
|
232
231
|
txLink: `${fromChain.metamask.blockExplorerUrls[0]}tx/${response.transaction.hash}`,
|
|
233
232
|
});
|
|
234
233
|
},
|
|
235
|
-
retryCount,
|
|
236
|
-
retryDelay,
|
|
237
234
|
});
|
|
238
|
-
if (transactionReceipt.status === 'reverted') {
|
|
239
|
-
throw new TransactionError(LiFiErrorCode.TransactionFailed, 'Transaction was reverted.');
|
|
240
|
-
}
|
|
241
|
-
if (replacementReason === 'cancelled') {
|
|
242
|
-
throw new TransactionError(LiFiErrorCode.TransactionCanceled, 'User canceled transaction.');
|
|
243
|
-
}
|
|
244
235
|
// if it's multisig wallet client and the process is in ACTION_REQUIRED
|
|
245
236
|
// then signatures are still needed
|
|
246
237
|
if (isMultisigWalletClient && process.status === 'ACTION_REQUIRED') {
|
|
247
|
-
await updateMultisigRouteProcess(transactionReceipt
|
|
238
|
+
await updateMultisigRouteProcess(transactionReceipt?.transactionHash || txHash, step, process.type, fromChain, this.statusManager, this.multisig);
|
|
248
239
|
}
|
|
249
|
-
if
|
|
240
|
+
// Update pending process if the transaction hash from the receipt is different.
|
|
241
|
+
// This might happen if the transaction was replaced.
|
|
242
|
+
if (!isMultisigWalletClient &&
|
|
243
|
+
transactionReceipt?.transactionHash &&
|
|
244
|
+
transactionReceipt.transactionHash !== txHash) {
|
|
250
245
|
process = this.statusManager.updateProcess(step, process.type, 'PENDING', {
|
|
251
246
|
txHash: transactionReceipt.transactionHash,
|
|
252
247
|
txLink: `${fromChain.metamask.blockExplorerUrls[0]}tx/${transactionReceipt.transactionHash}`,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EVMStepExecutor.js","sourceRoot":"","sources":["../../../core/EVM/EVMStepExecutor.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"EVMStepExecutor.js","sourceRoot":"","sources":["../../../core/EVM/EVMStepExecutor.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,8 @@
|
|
|
1
|
-
import { maxUint256
|
|
2
|
-
import { LiFiErrorCode, TransactionError } from '../../utils/index.js';
|
|
1
|
+
import { maxUint256 } from 'viem';
|
|
3
2
|
import { parseError } from '../../utils/parseError.js';
|
|
4
3
|
import { getAllowance } from './getAllowance.js';
|
|
5
4
|
import { setAllowance } from './setAllowance.js';
|
|
6
|
-
import {
|
|
5
|
+
import { waitForTransactionReceipt } from './waitForTransactionReceipt.js';
|
|
7
6
|
export const checkAllowance = async (chain, step, walletClient, statusManager, settings, allowUserInteraction = false, shouldBatchTransactions = false) => {
|
|
8
7
|
// Ask the user to set an allowance
|
|
9
8
|
let allowanceProcess = statusManager.findOrCreateProcess(step, 'TOKEN_ALLOWANCE');
|
|
@@ -50,33 +49,25 @@ export const checkAllowance = async (chain, step, walletClient, statusManager, s
|
|
|
50
49
|
}
|
|
51
50
|
};
|
|
52
51
|
const waitForApprovalTransaction = async (walletClient, txHash, processType, step, chain, statusManager) => {
|
|
53
|
-
const client = walletClient.extend(publicActions);
|
|
54
52
|
statusManager.updateProcess(step, processType, 'PENDING', {
|
|
55
53
|
txHash,
|
|
56
54
|
txLink: `${chain.metamask.blockExplorerUrls[0]}tx/${txHash}`,
|
|
57
55
|
});
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
56
|
+
const transactionReceipt = await waitForTransactionReceipt({
|
|
57
|
+
walletClient,
|
|
58
|
+
chainId: chain.id,
|
|
59
|
+
txHash: txHash,
|
|
61
60
|
onReplaced(response) {
|
|
62
|
-
replacementReason = response.reason;
|
|
63
61
|
statusManager.updateProcess(step, processType, 'PENDING', {
|
|
64
62
|
txHash: response.transaction.hash,
|
|
65
63
|
txLink: `${chain.metamask.blockExplorerUrls[0]}tx/${response.transaction.hash}`,
|
|
66
64
|
});
|
|
67
65
|
},
|
|
68
|
-
retryCount,
|
|
69
|
-
retryDelay,
|
|
70
66
|
});
|
|
71
|
-
|
|
72
|
-
throw new TransactionError(LiFiErrorCode.TransactionFailed, 'Transaction was reverted.');
|
|
73
|
-
}
|
|
74
|
-
if (replacementReason === 'cancelled') {
|
|
75
|
-
throw new TransactionError(LiFiErrorCode.TransactionCanceled, 'User canceled transaction.');
|
|
76
|
-
}
|
|
67
|
+
const transactionHash = transactionReceipt?.transactionHash || txHash;
|
|
77
68
|
statusManager.updateProcess(step, processType, 'DONE', {
|
|
78
|
-
txHash:
|
|
79
|
-
txLink: `${chain.metamask.blockExplorerUrls[0]}tx/${
|
|
69
|
+
txHash: transactionHash,
|
|
70
|
+
txLink: `${chain.metamask.blockExplorerUrls[0]}tx/${transactionHash}`,
|
|
80
71
|
});
|
|
81
72
|
};
|
|
82
73
|
//# sourceMappingURL=checkAllowance.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"checkAllowance.js","sourceRoot":"","sources":["../../../core/EVM/checkAllowance.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,
|
|
1
|
+
{"version":3,"file":"checkAllowance.js","sourceRoot":"","sources":["../../../core/EVM/checkAllowance.ts"],"names":[],"mappings":"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"}
|
|
@@ -25,5 +25,5 @@ export const getMulticallAddress = async (chainId) => {
|
|
|
25
25
|
};
|
|
26
26
|
// Modified viem retryDelay exponential backoff function.
|
|
27
27
|
export const retryDelay = ({ count }) => Math.min(~~(1 << count) * 200, 3000);
|
|
28
|
-
export const retryCount =
|
|
28
|
+
export const retryCount = 30;
|
|
29
29
|
//# sourceMappingURL=utils.js.map
|
|
@@ -0,0 +1,40 @@
|
|
|
1
|
+
import { publicActions } from 'viem';
|
|
2
|
+
import { LiFiErrorCode, TransactionError } from '../../utils/index.js';
|
|
3
|
+
import { getPublicClient } from './publicClient.js';
|
|
4
|
+
import { retryCount, retryDelay } from './utils.js';
|
|
5
|
+
export async function waitForTransactionReceipt({ walletClient, chainId, txHash, onReplaced, }) {
|
|
6
|
+
let { transactionReceipt, replacementReason } = await waitForReceipt(walletClient.extend(publicActions), txHash, onReplaced);
|
|
7
|
+
if (!transactionReceipt?.status) {
|
|
8
|
+
const publicClient = await getPublicClient(chainId);
|
|
9
|
+
const result = await waitForReceipt(publicClient, txHash, onReplaced);
|
|
10
|
+
transactionReceipt = result.transactionReceipt;
|
|
11
|
+
replacementReason = result.replacementReason;
|
|
12
|
+
}
|
|
13
|
+
if (transactionReceipt?.status === 'reverted') {
|
|
14
|
+
throw new TransactionError(LiFiErrorCode.TransactionFailed, 'Transaction was reverted.');
|
|
15
|
+
}
|
|
16
|
+
if (replacementReason === 'cancelled') {
|
|
17
|
+
throw new TransactionError(LiFiErrorCode.TransactionCanceled, 'User canceled transaction.');
|
|
18
|
+
}
|
|
19
|
+
return transactionReceipt;
|
|
20
|
+
}
|
|
21
|
+
async function waitForReceipt(client, txHash, onReplaced) {
|
|
22
|
+
let replacementReason;
|
|
23
|
+
let transactionReceipt;
|
|
24
|
+
try {
|
|
25
|
+
transactionReceipt = await client.waitForTransactionReceipt({
|
|
26
|
+
hash: txHash,
|
|
27
|
+
onReplaced: (response) => {
|
|
28
|
+
replacementReason = response.reason;
|
|
29
|
+
onReplaced?.(response);
|
|
30
|
+
},
|
|
31
|
+
retryCount,
|
|
32
|
+
retryDelay,
|
|
33
|
+
});
|
|
34
|
+
}
|
|
35
|
+
catch (error) {
|
|
36
|
+
// We can ignore errors from waitForTransactionReceipt as we have a status check fallback
|
|
37
|
+
}
|
|
38
|
+
return { transactionReceipt, replacementReason };
|
|
39
|
+
}
|
|
40
|
+
//# sourceMappingURL=waitForTransactionReceipt.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"waitForTransactionReceipt.js","sourceRoot":"","sources":["../../../core/EVM/waitForTransactionReceipt.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,aAAa,EAAE,MAAM,MAAM,CAAA;AACpC,OAAO,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAA;AACtE,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAA;AACnD,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,YAAY,CAAA;AASnD,MAAM,CAAC,KAAK,UAAU,yBAAyB,CAAC,EAC9C,YAAY,EACZ,OAAO,EACP,MAAM,EACN,UAAU,GACqB;IAC/B,IAAI,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,GAAG,MAAM,cAAc,CAClE,YAAY,CAAC,MAAM,CAAC,aAAa,CAAC,EAClC,MAAM,EACN,UAAU,CACX,CAAA;IAED,IAAI,CAAC,kBAAkB,EAAE,MAAM,EAAE,CAAC;QAChC,MAAM,YAAY,GAAG,MAAM,eAAe,CAAC,OAAO,CAAC,CAAA;QACnD,MAAM,MAAM,GAAG,MAAM,cAAc,CAAC,YAAY,EAAE,MAAM,EAAE,UAAU,CAAC,CAAA;QACrE,kBAAkB,GAAG,MAAM,CAAC,kBAAkB,CAAA;QAC9C,iBAAiB,GAAG,MAAM,CAAC,iBAAiB,CAAA;IAC9C,CAAC;IAED,IAAI,kBAAkB,EAAE,MAAM,KAAK,UAAU,EAAE,CAAC;QAC9C,MAAM,IAAI,gBAAgB,CACxB,aAAa,CAAC,iBAAiB,EAC/B,2BAA2B,CAC5B,CAAA;IACH,CAAC;IACD,IAAI,iBAAiB,KAAK,WAAW,EAAE,CAAC;QACtC,MAAM,IAAI,gBAAgB,CACxB,aAAa,CAAC,mBAAmB,EACjC,4BAA4B,CAC7B,CAAA;IACH,CAAC;IAED,OAAO,kBAAkB,CAAA;AAC3B,CAAC;AAED,KAAK,UAAU,cAAc,CAC3B,MAAmC,EACnC,MAAY,EACZ,UAAyE;IAKzE,IAAI,iBAAgD,CAAA;IACpD,IAAI,kBAAkD,CAAA;IAEtD,IAAI,CAAC;QACH,kBAAkB,GAAG,MACnB,MACD,CAAC,yBAAyB,CAAC;YAC1B,IAAI,EAAE,MAAM;YACZ,UAAU,EAAE,CAAC,QAAQ,EAAE,EAAE;gBACvB,iBAAiB,GAAG,QAAQ,CAAC,MAAM,CAAA;gBACnC,UAAU,EAAE,CAAC,QAAQ,CAAC,CAAA;YACxB,CAAC;YACD,UAAU;YACV,UAAU;SACX,CAAC,CAAA;IACJ,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,yFAAyF;IAC3F,CAAC;IAED,OAAO,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,CAAA;AAClD,CAAC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { ed25519 } from '@noble/curves/ed25519';
|
|
2
2
|
import { BaseSignerWalletAdapter, WalletConfigError, WalletNotConnectedError, WalletReadyState, isVersionedTransaction, } from '@solana/wallet-adapter-base';
|
|
3
3
|
import { Keypair } from '@solana/web3.js';
|
|
4
|
-
import
|
|
4
|
+
import bs58 from 'bs58';
|
|
5
5
|
export const KeypairWalletName = 'Keypair Wallet';
|
|
6
6
|
/**
|
|
7
7
|
* This keypair wallet adapter is unsafe to use on the frontend and is only included to provide an easy way for applications to test
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"KeypairWalletAdapter.js","sourceRoot":"","sources":["../../../core/Solana/KeypairWalletAdapter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAA;AAK/C,OAAO,EACL,uBAAuB,EACvB,iBAAiB,EACjB,uBAAuB,EACvB,gBAAgB,EAChB,sBAAsB,GACvB,MAAM,6BAA6B,CAAA;AAMpC,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAA;AACzC,OAAO,
|
|
1
|
+
{"version":3,"file":"KeypairWalletAdapter.js","sourceRoot":"","sources":["../../../core/Solana/KeypairWalletAdapter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAA;AAK/C,OAAO,EACL,uBAAuB,EACvB,iBAAiB,EACjB,uBAAuB,EACvB,gBAAgB,EAChB,sBAAsB,GACvB,MAAM,6BAA6B,CAAA;AAMpC,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAA;AACzC,OAAO,IAAI,MAAM,MAAM,CAAA;AAEvB,MAAM,CAAC,MAAM,iBAAiB,GAC5B,gBAAgD,CAAA;AAElD;;;GAGG;AACH,MAAM,OAAO,oBACX,SAAQ,uBAAuB;IAiB/B,YAAY,UAAkB;QAC5B,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,MAAM,IAAI,iBAAiB,EAAE,CAAA;QAC/B,CAAC;QACD,KAAK,EAAE,CAAA;QAlBT;;;;mBAAO,iBAAiB;WAAA;QACxB;;;;mBAAM,4CAA4C;WAAA;QAClD;;;;mBAAO,EAAE;WAAA;QACT;;;;mBAAgE,IAAI,GAAG,CAAC;gBACtE,QAAQ;gBACR,CAAC;aACF,CAAC;WAAA;QAEF;;;WAGG;QACK;;;;;WAA6B;QAOnC,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAA;IAChE,CAAC;IAED,IAAI,UAAU;QACZ,OAAO,KAAK,CAAA;IACd,CAAC;IAED,IAAI,SAAS;QACX,OAAO,IAAI,CAAC,QAAQ,EAAE,SAAS,IAAI,IAAI,CAAA;IACzC,CAAC;IAED,IAAI,UAAU;QACZ,OAAO,gBAAgB,CAAC,QAAQ,CAAA;IAClC,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,UAAmB;QAC/B,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,MAAM,IAAI,iBAAiB,EAAE,CAAA;QAC/B,CAAC;QACD,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAA;IAChE,CAAC;IAED,KAAK,CAAC,UAAU;QACd,IAAI,CAAC,QAAQ,GAAG,SAAS,CAAA;IAC3B,CAAC;IAED,KAAK,CAAC,eAAe,CACnB,WAAc;QAEd,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACnB,MAAM,IAAI,uBAAuB,EAAE,CAAA;QACrC,CAAC;QAED,IAAI,sBAAsB,CAAC,WAAW,CAAC,EAAE,CAAC;YACxC,WAAW,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAA;QACnC,CAAC;aAAM,CAAC;YACN,WAAW,CAAC,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;QACxC,CAAC;QAED,OAAO,WAAW,CAAA;IACpB,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,OAAmB;QACnC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACnB,MAAM,IAAI,uBAAuB,EAAE,CAAA;QACrC,CAAC;QAED,OAAO,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAA;IACpE,CAAC;CACF"}
|
package/src/_esm/version.js
CHANGED
package/src/_esm/version.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"version.js","sourceRoot":"","sources":["../version.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,IAAI,GAAG,WAAW,CAAA;AAC/B,MAAM,CAAC,MAAM,OAAO,GAAG,
|
|
1
|
+
{"version":3,"file":"version.js","sourceRoot":"","sources":["../version.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,IAAI,GAAG,WAAW,CAAA;AAC/B,MAAM,CAAC,MAAM,OAAO,GAAG,OAAO,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AACzD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAA;AAClD,OAAO,KAAK,EAAE,OAAO,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAA;AAE5E,eAAO,MAAM,MAAM;;;iBAiBF,SAAS;4BAcE,WAAW,EAAE;sBAOnB,aAAa,EAAE;;0BAiBL,OAAO;wBAUf,OAAO;;
|
|
1
|
+
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AACzD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAA;AAClD,OAAO,KAAK,EAAE,OAAO,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAA;AAE5E,eAAO,MAAM,MAAM;;;iBAiBF,SAAS;4BAcE,WAAW,EAAE;sBAOnB,aAAa,EAAE;;0BAiBL,OAAO;wBAUf,OAAO;;CAwB3B,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EVMStepExecutor.d.ts","sourceRoot":"","sources":["../../../core/EVM/EVMStepExecutor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAGV,OAAO,EACR,MAAM,aAAa,CAAA;AACpB,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"EVMStepExecutor.d.ts","sourceRoot":"","sources":["../../../core/EVM/EVMStepExecutor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAGV,OAAO,EACR,MAAM,aAAa,CAAA;AACpB,OAAO,KAAK,EAIV,YAAY,EACb,MAAM,MAAM,CAAA;AAYb,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AAGzD,OAAO,KAAK,EACV,gBAAgB,EAChB,mBAAmB,EAEpB,MAAM,aAAa,CAAA;AAMpB,OAAO,KAAK,EAAE,cAAc,EAAuB,MAAM,YAAY,CAAA;AAIrE,MAAM,WAAW,sBAAuB,SAAQ,mBAAmB;IACjE,YAAY,EAAE,YAAY,CAAA;IAC1B,QAAQ,CAAC,EAAE,cAAc,CAAA;CAC1B;AAED,qBAAa,eAAgB,SAAQ,gBAAgB;IACnD,OAAO,CAAC,YAAY,CAAc;IAClC,OAAO,CAAC,QAAQ,CAAC,CAAgB;gBAErB,OAAO,EAAE,sBAAsB;IAO3C,iBAAiB,SACT,gBAAgB,YACZ,OAAO,KAChB,OAAO,CAAC,YAAY,GAAG,SAAS,CAAC,CAqCnC;IAED,WAAW,SAAgB,gBAAgB,KAAG,OAAO,CAAC,gBAAgB,CAAC,CAsYtE;CACF"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"checkAllowance.d.ts","sourceRoot":"","sources":["../../../core/EVM/checkAllowance.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAwB,MAAM,aAAa,CAAA;AACxE,OAAO,KAAK,EAAW,IAAI,
|
|
1
|
+
{"version":3,"file":"checkAllowance.d.ts","sourceRoot":"","sources":["../../../core/EVM/checkAllowance.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAwB,MAAM,aAAa,CAAA;AACxE,OAAO,KAAK,EAAW,IAAI,EAAE,YAAY,EAAE,MAAM,MAAM,CAAA;AAGvD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AACxD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAA;AAKnD,eAAO,MAAM,cAAc,UAClB,KAAK,QACN,QAAQ,gBACA,YAAY,iBACX,aAAa,aACjB,gBAAgB,wEAG1B,OAAO,CAAC,IAAI,GAAG,IAAI,CAoGrB,CAAA"}
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
import type { ChainId } from '@lifi/types';
|
|
2
|
+
import type { Chain, Hash, ReplacementReturnType, TransactionReceipt, WalletClient } from 'viem';
|
|
3
|
+
interface WaitForTransactionReceiptProps {
|
|
4
|
+
walletClient: WalletClient;
|
|
5
|
+
chainId: ChainId;
|
|
6
|
+
txHash: Hash;
|
|
7
|
+
onReplaced?: (response: ReplacementReturnType<Chain | undefined>) => void;
|
|
8
|
+
}
|
|
9
|
+
export declare function waitForTransactionReceipt({ walletClient, chainId, txHash, onReplaced, }: WaitForTransactionReceiptProps): Promise<TransactionReceipt | undefined>;
|
|
10
|
+
export {};
|
|
11
|
+
//# sourceMappingURL=waitForTransactionReceipt.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"waitForTransactionReceipt.d.ts","sourceRoot":"","sources":["../../../core/EVM/waitForTransactionReceipt.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAA;AAC1C,OAAO,KAAK,EACV,KAAK,EACL,IAAI,EAGJ,qBAAqB,EACrB,kBAAkB,EAClB,YAAY,EACb,MAAM,MAAM,CAAA;AAMb,UAAU,8BAA8B;IACtC,YAAY,EAAE,YAAY,CAAA;IAC1B,OAAO,EAAE,OAAO,CAAA;IAChB,MAAM,EAAE,IAAI,CAAA;IACZ,UAAU,CAAC,EAAE,CAAC,QAAQ,EAAE,qBAAqB,CAAC,KAAK,GAAG,SAAS,CAAC,KAAK,IAAI,CAAA;CAC1E;AAED,wBAAsB,yBAAyB,CAAC,EAC9C,YAAY,EACZ,OAAO,EACP,MAAM,EACN,UAAU,GACX,EAAE,8BAA8B,GAAG,OAAO,CAAC,kBAAkB,GAAG,SAAS,CAAC,CA4B1E"}
|
package/src/_types/version.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../version.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,IAAI,cAAc,CAAA;AAC/B,eAAO,MAAM,OAAO,
|
|
1
|
+
{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../version.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,IAAI,cAAc,CAAA;AAC/B,eAAO,MAAM,OAAO,UAAU,CAAA"}
|
package/src/config.ts
CHANGED
|
@@ -77,7 +77,10 @@ export const config = (() => {
|
|
|
77
77
|
if (!_config.rpcUrls[chainId]?.length) {
|
|
78
78
|
_config.rpcUrls[chainId] = Array.from(urls)
|
|
79
79
|
} else {
|
|
80
|
-
|
|
80
|
+
const filteredUrls = urls.filter(
|
|
81
|
+
(url) => !_config.rpcUrls[chainId]?.includes(url)
|
|
82
|
+
)
|
|
83
|
+
_config.rpcUrls[chainId]?.push(...filteredUrls)
|
|
81
84
|
}
|
|
82
85
|
}
|
|
83
86
|
},
|
|
@@ -6,7 +6,6 @@ import type {
|
|
|
6
6
|
import type {
|
|
7
7
|
Hash,
|
|
8
8
|
PublicClient,
|
|
9
|
-
ReplacementReason,
|
|
10
9
|
SendTransactionParameters,
|
|
11
10
|
WalletClient,
|
|
12
11
|
} from 'viem'
|
|
@@ -35,7 +34,8 @@ import { checkAllowance } from './checkAllowance.js'
|
|
|
35
34
|
import { updateMultisigRouteProcess } from './multisig.js'
|
|
36
35
|
import { switchChain } from './switchChain.js'
|
|
37
36
|
import type { MultisigConfig, MultisigTransaction } from './types.js'
|
|
38
|
-
import { getMaxPriorityFeePerGas
|
|
37
|
+
import { getMaxPriorityFeePerGas } from './utils.js'
|
|
38
|
+
import { waitForTransactionReceipt } from './waitForTransactionReceipt.js'
|
|
39
39
|
|
|
40
40
|
export interface EVMStepExecutorOptions extends StepExecutorOptions {
|
|
41
41
|
walletClient: WalletClient
|
|
@@ -350,40 +350,23 @@ export class EVMStepExecutor extends BaseStepExecutor {
|
|
|
350
350
|
}
|
|
351
351
|
}
|
|
352
352
|
|
|
353
|
-
|
|
354
|
-
|
|
355
|
-
.
|
|
356
|
-
|
|
357
|
-
|
|
358
|
-
|
|
359
|
-
|
|
360
|
-
|
|
361
|
-
|
|
362
|
-
|
|
363
|
-
|
|
364
|
-
},
|
|
365
|
-
retryCount,
|
|
366
|
-
retryDelay,
|
|
367
|
-
})
|
|
368
|
-
|
|
369
|
-
if (transactionReceipt.status === 'reverted') {
|
|
370
|
-
throw new TransactionError(
|
|
371
|
-
LiFiErrorCode.TransactionFailed,
|
|
372
|
-
'Transaction was reverted.'
|
|
373
|
-
)
|
|
374
|
-
}
|
|
375
|
-
if (replacementReason === 'cancelled') {
|
|
376
|
-
throw new TransactionError(
|
|
377
|
-
LiFiErrorCode.TransactionCanceled,
|
|
378
|
-
'User canceled transaction.'
|
|
379
|
-
)
|
|
380
|
-
}
|
|
353
|
+
const transactionReceipt = await waitForTransactionReceipt({
|
|
354
|
+
walletClient: this.walletClient,
|
|
355
|
+
chainId: fromChain.id,
|
|
356
|
+
txHash,
|
|
357
|
+
onReplaced: (response) => {
|
|
358
|
+
this.statusManager.updateProcess(step, process.type, 'PENDING', {
|
|
359
|
+
txHash: response.transaction.hash,
|
|
360
|
+
txLink: `${fromChain.metamask.blockExplorerUrls[0]}tx/${response.transaction.hash}`,
|
|
361
|
+
})
|
|
362
|
+
},
|
|
363
|
+
})
|
|
381
364
|
|
|
382
365
|
// if it's multisig wallet client and the process is in ACTION_REQUIRED
|
|
383
366
|
// then signatures are still needed
|
|
384
367
|
if (isMultisigWalletClient && process.status === 'ACTION_REQUIRED') {
|
|
385
368
|
await updateMultisigRouteProcess(
|
|
386
|
-
transactionReceipt
|
|
369
|
+
transactionReceipt?.transactionHash || txHash,
|
|
387
370
|
step,
|
|
388
371
|
process.type,
|
|
389
372
|
fromChain,
|
|
@@ -392,7 +375,13 @@ export class EVMStepExecutor extends BaseStepExecutor {
|
|
|
392
375
|
)
|
|
393
376
|
}
|
|
394
377
|
|
|
395
|
-
if
|
|
378
|
+
// Update pending process if the transaction hash from the receipt is different.
|
|
379
|
+
// This might happen if the transaction was replaced.
|
|
380
|
+
if (
|
|
381
|
+
!isMultisigWalletClient &&
|
|
382
|
+
transactionReceipt?.transactionHash &&
|
|
383
|
+
transactionReceipt.transactionHash !== txHash
|
|
384
|
+
) {
|
|
396
385
|
process = this.statusManager.updateProcess(
|
|
397
386
|
step,
|
|
398
387
|
process.type,
|
|
@@ -1,13 +1,12 @@
|
|
|
1
1
|
import type { Chain, LiFiStep, Process, ProcessType } from '@lifi/types'
|
|
2
|
-
import type { Address, Hash,
|
|
3
|
-
import { maxUint256
|
|
4
|
-
import { LiFiErrorCode, TransactionError } from '../../utils/index.js'
|
|
2
|
+
import type { Address, Hash, WalletClient } from 'viem'
|
|
3
|
+
import { maxUint256 } from 'viem'
|
|
5
4
|
import { parseError } from '../../utils/parseError.js'
|
|
6
5
|
import type { StatusManager } from '../StatusManager.js'
|
|
7
6
|
import type { ExecutionOptions } from '../types.js'
|
|
8
7
|
import { getAllowance } from './getAllowance.js'
|
|
9
8
|
import { setAllowance } from './setAllowance.js'
|
|
10
|
-
import {
|
|
9
|
+
import { waitForTransactionReceipt } from './waitForTransactionReceipt.js'
|
|
11
10
|
|
|
12
11
|
export const checkAllowance = async (
|
|
13
12
|
chain: Chain,
|
|
@@ -127,42 +126,26 @@ const waitForApprovalTransaction = async (
|
|
|
127
126
|
chain: Chain,
|
|
128
127
|
statusManager: StatusManager
|
|
129
128
|
) => {
|
|
130
|
-
const client = walletClient.extend(publicActions)
|
|
131
129
|
statusManager.updateProcess(step, processType, 'PENDING', {
|
|
132
130
|
txHash,
|
|
133
131
|
txLink: `${chain.metamask.blockExplorerUrls[0]}tx/${txHash}`,
|
|
134
132
|
})
|
|
135
133
|
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
134
|
+
const transactionReceipt = await waitForTransactionReceipt({
|
|
135
|
+
walletClient,
|
|
136
|
+
chainId: chain.id,
|
|
137
|
+
txHash: txHash,
|
|
139
138
|
onReplaced(response) {
|
|
140
|
-
replacementReason = response.reason
|
|
141
139
|
statusManager.updateProcess(step, processType, 'PENDING', {
|
|
142
140
|
txHash: response.transaction.hash,
|
|
143
141
|
txLink: `${chain.metamask.blockExplorerUrls[0]}tx/${response.transaction.hash}`,
|
|
144
142
|
})
|
|
145
143
|
},
|
|
146
|
-
retryCount,
|
|
147
|
-
retryDelay,
|
|
148
144
|
})
|
|
149
145
|
|
|
150
|
-
|
|
151
|
-
throw new TransactionError(
|
|
152
|
-
LiFiErrorCode.TransactionFailed,
|
|
153
|
-
'Transaction was reverted.'
|
|
154
|
-
)
|
|
155
|
-
}
|
|
156
|
-
|
|
157
|
-
if (replacementReason === 'cancelled') {
|
|
158
|
-
throw new TransactionError(
|
|
159
|
-
LiFiErrorCode.TransactionCanceled,
|
|
160
|
-
'User canceled transaction.'
|
|
161
|
-
)
|
|
162
|
-
}
|
|
163
|
-
|
|
146
|
+
const transactionHash = transactionReceipt?.transactionHash || txHash
|
|
164
147
|
statusManager.updateProcess(step, processType, 'DONE', {
|
|
165
|
-
txHash:
|
|
166
|
-
txLink: `${chain.metamask.blockExplorerUrls[0]}tx/${
|
|
148
|
+
txHash: transactionHash,
|
|
149
|
+
txLink: `${chain.metamask.blockExplorerUrls[0]}tx/${transactionHash}`,
|
|
167
150
|
})
|
|
168
151
|
}
|
package/src/core/EVM/utils.ts
CHANGED
|
@@ -0,0 +1,86 @@
|
|
|
1
|
+
import type { ChainId } from '@lifi/types'
|
|
2
|
+
import type {
|
|
3
|
+
Chain,
|
|
4
|
+
Hash,
|
|
5
|
+
PublicClient,
|
|
6
|
+
ReplacementReason,
|
|
7
|
+
ReplacementReturnType,
|
|
8
|
+
TransactionReceipt,
|
|
9
|
+
WalletClient,
|
|
10
|
+
} from 'viem'
|
|
11
|
+
import { publicActions } from 'viem'
|
|
12
|
+
import { LiFiErrorCode, TransactionError } from '../../utils/index.js'
|
|
13
|
+
import { getPublicClient } from './publicClient.js'
|
|
14
|
+
import { retryCount, retryDelay } from './utils.js'
|
|
15
|
+
|
|
16
|
+
interface WaitForTransactionReceiptProps {
|
|
17
|
+
walletClient: WalletClient
|
|
18
|
+
chainId: ChainId
|
|
19
|
+
txHash: Hash
|
|
20
|
+
onReplaced?: (response: ReplacementReturnType<Chain | undefined>) => void
|
|
21
|
+
}
|
|
22
|
+
|
|
23
|
+
export async function waitForTransactionReceipt({
|
|
24
|
+
walletClient,
|
|
25
|
+
chainId,
|
|
26
|
+
txHash,
|
|
27
|
+
onReplaced,
|
|
28
|
+
}: WaitForTransactionReceiptProps): Promise<TransactionReceipt | undefined> {
|
|
29
|
+
let { transactionReceipt, replacementReason } = await waitForReceipt(
|
|
30
|
+
walletClient.extend(publicActions),
|
|
31
|
+
txHash,
|
|
32
|
+
onReplaced
|
|
33
|
+
)
|
|
34
|
+
|
|
35
|
+
if (!transactionReceipt?.status) {
|
|
36
|
+
const publicClient = await getPublicClient(chainId)
|
|
37
|
+
const result = await waitForReceipt(publicClient, txHash, onReplaced)
|
|
38
|
+
transactionReceipt = result.transactionReceipt
|
|
39
|
+
replacementReason = result.replacementReason
|
|
40
|
+
}
|
|
41
|
+
|
|
42
|
+
if (transactionReceipt?.status === 'reverted') {
|
|
43
|
+
throw new TransactionError(
|
|
44
|
+
LiFiErrorCode.TransactionFailed,
|
|
45
|
+
'Transaction was reverted.'
|
|
46
|
+
)
|
|
47
|
+
}
|
|
48
|
+
if (replacementReason === 'cancelled') {
|
|
49
|
+
throw new TransactionError(
|
|
50
|
+
LiFiErrorCode.TransactionCanceled,
|
|
51
|
+
'User canceled transaction.'
|
|
52
|
+
)
|
|
53
|
+
}
|
|
54
|
+
|
|
55
|
+
return transactionReceipt
|
|
56
|
+
}
|
|
57
|
+
|
|
58
|
+
async function waitForReceipt(
|
|
59
|
+
client: PublicClient | WalletClient,
|
|
60
|
+
txHash: Hash,
|
|
61
|
+
onReplaced?: (response: ReplacementReturnType<Chain | undefined>) => void
|
|
62
|
+
): Promise<{
|
|
63
|
+
transactionReceipt?: TransactionReceipt
|
|
64
|
+
replacementReason?: ReplacementReason
|
|
65
|
+
}> {
|
|
66
|
+
let replacementReason: ReplacementReason | undefined
|
|
67
|
+
let transactionReceipt: TransactionReceipt | undefined
|
|
68
|
+
|
|
69
|
+
try {
|
|
70
|
+
transactionReceipt = await (
|
|
71
|
+
client as PublicClient
|
|
72
|
+
).waitForTransactionReceipt({
|
|
73
|
+
hash: txHash,
|
|
74
|
+
onReplaced: (response) => {
|
|
75
|
+
replacementReason = response.reason
|
|
76
|
+
onReplaced?.(response)
|
|
77
|
+
},
|
|
78
|
+
retryCount,
|
|
79
|
+
retryDelay,
|
|
80
|
+
})
|
|
81
|
+
} catch (error) {
|
|
82
|
+
// We can ignore errors from waitForTransactionReceipt as we have a status check fallback
|
|
83
|
+
}
|
|
84
|
+
|
|
85
|
+
return { transactionReceipt, replacementReason }
|
|
86
|
+
}
|
|
@@ -16,7 +16,7 @@ import type {
|
|
|
16
16
|
VersionedTransaction,
|
|
17
17
|
} from '@solana/web3.js'
|
|
18
18
|
import { Keypair } from '@solana/web3.js'
|
|
19
|
-
import
|
|
19
|
+
import bs58 from 'bs58'
|
|
20
20
|
|
|
21
21
|
export const KeypairWalletName =
|
|
22
22
|
'Keypair Wallet' as WalletName<'Keypair Wallet'>
|
package/src/version.ts
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
export const name = '@lifi/sdk'
|
|
2
|
-
export const version = '3.0.
|
|
2
|
+
export const version = '3.0.1'
|