@across-protocol/sdk 4.2.16-alpha.5 → 4.2.16
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/arch/evm/SpokeUtils.d.ts +2 -2
- package/dist/cjs/arch/evm/SpokeUtils.js +6 -21
- package/dist/cjs/arch/evm/SpokeUtils.js.map +1 -1
- package/dist/cjs/arch/svm/SpokeUtils.d.ts +1 -5
- package/dist/cjs/arch/svm/SpokeUtils.js +39 -30
- package/dist/cjs/arch/svm/SpokeUtils.js.map +1 -1
- package/dist/cjs/arch/svm/eventsClient.js +2 -4
- package/dist/cjs/arch/svm/eventsClient.js.map +1 -1
- package/dist/cjs/arch/svm/utils.d.ts +3 -3
- package/dist/cjs/arch/svm/utils.js +14 -16
- package/dist/cjs/arch/svm/utils.js.map +1 -1
- package/dist/cjs/clients/AcrossConfigStoreClient/AcrossConfigStoreClient.d.ts +3 -3
- package/dist/cjs/clients/AcrossConfigStoreClient/AcrossConfigStoreClient.js +2 -4
- package/dist/cjs/clients/AcrossConfigStoreClient/AcrossConfigStoreClient.js.map +1 -1
- package/dist/cjs/clients/BundleDataClient/BundleDataClient.d.ts +6 -7
- package/dist/cjs/clients/BundleDataClient/BundleDataClient.js +83 -78
- package/dist/cjs/clients/BundleDataClient/BundleDataClient.js.map +1 -1
- package/dist/cjs/clients/BundleDataClient/utils/DataworkerUtils.js +13 -13
- package/dist/cjs/clients/BundleDataClient/utils/DataworkerUtils.js.map +1 -1
- package/dist/cjs/clients/BundleDataClient/utils/FillUtils.d.ts +1 -2
- package/dist/cjs/clients/BundleDataClient/utils/FillUtils.js +2 -3
- package/dist/cjs/clients/BundleDataClient/utils/FillUtils.js.map +1 -1
- package/dist/cjs/clients/BundleDataClient/utils/MerkleTreeUtils.js +1 -5
- package/dist/cjs/clients/BundleDataClient/utils/MerkleTreeUtils.js.map +1 -1
- package/dist/cjs/clients/BundleDataClient/utils/PoolRebalanceUtils.js +3 -3
- package/dist/cjs/clients/BundleDataClient/utils/PoolRebalanceUtils.js.map +1 -1
- package/dist/cjs/clients/BundleDataClient/utils/SuperstructUtils.d.ts +63 -63
- package/dist/cjs/clients/BundleDataClient/utils/SuperstructUtils.js +8 -13
- package/dist/cjs/clients/BundleDataClient/utils/SuperstructUtils.js.map +1 -1
- package/dist/cjs/clients/HubPoolClient.d.ts +21 -21
- package/dist/cjs/clients/HubPoolClient.js +58 -84
- package/dist/cjs/clients/HubPoolClient.js.map +1 -1
- package/dist/cjs/clients/SpokePoolClient/EVMSpokePoolClient.js +1 -1
- package/dist/cjs/clients/SpokePoolClient/EVMSpokePoolClient.js.map +1 -1
- package/dist/cjs/clients/SpokePoolClient/SpokePoolClient.d.ts +2 -2
- package/dist/cjs/clients/SpokePoolClient/SpokePoolClient.js +45 -65
- package/dist/cjs/clients/SpokePoolClient/SpokePoolClient.js.map +1 -1
- package/dist/cjs/clients/SpokePoolClient/SpokePoolClientManager.d.ts +13 -0
- package/dist/cjs/clients/SpokePoolClient/SpokePoolClientManager.js +18 -0
- package/dist/cjs/clients/SpokePoolClient/SpokePoolClientManager.js.map +1 -0
- package/dist/cjs/clients/mocks/MockHubPoolClient.d.ts +9 -9
- package/dist/cjs/clients/mocks/MockHubPoolClient.js +9 -15
- package/dist/cjs/clients/mocks/MockHubPoolClient.js.map +1 -1
- package/dist/cjs/clients/mocks/MockSpokePoolClient.d.ts +3 -5
- package/dist/cjs/clients/mocks/MockSpokePoolClient.js +36 -40
- package/dist/cjs/clients/mocks/MockSpokePoolClient.js.map +1 -1
- package/dist/cjs/clients/mocks/MockSvmCpiEventsClient.d.ts +1 -1
- package/dist/cjs/clients/mocks/MockSvmCpiEventsClient.js +4 -6
- package/dist/cjs/clients/mocks/MockSvmCpiEventsClient.js.map +1 -1
- package/dist/cjs/clients/mocks/MockSvmSpokePoolClient.d.ts +2 -2
- package/dist/cjs/clients/mocks/MockSvmSpokePoolClient.js +2 -2
- package/dist/cjs/clients/mocks/MockSvmSpokePoolClient.js.map +1 -1
- package/dist/cjs/interfaces/HubPool.d.ts +14 -19
- package/dist/cjs/interfaces/SpokePool.d.ts +13 -13
- package/dist/cjs/relayFeeCalculator/chain-queries/baseQuery.d.ts +6 -10
- package/dist/cjs/relayFeeCalculator/chain-queries/baseQuery.js +11 -20
- package/dist/cjs/relayFeeCalculator/chain-queries/baseQuery.js.map +1 -1
- package/dist/cjs/relayFeeCalculator/chain-queries/svmQuery.d.ts +3 -7
- package/dist/cjs/relayFeeCalculator/chain-queries/svmQuery.js +32 -34
- package/dist/cjs/relayFeeCalculator/chain-queries/svmQuery.js.map +1 -1
- package/dist/cjs/relayFeeCalculator/relayFeeCalculator.d.ts +5 -5
- package/dist/cjs/relayFeeCalculator/relayFeeCalculator.js +7 -7
- package/dist/cjs/relayFeeCalculator/relayFeeCalculator.js.map +1 -1
- package/dist/cjs/utils/AddressUtils.d.ts +8 -12
- package/dist/cjs/utils/AddressUtils.js +36 -33
- package/dist/cjs/utils/AddressUtils.js.map +1 -1
- package/dist/cjs/utils/NetworkUtils.js +1 -1
- package/dist/cjs/utils/NetworkUtils.js.map +1 -1
- package/dist/cjs/utils/SpokeUtils.d.ts +3 -3
- package/dist/cjs/utils/SpokeUtils.js +22 -4
- package/dist/cjs/utils/SpokeUtils.js.map +1 -1
- package/dist/cjs/utils/TokenUtils.d.ts +4 -4
- package/dist/cjs/utils/TokenUtils.js +3 -5
- package/dist/cjs/utils/TokenUtils.js.map +1 -1
- package/dist/esm/arch/evm/SpokeUtils.d.ts +2 -2
- package/dist/esm/arch/evm/SpokeUtils.js +7 -22
- package/dist/esm/arch/evm/SpokeUtils.js.map +1 -1
- package/dist/esm/arch/svm/SpokeUtils.d.ts +1 -5
- package/dist/esm/arch/svm/SpokeUtils.js +44 -31
- package/dist/esm/arch/svm/SpokeUtils.js.map +1 -1
- package/dist/esm/arch/svm/eventsClient.js +3 -5
- package/dist/esm/arch/svm/eventsClient.js.map +1 -1
- package/dist/esm/arch/svm/utils.d.ts +3 -3
- package/dist/esm/arch/svm/utils.js +15 -17
- package/dist/esm/arch/svm/utils.js.map +1 -1
- package/dist/esm/clients/AcrossConfigStoreClient/AcrossConfigStoreClient.d.ts +3 -3
- package/dist/esm/clients/AcrossConfigStoreClient/AcrossConfigStoreClient.js +2 -4
- package/dist/esm/clients/AcrossConfigStoreClient/AcrossConfigStoreClient.js.map +1 -1
- package/dist/esm/clients/BundleDataClient/BundleDataClient.d.ts +6 -7
- package/dist/esm/clients/BundleDataClient/BundleDataClient.js +84 -79
- package/dist/esm/clients/BundleDataClient/BundleDataClient.js.map +1 -1
- package/dist/esm/clients/BundleDataClient/utils/DataworkerUtils.js +14 -14
- package/dist/esm/clients/BundleDataClient/utils/DataworkerUtils.js.map +1 -1
- package/dist/esm/clients/BundleDataClient/utils/FillUtils.d.ts +1 -2
- package/dist/esm/clients/BundleDataClient/utils/FillUtils.js +3 -5
- package/dist/esm/clients/BundleDataClient/utils/FillUtils.js.map +1 -1
- package/dist/esm/clients/BundleDataClient/utils/MerkleTreeUtils.js +1 -5
- package/dist/esm/clients/BundleDataClient/utils/MerkleTreeUtils.js.map +1 -1
- package/dist/esm/clients/BundleDataClient/utils/PoolRebalanceUtils.js +4 -4
- package/dist/esm/clients/BundleDataClient/utils/PoolRebalanceUtils.js.map +1 -1
- package/dist/esm/clients/BundleDataClient/utils/SuperstructUtils.d.ts +63 -63
- package/dist/esm/clients/BundleDataClient/utils/SuperstructUtils.js +10 -20
- package/dist/esm/clients/BundleDataClient/utils/SuperstructUtils.js.map +1 -1
- package/dist/esm/clients/HubPoolClient.d.ts +22 -23
- package/dist/esm/clients/HubPoolClient.js +63 -98
- package/dist/esm/clients/HubPoolClient.js.map +1 -1
- package/dist/esm/clients/SpokePoolClient/EVMSpokePoolClient.js +2 -2
- package/dist/esm/clients/SpokePoolClient/EVMSpokePoolClient.js.map +1 -1
- package/dist/esm/clients/SpokePoolClient/SpokePoolClient.d.ts +2 -2
- package/dist/esm/clients/SpokePoolClient/SpokePoolClient.js +47 -68
- package/dist/esm/clients/SpokePoolClient/SpokePoolClient.js.map +1 -1
- package/dist/esm/clients/SpokePoolClient/SpokePoolClientManager.d.ts +28 -0
- package/dist/esm/clients/SpokePoolClient/SpokePoolClientManager.js +30 -0
- package/dist/esm/clients/SpokePoolClient/SpokePoolClientManager.js.map +1 -0
- package/dist/esm/clients/mocks/MockHubPoolClient.d.ts +9 -9
- package/dist/esm/clients/mocks/MockHubPoolClient.js +10 -16
- package/dist/esm/clients/mocks/MockHubPoolClient.js.map +1 -1
- package/dist/esm/clients/mocks/MockSpokePoolClient.d.ts +3 -5
- package/dist/esm/clients/mocks/MockSpokePoolClient.js +38 -42
- package/dist/esm/clients/mocks/MockSpokePoolClient.js.map +1 -1
- package/dist/esm/clients/mocks/MockSvmCpiEventsClient.d.ts +1 -1
- package/dist/esm/clients/mocks/MockSvmCpiEventsClient.js +5 -7
- package/dist/esm/clients/mocks/MockSvmCpiEventsClient.js.map +1 -1
- package/dist/esm/clients/mocks/MockSvmSpokePoolClient.d.ts +2 -2
- package/dist/esm/clients/mocks/MockSvmSpokePoolClient.js +3 -3
- package/dist/esm/clients/mocks/MockSvmSpokePoolClient.js.map +1 -1
- package/dist/esm/interfaces/HubPool.d.ts +14 -19
- package/dist/esm/interfaces/SpokePool.d.ts +13 -13
- package/dist/esm/relayFeeCalculator/chain-queries/baseQuery.d.ts +6 -10
- package/dist/esm/relayFeeCalculator/chain-queries/baseQuery.js +12 -21
- package/dist/esm/relayFeeCalculator/chain-queries/baseQuery.js.map +1 -1
- package/dist/esm/relayFeeCalculator/chain-queries/svmQuery.d.ts +3 -8
- package/dist/esm/relayFeeCalculator/chain-queries/svmQuery.js +34 -38
- package/dist/esm/relayFeeCalculator/chain-queries/svmQuery.js.map +1 -1
- package/dist/esm/relayFeeCalculator/relayFeeCalculator.d.ts +5 -5
- package/dist/esm/relayFeeCalculator/relayFeeCalculator.js +8 -8
- package/dist/esm/relayFeeCalculator/relayFeeCalculator.js.map +1 -1
- package/dist/esm/utils/AddressUtils.d.ts +8 -12
- package/dist/esm/utils/AddressUtils.js +38 -36
- package/dist/esm/utils/AddressUtils.js.map +1 -1
- package/dist/esm/utils/NetworkUtils.js +1 -1
- package/dist/esm/utils/NetworkUtils.js.map +1 -1
- package/dist/esm/utils/SpokeUtils.d.ts +8 -3
- package/dist/esm/utils/SpokeUtils.js +26 -4
- package/dist/esm/utils/SpokeUtils.js.map +1 -1
- package/dist/esm/utils/TokenUtils.d.ts +18 -22
- package/dist/esm/utils/TokenUtils.js +4 -6
- package/dist/esm/utils/TokenUtils.js.map +1 -1
- package/dist/types/arch/evm/SpokeUtils.d.ts +2 -2
- package/dist/types/arch/evm/SpokeUtils.d.ts.map +1 -1
- package/dist/types/arch/svm/SpokeUtils.d.ts +1 -5
- package/dist/types/arch/svm/SpokeUtils.d.ts.map +1 -1
- package/dist/types/arch/svm/eventsClient.d.ts.map +1 -1
- package/dist/types/arch/svm/utils.d.ts +3 -3
- package/dist/types/arch/svm/utils.d.ts.map +1 -1
- package/dist/types/clients/AcrossConfigStoreClient/AcrossConfigStoreClient.d.ts +3 -3
- package/dist/types/clients/AcrossConfigStoreClient/AcrossConfigStoreClient.d.ts.map +1 -1
- package/dist/types/clients/BundleDataClient/BundleDataClient.d.ts +6 -7
- package/dist/types/clients/BundleDataClient/BundleDataClient.d.ts.map +1 -1
- package/dist/types/clients/BundleDataClient/utils/DataworkerUtils.d.ts.map +1 -1
- package/dist/types/clients/BundleDataClient/utils/FillUtils.d.ts +1 -2
- package/dist/types/clients/BundleDataClient/utils/FillUtils.d.ts.map +1 -1
- package/dist/types/clients/BundleDataClient/utils/MerkleTreeUtils.d.ts.map +1 -1
- package/dist/types/clients/BundleDataClient/utils/PoolRebalanceUtils.d.ts.map +1 -1
- package/dist/types/clients/BundleDataClient/utils/SuperstructUtils.d.ts +63 -63
- package/dist/types/clients/BundleDataClient/utils/SuperstructUtils.d.ts.map +1 -1
- package/dist/types/clients/HubPoolClient.d.ts +22 -23
- package/dist/types/clients/HubPoolClient.d.ts.map +1 -1
- package/dist/types/clients/SpokePoolClient/EVMSpokePoolClient.d.ts.map +1 -1
- package/dist/types/clients/SpokePoolClient/SpokePoolClient.d.ts +2 -2
- package/dist/types/clients/SpokePoolClient/SpokePoolClient.d.ts.map +1 -1
- package/dist/types/clients/SpokePoolClient/SpokePoolClientManager.d.ts +29 -0
- package/dist/types/clients/SpokePoolClient/SpokePoolClientManager.d.ts.map +1 -0
- package/dist/types/clients/mocks/MockHubPoolClient.d.ts +9 -9
- package/dist/types/clients/mocks/MockHubPoolClient.d.ts.map +1 -1
- package/dist/types/clients/mocks/MockSpokePoolClient.d.ts +3 -5
- package/dist/types/clients/mocks/MockSpokePoolClient.d.ts.map +1 -1
- package/dist/types/clients/mocks/MockSvmCpiEventsClient.d.ts +1 -1
- package/dist/types/clients/mocks/MockSvmCpiEventsClient.d.ts.map +1 -1
- package/dist/types/clients/mocks/MockSvmSpokePoolClient.d.ts +2 -2
- package/dist/types/clients/mocks/MockSvmSpokePoolClient.d.ts.map +1 -1
- package/dist/types/interfaces/HubPool.d.ts +14 -19
- package/dist/types/interfaces/HubPool.d.ts.map +1 -1
- package/dist/types/interfaces/SpokePool.d.ts +13 -13
- package/dist/types/interfaces/SpokePool.d.ts.map +1 -1
- package/dist/types/relayFeeCalculator/chain-queries/baseQuery.d.ts +6 -10
- package/dist/types/relayFeeCalculator/chain-queries/baseQuery.d.ts.map +1 -1
- package/dist/types/relayFeeCalculator/chain-queries/svmQuery.d.ts +3 -8
- package/dist/types/relayFeeCalculator/chain-queries/svmQuery.d.ts.map +1 -1
- package/dist/types/relayFeeCalculator/relayFeeCalculator.d.ts +5 -5
- package/dist/types/relayFeeCalculator/relayFeeCalculator.d.ts.map +1 -1
- package/dist/types/utils/AddressUtils.d.ts +8 -12
- package/dist/types/utils/AddressUtils.d.ts.map +1 -1
- package/dist/types/utils/SpokeUtils.d.ts +8 -3
- package/dist/types/utils/SpokeUtils.d.ts.map +1 -1
- package/dist/types/utils/TokenUtils.d.ts +18 -22
- package/dist/types/utils/TokenUtils.d.ts.map +1 -1
- package/package.json +2 -1
- package/src/arch/evm/SpokeUtils.ts +12 -47
- package/src/arch/svm/SpokeUtils.ts +42 -64
- package/src/arch/svm/eventsClient.ts +8 -40
- package/src/arch/svm/utils.ts +6 -6
- package/src/clients/AcrossConfigStoreClient/AcrossConfigStoreClient.ts +4 -7
- package/src/clients/BundleDataClient/BundleDataClient.ts +90 -77
- package/src/clients/BundleDataClient/utils/DataworkerUtils.ts +13 -28
- package/src/clients/BundleDataClient/utils/FillUtils.ts +4 -10
- package/src/clients/BundleDataClient/utils/MerkleTreeUtils.ts +1 -7
- package/src/clients/BundleDataClient/utils/PoolRebalanceUtils.ts +4 -4
- package/src/clients/BundleDataClient/utils/SuperstructUtils.ts +10 -22
- package/src/clients/HubPoolClient.ts +82 -127
- package/src/clients/SpokePoolClient/EVMSpokePoolClient.ts +0 -6
- package/src/clients/SpokePoolClient/SpokePoolClient.ts +35 -121
- package/src/clients/SpokePoolClient/SpokePoolClientManager.ts +36 -0
- package/src/clients/mocks/MockHubPoolClient.ts +19 -24
- package/src/clients/mocks/MockSpokePoolClient.ts +27 -39
- package/src/clients/mocks/MockSvmCpiEventsClient.ts +5 -8
- package/src/clients/mocks/MockSvmSpokePoolClient.ts +3 -12
- package/src/interfaces/HubPool.ts +14 -23
- package/src/interfaces/SpokePool.ts +13 -13
- package/src/relayFeeCalculator/chain-queries/baseQuery.ts +11 -31
- package/src/relayFeeCalculator/chain-queries/svmQuery.ts +39 -43
- package/src/relayFeeCalculator/relayFeeCalculator.ts +12 -20
- package/src/utils/AddressUtils.ts +51 -39
- package/src/utils/NetworkUtils.ts +1 -1
- package/src/utils/SpokeUtils.ts +33 -11
- package/src/utils/TokenUtils.ts +8 -10
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MockSvmSpokePoolClient.js","sourceRoot":"","sources":["../../../../src/clients/mocks/MockSvmSpokePoolClient.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAG5D,OAAO,
|
|
1
|
+
{"version":3,"file":"MockSvmSpokePoolClient.js","sourceRoot":"","sources":["../../../../src/clients/mocks/MockSvmSpokePoolClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { BigNumber } from "../utils";
|
|
2
2
|
import { SortableEvent } from "./Common";
|
|
3
3
|
export interface PoolRebalanceLeaf {
|
|
4
4
|
chainId: number;
|
|
@@ -7,15 +7,15 @@ export interface PoolRebalanceLeaf {
|
|
|
7
7
|
netSendAmounts: BigNumber[];
|
|
8
8
|
runningBalances: BigNumber[];
|
|
9
9
|
leafId: number;
|
|
10
|
-
l1Tokens:
|
|
10
|
+
l1Tokens: string[];
|
|
11
11
|
}
|
|
12
12
|
export interface RelayerRefundLeaf {
|
|
13
13
|
amountToReturn: BigNumber;
|
|
14
14
|
chainId: number;
|
|
15
15
|
refundAmounts: BigNumber[];
|
|
16
16
|
leafId: number;
|
|
17
|
-
l2TokenAddress:
|
|
18
|
-
refundAddresses:
|
|
17
|
+
l2TokenAddress: string;
|
|
18
|
+
refundAddresses: string[];
|
|
19
19
|
}
|
|
20
20
|
export interface ProposedRootBundle extends SortableEvent {
|
|
21
21
|
challengePeriodEndTimestamp: number;
|
|
@@ -24,7 +24,7 @@ export interface ProposedRootBundle extends SortableEvent {
|
|
|
24
24
|
poolRebalanceRoot: string;
|
|
25
25
|
relayerRefundRoot: string;
|
|
26
26
|
slowRelayRoot: string;
|
|
27
|
-
proposer:
|
|
27
|
+
proposer: string;
|
|
28
28
|
}
|
|
29
29
|
export type RealizedLpFee = {
|
|
30
30
|
quoteBlock: number;
|
|
@@ -47,7 +47,7 @@ export interface ExecutedRootBundle extends SortableEvent {
|
|
|
47
47
|
netSendAmounts: BigNumber[];
|
|
48
48
|
runningBalances: BigNumber[];
|
|
49
49
|
leafId: number;
|
|
50
|
-
l1Tokens:
|
|
50
|
+
l1Tokens: string[];
|
|
51
51
|
proof: string[];
|
|
52
52
|
}
|
|
53
53
|
export type ExecutedRootBundleStringified = Omit<ExecutedRootBundle, "bundleLpFees" | "netSendAmounts" | "runningBalances"> & {
|
|
@@ -61,13 +61,8 @@ export type TokenRunningBalance = {
|
|
|
61
61
|
export interface RelayerRefundLeafWithGroup extends RelayerRefundLeaf {
|
|
62
62
|
groupIndex: number;
|
|
63
63
|
}
|
|
64
|
-
export interface
|
|
65
|
-
address:
|
|
66
|
-
symbol: string;
|
|
67
|
-
decimals: number;
|
|
68
|
-
}
|
|
69
|
-
export interface TokenInfo {
|
|
70
|
-
address: Address;
|
|
64
|
+
export interface L1Token {
|
|
65
|
+
address: string;
|
|
71
66
|
symbol: string;
|
|
72
67
|
decimals: number;
|
|
73
68
|
}
|
|
@@ -77,22 +72,22 @@ export interface LpToken {
|
|
|
77
72
|
}
|
|
78
73
|
export interface CrossChainContractsSet extends SortableEvent {
|
|
79
74
|
l2ChainId: number;
|
|
80
|
-
spokePool:
|
|
75
|
+
spokePool: string;
|
|
81
76
|
}
|
|
82
77
|
export interface DestinationTokenWithBlock extends SortableEvent {
|
|
83
|
-
l2Token:
|
|
84
|
-
l1Token:
|
|
78
|
+
l2Token: string;
|
|
79
|
+
l1Token: string;
|
|
85
80
|
}
|
|
86
81
|
export interface SetPoolRebalanceRoot extends SortableEvent {
|
|
87
82
|
destinationChainId: number;
|
|
88
|
-
l1Token:
|
|
89
|
-
destinationToken:
|
|
83
|
+
l1Token: string;
|
|
84
|
+
destinationToken: string;
|
|
90
85
|
}
|
|
91
86
|
export interface PendingRootBundle {
|
|
92
87
|
poolRebalanceRoot: string;
|
|
93
88
|
relayerRefundRoot: string;
|
|
94
89
|
slowRelayRoot: string;
|
|
95
|
-
proposer:
|
|
90
|
+
proposer: string;
|
|
96
91
|
unclaimedPoolRebalanceLeafCount: number;
|
|
97
92
|
challengePeriodEndTimestamp: number;
|
|
98
93
|
bundleEvaluationBlockNumbers: number[];
|
|
@@ -1,19 +1,19 @@
|
|
|
1
1
|
import { SortableEvent } from "./Common";
|
|
2
2
|
import { SpokePoolClient } from "../clients";
|
|
3
|
-
import { BigNumber
|
|
3
|
+
import { BigNumber } from "../utils";
|
|
4
4
|
import { RelayerRefundLeaf } from "./HubPool";
|
|
5
5
|
export interface RelayData {
|
|
6
6
|
originChainId: number;
|
|
7
|
-
depositor:
|
|
8
|
-
recipient:
|
|
7
|
+
depositor: string;
|
|
8
|
+
recipient: string;
|
|
9
9
|
depositId: BigNumber;
|
|
10
|
-
inputToken:
|
|
10
|
+
inputToken: string;
|
|
11
11
|
inputAmount: BigNumber;
|
|
12
|
-
outputToken:
|
|
12
|
+
outputToken: string;
|
|
13
13
|
outputAmount: BigNumber;
|
|
14
14
|
message: string;
|
|
15
15
|
fillDeadline: number;
|
|
16
|
-
exclusiveRelayer:
|
|
16
|
+
exclusiveRelayer: string;
|
|
17
17
|
exclusivityDeadline: number;
|
|
18
18
|
}
|
|
19
19
|
export interface Deposit extends RelayData {
|
|
@@ -21,7 +21,7 @@ export interface Deposit extends RelayData {
|
|
|
21
21
|
destinationChainId: number;
|
|
22
22
|
quoteTimestamp: number;
|
|
23
23
|
speedUpSignature?: string;
|
|
24
|
-
updatedRecipient?:
|
|
24
|
+
updatedRecipient?: string;
|
|
25
25
|
updatedOutputAmount?: BigNumber;
|
|
26
26
|
updatedMessage?: string;
|
|
27
27
|
fromLiteChain: boolean;
|
|
@@ -44,7 +44,7 @@ export declare enum FillType {
|
|
|
44
44
|
SlowFill = 2
|
|
45
45
|
}
|
|
46
46
|
export interface RelayExecutionEventInfo {
|
|
47
|
-
updatedRecipient:
|
|
47
|
+
updatedRecipient: string;
|
|
48
48
|
updatedOutputAmount: BigNumber;
|
|
49
49
|
updatedMessage?: string;
|
|
50
50
|
updatedMessageHash: string;
|
|
@@ -53,7 +53,7 @@ export interface RelayExecutionEventInfo {
|
|
|
53
53
|
export interface Fill extends Omit<RelayData, "message"> {
|
|
54
54
|
messageHash: string;
|
|
55
55
|
destinationChainId: number;
|
|
56
|
-
relayer:
|
|
56
|
+
relayer: string;
|
|
57
57
|
repaymentChainId: number;
|
|
58
58
|
relayExecutionInfo: RelayExecutionEventInfo;
|
|
59
59
|
}
|
|
@@ -63,18 +63,18 @@ export interface FillWithTime extends Fill, SortableEvent {
|
|
|
63
63
|
fillTimestamp: number;
|
|
64
64
|
}
|
|
65
65
|
export interface EnabledDepositRoute {
|
|
66
|
-
originToken:
|
|
66
|
+
originToken: string;
|
|
67
67
|
destinationChainId: number;
|
|
68
68
|
enabled: boolean;
|
|
69
69
|
}
|
|
70
70
|
export interface EnabledDepositRouteWithBlock extends EnabledDepositRoute, SortableEvent {
|
|
71
71
|
}
|
|
72
72
|
export interface SpeedUp {
|
|
73
|
-
depositor:
|
|
73
|
+
depositor: string;
|
|
74
74
|
depositorSignature: string;
|
|
75
75
|
depositId: BigNumber;
|
|
76
76
|
originChainId: number;
|
|
77
|
-
updatedRecipient:
|
|
77
|
+
updatedRecipient: string;
|
|
78
78
|
updatedOutputAmount: BigNumber;
|
|
79
79
|
updatedMessage: string;
|
|
80
80
|
}
|
|
@@ -115,7 +115,7 @@ export interface TokensBridged extends SortableEvent {
|
|
|
115
115
|
amountToReturn: BigNumber;
|
|
116
116
|
chainId: number;
|
|
117
117
|
leafId: number;
|
|
118
|
-
l2TokenAddress:
|
|
118
|
+
l2TokenAddress: string;
|
|
119
119
|
}
|
|
120
120
|
export interface ClaimedRelayerRefundWithBlock extends SortableEvent {
|
|
121
121
|
l2TokenAddress: string;
|
|
@@ -2,7 +2,7 @@ import { L2Provider } from "@eth-optimism/sdk/dist/interfaces/l2-provider";
|
|
|
2
2
|
import { PopulatedTransaction, providers } from "ethers";
|
|
3
3
|
import { Deposit } from "../../interfaces";
|
|
4
4
|
import { SpokePool } from "../../typechain";
|
|
5
|
-
import { BigNumberish,
|
|
5
|
+
import { BigNumberish, TransactionCostEstimate, BigNumber } from "../../utils";
|
|
6
6
|
import { Logger, QueryInterface } from "../relayFeeCalculator";
|
|
7
7
|
import { Transport } from "viem";
|
|
8
8
|
import { EvmProvider } from "../../arch/evm/types";
|
|
@@ -46,7 +46,7 @@ export declare class QueryBase implements QueryInterface {
|
|
|
46
46
|
* @param options.transport Optional transport object for custom gas price retrieval.
|
|
47
47
|
* @returns The gas estimate for this function call (multiplied with the optional buffer).
|
|
48
48
|
*/
|
|
49
|
-
getGasCosts(deposit: Omit<Deposit, "messageHash">, relayer?:
|
|
49
|
+
getGasCosts(deposit: Omit<Deposit, "messageHash">, relayer?: string, options?: Partial<{
|
|
50
50
|
gasPrice: BigNumberish;
|
|
51
51
|
gasUnits: BigNumberish;
|
|
52
52
|
baseFeeMultiplier: BigNumber;
|
|
@@ -60,18 +60,14 @@ export declare class QueryBase implements QueryInterface {
|
|
|
60
60
|
* @param relayer Sender of PopulatedTransaction
|
|
61
61
|
* @returns PopulatedTransaction
|
|
62
62
|
*/
|
|
63
|
-
getUnsignedTxFromDeposit(deposit: Omit<Deposit, "messageHash"
|
|
64
|
-
recipient: EvmAddress;
|
|
65
|
-
outputToken: EvmAddress;
|
|
66
|
-
exclusiveRelayer: EvmAddress;
|
|
67
|
-
}, relayer?: Address): Promise<PopulatedTransaction>;
|
|
63
|
+
getUnsignedTxFromDeposit(deposit: Omit<Deposit, "messageHash">, relayer?: string): Promise<PopulatedTransaction>;
|
|
68
64
|
/**
|
|
69
65
|
* @notice Return the gas cost of a simulated transaction
|
|
70
66
|
* @param deposit
|
|
71
67
|
* @param relayer Sender of PopulatedTransaction
|
|
72
68
|
* @returns Estimated gas cost based on ethers.VoidSigner's gas estimation
|
|
73
69
|
*/
|
|
74
|
-
getNativeGasCost(deposit: Omit<Deposit, "messageHash">, relayer?:
|
|
70
|
+
getNativeGasCost(deposit: Omit<Deposit, "messageHash">, relayer?: string): Promise<BigNumber>;
|
|
75
71
|
/**
|
|
76
72
|
* @notice Return L1 data fee for OP stack L2 transaction, which is based on L2 calldata.
|
|
77
73
|
* @dev https://docs.optimism.io/stack/transactions/fees#l1-data-fee
|
|
@@ -80,7 +76,7 @@ export declare class QueryBase implements QueryInterface {
|
|
|
80
76
|
* @param options Specify gas units to avoid additional gas estimation call and multiplier for L1 data fee
|
|
81
77
|
* @returns BigNumber L1 data fee in gas units
|
|
82
78
|
*/
|
|
83
|
-
getOpStackL1DataFee(unsignedTx: PopulatedTransaction, relayer:
|
|
79
|
+
getOpStackL1DataFee(unsignedTx: PopulatedTransaction, relayer: string | undefined, options: Partial<{
|
|
84
80
|
opStackL2GasUnits: BigNumberish;
|
|
85
81
|
opStackL1DataFeeMultiplier: BigNumber;
|
|
86
82
|
}>): Promise<BigNumber>;
|
|
@@ -95,7 +91,7 @@ export declare class QueryBase implements QueryInterface {
|
|
|
95
91
|
* @param options.transport A custom transport object for custom gas price retrieval.
|
|
96
92
|
* @returns Estimated cost in units of gas and the underlying gas token (gasPrice * estimatedGasUnits).
|
|
97
93
|
*/
|
|
98
|
-
estimateGas(unsignedTx: PopulatedTransaction, senderAddress:
|
|
94
|
+
estimateGas(unsignedTx: PopulatedTransaction, senderAddress: string, provider: providers.Provider | L2Provider<providers.Provider>, options?: Partial<{
|
|
99
95
|
gasPrice: BigNumberish;
|
|
100
96
|
gasUnits: BigNumberish;
|
|
101
97
|
baseFeeMultiplier: BigNumber;
|
|
@@ -5,7 +5,7 @@ import { Coingecko } from "../../coingecko";
|
|
|
5
5
|
import { CHAIN_IDs } from "../../constants";
|
|
6
6
|
import { SpokePool__factory } from "../../typechain";
|
|
7
7
|
import { populateV3Relay } from "../../arch/evm";
|
|
8
|
-
import { BigNumber, toBNWei, bnZero, chainIsOPStack, fixedPointAdjustment,
|
|
8
|
+
import { BigNumber, toBNWei, bnZero, chainIsOPStack, fixedPointAdjustment, } from "../../utils";
|
|
9
9
|
import assert from "assert";
|
|
10
10
|
import { getDefaultSimulatedRelayerAddress } from "../relayFeeCalculator";
|
|
11
11
|
import { getGasPriceEstimate } from "../../gasPriceOracle";
|
|
@@ -48,19 +48,15 @@ var QueryBase = /** @class */ (function () {
|
|
|
48
48
|
* @returns The gas estimate for this function call (multiplied with the optional buffer).
|
|
49
49
|
*/
|
|
50
50
|
QueryBase.prototype.getGasCosts = function (deposit, relayer, options) {
|
|
51
|
-
if (relayer === void 0) { relayer =
|
|
51
|
+
if (relayer === void 0) { relayer = getDefaultSimulatedRelayerAddress(deposit.destinationChainId); }
|
|
52
52
|
if (options === void 0) { options = {}; }
|
|
53
53
|
return __awaiter(this, void 0, void 0, function () {
|
|
54
|
-
var _a, gasPrice, gasUnits, baseFeeMultiplier, priorityFeeMultiplier, opStackL1GasCostMultiplier, transport,
|
|
54
|
+
var _a, gasPrice, gasUnits, baseFeeMultiplier, priorityFeeMultiplier, opStackL1GasCostMultiplier, transport, tx, _b, nativeGasCost, tokenGasCost, impliedGasPrice, opStackL1GasCost;
|
|
55
55
|
return __generator(this, function (_c) {
|
|
56
56
|
switch (_c.label) {
|
|
57
57
|
case 0:
|
|
58
58
|
_a = options.gasPrice, gasPrice = _a === void 0 ? this.fixedGasPrice : _a, gasUnits = options.gasUnits, baseFeeMultiplier = options.baseFeeMultiplier, priorityFeeMultiplier = options.priorityFeeMultiplier, opStackL1GasCostMultiplier = options.opStackL1GasCostMultiplier, transport = options.transport;
|
|
59
|
-
|
|
60
|
-
assert(recipient.isEVM(), "getGasCosts: recipient not an EVM address (".concat(recipient, ")"));
|
|
61
|
-
assert(outputToken.isEVM(), "getGasCosts: outputToken not an EVM address (".concat(outputToken, ")"));
|
|
62
|
-
assert(exclusiveRelayer.isEVM(), "getGasCosts: exclusiveRelayer not an EVM address (".concat(exclusiveRelayer, ")"));
|
|
63
|
-
return [4 /*yield*/, this.getUnsignedTxFromDeposit(__assign(__assign({}, deposit), { recipient: recipient, outputToken: outputToken, exclusiveRelayer: exclusiveRelayer }), relayer)];
|
|
59
|
+
return [4 /*yield*/, this.getUnsignedTxFromDeposit(deposit, relayer)];
|
|
64
60
|
case 1:
|
|
65
61
|
tx = _c.sent();
|
|
66
62
|
return [4 /*yield*/, this.estimateGas(tx, relayer, this.provider, {
|
|
@@ -90,7 +86,7 @@ var QueryBase = /** @class */ (function () {
|
|
|
90
86
|
* @returns PopulatedTransaction
|
|
91
87
|
*/
|
|
92
88
|
QueryBase.prototype.getUnsignedTxFromDeposit = function (deposit, relayer) {
|
|
93
|
-
if (relayer === void 0) { relayer =
|
|
89
|
+
if (relayer === void 0) { relayer = getDefaultSimulatedRelayerAddress(deposit.destinationChainId); }
|
|
94
90
|
return populateV3Relay(this.spokePool, deposit, relayer);
|
|
95
91
|
};
|
|
96
92
|
/**
|
|
@@ -100,20 +96,15 @@ var QueryBase = /** @class */ (function () {
|
|
|
100
96
|
* @returns Estimated gas cost based on ethers.VoidSigner's gas estimation
|
|
101
97
|
*/
|
|
102
98
|
QueryBase.prototype.getNativeGasCost = function (deposit, relayer) {
|
|
103
|
-
if (relayer === void 0) { relayer =
|
|
99
|
+
if (relayer === void 0) { relayer = getDefaultSimulatedRelayerAddress(deposit.destinationChainId); }
|
|
104
100
|
return __awaiter(this, void 0, void 0, function () {
|
|
105
|
-
var
|
|
101
|
+
var unsignedTx, voidSigner;
|
|
106
102
|
return __generator(this, function (_a) {
|
|
107
103
|
switch (_a.label) {
|
|
108
|
-
case 0:
|
|
109
|
-
recipient = deposit.recipient, outputToken = deposit.outputToken, exclusiveRelayer = deposit.exclusiveRelayer;
|
|
110
|
-
assert(recipient.isEVM(), "getNativeGasCost: recipient not an EVM address (".concat(recipient, ")"));
|
|
111
|
-
assert(outputToken.isEVM(), "getNativeGasCost: outputToken not an EVM address (".concat(outputToken, ")"));
|
|
112
|
-
assert(exclusiveRelayer.isEVM(), "getNativeGasCost: exclusiveRelayer not an EVM address (".concat(exclusiveRelayer, ")"));
|
|
113
|
-
return [4 /*yield*/, this.getUnsignedTxFromDeposit(__assign(__assign({}, deposit), { recipient: recipient, outputToken: outputToken, exclusiveRelayer: exclusiveRelayer }), relayer)];
|
|
104
|
+
case 0: return [4 /*yield*/, this.getUnsignedTxFromDeposit(deposit, relayer)];
|
|
114
105
|
case 1:
|
|
115
106
|
unsignedTx = _a.sent();
|
|
116
|
-
voidSigner = new VoidSigner(relayer
|
|
107
|
+
voidSigner = new VoidSigner(relayer, this.provider);
|
|
117
108
|
return [2 /*return*/, voidSigner.estimateGas(unsignedTx)];
|
|
118
109
|
}
|
|
119
110
|
});
|
|
@@ -128,7 +119,7 @@ var QueryBase = /** @class */ (function () {
|
|
|
128
119
|
* @returns BigNumber L1 data fee in gas units
|
|
129
120
|
*/
|
|
130
121
|
QueryBase.prototype.getOpStackL1DataFee = function (unsignedTx, relayer, options) {
|
|
131
|
-
if (relayer === void 0) { relayer =
|
|
122
|
+
if (relayer === void 0) { relayer = getDefaultSimulatedRelayerAddress(unsignedTx.chainId); }
|
|
132
123
|
return __awaiter(this, void 0, void 0, function () {
|
|
133
124
|
var _a, opStackL2GasUnits, _b, opStackL1DataFeeMultiplier, chainId, voidSigner, populatedTransaction, l1DataFee;
|
|
134
125
|
return __generator(this, function (_c) {
|
|
@@ -139,7 +130,7 @@ var QueryBase = /** @class */ (function () {
|
|
|
139
130
|
case 1:
|
|
140
131
|
chainId = (_c.sent()).chainId;
|
|
141
132
|
assert(isOptimismL2Provider(this.provider), "Unexpected provider for chain ID ".concat(chainId, "."));
|
|
142
|
-
voidSigner = new VoidSigner(relayer
|
|
133
|
+
voidSigner = new VoidSigner(relayer, this.provider);
|
|
143
134
|
return [4 /*yield*/, voidSigner.populateTransaction(__assign(__assign({}, unsignedTx), { gasLimit: opStackL2GasUnits }))];
|
|
144
135
|
case 2:
|
|
145
136
|
populatedTransaction = _c.sent();
|
|
@@ -173,7 +164,7 @@ var QueryBase = /** @class */ (function () {
|
|
|
173
164
|
return [4 /*yield*/, provider.getNetwork()];
|
|
174
165
|
case 1:
|
|
175
166
|
chainId = (_f.sent()).chainId;
|
|
176
|
-
voidSigner = new VoidSigner(senderAddress
|
|
167
|
+
voidSigner = new VoidSigner(senderAddress, provider);
|
|
177
168
|
queries = [
|
|
178
169
|
gasUnits ? Promise.resolve(BigNumber.from(gasUnits)) : voidSigner.estimateGas(unsignedTx),
|
|
179
170
|
_gasPrice
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"baseQuery.js","sourceRoot":"","sources":["../../../../src/relayFeeCalculator/chain-queries/baseQuery.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,YAAY,IAAI,oBAAoB,EAAE,MAAM,oCAAoC,CAAC;AAE1F,OAAO,EAAmC,UAAU,EAAE,MAAM,QAAQ,CAAC;AACrE,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,OAAO,EAAa,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAChE,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACjD,OAAO,
|
|
1
|
+
{"version":3,"file":"baseQuery.js","sourceRoot":"","sources":["../../../../src/relayFeeCalculator/chain-queries/baseQuery.ts"],"names":[],"mappings":"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"}
|
|
@@ -45,7 +45,7 @@ export declare class SvmQuery implements QueryInterface {
|
|
|
45
45
|
* @param options.transport Optional transport object for custom gas price retrieval.
|
|
46
46
|
* @returns The gas estimate for this function call (multiplied with the optional buffer).
|
|
47
47
|
*/
|
|
48
|
-
getGasCosts(deposit: Omit<Deposit, "messageHash">,
|
|
48
|
+
getGasCosts(deposit: Omit<Deposit, "messageHash">, _relayer?: string, options?: Partial<{
|
|
49
49
|
gasPrice: BigNumberish;
|
|
50
50
|
gasUnits: BigNumberish;
|
|
51
51
|
baseFeeMultiplier: BigNumber;
|
|
@@ -57,19 +57,14 @@ export declare class SvmQuery implements QueryInterface {
|
|
|
57
57
|
* @param relayer SVM address of the relayer
|
|
58
58
|
* @returns Estimated gas cost in compute units
|
|
59
59
|
*/
|
|
60
|
-
getNativeGasCost(deposit: Omit<Deposit, "messageHash">,
|
|
61
|
-
_relayer?: import("../../utils").Address): Promise<BigNumber>;
|
|
60
|
+
getNativeGasCost(deposit: Omit<Deposit, "messageHash">, _relayer?: string): Promise<BigNumber>;
|
|
62
61
|
/**
|
|
63
62
|
* @notice Return the fillRelay transaction for a given deposit
|
|
64
63
|
* @param deposit
|
|
65
64
|
* @param relayer SVM address of the relayer
|
|
66
65
|
* @returns FillRelay transaction
|
|
67
66
|
*/
|
|
68
|
-
getFillRelayTx(deposit: Omit<Deposit, "
|
|
69
|
-
recipient: SvmAddress;
|
|
70
|
-
outputToken: SvmAddress;
|
|
71
|
-
exclusiveRelayer: SvmAddress;
|
|
72
|
-
}, relayer?: import("../../utils").Address, repaymentChainId?: number, repaymentAddress?: import("../../utils").Address): Promise<import("@solana/kit").TransactionMessageWithBlockhashLifetime & import("@solana/kit").ITransactionMessageWithFeePayerSigner<string, import("@solana/kit").TransactionSigner<string>> & Omit<Readonly<{
|
|
67
|
+
getFillRelayTx(deposit: Omit<Deposit, "messageHash">, _relayer?: string, repaymentChainId?: number, repaymentAddress?: string): Promise<import("@solana/kit").TransactionMessageWithBlockhashLifetime & import("@solana/kit").ITransactionMessageWithFeePayerSigner<string, import("@solana/kit").TransactionSigner<string>> & Omit<Readonly<{
|
|
73
68
|
instructions: readonly import("@solana/kit").IInstruction<string, readonly (import("@solana/kit").IAccountLookupMeta<string, string> | import("@solana/kit").IAccountMeta<string>)[]>[];
|
|
74
69
|
version: 0;
|
|
75
70
|
}>, "feePayer">>;
|
|
@@ -1,5 +1,4 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import assert from "assert";
|
|
1
|
+
import { __awaiter, __generator } from "tslib";
|
|
3
2
|
import { intToU8Array32 } from "@across-protocol/contracts/dist/src/svm/web3-v1/conversionUtils";
|
|
4
3
|
import { SYSTEM_PROGRAM_ADDRESS } from "@solana-program/system";
|
|
5
4
|
import { ASSOCIATED_TOKEN_PROGRAM_ADDRESS, fetchMint } from "@solana-program/token";
|
|
@@ -50,19 +49,18 @@ var SvmQuery = /** @class */ (function () {
|
|
|
50
49
|
* @param options.transport Optional transport object for custom gas price retrieval.
|
|
51
50
|
* @returns The gas estimate for this function call (multiplied with the optional buffer).
|
|
52
51
|
*/
|
|
53
|
-
SvmQuery.prototype.getGasCosts = function (deposit,
|
|
54
|
-
if (
|
|
52
|
+
SvmQuery.prototype.getGasCosts = function (deposit, _relayer, options) {
|
|
53
|
+
if (_relayer === void 0) { _relayer = getDefaultSimulatedRelayerAddress(deposit.destinationChainId); }
|
|
55
54
|
if (options === void 0) { options = {}; }
|
|
56
55
|
return __awaiter(this, void 0, void 0, function () {
|
|
57
|
-
var
|
|
56
|
+
var relayer, fillRelayTx, _a, computeUnitsConsumed, gasPriceEstimate, _b, _c, _d, gasPrice;
|
|
58
57
|
return __generator(this, function (_e) {
|
|
59
58
|
switch (_e.label) {
|
|
60
59
|
case 0:
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
return [4 /*yield*/, this.getFillRelayTx(__assign(__assign({}, deposit), { recipient: recipient, outputToken: outputToken, exclusiveRelayer: exclusiveRelayer }), relayer)];
|
|
60
|
+
relayer = _relayer
|
|
61
|
+
? toAddressType(_relayer, deposit.destinationChainId).forceSvmAddress()
|
|
62
|
+
: this.simulatedRelayerAddress;
|
|
63
|
+
return [4 /*yield*/, this.getFillRelayTx(deposit, relayer.toBase58())];
|
|
66
64
|
case 1:
|
|
67
65
|
fillRelayTx = _e.sent();
|
|
68
66
|
_c = (_b = Promise).all;
|
|
@@ -95,19 +93,13 @@ var SvmQuery = /** @class */ (function () {
|
|
|
95
93
|
* @param relayer SVM address of the relayer
|
|
96
94
|
* @returns Estimated gas cost in compute units
|
|
97
95
|
*/
|
|
98
|
-
SvmQuery.prototype.getNativeGasCost = function (deposit,
|
|
99
|
-
|
|
100
|
-
if (_relayer === void 0) { _relayer = toAddressType(getDefaultSimulatedRelayerAddress(deposit.destinationChainId), deposit.destinationChainId); }
|
|
96
|
+
SvmQuery.prototype.getNativeGasCost = function (deposit, _relayer) {
|
|
97
|
+
if (_relayer === void 0) { _relayer = getDefaultSimulatedRelayerAddress(deposit.destinationChainId); }
|
|
101
98
|
return __awaiter(this, void 0, void 0, function () {
|
|
102
|
-
var
|
|
99
|
+
var fillRelayTx, _a;
|
|
103
100
|
return __generator(this, function (_b) {
|
|
104
101
|
switch (_b.label) {
|
|
105
|
-
case 0:
|
|
106
|
-
recipient = deposit.recipient, outputToken = deposit.outputToken, exclusiveRelayer = deposit.exclusiveRelayer;
|
|
107
|
-
assert(recipient.isSVM(), "getNativeGasCost: recipient not an SVM address (".concat(recipient, ")"));
|
|
108
|
-
assert(outputToken.isSVM(), "getNativeGasCost: outputToken not an SVM address (".concat(outputToken, ")"));
|
|
109
|
-
assert(exclusiveRelayer.isSVM(), "getNativeGasCost: exclusiveRelayer not an SVM address (".concat(exclusiveRelayer, ")"));
|
|
110
|
-
return [4 /*yield*/, this.getFillRelayTx(__assign(__assign({}, deposit), { recipient: recipient, outputToken: outputToken, exclusiveRelayer: exclusiveRelayer }), _relayer)];
|
|
102
|
+
case 0: return [4 /*yield*/, this.getFillRelayTx(deposit, _relayer)];
|
|
111
103
|
case 1:
|
|
112
104
|
fillRelayTx = _b.sent();
|
|
113
105
|
_a = toBN;
|
|
@@ -123,45 +115,49 @@ var SvmQuery = /** @class */ (function () {
|
|
|
123
115
|
* @param relayer SVM address of the relayer
|
|
124
116
|
* @returns FillRelay transaction
|
|
125
117
|
*/
|
|
126
|
-
SvmQuery.prototype.getFillRelayTx = function (deposit,
|
|
127
|
-
if (
|
|
118
|
+
SvmQuery.prototype.getFillRelayTx = function (deposit, _relayer, repaymentChainId, repaymentAddress) {
|
|
119
|
+
if (_relayer === void 0) { _relayer = getDefaultSimulatedRelayerAddress(deposit.destinationChainId); }
|
|
128
120
|
if (repaymentChainId === void 0) { repaymentChainId = deposit.destinationChainId; }
|
|
129
|
-
if (repaymentAddress === void 0) { repaymentAddress =
|
|
121
|
+
if (repaymentAddress === void 0) { repaymentAddress = getDefaultSimulatedRelayerAddress(deposit.destinationChainId); }
|
|
130
122
|
return __awaiter(this, void 0, void 0, function () {
|
|
131
|
-
var depositor, recipient, inputToken, outputToken, exclusiveRelayer, destinationChainId, program, _relayDataHash, relayDataHash, _a, state, delegate, mint, mintInfo, _b, recipientAta, relayerAta, fillStatus, eventAuthority, relayData, simulatedSigner, fillInput;
|
|
123
|
+
var toSvmAddress, depositor, recipient, inputToken, outputToken, exclusiveRelayer, originChainId, destinationChainId, program, relayer, _relayDataHash, relayDataHash, _a, state, delegate, _mint, mint, mintInfo, _b, recipientAta, relayerAta, fillStatus, eventAuthority, relayData, simulatedSigner, fillInput;
|
|
132
124
|
return __generator(this, function (_c) {
|
|
133
125
|
switch (_c.label) {
|
|
134
126
|
case 0:
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
127
|
+
toSvmAddress = function (address, chainId) {
|
|
128
|
+
return toAddress(toAddressType(address, chainId).forceSvmAddress());
|
|
129
|
+
};
|
|
130
|
+
depositor = deposit.depositor, recipient = deposit.recipient, inputToken = deposit.inputToken, outputToken = deposit.outputToken, exclusiveRelayer = deposit.exclusiveRelayer, originChainId = deposit.originChainId, destinationChainId = deposit.destinationChainId;
|
|
139
131
|
program = toAddress(this.spokePool);
|
|
132
|
+
relayer = _relayer
|
|
133
|
+
? toAddressType(_relayer, deposit.destinationChainId).forceSvmAddress()
|
|
134
|
+
: this.simulatedRelayerAddress;
|
|
140
135
|
_relayDataHash = getRelayDataHash(deposit, destinationChainId);
|
|
141
136
|
relayDataHash = new Uint8Array(Buffer.from(_relayDataHash.slice(2), "hex"));
|
|
142
137
|
return [4 /*yield*/, Promise.all([
|
|
143
138
|
getStatePda(program),
|
|
144
|
-
getFillRelayDelegatePda(relayDataHash, BigInt(repaymentChainId),
|
|
139
|
+
getFillRelayDelegatePda(relayDataHash, BigInt(repaymentChainId), toSvmAddress(repaymentAddress, repaymentChainId), program),
|
|
145
140
|
])];
|
|
146
141
|
case 1:
|
|
147
142
|
_a = _c.sent(), state = _a[0], delegate = _a[1];
|
|
148
|
-
|
|
143
|
+
_mint = toAddressType(outputToken, destinationChainId).forceSvmAddress();
|
|
144
|
+
mint = toAddress(_mint);
|
|
149
145
|
return [4 /*yield*/, fetchMint(this.provider, mint)];
|
|
150
146
|
case 2:
|
|
151
147
|
mintInfo = _c.sent();
|
|
152
148
|
return [4 /*yield*/, Promise.all([
|
|
153
|
-
getAssociatedTokenAddress(recipient,
|
|
154
|
-
getAssociatedTokenAddress(SvmAddress.from(relayer.toBase58()),
|
|
149
|
+
getAssociatedTokenAddress(toAddressType(deposit.recipient, destinationChainId).forceSvmAddress(), _mint, mintInfo.programAddress),
|
|
150
|
+
getAssociatedTokenAddress(SvmAddress.from(relayer.toBase58()), _mint, mintInfo.programAddress),
|
|
155
151
|
getFillStatusPda(program, deposit, destinationChainId),
|
|
156
|
-
getEventAuthority(
|
|
152
|
+
getEventAuthority(),
|
|
157
153
|
])];
|
|
158
154
|
case 3:
|
|
159
155
|
_b = _c.sent(), recipientAta = _b[0], relayerAta = _b[1], fillStatus = _b[2], eventAuthority = _b[3];
|
|
160
156
|
relayData = {
|
|
161
|
-
depositor:
|
|
162
|
-
recipient:
|
|
163
|
-
exclusiveRelayer:
|
|
164
|
-
inputToken:
|
|
157
|
+
depositor: toSvmAddress(depositor, originChainId),
|
|
158
|
+
recipient: toSvmAddress(recipient, destinationChainId),
|
|
159
|
+
exclusiveRelayer: toSvmAddress(exclusiveRelayer, destinationChainId),
|
|
160
|
+
inputToken: toSvmAddress(inputToken, originChainId),
|
|
165
161
|
outputToken: mint,
|
|
166
162
|
inputAmount: deposit.inputAmount.toBigInt(),
|
|
167
163
|
outputAmount: deposit.outputAmount.toBigInt(),
|
|
@@ -188,7 +184,7 @@ var SvmQuery = /** @class */ (function () {
|
|
|
188
184
|
relayHash: relayDataHash,
|
|
189
185
|
relayData: relayData,
|
|
190
186
|
repaymentChainId: BigInt(repaymentChainId),
|
|
191
|
-
repaymentAddress:
|
|
187
|
+
repaymentAddress: toSvmAddress(repaymentAddress, repaymentChainId),
|
|
192
188
|
};
|
|
193
189
|
// Pass createRecipientAtaIfNeeded =true to the createFillInstruction function to create the recipient token account
|
|
194
190
|
// if it doesn't exist.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"svmQuery.js","sourceRoot":"","sources":["../../../../src/relayFeeCalculator/chain-queries/svmQuery.ts"],"names":[],"mappings":";
|
|
1
|
+
{"version":3,"file":"svmQuery.js","sourceRoot":"","sources":["../../../../src/relayFeeCalculator/chain-queries/svmQuery.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { Transport } from "viem";
|
|
2
2
|
import { Deposit } from "../interfaces";
|
|
3
|
-
import { BigNumber, BigNumberish, TransactionCostEstimate
|
|
3
|
+
import { BigNumber, BigNumberish, TransactionCostEstimate } from "../utils";
|
|
4
4
|
export interface QueryInterface {
|
|
5
|
-
getGasCosts: (deposit: Omit<Deposit, "messageHash">, relayer:
|
|
5
|
+
getGasCosts: (deposit: Omit<Deposit, "messageHash">, relayer: string, options?: Partial<{
|
|
6
6
|
gasPrice: BigNumberish;
|
|
7
7
|
gasUnits: BigNumberish;
|
|
8
8
|
baseFeeMultiplier: BigNumber;
|
|
@@ -11,7 +11,7 @@ export interface QueryInterface {
|
|
|
11
11
|
transport: Transport;
|
|
12
12
|
}>) => Promise<TransactionCostEstimate>;
|
|
13
13
|
getTokenPrice: (tokenSymbol: string) => Promise<number>;
|
|
14
|
-
getNativeGasCost: (deposit: Omit<Deposit, "messageHash">, relayer:
|
|
14
|
+
getNativeGasCost: (deposit: Omit<Deposit, "messageHash">, relayer: string) => Promise<BigNumber>;
|
|
15
15
|
}
|
|
16
16
|
export declare const expectedCapitalCostsKeys: string[];
|
|
17
17
|
export interface CapitalCostConfig {
|
|
@@ -127,7 +127,7 @@ export declare class RelayFeeCalculator {
|
|
|
127
127
|
* a message & recipient contract is provided as this function may not simulate with
|
|
128
128
|
* the correct parameters to see a full fill.
|
|
129
129
|
*/
|
|
130
|
-
gasFeePercent(deposit: Deposit, outputAmount: BigNumberish, simulateZeroFill?: boolean, relayerAddress?:
|
|
130
|
+
gasFeePercent(deposit: Deposit, outputAmount: BigNumberish, simulateZeroFill?: boolean, relayerAddress?: string, _tokenPrice?: number, tokenMapping?: {
|
|
131
131
|
ACX: {
|
|
132
132
|
name: string;
|
|
133
133
|
symbol: string;
|
|
@@ -549,6 +549,6 @@ export declare class RelayFeeCalculator {
|
|
|
549
549
|
* @param gasUnits Optional gas units to use for the simulation
|
|
550
550
|
* @returns A resulting `RelayerFeeDetails` object
|
|
551
551
|
*/
|
|
552
|
-
relayerFeeDetails(deposit: Deposit, outputAmount?: BigNumberish, simulateZeroFill?: boolean, relayerAddress?:
|
|
552
|
+
relayerFeeDetails(deposit: Deposit, outputAmount?: BigNumberish, simulateZeroFill?: boolean, relayerAddress?: string, _tokenPrice?: number, gasPrice?: BigNumberish, gasUnits?: BigNumberish, tokenGasCost?: BigNumberish): Promise<RelayerFeeDetails>;
|
|
553
553
|
}
|
|
554
554
|
export {};
|