@lifi/sdk 3.6.0-beta.4 → 3.6.0-beta.6
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/package.json +4 -4
- package/src/_cjs/config.js +3 -0
- package/src/_cjs/config.js.map +1 -1
- package/src/_cjs/core/EVM/EVM.js +4 -0
- package/src/_cjs/core/EVM/EVM.js.map +1 -1
- package/src/_cjs/core/EVM/EVMStepExecutor.js +137 -112
- package/src/_cjs/core/EVM/EVMStepExecutor.js.map +1 -1
- package/src/_cjs/core/EVM/checkAllowance.js +34 -5
- package/src/_cjs/core/EVM/checkAllowance.js.map +1 -1
- package/src/_cjs/core/EVM/checkPermitSupport.js +33 -0
- package/src/_cjs/core/EVM/checkPermitSupport.js.map +1 -0
- package/src/_cjs/core/EVM/parseEVMErrors.js +3 -0
- package/src/_cjs/core/EVM/parseEVMErrors.js.map +1 -1
- package/src/_cjs/core/EVM/{permit2 → permits}/allowanceTransfer.js.map +1 -1
- package/src/_cjs/core/EVM/{permit2 → permits}/constants.js.map +1 -1
- package/src/_cjs/core/EVM/{permit2 → permits}/domain.js.map +1 -1
- package/src/_cjs/core/EVM/permits/encodeNativePermitData.js +16 -0
- package/src/_cjs/core/EVM/permits/encodeNativePermitData.js.map +1 -0
- package/src/_cjs/core/EVM/permits/encodePermit2Data.js +32 -0
- package/src/_cjs/core/EVM/permits/encodePermit2Data.js.map +1 -0
- package/src/_cjs/core/EVM/{getNativePermit.js → permits/getNativePermit.js} +30 -21
- package/src/_cjs/core/EVM/permits/getNativePermit.js.map +1 -0
- package/src/_cjs/core/EVM/permits/getPermitTransferFromValues.js +24 -0
- package/src/_cjs/core/EVM/permits/getPermitTransferFromValues.js.map +1 -0
- package/src/_cjs/core/EVM/permits/signNativePermitMessage.js +20 -0
- package/src/_cjs/core/EVM/permits/signNativePermitMessage.js.map +1 -0
- package/src/_cjs/core/EVM/permits/signPermit2Message.js +43 -0
- package/src/_cjs/core/EVM/permits/signPermit2Message.js.map +1 -0
- package/src/_cjs/core/EVM/permits/signatureTransfer.js.map +1 -0
- package/src/_cjs/core/EVM/permits/types.js +3 -0
- package/src/_cjs/core/EVM/permits/types.js.map +1 -0
- package/src/_cjs/core/EVM/permits/utils.js +31 -0
- package/src/_cjs/core/EVM/permits/utils.js.map +1 -0
- package/src/_cjs/core/EVM/publicClient.js +32 -33
- package/src/_cjs/core/EVM/publicClient.js.map +1 -1
- package/src/_cjs/core/EVM/typeguards.js +1 -1
- package/src/_cjs/core/EVM/typeguards.js.map +1 -1
- package/src/_cjs/core/EVM/types.js.map +1 -1
- package/src/_cjs/core/EVM/utils.js +37 -1
- package/src/_cjs/core/EVM/utils.js.map +1 -1
- package/src/_cjs/core/EVM/waitForBatchTransactionReceipt.js +3 -2
- package/src/_cjs/core/EVM/waitForBatchTransactionReceipt.js.map +1 -1
- package/src/_cjs/core/EVM/waitForRelayedTransactionReceipt.js +4 -4
- package/src/_cjs/core/EVM/waitForRelayedTransactionReceipt.js.map +1 -1
- package/src/_cjs/core/checkBalance.js +2 -1
- package/src/_cjs/core/checkBalance.js.map +1 -1
- package/src/_cjs/core/utils.js +1 -1
- package/src/_cjs/core/utils.js.map +1 -1
- package/src/_cjs/errors/constants.js +1 -0
- package/src/_cjs/errors/constants.js.map +1 -1
- package/src/_cjs/index.js +5 -2
- package/src/_cjs/index.js.map +1 -1
- package/src/_cjs/services/api.js +18 -6
- package/src/_cjs/services/api.js.map +1 -1
- package/src/_cjs/version.js +1 -1
- package/src/_esm/config.js +3 -0
- package/src/_esm/config.js.map +1 -1
- package/src/_esm/core/EVM/EVM.js +4 -0
- package/src/_esm/core/EVM/EVM.js.map +1 -1
- package/src/_esm/core/EVM/EVMStepExecutor.js +142 -125
- package/src/_esm/core/EVM/EVMStepExecutor.js.map +1 -1
- package/src/_esm/core/EVM/checkAllowance.js +35 -5
- package/src/_esm/core/EVM/checkAllowance.js.map +1 -1
- package/src/_esm/core/EVM/checkPermitSupport.js +43 -0
- package/src/_esm/core/EVM/checkPermitSupport.js.map +1 -0
- package/src/_esm/core/EVM/parseEVMErrors.js +9 -0
- package/src/_esm/core/EVM/parseEVMErrors.js.map +1 -1
- package/src/_esm/core/EVM/{permit2 → permits}/allowanceTransfer.js.map +1 -1
- package/src/_esm/core/EVM/{permit2 → permits}/constants.js.map +1 -1
- package/src/_esm/core/EVM/{permit2 → permits}/domain.js.map +1 -1
- package/src/_esm/core/EVM/permits/encodeNativePermitData.js +12 -0
- package/src/_esm/core/EVM/permits/encodeNativePermitData.js.map +1 -0
- package/src/_esm/core/EVM/permits/encodePermit2Data.js +28 -0
- package/src/_esm/core/EVM/permits/encodePermit2Data.js.map +1 -0
- package/src/_esm/core/EVM/{getNativePermit.js → permits/getNativePermit.js} +30 -21
- package/src/_esm/core/EVM/permits/getNativePermit.js.map +1 -0
- package/src/_esm/core/EVM/permits/getPermitTransferFromValues.js +20 -0
- package/src/_esm/core/EVM/permits/getPermitTransferFromValues.js.map +1 -0
- package/src/_esm/core/EVM/permits/signNativePermitMessage.js +16 -0
- package/src/_esm/core/EVM/permits/signNativePermitMessage.js.map +1 -0
- package/src/_esm/core/EVM/permits/signPermit2Message.js +41 -0
- package/src/_esm/core/EVM/permits/signPermit2Message.js.map +1 -0
- package/src/_esm/core/EVM/{permit2 → permits}/signatureTransfer.js +0 -2
- package/src/_esm/core/EVM/{permit2 → permits}/signatureTransfer.js.map +1 -1
- package/src/_esm/core/EVM/permits/types.js +2 -0
- package/src/_esm/core/EVM/permits/types.js.map +1 -0
- package/src/_esm/core/EVM/permits/utils.js +26 -0
- package/src/_esm/core/EVM/permits/utils.js.map +1 -0
- package/src/_esm/core/EVM/publicClient.js +34 -35
- package/src/_esm/core/EVM/publicClient.js.map +1 -1
- package/src/_esm/core/EVM/typeguards.js +1 -1
- package/src/_esm/core/EVM/typeguards.js.map +1 -1
- package/src/_esm/core/EVM/types.js.map +1 -1
- package/src/_esm/core/EVM/utils.js +34 -0
- package/src/_esm/core/EVM/utils.js.map +1 -1
- package/src/_esm/core/EVM/waitForBatchTransactionReceipt.js +5 -2
- package/src/_esm/core/EVM/waitForBatchTransactionReceipt.js.map +1 -1
- package/src/_esm/core/EVM/waitForRelayedTransactionReceipt.js +4 -4
- package/src/_esm/core/EVM/waitForRelayedTransactionReceipt.js.map +1 -1
- package/src/_esm/core/checkBalance.js +2 -1
- package/src/_esm/core/checkBalance.js.map +1 -1
- package/src/_esm/core/utils.js +1 -1
- package/src/_esm/core/utils.js.map +1 -1
- package/src/_esm/errors/constants.js +1 -0
- package/src/_esm/errors/constants.js.map +1 -1
- package/src/_esm/index.js +1 -0
- package/src/_esm/index.js.map +1 -1
- package/src/_esm/services/api.js +18 -6
- package/src/_esm/services/api.js.map +1 -1
- package/src/_esm/version.js +1 -1
- package/src/_types/config.d.ts +2 -1
- package/src/_types/config.d.ts.map +1 -1
- package/src/_types/core/BaseStepExecutor.d.ts.map +1 -1
- package/src/_types/core/EVM/EVM.d.ts.map +1 -1
- package/src/_types/core/EVM/EVMStepExecutor.d.ts +4 -10
- package/src/_types/core/EVM/EVMStepExecutor.d.ts.map +1 -1
- package/src/_types/core/EVM/checkAllowance.d.ts +13 -2
- package/src/_types/core/EVM/checkAllowance.d.ts.map +1 -1
- package/src/_types/core/EVM/checkPermitSupport.d.ts +27 -0
- package/src/_types/core/EVM/checkPermitSupport.d.ts.map +1 -0
- package/src/_types/core/EVM/getAllowance.d.ts.map +1 -1
- package/src/_types/core/EVM/getENSAddress.d.ts.map +1 -1
- package/src/_types/core/EVM/getEVMBalance.d.ts.map +1 -1
- package/src/_types/core/EVM/parseEVMErrors.d.ts.map +1 -1
- package/src/_types/core/EVM/{permit2 → permits}/allowanceTransfer.d.ts.map +1 -1
- package/src/_types/core/EVM/{permit2 → permits}/constants.d.ts.map +1 -1
- package/src/_types/core/EVM/permits/domain.d.ts +3 -0
- package/src/_types/core/EVM/permits/domain.d.ts.map +1 -0
- package/src/_types/core/EVM/permits/encodeNativePermitData.d.ts +3 -0
- package/src/_types/core/EVM/permits/encodeNativePermitData.d.ts.map +1 -0
- package/src/_types/core/EVM/permits/encodePermit2Data.d.ts +4 -0
- package/src/_types/core/EVM/permits/encodePermit2Data.d.ts.map +1 -0
- package/src/_types/core/EVM/{getNativePermit.d.ts → permits/getNativePermit.d.ts} +2 -9
- package/src/_types/core/EVM/permits/getNativePermit.d.ts.map +1 -0
- package/src/_types/core/EVM/permits/getPermitTransferFromValues.d.ts +5 -0
- package/src/_types/core/EVM/permits/getPermitTransferFromValues.d.ts.map +1 -0
- package/src/_types/core/EVM/permits/signNativePermitMessage.d.ts +4 -0
- package/src/_types/core/EVM/permits/signNativePermitMessage.d.ts.map +1 -0
- package/src/_types/core/EVM/permits/signPermit2Message.d.ts +21 -0
- package/src/_types/core/EVM/permits/signPermit2Message.d.ts.map +1 -0
- package/src/_types/core/EVM/{permit2 → permits}/signatureTransfer.d.ts +15 -16
- package/src/_types/core/EVM/permits/signatureTransfer.d.ts.map +1 -0
- package/src/_types/core/EVM/permits/types.d.ts +24 -0
- package/src/_types/core/EVM/permits/types.d.ts.map +1 -0
- package/src/_types/core/EVM/permits/utils.d.ts +6 -0
- package/src/_types/core/EVM/permits/utils.d.ts.map +1 -0
- package/src/_types/core/EVM/publicClient.d.ts.map +1 -1
- package/src/_types/core/EVM/setAllowance.d.ts.map +1 -1
- package/src/_types/core/EVM/switchChain.d.ts.map +1 -1
- package/src/_types/core/EVM/typeguards.d.ts +2 -1
- package/src/_types/core/EVM/typeguards.d.ts.map +1 -1
- package/src/_types/core/EVM/types.d.ts +13 -7
- package/src/_types/core/EVM/types.d.ts.map +1 -1
- package/src/_types/core/EVM/utils.d.ts +4 -2
- package/src/_types/core/EVM/utils.d.ts.map +1 -1
- package/src/_types/core/EVM/waitForBatchTransactionReceipt.d.ts.map +1 -1
- package/src/_types/core/EVM/waitForRelayedTransactionReceipt.d.ts.map +1 -1
- package/src/_types/core/Solana/SolanaStepExecutor.d.ts.map +1 -1
- package/src/_types/core/Solana/getSNSAddress.d.ts.map +1 -1
- package/src/_types/core/Solana/getSolanaBalance.d.ts.map +1 -1
- package/src/_types/core/Solana/parseSolanaErrors.d.ts.map +1 -1
- package/src/_types/core/StatusManager.d.ts.map +1 -1
- package/src/_types/core/UTXO/UTXOStepExecutor.d.ts.map +1 -1
- package/src/_types/core/UTXO/getUTXOAPIPublicClient.d.ts.map +1 -1
- package/src/_types/core/UTXO/getUTXOBalance.d.ts.map +1 -1
- package/src/_types/core/UTXO/getUTXOPublicClient.d.ts.map +1 -1
- package/src/_types/core/UTXO/parseUTXOErrors.d.ts.map +1 -1
- package/src/_types/core/checkBalance.d.ts.map +1 -1
- package/src/_types/core/execution.d.ts.map +1 -1
- package/src/_types/core/prepareRestart.d.ts.map +1 -1
- package/src/_types/core/provider.d.ts.map +1 -1
- package/src/_types/core/rpc.d.ts.map +1 -1
- package/src/_types/core/stepComparison.d.ts.map +1 -1
- package/src/_types/errors/constants.d.ts +2 -1
- package/src/_types/errors/constants.d.ts.map +1 -1
- package/src/_types/errors/utils/baseErrorRootCause.d.ts.map +1 -1
- package/src/_types/errors/utils/rootCause.d.ts.map +1 -1
- package/src/_types/index.d.ts +1 -0
- package/src/_types/index.d.ts.map +1 -1
- package/src/_types/request.d.ts.map +1 -1
- package/src/_types/services/api.d.ts +4 -47
- package/src/_types/services/api.d.ts.map +1 -1
- package/src/_types/services/balance.d.ts.map +1 -1
- package/src/_types/services/getNameServiceAddress.d.ts.map +1 -1
- package/src/_types/typeguards.d.ts.map +1 -1
- package/src/_types/utils/checkPackageUpdates.d.ts.map +1 -1
- package/src/_types/utils/convertQuoteToRoute.d.ts.map +1 -1
- package/src/_types/utils/fetchTxErrorDetails.d.ts.map +1 -1
- package/src/_types/utils/getTransactionMessage.d.ts.map +1 -1
- package/src/_types/utils/isZeroAddress.d.ts.map +1 -1
- package/src/_types/utils/median.d.ts.map +1 -1
- package/src/_types/utils/waitForResult.d.ts.map +1 -1
- package/src/_types/version.d.ts +1 -1
- package/src/config.ts +4 -1
- package/src/core/EVM/EVM.ts +4 -0
- package/src/core/EVM/EVMStepExecutor.ts +190 -150
- package/src/core/EVM/checkAllowance.ts +69 -6
- package/src/core/EVM/checkPermitSupport.ts +74 -0
- package/src/core/EVM/parseEVMErrors.ts +9 -0
- package/src/core/EVM/{permit2 → permits}/domain.ts +1 -7
- package/src/core/EVM/permits/encodeNativePermitData.ts +19 -0
- package/src/core/EVM/permits/encodePermit2Data.ts +41 -0
- package/src/core/EVM/{getNativePermit.ts → permits/getNativePermit.ts} +37 -31
- package/src/core/EVM/permits/getPermitTransferFromValues.ts +29 -0
- package/src/core/EVM/permits/signNativePermitMessage.ts +27 -0
- package/src/core/EVM/permits/signPermit2Message.ts +95 -0
- package/src/core/EVM/{permit2 → permits}/signatureTransfer.ts +19 -7
- package/src/core/EVM/permits/types.ts +33 -0
- package/src/core/EVM/permits/utils.ts +40 -0
- package/src/core/EVM/publicClient.ts +41 -38
- package/src/core/EVM/typeguards.ts +5 -2
- package/src/core/EVM/types.ts +15 -10
- package/src/core/EVM/utils.ts +53 -2
- package/src/core/EVM/waitForBatchTransactionReceipt.ts +7 -2
- package/src/core/EVM/waitForRelayedTransactionReceipt.ts +4 -4
- package/src/core/checkBalance.ts +2 -1
- package/src/core/utils.ts +1 -1
- package/src/errors/constants.ts +1 -0
- package/src/index.ts +1 -0
- package/src/services/api.ts +62 -66
- package/src/version.ts +1 -1
- package/src/_cjs/core/EVM/getNativePermit.js.map +0 -1
- package/src/_cjs/core/EVM/permit2/signatureTransfer.js.map +0 -1
- package/src/_cjs/core/EVM/signPermitMessage.js +0 -163
- package/src/_cjs/core/EVM/signPermitMessage.js.map +0 -1
- package/src/_esm/core/EVM/getNativePermit.js.map +0 -1
- package/src/_esm/core/EVM/signPermitMessage.js +0 -157
- package/src/_esm/core/EVM/signPermitMessage.js.map +0 -1
- package/src/_types/core/EVM/getNativePermit.d.ts.map +0 -1
- package/src/_types/core/EVM/permit2/domain.d.ts +0 -8
- package/src/_types/core/EVM/permit2/domain.d.ts.map +0 -1
- package/src/_types/core/EVM/permit2/signatureTransfer.d.ts.map +0 -1
- package/src/_types/core/EVM/signPermitMessage.d.ts +0 -25
- package/src/_types/core/EVM/signPermitMessage.d.ts.map +0 -1
- package/src/core/EVM/signPermitMessage.ts +0 -273
- /package/src/_cjs/core/EVM/{permit2 → permits}/allowanceTransfer.js +0 -0
- /package/src/_cjs/core/EVM/{permit2 → permits}/constants.js +0 -0
- /package/src/_cjs/core/EVM/{permit2 → permits}/domain.js +0 -0
- /package/src/_cjs/core/EVM/{permit2 → permits}/signatureTransfer.js +0 -0
- /package/src/_esm/core/EVM/{permit2 → permits}/allowanceTransfer.js +0 -0
- /package/src/_esm/core/EVM/{permit2 → permits}/constants.js +0 -0
- /package/src/_esm/core/EVM/{permit2 → permits}/domain.js +0 -0
- /package/src/_types/core/EVM/{permit2 → permits}/allowanceTransfer.d.ts +0 -0
- /package/src/_types/core/EVM/{permit2 → permits}/constants.d.ts +0 -0
- /package/src/core/EVM/{permit2 → permits}/allowanceTransfer.ts +0 -0
- /package/src/core/EVM/{permit2 → permits}/constants.ts +0 -0
package/src/core/EVM/utils.ts
CHANGED
|
@@ -1,9 +1,60 @@
|
|
|
1
|
-
import type { ChainId } from '@lifi/types'
|
|
2
|
-
import type { Address, Client, Transaction } from 'viem'
|
|
1
|
+
import type { ChainId, ExtendedChain } from '@lifi/types'
|
|
2
|
+
import type { Address, Chain, Client, Transaction } from 'viem'
|
|
3
3
|
import { getBlock } from 'viem/actions'
|
|
4
4
|
import { config } from '../../config.js'
|
|
5
5
|
import { median } from '../../utils/median.js'
|
|
6
6
|
|
|
7
|
+
type ChainBlockExplorer = {
|
|
8
|
+
name: string
|
|
9
|
+
url: string
|
|
10
|
+
}
|
|
11
|
+
|
|
12
|
+
type ChainBlockExplorers = {
|
|
13
|
+
[key: string]: ChainBlockExplorer
|
|
14
|
+
default: ChainBlockExplorer
|
|
15
|
+
}
|
|
16
|
+
|
|
17
|
+
export const convertExtendedChain = (chain: ExtendedChain): Chain => ({
|
|
18
|
+
...chain,
|
|
19
|
+
...chain.metamask,
|
|
20
|
+
blockExplorers: chain.metamask.blockExplorerUrls.reduce(
|
|
21
|
+
(blockExplorers, blockExplorer, index) => {
|
|
22
|
+
blockExplorers[index === 0 ? 'default' : `${index}`] = {
|
|
23
|
+
name: blockExplorer,
|
|
24
|
+
url: blockExplorer,
|
|
25
|
+
}
|
|
26
|
+
return blockExplorers
|
|
27
|
+
},
|
|
28
|
+
{} as ChainBlockExplorers
|
|
29
|
+
),
|
|
30
|
+
name: chain.metamask.chainName,
|
|
31
|
+
rpcUrls: {
|
|
32
|
+
default: { http: chain.metamask.rpcUrls },
|
|
33
|
+
public: { http: chain.metamask.rpcUrls },
|
|
34
|
+
},
|
|
35
|
+
contracts: {
|
|
36
|
+
...(chain.multicallAddress
|
|
37
|
+
? { multicall3: { address: chain.multicallAddress as Address } }
|
|
38
|
+
: undefined),
|
|
39
|
+
},
|
|
40
|
+
})
|
|
41
|
+
|
|
42
|
+
export function isExtendedChain(chain: any): chain is ExtendedChain {
|
|
43
|
+
return (
|
|
44
|
+
typeof chain === 'object' &&
|
|
45
|
+
chain !== null &&
|
|
46
|
+
'key' in chain &&
|
|
47
|
+
'chainType' in chain &&
|
|
48
|
+
'coin' in chain &&
|
|
49
|
+
'mainnet' in chain &&
|
|
50
|
+
'logoURI' in chain &&
|
|
51
|
+
typeof chain.metamask === 'object' &&
|
|
52
|
+
chain.metamask !== null &&
|
|
53
|
+
typeof chain.nativeToken === 'object' &&
|
|
54
|
+
chain.nativeToken !== null
|
|
55
|
+
)
|
|
56
|
+
}
|
|
57
|
+
|
|
7
58
|
export const getMaxPriorityFeePerGas = async (
|
|
8
59
|
client: Client
|
|
9
60
|
): Promise<bigint | undefined> => {
|
|
@@ -28,11 +28,16 @@ export const waitForBatchTransactionReceipt = async (
|
|
|
28
28
|
id: batchHash,
|
|
29
29
|
})
|
|
30
30
|
|
|
31
|
-
|
|
31
|
+
// EIP-5792 specs was updated to return 100 for pending transactions https://eips.ethereum.org/EIPS/eip-5792
|
|
32
|
+
if (
|
|
33
|
+
callsDetails.status === 'PENDING' ||
|
|
34
|
+
callsDetails.status === (100 as any)
|
|
35
|
+
) {
|
|
32
36
|
return undefined
|
|
33
37
|
}
|
|
34
38
|
|
|
35
|
-
|
|
39
|
+
// EIP-5792 specs was updated to return 200 for confirmed transactions https://eips.ethereum.org/EIPS/eip-5792
|
|
40
|
+
if (callsDetails.status === 'CONFIRMED' || callsDetails.status === 200) {
|
|
36
41
|
if (
|
|
37
42
|
!callsDetails.receipts?.length ||
|
|
38
43
|
!callsDetails.receipts.every((receipt) => receipt.transactionHash) ||
|
|
@@ -24,16 +24,16 @@ export const waitForRelayedTransactionReceipt = async (
|
|
|
24
24
|
return undefined
|
|
25
25
|
})
|
|
26
26
|
|
|
27
|
-
switch (result?.
|
|
27
|
+
switch (result?.status) {
|
|
28
28
|
case 'PENDING':
|
|
29
29
|
return undefined
|
|
30
30
|
case 'DONE': {
|
|
31
|
-
const sending: ExtendedTransactionInfo | undefined = result
|
|
32
|
-
|
|
31
|
+
const sending: ExtendedTransactionInfo | undefined = result
|
|
32
|
+
?.transactionStatus?.sending as ExtendedTransactionInfo
|
|
33
33
|
return {
|
|
34
34
|
status: 'success',
|
|
35
35
|
gasUsed: sending?.gasUsed,
|
|
36
|
-
transactionHash: result?.
|
|
36
|
+
transactionHash: result?.metadata.txHash,
|
|
37
37
|
} as unknown as WalletCallReceipt
|
|
38
38
|
}
|
|
39
39
|
case 'FAILED':
|
package/src/core/checkBalance.ts
CHANGED
|
@@ -19,7 +19,8 @@ export const checkBalance = async (
|
|
|
19
19
|
await sleep(200)
|
|
20
20
|
await checkBalance(walletAddress, step, depth + 1)
|
|
21
21
|
} else if (
|
|
22
|
-
(neededBalance *
|
|
22
|
+
(neededBalance *
|
|
23
|
+
BigInt((1 - (step.action.slippage ?? 0)) * 1_000_000_000)) /
|
|
23
24
|
1_000_000_000n <=
|
|
24
25
|
currentBalance
|
|
25
26
|
) {
|
package/src/core/utils.ts
CHANGED
package/src/errors/constants.ts
CHANGED
package/src/index.ts
CHANGED
|
@@ -12,6 +12,7 @@ export {
|
|
|
12
12
|
setTokenAllowance,
|
|
13
13
|
} from './core/EVM/setAllowance.js'
|
|
14
14
|
export { isEVM } from './core/EVM/types.js'
|
|
15
|
+
export { isExtendedChain, convertExtendedChain } from './core/EVM/utils.js'
|
|
15
16
|
export { isRelayerStep } from './core/EVM/typeguards.js'
|
|
16
17
|
export type {
|
|
17
18
|
EVMProvider,
|
package/src/services/api.ts
CHANGED
|
@@ -12,6 +12,14 @@ import {
|
|
|
12
12
|
type GetStatusRequest,
|
|
13
13
|
type LiFiStep,
|
|
14
14
|
type QuoteRequest,
|
|
15
|
+
type RelayRequest,
|
|
16
|
+
type RelayResponse,
|
|
17
|
+
type RelayResponseData,
|
|
18
|
+
type RelayStatusRequest,
|
|
19
|
+
type RelayStatusResponse,
|
|
20
|
+
type RelayStatusResponseData,
|
|
21
|
+
type RelayerQuoteResponse,
|
|
22
|
+
type RelayerQuoteResponseData,
|
|
15
23
|
type RequestOptions,
|
|
16
24
|
type RoutesRequest,
|
|
17
25
|
type RoutesResponse,
|
|
@@ -26,58 +34,15 @@ import {
|
|
|
26
34
|
isContractCallsRequestWithFromAmount,
|
|
27
35
|
isContractCallsRequestWithToAmount,
|
|
28
36
|
} from '@lifi/types'
|
|
29
|
-
import type { Address, Hash, Hex } from 'viem'
|
|
30
37
|
import { config } from '../config.js'
|
|
31
|
-
import type { PermitData } from '../core/EVM/permit2/domain.js'
|
|
32
|
-
import type {
|
|
33
|
-
PermitTransferFrom,
|
|
34
|
-
Witness,
|
|
35
|
-
} from '../core/EVM/permit2/signatureTransfer.js'
|
|
36
38
|
import { SDKError } from '../errors/SDKError.js'
|
|
39
|
+
import { BaseError } from '../errors/baseError.js'
|
|
40
|
+
import { ErrorName } from '../errors/constants.js'
|
|
37
41
|
import { ValidationError } from '../errors/errors.js'
|
|
38
42
|
import { request } from '../request.js'
|
|
39
43
|
import { isRoutesRequest, isStep } from '../typeguards.js'
|
|
40
44
|
import { withDedupe } from '../utils/withDedupe.js'
|
|
41
45
|
|
|
42
|
-
interface TaskStatus {
|
|
43
|
-
data: {
|
|
44
|
-
status: 'DONE' | 'PENDING' | 'FAILED'
|
|
45
|
-
message?: string
|
|
46
|
-
metadata: { chainId: number; txHash?: Hash }
|
|
47
|
-
transactionStatus?: StatusResponse
|
|
48
|
-
}
|
|
49
|
-
}
|
|
50
|
-
|
|
51
|
-
interface RelayStatusRequest {
|
|
52
|
-
taskId: Hash
|
|
53
|
-
}
|
|
54
|
-
|
|
55
|
-
interface RelayRequest {
|
|
56
|
-
tokenOwner: Address
|
|
57
|
-
chainId: number
|
|
58
|
-
permit: PermitTransferFrom
|
|
59
|
-
witness: Witness
|
|
60
|
-
signedPermitData: Hex
|
|
61
|
-
callData: string
|
|
62
|
-
}
|
|
63
|
-
|
|
64
|
-
interface RelayResponse {
|
|
65
|
-
data: { taskId: Hash }
|
|
66
|
-
}
|
|
67
|
-
|
|
68
|
-
interface RelayerQuoteResponse {
|
|
69
|
-
data: {
|
|
70
|
-
quote: {
|
|
71
|
-
step: LiFiStep
|
|
72
|
-
permit: PermitTransferFrom
|
|
73
|
-
witness: Witness
|
|
74
|
-
permitData: PermitData
|
|
75
|
-
tokenOwner: Address
|
|
76
|
-
chainId: number
|
|
77
|
-
}
|
|
78
|
-
}
|
|
79
|
-
}
|
|
80
|
-
|
|
81
46
|
/**
|
|
82
47
|
* Get a quote for a token transfer
|
|
83
48
|
* @param params - The configuration of the requested quote
|
|
@@ -297,7 +262,7 @@ export const getStatus = async (
|
|
|
297
262
|
export const getRelayerQuote = async (
|
|
298
263
|
params: QuoteRequest,
|
|
299
264
|
options?: RequestOptions
|
|
300
|
-
): Promise<
|
|
265
|
+
): Promise<RelayerQuoteResponseData> => {
|
|
301
266
|
const requiredParameters: Array<keyof QuoteRequest> = [
|
|
302
267
|
'fromChain',
|
|
303
268
|
'fromToken',
|
|
@@ -335,7 +300,7 @@ export const getRelayerQuote = async (
|
|
|
335
300
|
}
|
|
336
301
|
}
|
|
337
302
|
|
|
338
|
-
|
|
303
|
+
const result = await request<RelayerQuoteResponse>(
|
|
339
304
|
`${config.get().apiUrl}/relayer/quote?${new URLSearchParams(
|
|
340
305
|
params as unknown as Record<string, string>
|
|
341
306
|
)}`,
|
|
@@ -343,6 +308,16 @@ export const getRelayerQuote = async (
|
|
|
343
308
|
signal: options?.signal,
|
|
344
309
|
}
|
|
345
310
|
)
|
|
311
|
+
|
|
312
|
+
if (result.status === 'error') {
|
|
313
|
+
throw new BaseError(
|
|
314
|
+
ErrorName.ServerError,
|
|
315
|
+
result.data.code,
|
|
316
|
+
result.data.message
|
|
317
|
+
)
|
|
318
|
+
}
|
|
319
|
+
|
|
320
|
+
return result.data
|
|
346
321
|
}
|
|
347
322
|
|
|
348
323
|
/**
|
|
@@ -355,13 +330,11 @@ export const getRelayerQuote = async (
|
|
|
355
330
|
export const relayTransaction = async (
|
|
356
331
|
params: RelayRequest,
|
|
357
332
|
options?: RequestOptions
|
|
358
|
-
): Promise<
|
|
333
|
+
): Promise<RelayResponseData> => {
|
|
359
334
|
const requiredParameters: Array<keyof RelayRequest> = [
|
|
360
335
|
'tokenOwner',
|
|
361
336
|
'chainId',
|
|
362
|
-
'
|
|
363
|
-
'witness',
|
|
364
|
-
'signedPermitData',
|
|
337
|
+
'permits',
|
|
365
338
|
'callData',
|
|
366
339
|
]
|
|
367
340
|
|
|
@@ -375,19 +348,32 @@ export const relayTransaction = async (
|
|
|
375
348
|
}
|
|
376
349
|
}
|
|
377
350
|
|
|
378
|
-
|
|
379
|
-
|
|
380
|
-
|
|
381
|
-
|
|
382
|
-
|
|
383
|
-
|
|
384
|
-
|
|
385
|
-
|
|
386
|
-
|
|
387
|
-
|
|
388
|
-
|
|
389
|
-
|
|
390
|
-
|
|
351
|
+
const result = await request<RelayResponse>(
|
|
352
|
+
`${config.get().apiUrl}/relayer/relay`,
|
|
353
|
+
{
|
|
354
|
+
method: 'POST',
|
|
355
|
+
headers: {
|
|
356
|
+
'Content-Type': 'application/json',
|
|
357
|
+
},
|
|
358
|
+
body: JSON.stringify(params, (_, value) => {
|
|
359
|
+
if (typeof value === 'bigint') {
|
|
360
|
+
return value.toString()
|
|
361
|
+
}
|
|
362
|
+
return value
|
|
363
|
+
}),
|
|
364
|
+
signal: options?.signal,
|
|
365
|
+
}
|
|
366
|
+
)
|
|
367
|
+
|
|
368
|
+
if (result.status === 'error') {
|
|
369
|
+
throw new BaseError(
|
|
370
|
+
ErrorName.ServerError,
|
|
371
|
+
result.data.code,
|
|
372
|
+
result.data.message
|
|
373
|
+
)
|
|
374
|
+
}
|
|
375
|
+
|
|
376
|
+
return result.data
|
|
391
377
|
}
|
|
392
378
|
|
|
393
379
|
/**
|
|
@@ -400,19 +386,29 @@ export const relayTransaction = async (
|
|
|
400
386
|
export const getRelayedTransactionStatus = async (
|
|
401
387
|
params: RelayStatusRequest,
|
|
402
388
|
options?: RequestOptions
|
|
403
|
-
): Promise<
|
|
389
|
+
): Promise<RelayStatusResponseData> => {
|
|
404
390
|
if (!params.taskId) {
|
|
405
391
|
throw new SDKError(
|
|
406
392
|
new ValidationError('Required parameter "taskId" is missing.')
|
|
407
393
|
)
|
|
408
394
|
}
|
|
409
395
|
|
|
410
|
-
|
|
396
|
+
const result = await request<RelayStatusResponse>(
|
|
411
397
|
`${config.get().apiUrl}/relayer/status/${params.taskId}`,
|
|
412
398
|
{
|
|
413
399
|
signal: options?.signal,
|
|
414
400
|
}
|
|
415
401
|
)
|
|
402
|
+
|
|
403
|
+
if (result.status === 'error') {
|
|
404
|
+
throw new BaseError(
|
|
405
|
+
ErrorName.ServerError,
|
|
406
|
+
result.data.code,
|
|
407
|
+
result.data.message
|
|
408
|
+
)
|
|
409
|
+
}
|
|
410
|
+
|
|
411
|
+
return result.data
|
|
416
412
|
}
|
|
417
413
|
|
|
418
414
|
/**
|
package/src/version.ts
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
export const name = '@lifi/sdk'
|
|
2
|
-
export const version = '3.6.0-beta.
|
|
2
|
+
export const version = '3.6.0-beta.6'
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"getNativePermit.js","sourceRoot":"","sources":["../../../core/EVM/getNativePermit.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"signatureTransfer.js","sourceRoot":"","sources":["../../../../core/EVM/permit2/signatureTransfer.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,163 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.signPermitMessage = exports.signPermit2WitnessMessage = exports.signPermit2Message = exports.signNativePermitMessage = void 0;
|
|
4
|
-
const viem_1 = require("viem");
|
|
5
|
-
const actions_1 = require("viem/actions");
|
|
6
|
-
const utils_1 = require("viem/utils");
|
|
7
|
-
const abi_js_1 = require("./abi.js");
|
|
8
|
-
const getNativePermit_js_1 = require("./getNativePermit.js");
|
|
9
|
-
const signatureTransfer_js_1 = require("./permit2/signatureTransfer.js");
|
|
10
|
-
const signNativePermitMessage = async (client, transactionRequest, chain, tokenAddress, amount, nativePermit) => {
|
|
11
|
-
const deadline = BigInt(Math.floor(Date.now() / 1000) + 30 * 60);
|
|
12
|
-
const message = {
|
|
13
|
-
owner: client.account.address,
|
|
14
|
-
spender: chain.permit2Proxy,
|
|
15
|
-
value: amount,
|
|
16
|
-
nonce: nativePermit.nonce,
|
|
17
|
-
deadline,
|
|
18
|
-
};
|
|
19
|
-
const signature = await (0, utils_1.getAction)(client, actions_1.signTypedData, 'signTypedData')({
|
|
20
|
-
account: client.account,
|
|
21
|
-
domain: nativePermit.domain,
|
|
22
|
-
types: abi_js_1.eip2612Types,
|
|
23
|
-
primaryType: 'Permit',
|
|
24
|
-
message,
|
|
25
|
-
});
|
|
26
|
-
const { v, r, s } = (0, viem_1.parseSignature)(signature);
|
|
27
|
-
const data = (0, viem_1.encodeFunctionData)({
|
|
28
|
-
abi: abi_js_1.permit2ProxyAbi,
|
|
29
|
-
functionName: 'callDiamondWithEIP2612Signature',
|
|
30
|
-
args: [
|
|
31
|
-
tokenAddress,
|
|
32
|
-
amount,
|
|
33
|
-
deadline,
|
|
34
|
-
Number(v),
|
|
35
|
-
r,
|
|
36
|
-
s,
|
|
37
|
-
transactionRequest.data,
|
|
38
|
-
],
|
|
39
|
-
});
|
|
40
|
-
return {
|
|
41
|
-
signature,
|
|
42
|
-
data,
|
|
43
|
-
};
|
|
44
|
-
};
|
|
45
|
-
exports.signNativePermitMessage = signNativePermitMessage;
|
|
46
|
-
const signPermit2Message = async (client, transactionRequest, chain, tokenAddress, amount) => {
|
|
47
|
-
const nonce = await (0, actions_1.readContract)(client, {
|
|
48
|
-
address: chain.permit2Proxy,
|
|
49
|
-
abi: abi_js_1.permit2ProxyAbi,
|
|
50
|
-
functionName: 'nextNonce',
|
|
51
|
-
args: [client.account.address],
|
|
52
|
-
});
|
|
53
|
-
const permitTransferFrom = {
|
|
54
|
-
permitted: {
|
|
55
|
-
token: tokenAddress,
|
|
56
|
-
amount: amount,
|
|
57
|
-
},
|
|
58
|
-
spender: chain.permit2Proxy,
|
|
59
|
-
nonce: nonce,
|
|
60
|
-
deadline: BigInt(Math.floor(Date.now() / 1000) + 30 * 60),
|
|
61
|
-
};
|
|
62
|
-
const { domain, types, values } = (0, signatureTransfer_js_1.getPermitData)(permitTransferFrom, chain.permit2, chain.id);
|
|
63
|
-
const signature = await (0, utils_1.getAction)(client, actions_1.signTypedData, 'signTypedData')({
|
|
64
|
-
account: client.account,
|
|
65
|
-
primaryType: 'PermitTransferFrom',
|
|
66
|
-
domain,
|
|
67
|
-
types,
|
|
68
|
-
message: { ...values },
|
|
69
|
-
});
|
|
70
|
-
const data = (0, viem_1.encodeFunctionData)({
|
|
71
|
-
abi: abi_js_1.permit2ProxyAbi,
|
|
72
|
-
functionName: 'callDiamondWithPermit2',
|
|
73
|
-
args: [
|
|
74
|
-
transactionRequest.data,
|
|
75
|
-
[
|
|
76
|
-
[tokenAddress, amount],
|
|
77
|
-
permitTransferFrom.nonce,
|
|
78
|
-
permitTransferFrom.deadline,
|
|
79
|
-
],
|
|
80
|
-
signature,
|
|
81
|
-
],
|
|
82
|
-
});
|
|
83
|
-
return {
|
|
84
|
-
signature,
|
|
85
|
-
data,
|
|
86
|
-
};
|
|
87
|
-
};
|
|
88
|
-
exports.signPermit2Message = signPermit2Message;
|
|
89
|
-
const signPermit2WitnessMessage = async (client, transactionRequest, chain, tokenAddress, amount, permitData) => {
|
|
90
|
-
let _permitData = permitData;
|
|
91
|
-
if (!_permitData) {
|
|
92
|
-
const nonce = await (0, actions_1.readContract)(client, {
|
|
93
|
-
address: chain.permit2Proxy,
|
|
94
|
-
abi: abi_js_1.permit2ProxyAbi,
|
|
95
|
-
functionName: 'nextNonce',
|
|
96
|
-
args: [client.account.address],
|
|
97
|
-
});
|
|
98
|
-
const permitTransferFrom = {
|
|
99
|
-
permitted: {
|
|
100
|
-
token: tokenAddress,
|
|
101
|
-
amount: amount,
|
|
102
|
-
},
|
|
103
|
-
spender: chain.permit2Proxy,
|
|
104
|
-
nonce: nonce,
|
|
105
|
-
deadline: BigInt(Math.floor(Date.now() / 1000) + 30 * 60),
|
|
106
|
-
};
|
|
107
|
-
const witness = {
|
|
108
|
-
witness: {
|
|
109
|
-
diamondAddress: chain.diamondAddress,
|
|
110
|
-
diamondCalldataHash: (0, viem_1.keccak256)(transactionRequest.data),
|
|
111
|
-
},
|
|
112
|
-
witnessTypeName: 'LiFiCall',
|
|
113
|
-
witnessType: {
|
|
114
|
-
LiFiCall: [
|
|
115
|
-
{ name: 'diamondAddress', type: 'address' },
|
|
116
|
-
{ name: 'diamondCalldataHash', type: 'bytes32' },
|
|
117
|
-
],
|
|
118
|
-
},
|
|
119
|
-
};
|
|
120
|
-
_permitData = (0, signatureTransfer_js_1.getPermitData)(permitTransferFrom, chain.permit2, chain.id, witness);
|
|
121
|
-
}
|
|
122
|
-
const signature = await (0, utils_1.getAction)(client, actions_1.signTypedData, 'signTypedData')({
|
|
123
|
-
account: client.account,
|
|
124
|
-
primaryType: 'PermitWitnessTransferFrom',
|
|
125
|
-
domain: _permitData.domain,
|
|
126
|
-
types: _permitData.types,
|
|
127
|
-
message: { ..._permitData.values },
|
|
128
|
-
});
|
|
129
|
-
const data = (0, viem_1.encodeFunctionData)({
|
|
130
|
-
abi: abi_js_1.permit2ProxyAbi,
|
|
131
|
-
functionName: 'callDiamondWithPermit2Witness',
|
|
132
|
-
args: [
|
|
133
|
-
transactionRequest.data,
|
|
134
|
-
client.account.address,
|
|
135
|
-
[
|
|
136
|
-
[tokenAddress, amount],
|
|
137
|
-
_permitData.values.nonce,
|
|
138
|
-
_permitData.values.deadline,
|
|
139
|
-
],
|
|
140
|
-
signature,
|
|
141
|
-
],
|
|
142
|
-
});
|
|
143
|
-
return {
|
|
144
|
-
signature,
|
|
145
|
-
data,
|
|
146
|
-
};
|
|
147
|
-
};
|
|
148
|
-
exports.signPermit2WitnessMessage = signPermit2WitnessMessage;
|
|
149
|
-
const signPermitMessage = async (client, { transactionRequest, chain, tokenAddress, amount, nativePermit, permitData, useWitness = false, }) => {
|
|
150
|
-
if (useWitness) {
|
|
151
|
-
return (0, exports.signPermit2WitnessMessage)(client, transactionRequest, chain, tokenAddress, amount, permitData);
|
|
152
|
-
}
|
|
153
|
-
let _nativePermit = nativePermit;
|
|
154
|
-
if (!_nativePermit) {
|
|
155
|
-
_nativePermit = await (0, getNativePermit_js_1.getNativePermit)(client, chain, tokenAddress);
|
|
156
|
-
}
|
|
157
|
-
if (_nativePermit.supported) {
|
|
158
|
-
return (0, exports.signNativePermitMessage)(client, transactionRequest, chain, tokenAddress, amount, _nativePermit);
|
|
159
|
-
}
|
|
160
|
-
return (0, exports.signPermit2Message)(client, transactionRequest, chain, tokenAddress, amount);
|
|
161
|
-
};
|
|
162
|
-
exports.signPermitMessage = signPermitMessage;
|
|
163
|
-
//# sourceMappingURL=signPermitMessage.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"signPermitMessage.js","sourceRoot":"","sources":["../../../core/EVM/signPermitMessage.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"getNativePermit.js","sourceRoot":"","sources":["../../../core/EVM/getNativePermit.ts"],"names":[],"mappings":"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"}
|