Commit f0e1f90e authored by Will Cory's avatar Will Cory

linter

parent 26e0d120
...@@ -335,10 +335,7 @@ export class CrossChainMessenger { ...@@ -335,10 +335,7 @@ export class CrossChainMessenger {
*/ */
messageIndex = 0 messageIndex = 0
): Promise<CrossChainMessage> { ): Promise<CrossChainMessage> {
const resolved = await this.toCrossChainMessage( const resolved = await this.toCrossChainMessage(message, messageIndex)
message,
messageIndex
)
// Bedrock messages are already in the correct format. // Bedrock messages are already in the correct format.
const { version } = decodeVersionedNonce(resolved.messageNonce) const { version } = decodeVersionedNonce(resolved.messageNonce)
...@@ -374,7 +371,9 @@ export class CrossChainMessenger { ...@@ -374,7 +371,9 @@ export class CrossChainMessenger {
} }
} }
private async getWithdrawalsFromMessage(message: MessageLike): Promise<ethers.utils.Result[]> { private async getWithdrawalsFromMessage(
message: MessageLike
): Promise<ethers.utils.Result[]> {
const resolved = await this.toCrossChainMessage(message) const resolved = await this.toCrossChainMessage(message)
const receipt = await this.l2Provider.getTransactionReceipt( const receipt = await this.l2Provider.getTransactionReceipt(
resolved.transactionHash resolved.transactionHash
...@@ -407,10 +406,7 @@ export class CrossChainMessenger { ...@@ -407,10 +406,7 @@ export class CrossChainMessenger {
*/ */
messageIndex = 0 messageIndex = 0
): Promise<LowLevelMessage> { ): Promise<LowLevelMessage> {
const resolved = await this.toCrossChainMessage( const resolved = await this.toCrossChainMessage(message, messageIndex)
message,
messageIndex
)
if (resolved.direction === MessageDirection.L1_TO_L2) { if (resolved.direction === MessageDirection.L1_TO_L2) {
throw new Error(`can only convert L2 to L1 messages to low level`) throw new Error(`can only convert L2 to L1 messages to low level`)
} }
...@@ -419,10 +415,7 @@ export class CrossChainMessenger { ...@@ -419,10 +415,7 @@ export class CrossChainMessenger {
const { version } = decodeVersionedNonce(resolved.messageNonce) const { version } = decodeVersionedNonce(resolved.messageNonce)
let updated: CrossChainMessage let updated: CrossChainMessage
if (version.eq(0)) { if (version.eq(0)) {
updated = await this.toBedrockCrossChainMessage( updated = await this.toBedrockCrossChainMessage(resolved, messageIndex)
resolved,
messageIndex
)
} else { } else {
updated = resolved updated = resolved
} }
...@@ -672,10 +665,7 @@ export class CrossChainMessenger { ...@@ -672,10 +665,7 @@ export class CrossChainMessenger {
*/ */
messageIndex = 0 messageIndex = 0
): Promise<MessageStatus> { ): Promise<MessageStatus> {
const resolved = await this.toCrossChainMessage( const resolved = await this.toCrossChainMessage(message, messageIndex)
message,
messageIndex
)
const receipt = await this.getMessageReceipt(resolved, messageIndex) const receipt = await this.getMessageReceipt(resolved, messageIndex)
if (resolved.direction === MessageDirection.L1_TO_L2) { if (resolved.direction === MessageDirection.L1_TO_L2) {
...@@ -767,10 +757,7 @@ export class CrossChainMessenger { ...@@ -767,10 +757,7 @@ export class CrossChainMessenger {
*/ */
messageIndex = 0 messageIndex = 0
): Promise<MessageReceipt> { ): Promise<MessageReceipt> {
const resolved = await this.toCrossChainMessage( const resolved = await this.toCrossChainMessage(message, messageIndex)
message,
messageIndex
)
// legacy withdrawals relayed prebedrock are v1 // legacy withdrawals relayed prebedrock are v1
const messageHashV0 = hashCrossDomainMessagev0( const messageHashV0 = hashCrossDomainMessagev0(
resolved.target, resolved.target,
...@@ -880,18 +867,12 @@ export class CrossChainMessenger { ...@@ -880,18 +867,12 @@ export class CrossChainMessenger {
messageIndex = 0 messageIndex = 0
): Promise<MessageReceipt> { ): Promise<MessageReceipt> {
// Resolving once up-front is slightly more efficient. // Resolving once up-front is slightly more efficient.
const resolved = await this.toCrossChainMessage( const resolved = await this.toCrossChainMessage(message, messageIndex)
message,
messageIndex
)
let totalTimeMs = 0 let totalTimeMs = 0
while (totalTimeMs < (opts.timeoutMs || Infinity)) { while (totalTimeMs < (opts.timeoutMs || Infinity)) {
const tick = Date.now() const tick = Date.now()
const receipt = await this.getMessageReceipt( const receipt = await this.getMessageReceipt(resolved, messageIndex)
resolved,
messageIndex
)
if (receipt !== null) { if (receipt !== null) {
return receipt return receipt
} else { } else {
...@@ -929,18 +910,12 @@ export class CrossChainMessenger { ...@@ -929,18 +910,12 @@ export class CrossChainMessenger {
messageIndex = 0 messageIndex = 0
): Promise<void> { ): Promise<void> {
// Resolving once up-front is slightly more efficient. // Resolving once up-front is slightly more efficient.
const resolved = await this.toCrossChainMessage( const resolved = await this.toCrossChainMessage(message, messageIndex)
message,
messageIndex
)
let totalTimeMs = 0 let totalTimeMs = 0
while (totalTimeMs < (opts.timeoutMs || Infinity)) { while (totalTimeMs < (opts.timeoutMs || Infinity)) {
const tick = Date.now() const tick = Date.now()
const currentStatus = await this.getMessageStatus( const currentStatus = await this.getMessageStatus(resolved, messageIndex)
resolved,
messageIndex
)
// Handle special cases for L1 to L2 messages. // Handle special cases for L1 to L2 messages.
if (resolved.direction === MessageDirection.L1_TO_L2) { if (resolved.direction === MessageDirection.L1_TO_L2) {
...@@ -1057,10 +1032,7 @@ export class CrossChainMessenger { ...@@ -1057,10 +1032,7 @@ export class CrossChainMessenger {
*/ */
messageIndex = 0 messageIndex = 0
): Promise<number> { ): Promise<number> {
const resolved = await this.toCrossChainMessage( const resolved = await this.toCrossChainMessage(message, messageIndex)
message,
messageIndex
)
const status = await this.getMessageStatus(resolved, messageIndex) const status = await this.getMessageStatus(resolved, messageIndex)
if (resolved.direction === MessageDirection.L1_TO_L2) { if (resolved.direction === MessageDirection.L1_TO_L2) {
if ( if (
...@@ -1099,10 +1071,7 @@ export class CrossChainMessenger { ...@@ -1099,10 +1071,7 @@ export class CrossChainMessenger {
// If the message is still within the challenge period, then we need to estimate exactly // If the message is still within the challenge period, then we need to estimate exactly
// the amount of time left until the challenge period expires. The challenge period starts // the amount of time left until the challenge period expires. The challenge period starts
// when the state root is published. // when the state root is published.
const stateRoot = await this.getMessageStateRoot( const stateRoot = await this.getMessageStateRoot(resolved, messageIndex)
resolved,
messageIndex
)
const challengePeriod = await this.getChallengePeriodSeconds() const challengePeriod = await this.getChallengePeriodSeconds()
const targetBlock = await this.l1Provider.getBlock( const targetBlock = await this.l1Provider.getBlock(
stateRoot.batch.blockNumber stateRoot.batch.blockNumber
...@@ -1179,10 +1148,7 @@ export class CrossChainMessenger { ...@@ -1179,10 +1148,7 @@ export class CrossChainMessenger {
*/ */
messageIndex = 0 messageIndex = 0
): Promise<BedrockOutputData | null> { ): Promise<BedrockOutputData | null> {
const resolved = await this.toCrossChainMessage( const resolved = await this.toCrossChainMessage(message, messageIndex)
message,
messageIndex
)
// Outputs are only a thing for L2 to L1 messages. // Outputs are only a thing for L2 to L1 messages.
if (resolved.direction === MessageDirection.L1_TO_L2) { if (resolved.direction === MessageDirection.L1_TO_L2) {
...@@ -1238,10 +1204,7 @@ export class CrossChainMessenger { ...@@ -1238,10 +1204,7 @@ export class CrossChainMessenger {
*/ */
messageIndex = 0 messageIndex = 0
): Promise<StateRoot | null> { ): Promise<StateRoot | null> {
const resolved = await this.toCrossChainMessage( const resolved = await this.toCrossChainMessage(message, messageIndex)
message,
messageIndex
)
// State roots are only a thing for L2 to L1 messages. // State roots are only a thing for L2 to L1 messages.
if (resolved.direction === MessageDirection.L1_TO_L2) { if (resolved.direction === MessageDirection.L1_TO_L2) {
...@@ -1431,18 +1394,12 @@ export class CrossChainMessenger { ...@@ -1431,18 +1394,12 @@ export class CrossChainMessenger {
*/ */
messageIndex = 0 messageIndex = 0
): Promise<CrossChainMessageProof> { ): Promise<CrossChainMessageProof> {
const resolved = await this.toCrossChainMessage( const resolved = await this.toCrossChainMessage(message, messageIndex)
message,
messageIndex
)
if (resolved.direction === MessageDirection.L1_TO_L2) { if (resolved.direction === MessageDirection.L1_TO_L2) {
throw new Error(`can only generate proofs for L2 to L1 messages`) throw new Error(`can only generate proofs for L2 to L1 messages`)
} }
const stateRoot = await this.getMessageStateRoot( const stateRoot = await this.getMessageStateRoot(resolved, messageIndex)
resolved,
messageIndex
)
if (stateRoot === null) { if (stateRoot === null) {
throw new Error(`state root for message not yet published`) throw new Error(`state root for message not yet published`)
} }
...@@ -1500,26 +1457,17 @@ export class CrossChainMessenger { ...@@ -1500,26 +1457,17 @@ export class CrossChainMessenger {
*/ */
messageIndex = 0 messageIndex = 0
): Promise<BedrockCrossChainMessageProof> { ): Promise<BedrockCrossChainMessageProof> {
const resolved = await this.toCrossChainMessage( const resolved = await this.toCrossChainMessage(message, messageIndex)
message,
messageIndex
)
if (resolved.direction === MessageDirection.L1_TO_L2) { if (resolved.direction === MessageDirection.L1_TO_L2) {
throw new Error(`can only generate proofs for L2 to L1 messages`) throw new Error(`can only generate proofs for L2 to L1 messages`)
} }
const output = await this.getMessageBedrockOutput( const output = await this.getMessageBedrockOutput(resolved, messageIndex)
resolved,
messageIndex
)
if (output === null) { if (output === null) {
throw new Error(`state root for message not yet published`) throw new Error(`state root for message not yet published`)
} }
const withdrawal = await this.toLowLevelMessage( const withdrawal = await this.toLowLevelMessage(resolved, messageIndex)
resolved,
messageIndex
)
const hash = hashLowLevelMessage(withdrawal) const hash = hashLowLevelMessage(withdrawal)
const messageSlot = hashMessageHash(hash) const messageSlot = hashMessageHash(hash)
...@@ -1872,10 +1820,7 @@ export class CrossChainMessenger { ...@@ -1872,10 +1820,7 @@ export class CrossChainMessenger {
*/ */
messageIndex = 0 messageIndex = 0
): Promise<TransactionRequest> => { ): Promise<TransactionRequest> => {
const resolved = await this.toCrossChainMessage( const resolved = await this.toCrossChainMessage(message, messageIndex)
message,
messageIndex
)
if (resolved.direction === MessageDirection.L2_TO_L1) { if (resolved.direction === MessageDirection.L2_TO_L1) {
throw new Error(`cannot resend L2 to L1 message`) throw new Error(`cannot resend L2 to L1 message`)
} }
...@@ -1926,10 +1871,7 @@ export class CrossChainMessenger { ...@@ -1926,10 +1871,7 @@ export class CrossChainMessenger {
*/ */
messageIndex = 0 messageIndex = 0
): Promise<TransactionRequest> => { ): Promise<TransactionRequest> => {
const resolved = await this.toCrossChainMessage( const resolved = await this.toCrossChainMessage(message, messageIndex)
message,
messageIndex
)
if (resolved.direction === MessageDirection.L1_TO_L2) { if (resolved.direction === MessageDirection.L1_TO_L2) {
throw new Error('cannot finalize L1 to L2 message') throw new Error('cannot finalize L1 to L2 message')
} }
...@@ -1940,14 +1882,8 @@ export class CrossChainMessenger { ...@@ -1940,14 +1882,8 @@ export class CrossChainMessenger {
) )
} }
const withdrawal = await this.toLowLevelMessage( const withdrawal = await this.toLowLevelMessage(resolved, messageIndex)
resolved, const proof = await this.getBedrockMessageProof(resolved, messageIndex)
messageIndex
)
const proof = await this.getBedrockMessageProof(
resolved,
messageIndex
)
const args = [ const args = [
[ [
...@@ -1995,19 +1931,13 @@ export class CrossChainMessenger { ...@@ -1995,19 +1931,13 @@ export class CrossChainMessenger {
*/ */
messageIndex = 0 messageIndex = 0
): Promise<TransactionRequest> => { ): Promise<TransactionRequest> => {
const resolved = await this.toCrossChainMessage( const resolved = await this.toCrossChainMessage(message, messageIndex)
message,
messageIndex
)
if (resolved.direction === MessageDirection.L1_TO_L2) { if (resolved.direction === MessageDirection.L1_TO_L2) {
throw new Error(`cannot finalize L1 to L2 message`) throw new Error(`cannot finalize L1 to L2 message`)
} }
if (this.bedrock) { if (this.bedrock) {
const withdrawal = await this.toLowLevelMessage( const withdrawal = await this.toLowLevelMessage(resolved, messageIndex)
resolved,
messageIndex
)
return this.contracts.l1.OptimismPortal.populateTransaction.finalizeWithdrawalTransaction( return this.contracts.l1.OptimismPortal.populateTransaction.finalizeWithdrawalTransaction(
[ [
withdrawal.messageNonce, withdrawal.messageNonce,
...@@ -2287,11 +2217,7 @@ export class CrossChainMessenger { ...@@ -2287,11 +2217,7 @@ export class CrossChainMessenger {
messageIndex = 0 messageIndex = 0
): Promise<BigNumber> => { ): Promise<BigNumber> => {
return this.l1Provider.estimateGas( return this.l1Provider.estimateGas(
await this.populateTransaction.proveMessage( await this.populateTransaction.proveMessage(message, opts, messageIndex)
message,
opts,
messageIndex
)
) )
}, },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment