improve: Create SVM relayDataHash with messageHash instead of message #1168
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,7 +7,7 @@ import { | |
| relayFillStatus, | ||
| getTimestampForBlock as _getTimestampForBlock, | ||
| } from "../../arch/evm"; | ||
| import { DepositWithBlock, FillStatus, RelayDataWithMessageHash } from "../../interfaces"; | ||
| import { | ||
| BigNumber, | ||
| DepositSearchResult, | ||
|
|
@@ -48,11 +48,14 @@ export class EVMSpokePoolClient extends SpokePoolClient { | |
| this.spokePoolAddress = EvmAddress.from(spokePool.address); | ||
| } | ||
|
|
||
| public override relayFillStatus(relayData: RelayDataWithMessageHash, atHeight?: number): Promise<FillStatus> { | ||
| return relayFillStatus(this.spokePool, relayData, atHeight, this.chainId); | ||
| } | ||
|
|
||
| public override fillStatusArray( | ||
| relayData: RelayDataWithMessageHash[], | ||
| atHeight?: number | ||
| ): Promise<(FillStatus | undefined)[]> { | ||
| return fillStatusArray(this.spokePool, relayData, atHeight); | ||
| } | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -11,7 +11,7 @@ import { | |
| relayFillStatus, | ||
| fillStatusArray, | ||
| } from "../../arch/svm"; | ||
| import { FillStatus, RelayDataWithMessageHash, SortableEvent } from "../../interfaces"; | ||
| import { | ||
| BigNumber, | ||
| DepositSearchResult, | ||
|
|
@@ -243,7 +243,7 @@ export class SVMSpokePoolClient extends SpokePoolClient { | |
| /** | ||
| * Retrieves the fill status for a given relay data from the SVM chain. | ||
| */ | ||
| public override relayFillStatus(relayData: RelayDataWithMessageHash, atHeight?: number): Promise<FillStatus> { | ||
| return relayFillStatus(this.programId, relayData, this.chainId, this.svmEventsClient, atHeight); | ||
| } | ||
|
|
||
|
|
@@ -254,7 +254,7 @@ export class SVMSpokePoolClient extends SpokePoolClient { | |
| * @returns The fill status for each of the given relay data. | ||
| */ | ||
| public fillStatusArray( | ||
| relayData: RelayDataWithMessageHash[], | ||
| atHeight?: number, | ||
| destinationChainId?: number | ||
| ): Promise<(FillStatus | undefined)[]> { | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -40,6 +40,7 @@ import { | |
| SpeedUpWithBlock, | ||
| TokensBridged, | ||
| RelayExecutionEventInfo, | ||
| RelayDataWithMessageHash, | ||
| } from "../../interfaces"; | ||
| import { BaseAbstractClient, UpdateFailureReason } from "../BaseAbstractClient"; | ||
| import { AcrossConfigStoreClient } from "../AcrossConfigStoreClient"; | ||
|
|
@@ -980,13 +981,16 @@ export abstract class SpokePoolClient extends BaseAbstractClient { | |
| * @param atHeight The height at which to query the fill status. | ||
| * @returns The fill status for the given relay data. | ||
| */ | ||
| public abstract relayFillStatus(relayData: RelayDataWithMessageHash, atHeight?: number): Promise<FillStatus>; | ||
|
|
||
| /** | ||
| * Retrieves the fill status for an array of given relay data. | ||
| * @param relayData The array relay data to retrieve the fill status for. | ||
| * @param atHeight The height at which to query the fill status. | ||
| * @returns The fill status for each of the given relay data. | ||
| */ | ||
| public abstract fillStatusArray( | ||
| relayData: RelayDataWithMessageHash[], | ||
| atHeight?: number | ||
| ): Promise<(FillStatus | undefined)[]>; | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,6 +3,10 @@ import { SpokePoolClient } from "../clients"; | |
| import { BigNumber, Address, EvmAddress } from "../utils"; | ||
| import { RelayerRefundLeaf } from "./HubPool"; | ||
|
|
||
| export interface RelayDataWithMessageHash extends RelayData { | ||
| messageHash: string; | ||
| } | ||
|
|
||
| export interface RelayData { | ||
| originChainId: number; | ||
| depositor: Address; | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,7 +3,7 @@ import { isL2Provider as isOptimismL2Provider } from "@eth-optimism/sdk/dist/l2- | |
| import { PopulatedTransaction, providers, VoidSigner } from "ethers"; | ||
| import { Coingecko } from "../../coingecko"; | ||
| import { CHAIN_IDs } from "../../constants"; | ||
| import { RelayData, RelayDataWithMessageHash } from "../../interfaces"; | ||
| import { SpokePool, SpokePool__factory } from "../../typechain"; | ||
| import { populateV3Relay } from "../../arch/evm"; | ||
| import { | ||
|
|
@@ -72,7 +72,7 @@ export class QueryBase implements QueryInterface { | |
| * @returns The gas estimate for this function call (multiplied with the optional buffer). | ||
| */ | ||
| async getGasCosts( | ||
| relayData: RelayDataWithMessageHash & { destinationChainId: number }, | ||
| relayer = getDefaultRelayer(relayData.destinationChainId), | ||
| options: Partial<{ | ||
| gasPrice: BigNumberish; | ||
|
|
@@ -144,7 +144,7 @@ export class QueryBase implements QueryInterface { | |
| * @returns Estimated gas cost based on ethers.VoidSigner's gas estimation | ||
| */ | ||
| async getNativeGasCost( | ||
| relayData: RelayDataWithMessageHash & { destinationChainId: number }, | ||
| relayer = getDefaultRelayer(relayData.destinationChainId) | ||
| ): Promise<BigNumber> { | ||
| const { recipient, outputToken, exclusiveRelayer } = relayData; | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,7 +4,7 @@ import { SVMProvider, SolanaVoidSigner, getFillRelayTx } from "../../arch/svm"; | |
| import { Coingecko } from "../../coingecko"; | ||
| import { CHAIN_IDs } from "../../constants"; | ||
| import { getGasPriceEstimate } from "../../gasPriceOracle"; | ||
| import { RelayDataWithMessageHash } from "../../interfaces"; | ||
| import { Address, BigNumber, BigNumberish, SvmAddress, TransactionCostEstimate, toBN } from "../../utils"; | ||
| import { Logger, QueryInterface, getDefaultRelayer } from "../relayFeeCalculator"; | ||
| import { SymbolMappingType } from "./"; | ||
|
|
@@ -53,7 +53,7 @@ export class SvmQuery implements QueryInterface { | |
| * @returns The gas estimate for this function call (multiplied with the optional buffer). | ||
| */ | ||
| async getGasCosts( | ||
| relayData: RelayDataWithMessageHash & { destinationChainId: number }, | ||
| relayer = getDefaultRelayer(relayData.destinationChainId), | ||
| options: Partial<{ | ||
| gasPrice: BigNumberish; | ||
|
|
@@ -105,7 +105,7 @@ export class SvmQuery implements QueryInterface { | |
| * @returns Estimated gas cost in compute units | ||
| */ | ||
| async getNativeGasCost( | ||
| deposit: RelayDataWithMessageHash & { destinationChainId: number }, | ||
| relayer = getDefaultRelayer(deposit.destinationChainId) | ||
| ): Promise<BigNumber> { | ||
| const { destinationChainId, recipient, outputToken, exclusiveRelayer } = deposit; | ||
|
|
@@ -131,7 +131,7 @@ export class SvmQuery implements QueryInterface { | |
| * @returns FillRelay transaction | ||
| */ | ||
| protected async getFillRelayTx( | ||
| relayData: Omit<RelayDataWithMessageHash, "recipient" | "outputToken"> & { | ||
| destinationChainId: number; | ||
| recipient: SvmAddress; | ||
| outputToken: SvmAddress; | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should be OK to drop this one now 👍
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
93ef97a