@across-protocol/sdk 4.2.16 → 4.3.1

package/dist/cjs/interfaces/SpokePool.d.ts

@@ -1,29 +1,31 @@
 import { SortableEvent } from "./Common";
 import { SpokePoolClient } from "../clients";
-import { BigNumber } from "../utils";
+import { BigNumber, Address, EvmAddress } from "../utils";
 import { RelayerRefundLeaf } from "./HubPool";
 export interface RelayData {
     originChainId: number;
-    depositor: string;
-    recipient: string;
+    depositor: Address;
+    recipient: Address;
     depositId: BigNumber;
-    inputToken: string;
+    inputToken: Address;
     inputAmount: BigNumber;
-    outputToken: string;
+    outputToken: Address;
     outputAmount: BigNumber;
     message: string;
     fillDeadline: number;
-    exclusiveRelayer: string;
+    exclusiveRelayer: Address;
     exclusivityDeadline: number;
 }
-export interface Deposit extends RelayData {
+export interface SpeedUpCommon {
+    updatedRecipient: Address;
+    updatedOutputAmount: BigNumber;
+    updatedMessage: string;
+}
+export interface Deposit extends RelayData, Partial<SpeedUpCommon> {
     messageHash: string;
     destinationChainId: number;
     quoteTimestamp: number;
     speedUpSignature?: string;
-    updatedRecipient?: string;
-    updatedOutputAmount?: BigNumber;
-    updatedMessage?: string;
     fromLiteChain: boolean;
     toLiteChain: boolean;
 }
@@ -44,7 +46,7 @@ export declare enum FillType {
     SlowFill = 2
 }
 export interface RelayExecutionEventInfo {
-    updatedRecipient: string;
+    updatedRecipient: Address;
     updatedOutputAmount: BigNumber;
     updatedMessage?: string;
     updatedMessageHash: string;
@@ -53,7 +55,7 @@ export interface RelayExecutionEventInfo {
 export interface Fill extends Omit<RelayData, "message"> {
     messageHash: string;
     destinationChainId: number;
-    relayer: string;
+    relayer: Address;
     repaymentChainId: number;
     relayExecutionInfo: RelayExecutionEventInfo;
 }
@@ -63,20 +65,17 @@ export interface FillWithTime extends Fill, SortableEvent {
     fillTimestamp: number;
 }
 export interface EnabledDepositRoute {
-    originToken: string;
+    originToken: Address;
     destinationChainId: number;
     enabled: boolean;
 }
 export interface EnabledDepositRouteWithBlock extends EnabledDepositRoute, SortableEvent {
 }
-export interface SpeedUp {
-    depositor: string;
+export interface SpeedUp extends SpeedUpCommon {
+    depositor: EvmAddress;
     depositorSignature: string;
     depositId: BigNumber;
     originChainId: number;
-    updatedRecipient: string;
-    updatedOutputAmount: BigNumber;
-    updatedMessage: string;
 }
 export interface SpeedUpWithBlock extends SpeedUp, SortableEvent {
 }
@@ -115,7 +114,7 @@ export interface TokensBridged extends SortableEvent {
     amountToReturn: BigNumber;
     chainId: number;
     leafId: number;
-    l2TokenAddress: string;
+    l2TokenAddress: Address;
 }
 export interface ClaimedRelayerRefundWithBlock extends SortableEvent {
     l2TokenAddress: string;

package/dist/cjs/interfaces/SpokePool.js.map

@@ -1 +1 @@
-{"version":3,"file":"SpokePool.js","sourceRoot":"","sources":["../../../src/interfaces/SpokePool.ts"],"names":[],"mappings":";;;AAwCA,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"}
+{"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"}

package/dist/cjs/relayFeeCalculator/chain-queries/baseQuery.d.ts

@@ -1,8 +1,8 @@
 import { L2Provider } from "@eth-optimism/sdk/dist/interfaces/l2-provider";
 import { PopulatedTransaction, providers } from "ethers";
-import { Deposit } from "../../interfaces";
+import { RelayData } from "../../interfaces";
 import { SpokePool } from "../../typechain";
-import { BigNumberish, TransactionCostEstimate, BigNumber } from "../../utils";
+import { BigNumberish, EvmAddress, TransactionCostEstimate, BigNumber, Address } from "../../utils";
 import { Logger, QueryInterface } from "../relayFeeCalculator";
 import { Transport } from "viem";
 import { EvmProvider } from "../../arch/evm/types";
@@ -14,14 +14,16 @@ export declare class QueryBase implements QueryInterface {
     readonly provider: EvmProvider;
     readonly symbolMapping: SymbolMappingType;
     readonly spokePoolAddress: string;
-    readonly simulatedRelayerAddress: string;
+    readonly simulatedRelayerAddress: EvmAddress;
     readonly logger: Logger;
     readonly coingeckoProApiKey?: string | undefined;
     readonly fixedGasPrice?: BigNumberish | undefined;
     readonly coingeckoBaseCurrency: string;
     readonly spokePool: SpokePool;
-    constructor(provider: EvmProvider, symbolMapping: SymbolMappingType, spokePoolAddress: string, simulatedRelayerAddress: string, logger: Logger, coingeckoProApiKey?: string | undefined, fixedGasPrice?: BigNumberish | undefined, coingeckoBaseCurrency?: string);
-    getGasCosts(deposit: Omit<Deposit, "messageHash">, relayer?: string, options?: Partial<{
+    constructor(provider: EvmProvider, symbolMapping: SymbolMappingType, spokePoolAddress: string, simulatedRelayerAddress: EvmAddress, logger: Logger, coingeckoProApiKey?: string | undefined, fixedGasPrice?: BigNumberish | undefined, coingeckoBaseCurrency?: string);
+    getGasCosts(relayData: RelayData & {
+        destinationChainId: number;
+    }, relayer?: Address, options?: Partial<{
         gasPrice: BigNumberish;
         gasUnits: BigNumberish;
         baseFeeMultiplier: BigNumber;
@@ -29,13 +31,19 @@ export declare class QueryBase implements QueryInterface {
         opStackL1GasCostMultiplier: BigNumber;
         transport: Transport;
     }>): Promise<TransactionCostEstimate>;
-    getUnsignedTxFromDeposit(deposit: Omit<Deposit, "messageHash">, relayer?: string): Promise<PopulatedTransaction>;
-    getNativeGasCost(deposit: Omit<Deposit, "messageHash">, relayer?: string): Promise<BigNumber>;
-    getOpStackL1DataFee(unsignedTx: PopulatedTransaction, relayer: string | undefined, options: Partial<{
+    getUnsignedTxFromDeposit(relayData: Omit<RelayData, "recipient" | "outputToken"> & {
+        destinationChainId: number;
+        recipient: EvmAddress;
+        outputToken: EvmAddress;
+    }, relayer?: Address): Promise<PopulatedTransaction>;
+    getNativeGasCost(relayData: RelayData & {
+        destinationChainId: number;
+    }, relayer?: Address): Promise<BigNumber>;
+    getOpStackL1DataFee(unsignedTx: PopulatedTransaction, relayer: Address | undefined, options: Partial<{
         opStackL2GasUnits: BigNumberish;
         opStackL1DataFeeMultiplier: BigNumber;
     }>): Promise<BigNumber>;
-    estimateGas(unsignedTx: PopulatedTransaction, senderAddress: string, provider: providers.Provider | L2Provider<providers.Provider>, options?: Partial<{
+    estimateGas(unsignedTx: PopulatedTransaction, senderAddress: Address, provider: providers.Provider | L2Provider<providers.Provider>, options?: Partial<{
         gasPrice: BigNumberish;
         gasUnits: BigNumberish;
         baseFeeMultiplier: BigNumber;

package/dist/cjs/relayFeeCalculator/chain-queries/baseQuery.js

@@ -25,16 +25,20 @@ var QueryBase = (function () {
         this.coingeckoBaseCurrency = coingeckoBaseCurrency;
         this.spokePool = typechain_1.SpokePool__factory.connect(spokePoolAddress, provider);
     }
-    QueryBase.prototype.getGasCosts = function (deposit, relayer, options) {
-        if (relayer === void 0) { relayer = (0, relayFeeCalculator_1.getDefaultSimulatedRelayerAddress)(deposit.destinationChainId); }
+    QueryBase.prototype.getGasCosts = function (relayData, relayer, options) {
+        if (relayer === void 0) { relayer = (0, relayFeeCalculator_1.getDefaultRelayer)(relayData.destinationChainId); }
         if (options === void 0) { options = {}; }
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var _a, gasPrice, gasUnits, baseFeeMultiplier, priorityFeeMultiplier, opStackL1GasCostMultiplier, transport, tx, _b, nativeGasCost, tokenGasCost, impliedGasPrice, opStackL1GasCost;
+            var _a, gasPrice, gasUnits, baseFeeMultiplier, priorityFeeMultiplier, opStackL1GasCostMultiplier, transport, recipient, outputToken, exclusiveRelayer, tx, _b, nativeGasCost, tokenGasCost, impliedGasPrice, opStackL1GasCost;
             return tslib_1.__generator(this, function (_c) {
                 switch (_c.label) {
                     case 0:
                         _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;
-                        return [4, this.getUnsignedTxFromDeposit(deposit, relayer)];
+                        recipient = relayData.recipient, outputToken = relayData.outputToken, exclusiveRelayer = relayData.exclusiveRelayer;
+                        (0, assert_1.default)(recipient.isEVM(), "getGasCosts: recipient not an EVM address (".concat(recipient, ")"));
+                        (0, assert_1.default)(outputToken.isEVM(), "getGasCosts: outputToken not an EVM address (".concat(outputToken, ")"));
+                        (0, assert_1.default)(exclusiveRelayer.isEVM(), "getGasCosts: exclusiveRelayer not an EVM address (".concat(exclusiveRelayer, ")"));
+                        return [4, this.getUnsignedTxFromDeposit(tslib_1.__assign(tslib_1.__assign({}, relayData), { recipient: recipient, outputToken: outputToken, exclusiveRelayer: exclusiveRelayer }), relayer)];
                     case 1:
                         tx = _c.sent();
                         return [4, this.estimateGas(tx, relayer, this.provider, {
@@ -57,27 +61,32 @@ var QueryBase = (function () {
             });
         });
     };
-    QueryBase.prototype.getUnsignedTxFromDeposit = function (deposit, relayer) {
-        if (relayer === void 0) { relayer = (0, relayFeeCalculator_1.getDefaultSimulatedRelayerAddress)(deposit.destinationChainId); }
-        return (0, evm_1.populateV3Relay)(this.spokePool, deposit, relayer);
+    QueryBase.prototype.getUnsignedTxFromDeposit = function (relayData, relayer) {
+        if (relayer === void 0) { relayer = (0, relayFeeCalculator_1.getDefaultRelayer)(relayData.destinationChainId); }
+        return (0, evm_1.populateV3Relay)(this.spokePool, relayData, relayer);
     };
-    QueryBase.prototype.getNativeGasCost = function (deposit, relayer) {
-        if (relayer === void 0) { relayer = (0, relayFeeCalculator_1.getDefaultSimulatedRelayerAddress)(deposit.destinationChainId); }
+    QueryBase.prototype.getNativeGasCost = function (relayData, relayer) {
+        if (relayer === void 0) { relayer = (0, relayFeeCalculator_1.getDefaultRelayer)(relayData.destinationChainId); }
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var unsignedTx, voidSigner;
+            var recipient, outputToken, exclusiveRelayer, unsignedTx, voidSigner;
             return tslib_1.__generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4, this.getUnsignedTxFromDeposit(deposit, relayer)];
+                    case 0:
+                        recipient = relayData.recipient, outputToken = relayData.outputToken, exclusiveRelayer = relayData.exclusiveRelayer;
+                        (0, assert_1.default)(recipient.isEVM(), "getNativeGasCost: recipient not an EVM address (".concat(recipient, ")"));
+                        (0, assert_1.default)(outputToken.isEVM(), "getNativeGasCost: outputToken not an EVM address (".concat(outputToken, ")"));
+                        (0, assert_1.default)(exclusiveRelayer.isEVM(), "getNativeGasCost: exclusiveRelayer not an EVM address (".concat(exclusiveRelayer, ")"));
+                        return [4, this.getUnsignedTxFromDeposit(tslib_1.__assign(tslib_1.__assign({}, relayData), { recipient: recipient, outputToken: outputToken, exclusiveRelayer: exclusiveRelayer }), relayer)];
                     case 1:
                         unsignedTx = _a.sent();
-                        voidSigner = new ethers_1.VoidSigner(relayer, this.provider);
+                        voidSigner = new ethers_1.VoidSigner(relayer.toEvmAddress(), this.provider);
                         return [2, voidSigner.estimateGas(unsignedTx)];
                 }
             });
         });
     };
     QueryBase.prototype.getOpStackL1DataFee = function (unsignedTx, relayer, options) {
-        if (relayer === void 0) { relayer = (0, relayFeeCalculator_1.getDefaultSimulatedRelayerAddress)(unsignedTx.chainId); }
+        if (relayer === void 0) { relayer = (0, relayFeeCalculator_1.getDefaultRelayer)(unsignedTx.chainId); }
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             var _a, opStackL2GasUnits, _b, opStackL1DataFeeMultiplier, chainId, voidSigner, populatedTransaction, l1DataFee;
             return tslib_1.__generator(this, function (_c) {
@@ -88,7 +97,7 @@ var QueryBase = (function () {
                     case 1:
                         chainId = (_c.sent()).chainId;
                         (0, assert_1.default)((0, l2_provider_1.isL2Provider)(this.provider), "Unexpected provider for chain ID ".concat(chainId, "."));
-                        voidSigner = new ethers_1.VoidSigner(relayer, this.provider);
+                        voidSigner = new ethers_1.VoidSigner(relayer.toEvmAddress(), this.provider);
                         return [4, voidSigner.populateTransaction(tslib_1.__assign(tslib_1.__assign({}, unsignedTx), { gasLimit: opStackL2GasUnits }))];
                     case 2:
                         populatedTransaction = _c.sent();
@@ -111,7 +120,7 @@ var QueryBase = (function () {
                         return [4, provider.getNetwork()];
                     case 1:
                         chainId = (_f.sent()).chainId;
-                        voidSigner = new ethers_1.VoidSigner(senderAddress, provider);
+                        voidSigner = new ethers_1.VoidSigner(senderAddress.toEvmAddress(), provider);
                         queries = [
                             gasUnits ? Promise.resolve(utils_1.BigNumber.from(gasUnits)) : voidSigner.estimateGas(unsignedTx),
                             _gasPrice

package/dist/cjs/relayFeeCalculator/chain-queries/baseQuery.js.map

@@ -1 +1 @@
-{"version":3,"file":"baseQuery.js","sourceRoot":"","sources":["../../../../src/relayFeeCalculator/chain-queries/baseQuery.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"baseQuery.js","sourceRoot":"","sources":["../../../../src/relayFeeCalculator/chain-queries/baseQuery.ts"],"names":[],"mappings":"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"}

package/dist/cjs/relayFeeCalculator/chain-queries/factory.d.ts

@@ -397,5 +397,5 @@ export declare class QueryBase__factory {
             };
             coingeckoId: string;
         };
-    }, spokePoolAddress?: string | undefined, simulatedRelayerAddress?: string, coingeckoProApiKey?: string, logger?: Logger, coingeckoBaseCurrency?: string): QueryBase | SvmQuery;
+    }, spokePoolAddress?: string | undefined, relayerAddress?: import("../../utils").Address, coingeckoProApiKey?: string, logger?: Logger, coingeckoBaseCurrency?: string): QueryBase | SvmQuery;
 }

package/dist/cjs/relayFeeCalculator/chain-queries/factory.js

@@ -19,21 +19,22 @@ var fixedGasPrice = (_a = {},
 var QueryBase__factory = (function () {
     function QueryBase__factory() {
     }
-    QueryBase__factory.create = function (chainId, provider, symbolMapping, spokePoolAddress, simulatedRelayerAddress, coingeckoProApiKey, logger, coingeckoBaseCurrency) {
+    QueryBase__factory.create = function (chainId, provider, symbolMapping, spokePoolAddress, relayerAddress, coingeckoProApiKey, logger, coingeckoBaseCurrency) {
         if (symbolMapping === void 0) { symbolMapping = constants_1.TOKEN_SYMBOLS_MAP; }
         if (spokePoolAddress === void 0) { spokePoolAddress = (0, contracts_1.getDeployedAddress)("SpokePool", chainId); }
-        if (simulatedRelayerAddress === void 0) { simulatedRelayerAddress = (0, relayFeeCalculator_1.getDefaultSimulatedRelayerAddress)(chainId); }
+        if (relayerAddress === void 0) { relayerAddress = (0, relayFeeCalculator_1.getDefaultRelayer)(chainId); }
         if (logger === void 0) { logger = relayFeeCalculator_1.DEFAULT_LOGGER; }
         if (coingeckoBaseCurrency === void 0) { coingeckoBaseCurrency = "eth"; }
         (0, assert_1.default)((0, utils_1.isDefined)(spokePoolAddress));
         var customGasTokenSymbol = constants_2.CUSTOM_GAS_TOKENS[chainId];
         if (customGasTokenSymbol) {
+            (0, assert_1.default)(relayerAddress.isEVM());
             return new customGasToken_1.CustomGasTokenQueries({
                 queryBaseArgs: [
                     provider,
                     symbolMapping,
                     spokePoolAddress,
-                    simulatedRelayerAddress,
+                    relayerAddress,
                     logger,
                     coingeckoProApiKey,
                     fixedGasPrice[chainId],
@@ -43,12 +44,14 @@ var QueryBase__factory = (function () {
             });
         }
         if ((0, utils_1.chainIsSvm)(chainId)) {
-            return new svmQuery_1.SvmQuery(provider, symbolMapping, utils_1.SvmAddress.from(spokePoolAddress), utils_1.SvmAddress.from(simulatedRelayerAddress), logger, coingeckoProApiKey, fixedGasPrice[chainId], coingeckoBaseCurrency);
+            (0, assert_1.default)(relayerAddress.isSVM());
+            return new svmQuery_1.SvmQuery(provider, symbolMapping, utils_1.SvmAddress.from(spokePoolAddress), relayerAddress, logger, coingeckoProApiKey, fixedGasPrice[chainId], coingeckoBaseCurrency);
         }
         provider = (0, utils_1.chainIsOPStack)(chainId)
             ? (0, sdk_1.asL2Provider)(provider)
             : provider;
-        return new baseQuery_1.QueryBase(provider, symbolMapping, spokePoolAddress, simulatedRelayerAddress, logger, coingeckoProApiKey, fixedGasPrice[chainId], coingeckoBaseCurrency);
+        (0, assert_1.default)(relayerAddress.isEVM());
+        return new baseQuery_1.QueryBase(provider, symbolMapping, spokePoolAddress, relayerAddress, logger, coingeckoProApiKey, fixedGasPrice[chainId], coingeckoBaseCurrency);
     };
     return QueryBase__factory;
 }());

package/dist/cjs/relayFeeCalculator/chain-queries/factory.js.map

@@ -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,4DAAkG;AAClG,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,uBAAoE,EACpE,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,sDAAiC,EAAC,OAAO,CAAC;QAEpE,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"}
+{"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;IA6DA,CAAC;IA5DQ,yBAAM,GAAb,UACE,OAAe,EACf,QAA0C,EAC1C,aAAiC,EACjC,gBAA2D,EAC3D,cAA2C,EAC3C,kBAA2B,EAC3B,MAA+B,EAC/B,qBAA6B;QAL7B,8BAAA,EAAA,gBAAgB,6BAAiB;QACjC,iCAAA,EAAA,uBAAmB,8BAAkB,EAAC,WAAW,EAAE,OAAO,CAAC;QAC3D,+BAAA,EAAA,qBAAiB,sCAAiB,EAAC,OAAO,CAAC;QAE3C,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,IAAA,gBAAM,EAAC,cAAc,CAAC,KAAK,EAAE,CAAC,CAAC;YAC/B,OAAO,IAAI,sCAAqB,CAAC;gBAC/B,aAAa,EAAE;oBACb,QAA8B;oBAC9B,aAAa;oBACb,gBAAgB;oBAChB,cAAc;oBACd,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,IAAA,gBAAM,EAAC,cAAc,CAAC,KAAK,EAAE,CAAC,CAAC;YAC/B,OAAO,IAAI,mBAAQ,CACjB,QAAuB,EACvB,aAAa,EACb,kBAAU,CAAC,IAAI,CAAC,gBAAgB,CAAC,EACjC,cAAc,EACd,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,IAAA,gBAAM,EAAC,cAAc,CAAC,KAAK,EAAE,CAAC,CAAC;QAC/B,OAAO,IAAI,qBAAS,CAClB,QAAQ,EACR,aAAa,EACb,gBAAgB,EAChB,cAAc,EACd,MAAM,EACN,kBAAkB,EAClB,aAAa,CAAC,OAAO,CAAC,EACtB,qBAAqB,CACtB,CAAC;IACJ,CAAC;IACH,yBAAC;AAAD,CAAC,AA7DD,IA6DC;AA7DY,gDAAkB"}

package/dist/cjs/relayFeeCalculator/chain-queries/svmQuery.d.ts

@@ -1,6 +1,6 @@
 import { SVMProvider } from "../../arch/svm";
-import { Deposit } from "../../interfaces";
-import { BigNumber, BigNumberish, SvmAddress, TransactionCostEstimate } from "../../utils";
+import { RelayData } from "../../interfaces";
+import { Address, BigNumber, BigNumberish, SvmAddress, TransactionCostEstimate } from "../../utils";
 import { Logger, QueryInterface } from "../relayFeeCalculator";
 import { SymbolMappingType } from "./";
 export declare class SvmQuery implements QueryInterface {
@@ -20,14 +20,22 @@ export declare class SvmQuery implements QueryInterface {
         transactionMessage: import("@solana/kit").CompilableTransactionMessage | (import("@solana/kit").ITransactionMessageWithFeePayer<string> & import("@solana/kit").TransactionMessage);
     }>, "rpc" | "transactionMessage"> | undefined) => Promise<number>;
     constructor(provider: SVMProvider, symbolMapping: SymbolMappingType, spokePool: SvmAddress, simulatedRelayerAddress: SvmAddress, logger: Logger, coingeckoProApiKey?: string | undefined, fixedGasPrice?: BigNumberish | undefined, coingeckoBaseCurrency?: string);
-    getGasCosts(deposit: Omit<Deposit, "messageHash">, _relayer?: string, options?: Partial<{
+    getGasCosts(relayData: RelayData & {
+        destinationChainId: number;
+    }, relayer?: Address, options?: Partial<{
         gasPrice: BigNumberish;
         gasUnits: BigNumberish;
         baseFeeMultiplier: BigNumber;
         priorityFeeMultiplier: BigNumber;
     }>): Promise<TransactionCostEstimate>;
-    getNativeGasCost(deposit: Omit<Deposit, "messageHash">, _relayer?: string): Promise<BigNumber>;
-    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<{
+    getNativeGasCost(deposit: RelayData & {
+        destinationChainId: number;
+    }, relayer?: Address): Promise<BigNumber>;
+    protected getFillRelayTx(relayData: Omit<RelayData, "recipent" | "outputToken"> & {
+        destinationChainId: number;
+        recipient: SvmAddress;
+        outputToken: SvmAddress;
+    }, relayer: SvmAddress, repaymentChainId: number, repaymentAddress: Address): Promise<import("@solana/kit").TransactionMessageWithBlockhashLifetime & import("@solana/kit").ITransactionMessageWithFeePayerSigner<string, import("@solana/kit").TransactionSigner<string>> & Omit<Readonly<{
         instructions: readonly import("@solana/kit").IInstruction<string, readonly (import("@solana/kit").IAccountLookupMeta<string, string> | import("@solana/kit").IAccountMeta<string>)[]>[];
         version: 0;
     }>, "feePayer">>;

package/dist/cjs/relayFeeCalculator/chain-queries/svmQuery.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SvmQuery = void 0;
 var tslib_1 = require("tslib");
+var assert_1 = tslib_1.__importDefault(require("assert"));
 var conversionUtils_1 = require("@across-protocol/contracts/dist/src/svm/web3-v1/conversionUtils");
 var system_1 = require("@solana-program/system");
 var token_1 = require("@solana-program/token");
@@ -27,25 +28,28 @@ var SvmQuery = (function () {
             rpc: provider,
         });
     }
-    SvmQuery.prototype.getGasCosts = function (deposit, _relayer, options) {
-        if (_relayer === void 0) { _relayer = (0, relayFeeCalculator_1.getDefaultSimulatedRelayerAddress)(deposit.destinationChainId); }
+    SvmQuery.prototype.getGasCosts = function (relayData, relayer, options) {
+        if (relayer === void 0) { relayer = (0, relayFeeCalculator_1.getDefaultRelayer)(relayData.destinationChainId); }
         if (options === void 0) { options = {}; }
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var relayer, fillRelayTx, _a, computeUnitsConsumed, gasPriceEstimate, _b, _c, _d, gasPrice;
-            return tslib_1.__generator(this, function (_e) {
-                switch (_e.label) {
+            var destinationChainId, recipient, outputToken, exclusiveRelayer, _a, repaymentChainId, repaymentAddress, fillRelayTx, _b, computeUnitsConsumed, gasPriceEstimate, _c, _d, _e, gasPrice;
+            return tslib_1.__generator(this, function (_f) {
+                switch (_f.label) {
                     case 0:
-                        relayer = _relayer
-                            ? (0, utils_1.toAddressType)(_relayer, deposit.destinationChainId).forceSvmAddress()
-                            : this.simulatedRelayerAddress;
-                        return [4, this.getFillRelayTx(deposit, relayer.toBase58())];
+                        destinationChainId = relayData.destinationChainId, recipient = relayData.recipient, outputToken = relayData.outputToken, exclusiveRelayer = relayData.exclusiveRelayer;
+                        (0, assert_1.default)(recipient.isSVM(), "getGasCosts: recipient not an SVM address (".concat(recipient, ")"));
+                        (0, assert_1.default)(outputToken.isSVM(), "getGasCosts: outputToken not an SVM address (".concat(outputToken, ")"));
+                        (0, assert_1.default)(exclusiveRelayer.isSVM(), "getGasCosts: exclusiveRelayer not an SVM address (".concat(exclusiveRelayer, ")"));
+                        (0, assert_1.default)(relayer.isSVM());
+                        _a = [destinationChainId, relayer], repaymentChainId = _a[0], repaymentAddress = _a[1];
+                        return [4, this.getFillRelayTx(tslib_1.__assign(tslib_1.__assign({}, relayData), { recipient: recipient, outputToken: outputToken, exclusiveRelayer: exclusiveRelayer }), relayer, repaymentChainId, repaymentAddress)];
                     case 1:
-                        fillRelayTx = _e.sent();
-                        _c = (_b = Promise).all;
-                        _d = utils_1.toBN;
+                        fillRelayTx = _f.sent();
+                        _d = (_c = Promise).all;
+                        _e = utils_1.toBN;
                         return [4, this.computeUnitEstimator(fillRelayTx)];
-                    case 2: return [4, _c.apply(_b, [[
-                                _d.apply(void 0, [_e.sent()]),
+                    case 2: return [4, _d.apply(_c, [[
+                                _e.apply(void 0, [_f.sent()]),
                                 (0, gasPriceOracle_1.getGasPriceEstimate)(this.provider, {
                                     unsignedTx: fillRelayTx,
                                     baseFeeMultiplier: options.baseFeeMultiplier,
@@ -53,7 +57,7 @@ var SvmQuery = (function () {
                                 })
                             ]])];
                     case 3:
-                        _a = _e.sent(), computeUnitsConsumed = _a[0], gasPriceEstimate = _a[1];
+                        _b = _f.sent(), computeUnitsConsumed = _b[0], gasPriceEstimate = _b[1];
                         gasPrice = gasPriceEstimate.baseFee.add(gasPriceEstimate.microLamportsPerComputeUnit.mul(computeUnitsConsumed).div((0, utils_1.toBN)(1000000)));
                         return [2, {
                                 nativeGasCost: computeUnitsConsumed,
@@ -64,73 +68,72 @@ var SvmQuery = (function () {
             });
         });
     };
-    SvmQuery.prototype.getNativeGasCost = function (deposit, _relayer) {
-        if (_relayer === void 0) { _relayer = (0, relayFeeCalculator_1.getDefaultSimulatedRelayerAddress)(deposit.destinationChainId); }
+    SvmQuery.prototype.getNativeGasCost = function (deposit, relayer) {
+        if (relayer === void 0) { relayer = (0, relayFeeCalculator_1.getDefaultRelayer)(deposit.destinationChainId); }
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var fillRelayTx, _a;
-            return tslib_1.__generator(this, function (_b) {
-                switch (_b.label) {
-                    case 0: return [4, this.getFillRelayTx(deposit, _relayer)];
+            var destinationChainId, recipient, outputToken, exclusiveRelayer, _a, repaymentChainId, repaymentAddress, fillRelayTx, _b;
+            return tslib_1.__generator(this, function (_c) {
+                switch (_c.label) {
+                    case 0:
+                        destinationChainId = deposit.destinationChainId, recipient = deposit.recipient, outputToken = deposit.outputToken, exclusiveRelayer = deposit.exclusiveRelayer;
+                        (0, assert_1.default)(recipient.isSVM(), "getNativeGasCost: recipient not an SVM address (".concat(recipient, ")"));
+                        (0, assert_1.default)(outputToken.isSVM(), "getNativeGasCost: outputToken not an SVM address (".concat(outputToken, ")"));
+                        (0, assert_1.default)(exclusiveRelayer.isSVM(), "getNativeGasCost: exclusiveRelayer not an SVM address (".concat(exclusiveRelayer, ")"));
+                        (0, assert_1.default)(relayer.isSVM());
+                        _a = [destinationChainId, relayer], repaymentChainId = _a[0], repaymentAddress = _a[1];
+                        return [4, this.getFillRelayTx(tslib_1.__assign(tslib_1.__assign({}, deposit), { recipient: recipient, outputToken: outputToken, exclusiveRelayer: exclusiveRelayer }), relayer, repaymentChainId, repaymentAddress)];
                     case 1:
-                        fillRelayTx = _b.sent();
-                        _a = utils_1.toBN;
+                        fillRelayTx = _c.sent();
+                        _b = utils_1.toBN;
                         return [4, this.computeUnitEstimator(fillRelayTx)];
-                    case 2: return [2, _a.apply(void 0, [_b.sent()])];
+                    case 2: return [2, _b.apply(void 0, [_c.sent()])];
                 }
             });
         });
     };
-    SvmQuery.prototype.getFillRelayTx = function (deposit, _relayer, repaymentChainId, repaymentAddress) {
-        if (_relayer === void 0) { _relayer = (0, relayFeeCalculator_1.getDefaultSimulatedRelayerAddress)(deposit.destinationChainId); }
-        if (repaymentChainId === void 0) { repaymentChainId = deposit.destinationChainId; }
-        if (repaymentAddress === void 0) { repaymentAddress = (0, relayFeeCalculator_1.getDefaultSimulatedRelayerAddress)(deposit.destinationChainId); }
+    SvmQuery.prototype.getFillRelayTx = function (relayData, relayer, repaymentChainId, repaymentAddress) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            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;
+            var depositor, recipient, inputToken, outputToken, exclusiveRelayer, destinationChainId, program, _relayDataHash, relayDataHash, _a, state, delegate, mint, mintInfo, _b, recipientAta, relayerAta, fillStatus, eventAuthority, svmRelayData, simulatedSigner, fillInput;
             return tslib_1.__generator(this, function (_c) {
                 switch (_c.label) {
                     case 0:
-                        toSvmAddress = function (address, chainId) {
-                            return (0, svm_1.toAddress)((0, utils_1.toAddressType)(address, chainId).forceSvmAddress());
-                        };
-                        depositor = deposit.depositor, recipient = deposit.recipient, inputToken = deposit.inputToken, outputToken = deposit.outputToken, exclusiveRelayer = deposit.exclusiveRelayer, originChainId = deposit.originChainId, destinationChainId = deposit.destinationChainId;
+                        depositor = relayData.depositor, recipient = relayData.recipient, inputToken = relayData.inputToken, outputToken = relayData.outputToken, exclusiveRelayer = relayData.exclusiveRelayer, destinationChainId = relayData.destinationChainId;
+                        (0, assert_1.default)(recipient.isSVM(), "getFillRelayTx: recipient not an SVM address (".concat(recipient, ")"));
+                        (0, assert_1.default)(repaymentAddress.isValidOn(repaymentChainId), "getFillRelayTx: repayment address ".concat(repaymentAddress, " not valid on chain ").concat(repaymentChainId, ")"));
                         program = (0, svm_1.toAddress)(this.spokePool);
-                        relayer = _relayer
-                            ? (0, utils_1.toAddressType)(_relayer, deposit.destinationChainId).forceSvmAddress()
-                            : this.simulatedRelayerAddress;
-                        _relayDataHash = (0, utils_1.getRelayDataHash)(deposit, destinationChainId);
+                        _relayDataHash = (0, utils_1.getRelayDataHash)(relayData, destinationChainId);
                         relayDataHash = new Uint8Array(Buffer.from(_relayDataHash.slice(2), "hex"));
                         return [4, Promise.all([
                                 (0, svm_1.getStatePda)(program),
-                                (0, svm_1.getFillRelayDelegatePda)(relayDataHash, BigInt(repaymentChainId), toSvmAddress(repaymentAddress, repaymentChainId), program),
+                                (0, svm_1.getFillRelayDelegatePda)(relayDataHash, BigInt(repaymentChainId), (0, svm_1.toAddress)(repaymentAddress), program),
                             ])];
                     case 1:
                         _a = _c.sent(), state = _a[0], delegate = _a[1];
-                        _mint = (0, utils_1.toAddressType)(outputToken, destinationChainId).forceSvmAddress();
-                        mint = (0, svm_1.toAddress)(_mint);
+                        mint = (0, svm_1.toAddress)(outputToken);
                         return [4, (0, token_1.fetchMint)(this.provider, mint)];
                     case 2:
                         mintInfo = _c.sent();
                         return [4, Promise.all([
-                                (0, svm_1.getAssociatedTokenAddress)((0, utils_1.toAddressType)(deposit.recipient, destinationChainId).forceSvmAddress(), _mint, mintInfo.programAddress),
-                                (0, svm_1.getAssociatedTokenAddress)(utils_1.SvmAddress.from(relayer.toBase58()), _mint, mintInfo.programAddress),
-                                (0, svm_1.getFillStatusPda)(program, deposit, destinationChainId),
-                                (0, svm_1.getEventAuthority)(),
+                                (0, svm_1.getAssociatedTokenAddress)(recipient, outputToken, mintInfo.programAddress),
+                                (0, svm_1.getAssociatedTokenAddress)(utils_1.SvmAddress.from(relayer.toBase58()), outputToken, mintInfo.programAddress),
+                                (0, svm_1.getFillStatusPda)(program, relayData, destinationChainId),
+                                (0, svm_1.getEventAuthority)(program),
                             ])];
                     case 3:
                         _b = _c.sent(), recipientAta = _b[0], relayerAta = _b[1], fillStatus = _b[2], eventAuthority = _b[3];
-                        relayData = {
-                            depositor: toSvmAddress(depositor, originChainId),
-                            recipient: toSvmAddress(recipient, destinationChainId),
-                            exclusiveRelayer: toSvmAddress(exclusiveRelayer, destinationChainId),
-                            inputToken: toSvmAddress(inputToken, originChainId),
+                        svmRelayData = {
+                            depositor: (0, svm_1.toAddress)(depositor),
+                            recipient: (0, svm_1.toAddress)(recipient),
+                            exclusiveRelayer: (0, svm_1.toAddress)(exclusiveRelayer),
+                            inputToken: (0, svm_1.toAddress)(inputToken),
                             outputToken: mint,
-                            inputAmount: deposit.inputAmount.toBigInt(),
-                            outputAmount: deposit.outputAmount.toBigInt(),
-                            originChainId: deposit.originChainId,
-                            depositId: new Uint8Array((0, conversionUtils_1.intToU8Array32)(deposit.depositId.toNumber())),
-                            fillDeadline: deposit.fillDeadline,
-                            exclusivityDeadline: deposit.exclusivityDeadline,
-                            message: new Uint8Array(Buffer.from(deposit.message, "hex")),
+                            inputAmount: relayData.inputAmount.toBigInt(),
+                            outputAmount: relayData.outputAmount.toBigInt(),
+                            originChainId: relayData.originChainId,
+                            depositId: new Uint8Array((0, conversionUtils_1.intToU8Array32)(relayData.depositId.toNumber())),
+                            fillDeadline: relayData.fillDeadline,
+                            exclusivityDeadline: relayData.exclusivityDeadline,
+                            message: new Uint8Array(Buffer.from(relayData.message, "hex")),
                         };
                         simulatedSigner = (0, svm_1.SolanaVoidSigner)(relayer.toBase58());
                         fillInput = {
@@ -147,9 +150,9 @@ var SvmQuery = (function () {
                             eventAuthority: eventAuthority,
                             program: program,
                             relayHash: relayDataHash,
-                            relayData: relayData,
+                            relayData: svmRelayData,
                             repaymentChainId: BigInt(repaymentChainId),
-                            repaymentAddress: toSvmAddress(repaymentAddress, repaymentChainId),
+                            repaymentAddress: (0, svm_1.toAddress)(repaymentAddress),
                         };
                         return [2, (0, svm_1.createFillInstruction)(simulatedSigner, this.provider, fillInput, mintInfo.data.decimals, true)];
                 }

package/dist/cjs/relayFeeCalculator/chain-queries/svmQuery.js.map

@@ -1 +1 @@
-{"version":3,"file":"svmQuery.js","sourceRoot":"","sources":["../../../../src/relayFeeCalculator/chain-queries/svmQuery.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"svmQuery.js","sourceRoot":"","sources":["../../../../src/relayFeeCalculator/chain-queries/svmQuery.ts"],"names":[],"mappings":"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"}