@across-protocol/sdk 4.2.16-alpha.4 → 4.2.16-alpha.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/dist/cjs/arch/evm/SpokeUtils.d.ts +8 -3
- package/dist/cjs/arch/evm/SpokeUtils.js +21 -21
- package/dist/cjs/arch/evm/SpokeUtils.js.map +1 -1
- package/dist/cjs/arch/svm/SpokeUtils.d.ts +8 -6
- package/dist/cjs/arch/svm/SpokeUtils.js +17 -17
- package/dist/cjs/arch/svm/SpokeUtils.js.map +1 -1
- package/dist/cjs/arch/svm/eventsClient.js +4 -2
- package/dist/cjs/arch/svm/eventsClient.js.map +1 -1
- package/dist/cjs/arch/svm/utils.js +1 -1
- package/dist/cjs/arch/svm/utils.js.map +1 -1
- package/dist/cjs/clients/BundleDataClient/utils/SuperstructUtils.d.ts +71 -71
- package/dist/cjs/clients/BundleDataClient/utils/SuperstructUtils.js +4 -2
- package/dist/cjs/clients/BundleDataClient/utils/SuperstructUtils.js.map +1 -1
- package/dist/cjs/clients/HubPoolClient.js +4 -3
- package/dist/cjs/clients/HubPoolClient.js.map +1 -1
- package/dist/cjs/clients/SpokePoolClient/SpokePoolClient.js +2 -1
- package/dist/cjs/clients/SpokePoolClient/SpokePoolClient.js.map +1 -1
- package/dist/cjs/clients/mocks/MockSvmCpiEventsClient.d.ts +1 -1
- package/dist/cjs/clients/mocks/MockSvmCpiEventsClient.js +6 -4
- package/dist/cjs/clients/mocks/MockSvmCpiEventsClient.js.map +1 -1
- package/dist/cjs/interfaces/SpokePool.d.ts +7 -8
- package/dist/cjs/interfaces/SpokePool.js.map +1 -1
- package/dist/cjs/relayFeeCalculator/chain-queries/baseQuery.d.ts +13 -5
- package/dist/cjs/relayFeeCalculator/chain-queries/baseQuery.js +21 -12
- package/dist/cjs/relayFeeCalculator/chain-queries/baseQuery.js.map +1 -1
- package/dist/cjs/relayFeeCalculator/chain-queries/factory.js +1 -1
- package/dist/cjs/relayFeeCalculator/chain-queries/factory.js.map +1 -1
- package/dist/cjs/relayFeeCalculator/chain-queries/svmQuery.d.ts +12 -4
- package/dist/cjs/relayFeeCalculator/chain-queries/svmQuery.js +42 -30
- package/dist/cjs/relayFeeCalculator/chain-queries/svmQuery.js.map +1 -1
- package/dist/cjs/relayFeeCalculator/relayFeeCalculator.d.ts +1 -1
- package/dist/cjs/relayFeeCalculator/relayFeeCalculator.js +5 -5
- package/dist/cjs/relayFeeCalculator/relayFeeCalculator.js.map +1 -1
- package/dist/cjs/utils/AddressUtils.d.ts +12 -8
- package/dist/cjs/utils/AddressUtils.js +33 -36
- package/dist/cjs/utils/AddressUtils.js.map +1 -1
- package/dist/cjs/utils/TokenUtils.js +5 -3
- package/dist/cjs/utils/TokenUtils.js.map +1 -1
- package/dist/esm/arch/evm/SpokeUtils.d.ts +9 -4
- package/dist/esm/arch/evm/SpokeUtils.js +24 -24
- package/dist/esm/arch/evm/SpokeUtils.js.map +1 -1
- package/dist/esm/arch/svm/SpokeUtils.d.ts +9 -7
- package/dist/esm/arch/svm/SpokeUtils.js +19 -19
- package/dist/esm/arch/svm/SpokeUtils.js.map +1 -1
- package/dist/esm/arch/svm/eventsClient.js +5 -3
- package/dist/esm/arch/svm/eventsClient.js.map +1 -1
- package/dist/esm/arch/svm/utils.js +2 -2
- package/dist/esm/arch/svm/utils.js.map +1 -1
- package/dist/esm/clients/BundleDataClient/utils/SuperstructUtils.d.ts +71 -71
- package/dist/esm/clients/BundleDataClient/utils/SuperstructUtils.js +11 -4
- package/dist/esm/clients/BundleDataClient/utils/SuperstructUtils.js.map +1 -1
- package/dist/esm/clients/HubPoolClient.js +4 -3
- package/dist/esm/clients/HubPoolClient.js.map +1 -1
- package/dist/esm/clients/SpokePoolClient/SpokePoolClient.js +2 -1
- package/dist/esm/clients/SpokePoolClient/SpokePoolClient.js.map +1 -1
- package/dist/esm/clients/mocks/MockSvmCpiEventsClient.d.ts +1 -1
- package/dist/esm/clients/mocks/MockSvmCpiEventsClient.js +7 -5
- package/dist/esm/clients/mocks/MockSvmCpiEventsClient.js.map +1 -1
- package/dist/esm/interfaces/SpokePool.d.ts +7 -8
- package/dist/esm/interfaces/SpokePool.js.map +1 -1
- package/dist/esm/relayFeeCalculator/chain-queries/baseQuery.d.ts +16 -8
- package/dist/esm/relayFeeCalculator/chain-queries/baseQuery.js +25 -16
- package/dist/esm/relayFeeCalculator/chain-queries/baseQuery.js.map +1 -1
- package/dist/esm/relayFeeCalculator/chain-queries/factory.js +2 -2
- package/dist/esm/relayFeeCalculator/chain-queries/factory.js.map +1 -1
- package/dist/esm/relayFeeCalculator/chain-queries/svmQuery.d.ts +14 -6
- package/dist/esm/relayFeeCalculator/chain-queries/svmQuery.js +47 -34
- package/dist/esm/relayFeeCalculator/chain-queries/svmQuery.js.map +1 -1
- package/dist/esm/relayFeeCalculator/relayFeeCalculator.d.ts +1 -1
- package/dist/esm/relayFeeCalculator/relayFeeCalculator.js +3 -3
- package/dist/esm/relayFeeCalculator/relayFeeCalculator.js.map +1 -1
- package/dist/esm/utils/AddressUtils.d.ts +12 -8
- package/dist/esm/utils/AddressUtils.js +36 -38
- package/dist/esm/utils/AddressUtils.js.map +1 -1
- package/dist/esm/utils/TokenUtils.d.ts +16 -0
- package/dist/esm/utils/TokenUtils.js +6 -4
- package/dist/esm/utils/TokenUtils.js.map +1 -1
- package/dist/types/arch/evm/SpokeUtils.d.ts +9 -4
- package/dist/types/arch/evm/SpokeUtils.d.ts.map +1 -1
- package/dist/types/arch/svm/SpokeUtils.d.ts +9 -7
- 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.map +1 -1
- package/dist/types/clients/BundleDataClient/utils/SuperstructUtils.d.ts +71 -71
- package/dist/types/clients/BundleDataClient/utils/SuperstructUtils.d.ts.map +1 -1
- package/dist/types/clients/HubPoolClient.d.ts.map +1 -1
- package/dist/types/clients/SpokePoolClient/SpokePoolClient.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/interfaces/SpokePool.d.ts +7 -8
- package/dist/types/interfaces/SpokePool.d.ts.map +1 -1
- package/dist/types/relayFeeCalculator/chain-queries/baseQuery.d.ts +16 -8
- package/dist/types/relayFeeCalculator/chain-queries/baseQuery.d.ts.map +1 -1
- package/dist/types/relayFeeCalculator/chain-queries/factory.d.ts.map +1 -1
- package/dist/types/relayFeeCalculator/chain-queries/svmQuery.d.ts +14 -6
- package/dist/types/relayFeeCalculator/chain-queries/svmQuery.d.ts.map +1 -1
- package/dist/types/relayFeeCalculator/relayFeeCalculator.d.ts +1 -1
- package/dist/types/relayFeeCalculator/relayFeeCalculator.d.ts.map +1 -1
- package/dist/types/utils/AddressUtils.d.ts +12 -8
- package/dist/types/utils/AddressUtils.d.ts.map +1 -1
- package/dist/types/utils/TokenUtils.d.ts +16 -0
- package/dist/types/utils/TokenUtils.d.ts.map +1 -1
- package/package.json +1 -1
- package/src/arch/evm/SpokeUtils.ts +42 -27
- package/src/arch/svm/SpokeUtils.ts +25 -30
- package/src/arch/svm/eventsClient.ts +40 -8
- package/src/arch/svm/utils.ts +2 -2
- package/src/clients/BundleDataClient/utils/SuperstructUtils.ts +12 -4
- package/src/clients/HubPoolClient.ts +5 -4
- package/src/clients/SpokePoolClient/SpokePoolClient.ts +4 -1
- package/src/clients/mocks/MockSvmCpiEventsClient.ts +8 -5
- package/src/interfaces/SpokePool.ts +8 -8
- package/src/relayFeeCalculator/chain-queries/baseQuery.ts +33 -16
- package/src/relayFeeCalculator/chain-queries/factory.ts +2 -2
- package/src/relayFeeCalculator/chain-queries/svmQuery.ts +48 -37
- package/src/relayFeeCalculator/relayFeeCalculator.ts +3 -9
- package/src/utils/AddressUtils.ts +39 -51
- package/src/utils/TokenUtils.ts +6 -4
|
@@ -6,7 +6,7 @@ export declare class MockSvmCpiEventsClient extends SvmCpiEventsClient {
|
|
|
6
6
|
private slotHeight;
|
|
7
7
|
chainId: number;
|
|
8
8
|
minBlockRange: number;
|
|
9
|
-
numberOfDeposits: import("
|
|
9
|
+
numberOfDeposits: import("ethers").BigNumber;
|
|
10
10
|
constructor(programId?: Address<"JAZWcGrpSWNPTBj8QtJ9UyQqhJCDhG9GJkDeMf5NQBiq">, chainId?: number);
|
|
11
11
|
setSlotHeight(slotHeight: bigint): void;
|
|
12
12
|
setEvents(events: EventWithData[]): void;
|
|
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.MockSvmCpiEventsClient = void 0;
|
|
4
4
|
var tslib_1 = require("tslib");
|
|
5
5
|
var assert_1 = tslib_1.__importDefault(require("assert"));
|
|
6
|
+
var ethers_1 = require("ethers");
|
|
6
7
|
var crypto_1 = require("crypto");
|
|
7
8
|
var utils_1 = require("ethers/lib/utils");
|
|
8
9
|
var lodash_1 = require("lodash");
|
|
@@ -13,6 +14,7 @@ var mocks_1 = require("../../providers/mocks");
|
|
|
13
14
|
var svm_1 = require("../../arch/svm");
|
|
14
15
|
var utils_2 = require("../../utils");
|
|
15
16
|
var interfaces_1 = require("../../interfaces");
|
|
17
|
+
var randomBytes = function (n) { return ethers_1.utils.hexlify(ethers_1.utils.randomBytes(n)); };
|
|
16
18
|
var MockSvmCpiEventsClient = (function (_super) {
|
|
17
19
|
tslib_1.__extends(MockSvmCpiEventsClient, _super);
|
|
18
20
|
function MockSvmCpiEventsClient(programId, chainId) {
|
|
@@ -65,9 +67,9 @@ var MockSvmCpiEventsClient = (function (_super) {
|
|
|
65
67
|
this.numberOfDeposits = this.numberOfDeposits.add(utils_2.bnOne);
|
|
66
68
|
destinationChainId !== null && destinationChainId !== void 0 ? destinationChainId : (destinationChainId = BigInt((0, lodash_1.random)(1, 42161, false)));
|
|
67
69
|
var depositor = (_a = deposit.depositor) !== null && _a !== void 0 ? _a : (0, svm_1.getRandomSvmAddress)();
|
|
68
|
-
var recipient = (_b = deposit.recipient) !== null && _b !== void 0 ? _b : utils_2.
|
|
70
|
+
var recipient = (_b = deposit.recipient) !== null && _b !== void 0 ? _b : utils_2.SvmAddress.from(randomBytes(32), "base16").toBase58();
|
|
69
71
|
var inputToken = (_c = deposit.inputToken) !== null && _c !== void 0 ? _c : (0, svm_1.getRandomSvmAddress)();
|
|
70
|
-
var outputToken = (_d = deposit.outputToken) !== null && _d !== void 0 ? _d : utils_2.
|
|
72
|
+
var outputToken = (_d = deposit.outputToken) !== null && _d !== void 0 ? _d : utils_2.SvmAddress.from(randomBytes(32), "base16").toBase58();
|
|
71
73
|
inputAmount !== null && inputAmount !== void 0 ? inputAmount : (inputAmount = BigInt((0, lodash_1.random)(1, 1000, false)));
|
|
72
74
|
outputAmount !== null && outputAmount !== void 0 ? outputAmount : (outputAmount = (inputAmount * BigInt(95)) / BigInt(100));
|
|
73
75
|
var message = (_e = deposit.message) !== null && _e !== void 0 ? _e : new Uint8Array(32);
|
|
@@ -142,9 +144,9 @@ var MockSvmCpiEventsClient = (function (_super) {
|
|
|
142
144
|
var depositId = slowFillRequest.depositId, originChainId = slowFillRequest.originChainId;
|
|
143
145
|
depositId !== null && depositId !== void 0 ? depositId : (depositId = Uint8Array.from([(0, lodash_1.random)(1, 100000, false)]));
|
|
144
146
|
originChainId !== null && originChainId !== void 0 ? originChainId : (originChainId = BigInt((0, lodash_1.random)(1, 42161, false)));
|
|
145
|
-
var depositor = (_a = slowFillRequest.depositor) !== null && _a !== void 0 ? _a : utils_2.
|
|
147
|
+
var depositor = (_a = slowFillRequest.depositor) !== null && _a !== void 0 ? _a : utils_2.SvmAddress.from(randomBytes(32)).toBase58();
|
|
146
148
|
var recipient = (_b = slowFillRequest.recipient) !== null && _b !== void 0 ? _b : (0, svm_1.getRandomSvmAddress)();
|
|
147
|
-
var inputToken = (_c = slowFillRequest.inputToken) !== null && _c !== void 0 ? _c : utils_2.
|
|
149
|
+
var inputToken = (_c = slowFillRequest.inputToken) !== null && _c !== void 0 ? _c : utils_2.SvmAddress.from(randomBytes(32)).toBase58();
|
|
148
150
|
var outputToken = (_d = slowFillRequest.outputToken) !== null && _d !== void 0 ? _d : (0, svm_1.getRandomSvmAddress)();
|
|
149
151
|
var args = tslib_1.__assign(tslib_1.__assign({}, slowFillRequest), { depositId: depositId, originChainId: originChainId, depositor: depositor, recipient: recipient, inputToken: inputToken, outputToken: outputToken, inputAmount: (_e = slowFillRequest.inputAmount) !== null && _e !== void 0 ? _e : BigInt((0, lodash_1.random)(1, 1000, false)), outputAmount: (_g = (_f = slowFillRequest.outputAmount) !== null && _f !== void 0 ? _f : slowFillRequest.inputAmount) !== null && _g !== void 0 ? _g : BigInt((0, lodash_1.random)(1, 1000, false)), exclusiveRelayer: (_h = slowFillRequest.exclusiveRelayer) !== null && _h !== void 0 ? _h : svm_1.SVM_DEFAULT_ADDRESS });
|
|
150
152
|
return this.generateEvent({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MockSvmCpiEventsClient.js","sourceRoot":"","sources":["../../../../src/clients/mocks/MockSvmCpiEventsClient.ts"],"names":[],"mappings":";;;;AAAA,0DAA4B;AAC5B,iCAAoC;AACpC,0CAAiE;AACjE,iCAAgC;AAChC,mCAAgE;AAEhE,wDAA4D;AAC5D,wDAAuD;AAEvD,+CAA6D;AAC7D,sCAQwB;AACxB,
|
|
1
|
+
{"version":3,"file":"MockSvmCpiEventsClient.js","sourceRoot":"","sources":["../../../../src/clients/mocks/MockSvmCpiEventsClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,14 +16,16 @@ export interface RelayData {
|
|
|
16
16
|
exclusiveRelayer: Address;
|
|
17
17
|
exclusivityDeadline: number;
|
|
18
18
|
}
|
|
19
|
-
export interface
|
|
19
|
+
export interface SpeedUpCommon {
|
|
20
|
+
updatedRecipient: Address;
|
|
21
|
+
updatedOutputAmount: BigNumber;
|
|
22
|
+
updatedMessage: string;
|
|
23
|
+
}
|
|
24
|
+
export interface Deposit extends RelayData, Partial<SpeedUpCommon> {
|
|
20
25
|
messageHash: string;
|
|
21
26
|
destinationChainId: number;
|
|
22
27
|
quoteTimestamp: number;
|
|
23
28
|
speedUpSignature?: string;
|
|
24
|
-
updatedRecipient?: Address;
|
|
25
|
-
updatedOutputAmount?: BigNumber;
|
|
26
|
-
updatedMessage?: string;
|
|
27
29
|
fromLiteChain: boolean;
|
|
28
30
|
toLiteChain: boolean;
|
|
29
31
|
}
|
|
@@ -69,14 +71,11 @@ export interface EnabledDepositRoute {
|
|
|
69
71
|
}
|
|
70
72
|
export interface EnabledDepositRouteWithBlock extends EnabledDepositRoute, SortableEvent {
|
|
71
73
|
}
|
|
72
|
-
export interface SpeedUp {
|
|
74
|
+
export interface SpeedUp extends SpeedUpCommon {
|
|
73
75
|
depositor: EvmAddress;
|
|
74
76
|
depositorSignature: string;
|
|
75
77
|
depositId: BigNumber;
|
|
76
78
|
originChainId: number;
|
|
77
|
-
updatedRecipient: Address;
|
|
78
|
-
updatedOutputAmount: BigNumber;
|
|
79
|
-
updatedMessage: string;
|
|
80
79
|
}
|
|
81
80
|
export interface SpeedUpWithBlock extends SpeedUp, SortableEvent {
|
|
82
81
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SpokePool.js","sourceRoot":"","sources":["../../../src/interfaces/SpokePool.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"SpokePool.js","sourceRoot":"","sources":["../../../src/interfaces/SpokePool.ts"],"names":[],"mappings":";;;AA2CA,IAAY,UAIX;AAJD,WAAY,UAAU;IACpB,mDAAY,CAAA;IACZ,qEAAiB,CAAA;IACjB,+CAAM,CAAA;AACR,CAAC,EAJW,UAAU,0BAAV,UAAU,QAIrB;AAED,IAAY,QAIX;AAJD,WAAY,QAAQ;IAClB,+CAAY,CAAA;IACZ,+DAAgB,CAAA;IAChB,+CAAQ,CAAA;AACV,CAAC,EAJW,QAAQ,wBAAR,QAAQ,QAInB"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { L2Provider } from "@eth-optimism/sdk/dist/interfaces/l2-provider";
|
|
2
2
|
import { PopulatedTransaction, providers } from "ethers";
|
|
3
|
-
import {
|
|
3
|
+
import { RelayData } from "../../interfaces";
|
|
4
4
|
import { SpokePool } from "../../typechain";
|
|
5
|
-
import { BigNumberish, TransactionCostEstimate, BigNumber, Address } from "../../utils";
|
|
5
|
+
import { BigNumberish, EvmAddress, TransactionCostEstimate, BigNumber, Address } from "../../utils";
|
|
6
6
|
import { Logger, QueryInterface } from "../relayFeeCalculator";
|
|
7
7
|
import { Transport } from "viem";
|
|
8
8
|
import { EvmProvider } from "../../arch/evm/types";
|
|
@@ -21,7 +21,9 @@ export declare class QueryBase implements QueryInterface {
|
|
|
21
21
|
readonly coingeckoBaseCurrency: string;
|
|
22
22
|
readonly spokePool: SpokePool;
|
|
23
23
|
constructor(provider: EvmProvider, symbolMapping: SymbolMappingType, spokePoolAddress: string, simulatedRelayerAddress: string, logger: Logger, coingeckoProApiKey?: string | undefined, fixedGasPrice?: BigNumberish | undefined, coingeckoBaseCurrency?: string);
|
|
24
|
-
getGasCosts(
|
|
24
|
+
getGasCosts(relayData: RelayData & {
|
|
25
|
+
destinationChainId: number;
|
|
26
|
+
}, relayer?: Address, options?: Partial<{
|
|
25
27
|
gasPrice: BigNumberish;
|
|
26
28
|
gasUnits: BigNumberish;
|
|
27
29
|
baseFeeMultiplier: BigNumber;
|
|
@@ -29,8 +31,14 @@ export declare class QueryBase implements QueryInterface {
|
|
|
29
31
|
opStackL1GasCostMultiplier: BigNumber;
|
|
30
32
|
transport: Transport;
|
|
31
33
|
}>): Promise<TransactionCostEstimate>;
|
|
32
|
-
getUnsignedTxFromDeposit(
|
|
33
|
-
|
|
34
|
+
getUnsignedTxFromDeposit(relayData: Omit<RelayData, "recipient" | "outputToken"> & {
|
|
35
|
+
destinationChainId: number;
|
|
36
|
+
recipient: EvmAddress;
|
|
37
|
+
outputToken: EvmAddress;
|
|
38
|
+
}, relayer?: Address): Promise<PopulatedTransaction>;
|
|
39
|
+
getNativeGasCost(relayData: RelayData & {
|
|
40
|
+
destinationChainId: number;
|
|
41
|
+
}, relayer?: Address): Promise<BigNumber>;
|
|
34
42
|
getOpStackL1DataFee(unsignedTx: PopulatedTransaction, relayer: Address | undefined, options: Partial<{
|
|
35
43
|
opStackL2GasUnits: BigNumberish;
|
|
36
44
|
opStackL1DataFeeMultiplier: BigNumber;
|
|
@@ -25,16 +25,20 @@ var QueryBase = (function () {
|
|
|
25
25
|
this.coingeckoBaseCurrency = coingeckoBaseCurrency;
|
|
26
26
|
this.spokePool = typechain_1.SpokePool__factory.connect(spokePoolAddress, provider);
|
|
27
27
|
}
|
|
28
|
-
QueryBase.prototype.getGasCosts = function (
|
|
29
|
-
if (relayer === void 0) { relayer = (0, utils_1.toAddressType)((0, relayFeeCalculator_1.
|
|
28
|
+
QueryBase.prototype.getGasCosts = function (relayData, relayer, options) {
|
|
29
|
+
if (relayer === void 0) { relayer = (0, utils_1.toAddressType)((0, relayFeeCalculator_1.getDefaultRelayer)(relayData.destinationChainId), relayData.destinationChainId); }
|
|
30
30
|
if (options === void 0) { options = {}; }
|
|
31
31
|
return tslib_1.__awaiter(this, void 0, void 0, function () {
|
|
32
|
-
var _a, gasPrice, gasUnits, baseFeeMultiplier, priorityFeeMultiplier, opStackL1GasCostMultiplier, transport, tx, _b, nativeGasCost, tokenGasCost, impliedGasPrice, opStackL1GasCost;
|
|
32
|
+
var _a, gasPrice, gasUnits, baseFeeMultiplier, priorityFeeMultiplier, opStackL1GasCostMultiplier, transport, recipient, outputToken, exclusiveRelayer, tx, _b, nativeGasCost, tokenGasCost, impliedGasPrice, opStackL1GasCost;
|
|
33
33
|
return tslib_1.__generator(this, function (_c) {
|
|
34
34
|
switch (_c.label) {
|
|
35
35
|
case 0:
|
|
36
36
|
_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;
|
|
37
|
-
|
|
37
|
+
recipient = relayData.recipient, outputToken = relayData.outputToken, exclusiveRelayer = relayData.exclusiveRelayer;
|
|
38
|
+
(0, assert_1.default)(recipient.isEVM(), "getGasCosts: recipient not an EVM address (".concat(recipient, ")"));
|
|
39
|
+
(0, assert_1.default)(outputToken.isEVM(), "getGasCosts: outputToken not an EVM address (".concat(outputToken, ")"));
|
|
40
|
+
(0, assert_1.default)(exclusiveRelayer.isEVM(), "getGasCosts: exclusiveRelayer not an EVM address (".concat(exclusiveRelayer, ")"));
|
|
41
|
+
return [4, this.getUnsignedTxFromDeposit(tslib_1.__assign(tslib_1.__assign({}, relayData), { recipient: recipient, outputToken: outputToken, exclusiveRelayer: exclusiveRelayer }), relayer)];
|
|
38
42
|
case 1:
|
|
39
43
|
tx = _c.sent();
|
|
40
44
|
return [4, this.estimateGas(tx, relayer, this.provider, {
|
|
@@ -57,17 +61,22 @@ var QueryBase = (function () {
|
|
|
57
61
|
});
|
|
58
62
|
});
|
|
59
63
|
};
|
|
60
|
-
QueryBase.prototype.getUnsignedTxFromDeposit = function (
|
|
61
|
-
if (relayer === void 0) { relayer = (0, utils_1.toAddressType)((0, relayFeeCalculator_1.
|
|
62
|
-
return (0, evm_1.populateV3Relay)(this.spokePool,
|
|
64
|
+
QueryBase.prototype.getUnsignedTxFromDeposit = function (relayData, relayer) {
|
|
65
|
+
if (relayer === void 0) { relayer = (0, utils_1.toAddressType)((0, relayFeeCalculator_1.getDefaultRelayer)(relayData.destinationChainId), relayData.destinationChainId); }
|
|
66
|
+
return (0, evm_1.populateV3Relay)(this.spokePool, relayData, relayer);
|
|
63
67
|
};
|
|
64
|
-
QueryBase.prototype.getNativeGasCost = function (
|
|
65
|
-
if (relayer === void 0) { relayer = (0, utils_1.toAddressType)((0, relayFeeCalculator_1.
|
|
68
|
+
QueryBase.prototype.getNativeGasCost = function (relayData, relayer) {
|
|
69
|
+
if (relayer === void 0) { relayer = (0, utils_1.toAddressType)((0, relayFeeCalculator_1.getDefaultRelayer)(relayData.destinationChainId), relayData.destinationChainId); }
|
|
66
70
|
return tslib_1.__awaiter(this, void 0, void 0, function () {
|
|
67
|
-
var unsignedTx, voidSigner;
|
|
71
|
+
var recipient, outputToken, exclusiveRelayer, unsignedTx, voidSigner;
|
|
68
72
|
return tslib_1.__generator(this, function (_a) {
|
|
69
73
|
switch (_a.label) {
|
|
70
|
-
case 0:
|
|
74
|
+
case 0:
|
|
75
|
+
recipient = relayData.recipient, outputToken = relayData.outputToken, exclusiveRelayer = relayData.exclusiveRelayer;
|
|
76
|
+
(0, assert_1.default)(recipient.isEVM(), "getNativeGasCost: recipient not an EVM address (".concat(recipient, ")"));
|
|
77
|
+
(0, assert_1.default)(outputToken.isEVM(), "getNativeGasCost: outputToken not an EVM address (".concat(outputToken, ")"));
|
|
78
|
+
(0, assert_1.default)(exclusiveRelayer.isEVM(), "getNativeGasCost: exclusiveRelayer not an EVM address (".concat(exclusiveRelayer, ")"));
|
|
79
|
+
return [4, this.getUnsignedTxFromDeposit(tslib_1.__assign(tslib_1.__assign({}, relayData), { recipient: recipient, outputToken: outputToken, exclusiveRelayer: exclusiveRelayer }), relayer)];
|
|
71
80
|
case 1:
|
|
72
81
|
unsignedTx = _a.sent();
|
|
73
82
|
voidSigner = new ethers_1.VoidSigner(relayer.toEvmAddress(), this.provider);
|
|
@@ -77,7 +86,7 @@ var QueryBase = (function () {
|
|
|
77
86
|
});
|
|
78
87
|
};
|
|
79
88
|
QueryBase.prototype.getOpStackL1DataFee = function (unsignedTx, relayer, options) {
|
|
80
|
-
if (relayer === void 0) { relayer = (0, utils_1.toAddressType)((0, relayFeeCalculator_1.
|
|
89
|
+
if (relayer === void 0) { relayer = (0, utils_1.toAddressType)((0, relayFeeCalculator_1.getDefaultRelayer)(unsignedTx.chainId), constants_1.CHAIN_IDs.MAINNET); }
|
|
81
90
|
return tslib_1.__awaiter(this, void 0, void 0, function () {
|
|
82
91
|
var _a, opStackL2GasUnits, _b, opStackL1DataFeeMultiplier, chainId, voidSigner, populatedTransaction, l1DataFee;
|
|
83
92
|
return tslib_1.__generator(this, function (_c) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"baseQuery.js","sourceRoot":"","sources":["../../../../src/relayFeeCalculator/chain-queries/baseQuery.ts"],"names":[],"mappings":";;;;AACA,kEAA0F;
|
|
1
|
+
{"version":3,"file":"baseQuery.js","sourceRoot":"","sources":["../../../../src/relayFeeCalculator/chain-queries/baseQuery.ts"],"names":[],"mappings":"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"}
|
|
@@ -22,7 +22,7 @@ var QueryBase__factory = (function () {
|
|
|
22
22
|
QueryBase__factory.create = function (chainId, provider, symbolMapping, spokePoolAddress, simulatedRelayerAddress, coingeckoProApiKey, logger, coingeckoBaseCurrency) {
|
|
23
23
|
if (symbolMapping === void 0) { symbolMapping = constants_1.TOKEN_SYMBOLS_MAP; }
|
|
24
24
|
if (spokePoolAddress === void 0) { spokePoolAddress = (0, contracts_1.getDeployedAddress)("SpokePool", chainId); }
|
|
25
|
-
if (simulatedRelayerAddress === void 0) { simulatedRelayerAddress = (0, relayFeeCalculator_1.
|
|
25
|
+
if (simulatedRelayerAddress === void 0) { simulatedRelayerAddress = (0, relayFeeCalculator_1.getDefaultRelayer)(chainId); }
|
|
26
26
|
if (logger === void 0) { logger = relayFeeCalculator_1.DEFAULT_LOGGER; }
|
|
27
27
|
if (coingeckoBaseCurrency === void 0) { coingeckoBaseCurrency = "eth"; }
|
|
28
28
|
(0, assert_1.default)((0, utils_1.isDefined)(spokePoolAddress));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"factory.js","sourceRoot":"","sources":["../../../../src/relayFeeCalculator/chain-queries/factory.ts"],"names":[],"mappings":";;;;;AAAA,0DAA4B;AAC5B,wDAA0E;AAC1E,wDAAgE;AAChE,yCAAiD;AAEjD,6CAAoD;AACpD,qCAAgF;AAChF,yCAAwC;AAExC,
|
|
1
|
+
{"version":3,"file":"factory.js","sourceRoot":"","sources":["../../../../src/relayFeeCalculator/chain-queries/factory.ts"],"names":[],"mappings":";;;;;AAAA,0DAA4B;AAC5B,wDAA0E;AAC1E,wDAAgE;AAChE,yCAAiD;AAEjD,6CAAoD;AACpD,qCAAgF;AAChF,yCAAwC;AAExC,4DAAkF;AAClF,mDAAyD;AACzD,uCAAsC;AAMtC,IAAM,aAAa;IACjB,GAAC,qBAAS,CAAC,IAAI,IAAG,GAAG;OACtB,CAAC;AAEF;IAAA;IA0DA,CAAC;IAzDQ,yBAAM,GAAb,UACE,OAAe,EACf,QAA0C,EAC1C,aAAiC,EACjC,gBAA2D,EAC3D,uBAAoD,EACpD,kBAA2B,EAC3B,MAA+B,EAC/B,qBAA6B;QAL7B,8BAAA,EAAA,gBAAgB,6BAAiB;QACjC,iCAAA,EAAA,uBAAmB,8BAAkB,EAAC,WAAW,EAAE,OAAO,CAAC;QAC3D,wCAAA,EAAA,8BAA0B,sCAAiB,EAAC,OAAO,CAAC;QAEpD,uBAAA,EAAA,SAAiB,mCAAc;QAC/B,sCAAA,EAAA,6BAA6B;QAE7B,IAAA,gBAAM,EAAC,IAAA,iBAAS,EAAC,gBAAgB,CAAC,CAAC,CAAC;QAEpC,IAAM,oBAAoB,GAAG,6BAAiB,CAAC,OAAO,CAAC,CAAC;QACxD,IAAI,oBAAoB,EAAE;YACxB,OAAO,IAAI,sCAAqB,CAAC;gBAC/B,aAAa,EAAE;oBACb,QAA8B;oBAC9B,aAAa;oBACb,gBAAgB;oBAChB,uBAAuB;oBACvB,MAAM;oBACN,kBAAkB;oBAClB,aAAa,CAAC,OAAO,CAAC;oBACtB,KAAK;iBACN;gBACD,oBAAoB,sBAAA;aACrB,CAAC,CAAC;SACJ;QACD,IAAI,IAAA,kBAAU,EAAC,OAAO,CAAC,EAAE;YACvB,OAAO,IAAI,mBAAQ,CACjB,QAAuB,EACvB,aAAa,EACb,kBAAU,CAAC,IAAI,CAAC,gBAAgB,CAAC,EACjC,kBAAU,CAAC,IAAI,CAAC,uBAAuB,CAAC,EACxC,MAAM,EACN,kBAAkB,EAClB,aAAa,CAAC,OAAO,CAAC,EACtB,qBAAqB,CACtB,CAAC;SACH;QAGD,QAAQ,GAAG,IAAA,sBAAc,EAAC,OAAO,CAAC;YAChC,CAAC,CAAC,IAAA,kBAAY,EAAC,QAA8B,CAAC;YAC9C,CAAC,CAAE,QAA+B,CAAC;QAErC,OAAO,IAAI,qBAAS,CAClB,QAAQ,EACR,aAAa,EACb,gBAAgB,EAChB,uBAAuB,EACvB,MAAM,EACN,kBAAkB,EAClB,aAAa,CAAC,OAAO,CAAC,EACtB,qBAAqB,CACtB,CAAC;IACJ,CAAC;IACH,yBAAC;AAAD,CAAC,AA1DD,IA0DC;AA1DY,gDAAkB"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { SVMProvider } from "../../arch/svm";
|
|
2
|
-
import {
|
|
2
|
+
import { RelayData } from "../../interfaces";
|
|
3
3
|
import { BigNumber, BigNumberish, SvmAddress, TransactionCostEstimate } from "../../utils";
|
|
4
4
|
import { Logger, QueryInterface } from "../relayFeeCalculator";
|
|
5
5
|
import { SymbolMappingType } from "./";
|
|
@@ -20,14 +20,22 @@ export declare class SvmQuery implements QueryInterface {
|
|
|
20
20
|
transactionMessage: import("@solana/kit").CompilableTransactionMessage | (import("@solana/kit").ITransactionMessageWithFeePayer<string> & import("@solana/kit").TransactionMessage);
|
|
21
21
|
}>, "rpc" | "transactionMessage"> | undefined) => Promise<number>;
|
|
22
22
|
constructor(provider: SVMProvider, symbolMapping: SymbolMappingType, spokePool: SvmAddress, simulatedRelayerAddress: SvmAddress, logger: Logger, coingeckoProApiKey?: string | undefined, fixedGasPrice?: BigNumberish | undefined, coingeckoBaseCurrency?: string);
|
|
23
|
-
getGasCosts(
|
|
23
|
+
getGasCosts(relayData: RelayData & {
|
|
24
|
+
destinationChainId: number;
|
|
25
|
+
}, relayer?: import("../../utils").Address, options?: Partial<{
|
|
24
26
|
gasPrice: BigNumberish;
|
|
25
27
|
gasUnits: BigNumberish;
|
|
26
28
|
baseFeeMultiplier: BigNumber;
|
|
27
29
|
priorityFeeMultiplier: BigNumber;
|
|
28
30
|
}>): Promise<TransactionCostEstimate>;
|
|
29
|
-
getNativeGasCost(deposit:
|
|
30
|
-
|
|
31
|
+
getNativeGasCost(deposit: RelayData & {
|
|
32
|
+
destinationChainId: number;
|
|
33
|
+
}, _relayer?: import("../../utils").Address): Promise<BigNumber>;
|
|
34
|
+
getFillRelayTx(relayData: Omit<RelayData, "recipent" | "outputToken"> & {
|
|
35
|
+
destinationChainId: number;
|
|
36
|
+
recipient: SvmAddress;
|
|
37
|
+
outputToken: SvmAddress;
|
|
38
|
+
}, 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<{
|
|
31
39
|
instructions: readonly import("@solana/kit").IInstruction<string, readonly (import("@solana/kit").IAccountLookupMeta<string, string> | import("@solana/kit").IAccountMeta<string>)[]>[];
|
|
32
40
|
version: 0;
|
|
33
41
|
}>, "feePayer">>;
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.SvmQuery = void 0;
|
|
4
4
|
var tslib_1 = require("tslib");
|
|
5
|
+
var assert_1 = tslib_1.__importDefault(require("assert"));
|
|
5
6
|
var conversionUtils_1 = require("@across-protocol/contracts/dist/src/svm/web3-v1/conversionUtils");
|
|
6
7
|
var system_1 = require("@solana-program/system");
|
|
7
8
|
var token_1 = require("@solana-program/token");
|
|
@@ -27,14 +28,19 @@ var SvmQuery = (function () {
|
|
|
27
28
|
rpc: provider,
|
|
28
29
|
});
|
|
29
30
|
}
|
|
30
|
-
SvmQuery.prototype.getGasCosts = function (
|
|
31
|
-
if (relayer === void 0) { relayer = (0, utils_1.toAddressType)((0, relayFeeCalculator_1.
|
|
31
|
+
SvmQuery.prototype.getGasCosts = function (relayData, relayer, options) {
|
|
32
|
+
if (relayer === void 0) { relayer = (0, utils_1.toAddressType)((0, relayFeeCalculator_1.getDefaultRelayer)(relayData.destinationChainId), relayData.destinationChainId); }
|
|
32
33
|
if (options === void 0) { options = {}; }
|
|
33
34
|
return tslib_1.__awaiter(this, void 0, void 0, function () {
|
|
34
|
-
var fillRelayTx, _a, computeUnitsConsumed, gasPriceEstimate, _b, _c, _d, gasPrice;
|
|
35
|
+
var recipient, outputToken, exclusiveRelayer, fillRelayTx, _a, computeUnitsConsumed, gasPriceEstimate, _b, _c, _d, gasPrice;
|
|
35
36
|
return tslib_1.__generator(this, function (_e) {
|
|
36
37
|
switch (_e.label) {
|
|
37
|
-
case 0:
|
|
38
|
+
case 0:
|
|
39
|
+
recipient = relayData.recipient, outputToken = relayData.outputToken, exclusiveRelayer = relayData.exclusiveRelayer;
|
|
40
|
+
(0, assert_1.default)(recipient.isSVM(), "getGasCosts: recipient not an SVM address (".concat(recipient, ")"));
|
|
41
|
+
(0, assert_1.default)(outputToken.isSVM(), "getGasCosts: outputToken not an SVM address (".concat(outputToken, ")"));
|
|
42
|
+
(0, assert_1.default)(exclusiveRelayer.isSVM(), "getGasCosts: exclusiveRelayer not an SVM address (".concat(exclusiveRelayer, ")"));
|
|
43
|
+
return [4, this.getFillRelayTx(tslib_1.__assign(tslib_1.__assign({}, relayData), { recipient: recipient, outputToken: outputToken, exclusiveRelayer: exclusiveRelayer }), relayer)];
|
|
38
44
|
case 1:
|
|
39
45
|
fillRelayTx = _e.sent();
|
|
40
46
|
_c = (_b = Promise).all;
|
|
@@ -61,12 +67,17 @@ var SvmQuery = (function () {
|
|
|
61
67
|
});
|
|
62
68
|
};
|
|
63
69
|
SvmQuery.prototype.getNativeGasCost = function (deposit, _relayer) {
|
|
64
|
-
if (_relayer === void 0) { _relayer = (0, utils_1.toAddressType)((0, relayFeeCalculator_1.
|
|
70
|
+
if (_relayer === void 0) { _relayer = (0, utils_1.toAddressType)((0, relayFeeCalculator_1.getDefaultRelayer)(deposit.destinationChainId), deposit.destinationChainId); }
|
|
65
71
|
return tslib_1.__awaiter(this, void 0, void 0, function () {
|
|
66
|
-
var fillRelayTx, _a;
|
|
72
|
+
var recipient, outputToken, exclusiveRelayer, fillRelayTx, _a;
|
|
67
73
|
return tslib_1.__generator(this, function (_b) {
|
|
68
74
|
switch (_b.label) {
|
|
69
|
-
case 0:
|
|
75
|
+
case 0:
|
|
76
|
+
recipient = deposit.recipient, outputToken = deposit.outputToken, exclusiveRelayer = deposit.exclusiveRelayer;
|
|
77
|
+
(0, assert_1.default)(recipient.isSVM(), "getNativeGasCost: recipient not an SVM address (".concat(recipient, ")"));
|
|
78
|
+
(0, assert_1.default)(outputToken.isSVM(), "getNativeGasCost: outputToken not an SVM address (".concat(outputToken, ")"));
|
|
79
|
+
(0, assert_1.default)(exclusiveRelayer.isSVM(), "getNativeGasCost: exclusiveRelayer not an SVM address (".concat(exclusiveRelayer, ")"));
|
|
80
|
+
return [4, this.getFillRelayTx(tslib_1.__assign(tslib_1.__assign({}, deposit), { recipient: recipient, outputToken: outputToken, exclusiveRelayer: exclusiveRelayer }), _relayer)];
|
|
70
81
|
case 1:
|
|
71
82
|
fillRelayTx = _b.sent();
|
|
72
83
|
_a = utils_1.toBN;
|
|
@@ -76,51 +87,52 @@ var SvmQuery = (function () {
|
|
|
76
87
|
});
|
|
77
88
|
});
|
|
78
89
|
};
|
|
79
|
-
SvmQuery.prototype.getFillRelayTx = function (
|
|
80
|
-
if (relayer === void 0) { relayer = (0, utils_1.toAddressType)((0, relayFeeCalculator_1.
|
|
81
|
-
if (repaymentChainId === void 0) { repaymentChainId =
|
|
82
|
-
if (repaymentAddress === void 0) { repaymentAddress = (0, utils_1.toAddressType)((0, relayFeeCalculator_1.
|
|
90
|
+
SvmQuery.prototype.getFillRelayTx = function (relayData, relayer, repaymentChainId, repaymentAddress) {
|
|
91
|
+
if (relayer === void 0) { relayer = (0, utils_1.toAddressType)((0, relayFeeCalculator_1.getDefaultRelayer)(relayData.destinationChainId), relayData.destinationChainId); }
|
|
92
|
+
if (repaymentChainId === void 0) { repaymentChainId = relayData.destinationChainId; }
|
|
93
|
+
if (repaymentAddress === void 0) { repaymentAddress = (0, utils_1.toAddressType)((0, relayFeeCalculator_1.getDefaultRelayer)(relayData.destinationChainId), relayData.destinationChainId); }
|
|
83
94
|
return tslib_1.__awaiter(this, void 0, void 0, function () {
|
|
84
|
-
var depositor,
|
|
85
|
-
return tslib_1.__generator(this, function (
|
|
86
|
-
switch (
|
|
95
|
+
var depositor, recipient, inputToken, outputToken, exclusiveRelayer, destinationChainId, program, _relayDataHash, relayDataHash, _a, state, delegate, mint, mintInfo, _b, recipientAta, relayerAta, fillStatus, eventAuthority, svmRelayData, simulatedSigner, fillInput;
|
|
96
|
+
return tslib_1.__generator(this, function (_c) {
|
|
97
|
+
switch (_c.label) {
|
|
87
98
|
case 0:
|
|
88
|
-
depositor =
|
|
99
|
+
depositor = relayData.depositor, recipient = relayData.recipient, inputToken = relayData.inputToken, outputToken = relayData.outputToken, exclusiveRelayer = relayData.exclusiveRelayer, destinationChainId = relayData.destinationChainId;
|
|
100
|
+
(0, assert_1.default)(recipient.isSVM(), "getFillRelayTx: recipient not an SVM address (".concat(recipient, ")"));
|
|
101
|
+
(0, assert_1.default)(repaymentAddress.isValidOn(repaymentChainId), "getFillRelayTx: repayment address ".concat(repaymentAddress, " not valid on chain ").concat(repaymentChainId, ")"));
|
|
89
102
|
program = (0, svm_1.toAddress)(this.spokePool);
|
|
90
|
-
_relayDataHash = (0, utils_1.getRelayDataHash)(
|
|
103
|
+
_relayDataHash = (0, utils_1.getRelayDataHash)(relayData, destinationChainId);
|
|
91
104
|
relayDataHash = new Uint8Array(Buffer.from(_relayDataHash.slice(2), "hex"));
|
|
92
105
|
return [4, Promise.all([
|
|
93
106
|
(0, svm_1.getStatePda)(program),
|
|
94
107
|
(0, svm_1.getFillRelayDelegatePda)(relayDataHash, BigInt(repaymentChainId), (0, svm_1.toAddress)(repaymentAddress), program),
|
|
95
108
|
])];
|
|
96
109
|
case 1:
|
|
97
|
-
_a =
|
|
98
|
-
_b = [_recipient.forceSvmAddress(), _outputToken.forceSvmAddress()], recipient = _b[0], outputToken = _b[1];
|
|
110
|
+
_a = _c.sent(), state = _a[0], delegate = _a[1];
|
|
99
111
|
mint = (0, svm_1.toAddress)(outputToken);
|
|
100
112
|
return [4, (0, token_1.fetchMint)(this.provider, mint)];
|
|
101
113
|
case 2:
|
|
102
|
-
mintInfo =
|
|
114
|
+
mintInfo = _c.sent();
|
|
103
115
|
return [4, Promise.all([
|
|
104
116
|
(0, svm_1.getAssociatedTokenAddress)(recipient, outputToken, mintInfo.programAddress),
|
|
105
117
|
(0, svm_1.getAssociatedTokenAddress)(utils_1.SvmAddress.from(relayer.toBase58()), outputToken, mintInfo.programAddress),
|
|
106
|
-
(0, svm_1.getFillStatusPda)(program,
|
|
118
|
+
(0, svm_1.getFillStatusPda)(program, relayData, destinationChainId),
|
|
107
119
|
(0, svm_1.getEventAuthority)(program),
|
|
108
120
|
])];
|
|
109
121
|
case 3:
|
|
110
|
-
|
|
111
|
-
|
|
122
|
+
_b = _c.sent(), recipientAta = _b[0], relayerAta = _b[1], fillStatus = _b[2], eventAuthority = _b[3];
|
|
123
|
+
svmRelayData = {
|
|
112
124
|
depositor: (0, svm_1.toAddress)(depositor),
|
|
113
125
|
recipient: (0, svm_1.toAddress)(recipient),
|
|
114
126
|
exclusiveRelayer: (0, svm_1.toAddress)(exclusiveRelayer),
|
|
115
127
|
inputToken: (0, svm_1.toAddress)(inputToken),
|
|
116
128
|
outputToken: mint,
|
|
117
|
-
inputAmount:
|
|
118
|
-
outputAmount:
|
|
119
|
-
originChainId:
|
|
120
|
-
depositId: new Uint8Array((0, conversionUtils_1.intToU8Array32)(
|
|
121
|
-
fillDeadline:
|
|
122
|
-
exclusivityDeadline:
|
|
123
|
-
message: new Uint8Array(Buffer.from(
|
|
129
|
+
inputAmount: relayData.inputAmount.toBigInt(),
|
|
130
|
+
outputAmount: relayData.outputAmount.toBigInt(),
|
|
131
|
+
originChainId: relayData.originChainId,
|
|
132
|
+
depositId: new Uint8Array((0, conversionUtils_1.intToU8Array32)(relayData.depositId.toNumber())),
|
|
133
|
+
fillDeadline: relayData.fillDeadline,
|
|
134
|
+
exclusivityDeadline: relayData.exclusivityDeadline,
|
|
135
|
+
message: new Uint8Array(Buffer.from(relayData.message, "hex")),
|
|
124
136
|
};
|
|
125
137
|
simulatedSigner = (0, svm_1.SolanaVoidSigner)(relayer.toBase58());
|
|
126
138
|
fillInput = {
|
|
@@ -137,7 +149,7 @@ var SvmQuery = (function () {
|
|
|
137
149
|
eventAuthority: eventAuthority,
|
|
138
150
|
program: program,
|
|
139
151
|
relayHash: relayDataHash,
|
|
140
|
-
relayData:
|
|
152
|
+
relayData: svmRelayData,
|
|
141
153
|
repaymentChainId: BigInt(repaymentChainId),
|
|
142
154
|
repaymentAddress: (0, svm_1.toAddress)(repaymentAddress),
|
|
143
155
|
};
|
|
@@ -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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"}
|
|
@@ -74,7 +74,7 @@ export interface Logger {
|
|
|
74
74
|
error: LoggingFunction;
|
|
75
75
|
}
|
|
76
76
|
export declare const DEFAULT_LOGGER: Logger;
|
|
77
|
-
export declare function
|
|
77
|
+
export declare function getDefaultRelayer(chainId?: number): "0x07aE8551Be970cB1cCa11Dd7a11F47Ae82e70E67" | "FmMK62wrtWVb5SVoTZftSCGw3nEDA79hDbZNTRnC1R6t";
|
|
78
78
|
export declare class RelayFeeCalculator {
|
|
79
79
|
private queries;
|
|
80
80
|
private gasDiscountPercent;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.RelayFeeCalculator = exports.
|
|
3
|
+
exports.RelayFeeCalculator = exports.getDefaultRelayer = exports.DEFAULT_LOGGER = exports.expectedCapitalCostsKeys = void 0;
|
|
4
4
|
var tslib_1 = require("tslib");
|
|
5
5
|
var assert_1 = tslib_1.__importDefault(require("assert"));
|
|
6
6
|
var constants_1 = require("../constants");
|
|
@@ -36,12 +36,12 @@ exports.DEFAULT_LOGGER = {
|
|
|
36
36
|
return console.error(args);
|
|
37
37
|
},
|
|
38
38
|
};
|
|
39
|
-
function
|
|
39
|
+
function getDefaultRelayer(chainId) {
|
|
40
40
|
return (0, utils_1.isDefined)(chainId) && (0, utils_1.chainIsSvm)(chainId)
|
|
41
41
|
? constants_1.DEFAULT_SIMULATED_RELAYER_ADDRESS_SVM
|
|
42
42
|
: constants_1.DEFAULT_SIMULATED_RELAYER_ADDRESS;
|
|
43
43
|
}
|
|
44
|
-
exports.
|
|
44
|
+
exports.getDefaultRelayer = getDefaultRelayer;
|
|
45
45
|
var safeOutputAmount = (0, utils_1.toBN)(100);
|
|
46
46
|
var RelayFeeCalculator = (function () {
|
|
47
47
|
function RelayFeeCalculator(config, logger, destinationChainId) {
|
|
@@ -94,7 +94,7 @@ var RelayFeeCalculator = (function () {
|
|
|
94
94
|
};
|
|
95
95
|
RelayFeeCalculator.prototype.gasFeePercent = function (deposit, outputAmount, simulateZeroFill, relayerAddress, _tokenPrice, tokenMapping, gasPrice, gasLimit, _tokenGasCost, transport) {
|
|
96
96
|
if (simulateZeroFill === void 0) { simulateZeroFill = false; }
|
|
97
|
-
if (relayerAddress === void 0) { relayerAddress = (0, utils_1.toAddressType)(
|
|
97
|
+
if (relayerAddress === void 0) { relayerAddress = (0, utils_1.toAddressType)(getDefaultRelayer(deposit.destinationChainId), deposit.destinationChainId); }
|
|
98
98
|
if (tokenMapping === void 0) { tokenMapping = constants_1.TOKEN_SYMBOLS_MAP; }
|
|
99
99
|
return tslib_1.__awaiter(this, void 0, void 0, function () {
|
|
100
100
|
var inputToken, destinationChainId, originChainId, destinationChainTokenDetails, outputToken, outputTokenInfo, inputTokenInfo, simulatedAmount, getGasCosts, _a, tokenGasCost, tokenPrice, gasFeesInToken;
|
|
@@ -242,7 +242,7 @@ var RelayFeeCalculator = (function () {
|
|
|
242
242
|
};
|
|
243
243
|
RelayFeeCalculator.prototype.relayerFeeDetails = function (deposit, outputAmount, simulateZeroFill, relayerAddress, _tokenPrice, gasPrice, gasUnits, tokenGasCost) {
|
|
244
244
|
if (simulateZeroFill === void 0) { simulateZeroFill = false; }
|
|
245
|
-
if (relayerAddress === void 0) { relayerAddress = (0, utils_1.toAddressType)(
|
|
245
|
+
if (relayerAddress === void 0) { relayerAddress = (0, utils_1.toAddressType)(getDefaultRelayer(deposit.destinationChainId), deposit.destinationChainId); }
|
|
246
246
|
return tslib_1.__awaiter(this, void 0, void 0, function () {
|
|
247
247
|
var inputToken, originChainId, outputToken, destinationChainId, inputTokenInfo, outputTokenInfo, gasFeePercent, outToInDecimals, gasFeeTotal, capitalFeePercent, capitalFeeTotal, relayFeePercent, relayFeeTotal, maxGasFeePercent, minDeposit, isAmountTooLow;
|
|
248
248
|
return tslib_1.__generator(this, function (_a) {
|