Commit 1338135c authored by smartcontracts's avatar smartcontracts Committed by GitHub

fix(sdk): use correct overrides type (#2468)

Replaces Overrides with CallOverrides for estimateGas functions so you
can specify the "from" address.
Co-authored-by: default avatarMatthew Slipper <me@matthewslipper.com>
parent c79558b3
---
'@eth-optimism/sdk': patch
---
Fixes a bug where the wrong Overrides type was being used for gas estimation functions
/* eslint-disable @typescript-eslint/no-unused-vars */ /* eslint-disable @typescript-eslint/no-unused-vars */
import { ethers, Contract, Overrides, Signer, BigNumber } from 'ethers' import {
ethers,
Contract,
Overrides,
Signer,
BigNumber,
CallOverrides,
} from 'ethers'
import { import {
TransactionRequest, TransactionRequest,
TransactionResponse, TransactionResponse,
...@@ -350,7 +357,7 @@ export class StandardBridgeAdapter implements IBridgeAdapter { ...@@ -350,7 +357,7 @@ export class StandardBridgeAdapter implements IBridgeAdapter {
l2Token: AddressLike, l2Token: AddressLike,
amount: NumberLike, amount: NumberLike,
opts?: { opts?: {
overrides?: Overrides overrides?: CallOverrides
} }
): Promise<BigNumber> => { ): Promise<BigNumber> => {
return this.messenger.l1Provider.estimateGas( return this.messenger.l1Provider.estimateGas(
...@@ -365,7 +372,7 @@ export class StandardBridgeAdapter implements IBridgeAdapter { ...@@ -365,7 +372,7 @@ export class StandardBridgeAdapter implements IBridgeAdapter {
opts?: { opts?: {
recipient?: AddressLike recipient?: AddressLike
l2GasLimit?: NumberLike l2GasLimit?: NumberLike
overrides?: Overrides overrides?: CallOverrides
} }
): Promise<BigNumber> => { ): Promise<BigNumber> => {
return this.messenger.l1Provider.estimateGas( return this.messenger.l1Provider.estimateGas(
...@@ -379,7 +386,7 @@ export class StandardBridgeAdapter implements IBridgeAdapter { ...@@ -379,7 +386,7 @@ export class StandardBridgeAdapter implements IBridgeAdapter {
amount: NumberLike, amount: NumberLike,
opts?: { opts?: {
recipient?: AddressLike recipient?: AddressLike
overrides?: Overrides overrides?: CallOverrides
} }
): Promise<BigNumber> => { ): Promise<BigNumber> => {
return this.messenger.l2Provider.estimateGas( return this.messenger.l2Provider.estimateGas(
......
...@@ -7,7 +7,7 @@ import { ...@@ -7,7 +7,7 @@ import {
TransactionRequest, TransactionRequest,
} from '@ethersproject/abstract-provider' } from '@ethersproject/abstract-provider'
import { Signer } from '@ethersproject/abstract-signer' import { Signer } from '@ethersproject/abstract-signer'
import { ethers, BigNumber, Overrides } from 'ethers' import { ethers, BigNumber, Overrides, CallOverrides } from 'ethers'
import { sleep, remove0x } from '@eth-optimism/core-utils' import { sleep, remove0x } from '@eth-optimism/core-utils'
import { predeploys } from '@eth-optimism/contracts' import { predeploys } from '@eth-optimism/contracts'
...@@ -1128,7 +1128,7 @@ export class CrossChainMessenger implements ICrossChainMessenger { ...@@ -1128,7 +1128,7 @@ export class CrossChainMessenger implements ICrossChainMessenger {
message: CrossChainMessageRequest, message: CrossChainMessageRequest,
opts?: { opts?: {
l2GasLimit?: NumberLike l2GasLimit?: NumberLike
overrides?: Overrides overrides?: CallOverrides
} }
): Promise<BigNumber> => { ): Promise<BigNumber> => {
const tx = await this.populateTransaction.sendMessage(message, opts) const tx = await this.populateTransaction.sendMessage(message, opts)
...@@ -1143,7 +1143,7 @@ export class CrossChainMessenger implements ICrossChainMessenger { ...@@ -1143,7 +1143,7 @@ export class CrossChainMessenger implements ICrossChainMessenger {
message: MessageLike, message: MessageLike,
messageGasLimit: NumberLike, messageGasLimit: NumberLike,
opts?: { opts?: {
overrides?: Overrides overrides?: CallOverrides
} }
): Promise<BigNumber> => { ): Promise<BigNumber> => {
return this.l1Provider.estimateGas( return this.l1Provider.estimateGas(
...@@ -1158,7 +1158,7 @@ export class CrossChainMessenger implements ICrossChainMessenger { ...@@ -1158,7 +1158,7 @@ export class CrossChainMessenger implements ICrossChainMessenger {
finalizeMessage: async ( finalizeMessage: async (
message: MessageLike, message: MessageLike,
opts?: { opts?: {
overrides?: Overrides overrides?: CallOverrides
} }
): Promise<BigNumber> => { ): Promise<BigNumber> => {
return this.l1Provider.estimateGas( return this.l1Provider.estimateGas(
...@@ -1171,7 +1171,7 @@ export class CrossChainMessenger implements ICrossChainMessenger { ...@@ -1171,7 +1171,7 @@ export class CrossChainMessenger implements ICrossChainMessenger {
opts?: { opts?: {
recipient?: AddressLike recipient?: AddressLike
l2GasLimit?: NumberLike l2GasLimit?: NumberLike
overrides?: Overrides overrides?: CallOverrides
} }
): Promise<BigNumber> => { ): Promise<BigNumber> => {
return this.l1Provider.estimateGas( return this.l1Provider.estimateGas(
...@@ -1183,7 +1183,7 @@ export class CrossChainMessenger implements ICrossChainMessenger { ...@@ -1183,7 +1183,7 @@ export class CrossChainMessenger implements ICrossChainMessenger {
amount: NumberLike, amount: NumberLike,
opts?: { opts?: {
recipient?: AddressLike recipient?: AddressLike
overrides?: Overrides overrides?: CallOverrides
} }
): Promise<BigNumber> => { ): Promise<BigNumber> => {
return this.l2Provider.estimateGas( return this.l2Provider.estimateGas(
...@@ -1196,7 +1196,7 @@ export class CrossChainMessenger implements ICrossChainMessenger { ...@@ -1196,7 +1196,7 @@ export class CrossChainMessenger implements ICrossChainMessenger {
l2Token: AddressLike, l2Token: AddressLike,
amount: NumberLike, amount: NumberLike,
opts?: { opts?: {
overrides?: Overrides overrides?: CallOverrides
} }
): Promise<BigNumber> => { ): Promise<BigNumber> => {
return this.l1Provider.estimateGas( return this.l1Provider.estimateGas(
...@@ -1216,7 +1216,7 @@ export class CrossChainMessenger implements ICrossChainMessenger { ...@@ -1216,7 +1216,7 @@ export class CrossChainMessenger implements ICrossChainMessenger {
opts?: { opts?: {
recipient?: AddressLike recipient?: AddressLike
l2GasLimit?: NumberLike l2GasLimit?: NumberLike
overrides?: Overrides overrides?: CallOverrides
} }
): Promise<BigNumber> => { ): Promise<BigNumber> => {
return this.l1Provider.estimateGas( return this.l1Provider.estimateGas(
...@@ -1235,7 +1235,7 @@ export class CrossChainMessenger implements ICrossChainMessenger { ...@@ -1235,7 +1235,7 @@ export class CrossChainMessenger implements ICrossChainMessenger {
amount: NumberLike, amount: NumberLike,
opts?: { opts?: {
recipient?: AddressLike recipient?: AddressLike
overrides?: Overrides overrides?: CallOverrides
} }
): Promise<BigNumber> => { ): Promise<BigNumber> => {
return this.l2Provider.estimateGas( return this.l2Provider.estimateGas(
......
import { Contract, Overrides, Signer, BigNumber } from 'ethers' import { Contract, Overrides, Signer, BigNumber, CallOverrides } from 'ethers'
import { import {
TransactionRequest, TransactionRequest,
TransactionResponse, TransactionResponse,
...@@ -250,7 +250,7 @@ export interface IBridgeAdapter { ...@@ -250,7 +250,7 @@ export interface IBridgeAdapter {
l2Token: AddressLike, l2Token: AddressLike,
amount: NumberLike, amount: NumberLike,
opts?: { opts?: {
overrides?: Overrides overrides?: CallOverrides
} }
): Promise<BigNumber> ): Promise<BigNumber>
...@@ -273,7 +273,7 @@ export interface IBridgeAdapter { ...@@ -273,7 +273,7 @@ export interface IBridgeAdapter {
opts?: { opts?: {
recipient?: AddressLike recipient?: AddressLike
l2GasLimit?: NumberLike l2GasLimit?: NumberLike
overrides?: Overrides overrides?: CallOverrides
} }
): Promise<BigNumber> ): Promise<BigNumber>
...@@ -294,7 +294,7 @@ export interface IBridgeAdapter { ...@@ -294,7 +294,7 @@ export interface IBridgeAdapter {
amount: NumberLike, amount: NumberLike,
opts?: { opts?: {
recipient?: AddressLike recipient?: AddressLike
overrides?: Overrides overrides?: CallOverrides
} }
): Promise<BigNumber> ): Promise<BigNumber>
} }
......
import { Event, BigNumber, Overrides } from 'ethers' import { Event, BigNumber, Overrides, CallOverrides } from 'ethers'
import { import {
Provider, Provider,
BlockTag, BlockTag,
...@@ -697,7 +697,7 @@ export interface ICrossChainMessenger { ...@@ -697,7 +697,7 @@ export interface ICrossChainMessenger {
message: CrossChainMessageRequest, message: CrossChainMessageRequest,
opts?: { opts?: {
l2GasLimit?: NumberLike l2GasLimit?: NumberLike
overrides?: Overrides overrides?: CallOverrides
} }
) => Promise<BigNumber> ) => Promise<BigNumber>
...@@ -714,7 +714,7 @@ export interface ICrossChainMessenger { ...@@ -714,7 +714,7 @@ export interface ICrossChainMessenger {
message: MessageLike, message: MessageLike,
messageGasLimit: NumberLike, messageGasLimit: NumberLike,
opts?: { opts?: {
overrides?: Overrides overrides?: CallOverrides
} }
): Promise<BigNumber> ): Promise<BigNumber>
...@@ -729,7 +729,7 @@ export interface ICrossChainMessenger { ...@@ -729,7 +729,7 @@ export interface ICrossChainMessenger {
finalizeMessage( finalizeMessage(
message: MessageLike, message: MessageLike,
opts?: { opts?: {
overrides?: Overrides overrides?: CallOverrides
} }
): Promise<BigNumber> ): Promise<BigNumber>
...@@ -748,7 +748,7 @@ export interface ICrossChainMessenger { ...@@ -748,7 +748,7 @@ export interface ICrossChainMessenger {
l2Token: AddressLike, l2Token: AddressLike,
amount: NumberLike, amount: NumberLike,
opts?: { opts?: {
overrides?: Overrides overrides?: CallOverrides
} }
): Promise<BigNumber> ): Promise<BigNumber>
...@@ -767,7 +767,7 @@ export interface ICrossChainMessenger { ...@@ -767,7 +767,7 @@ export interface ICrossChainMessenger {
opts?: { opts?: {
recipient?: AddressLike recipient?: AddressLike
l2GasLimit?: NumberLike l2GasLimit?: NumberLike
overrides?: Overrides overrides?: CallOverrides
} }
): Promise<BigNumber> ): Promise<BigNumber>
...@@ -784,7 +784,7 @@ export interface ICrossChainMessenger { ...@@ -784,7 +784,7 @@ export interface ICrossChainMessenger {
amount: NumberLike, amount: NumberLike,
opts?: { opts?: {
recipient?: AddressLike recipient?: AddressLike
overrides?: Overrides overrides?: CallOverrides
} }
): Promise<BigNumber> ): Promise<BigNumber>
...@@ -807,7 +807,7 @@ export interface ICrossChainMessenger { ...@@ -807,7 +807,7 @@ export interface ICrossChainMessenger {
opts?: { opts?: {
recipient?: AddressLike recipient?: AddressLike
l2GasLimit?: NumberLike l2GasLimit?: NumberLike
overrides?: Overrides overrides?: CallOverrides
} }
): Promise<BigNumber> ): Promise<BigNumber>
...@@ -828,7 +828,7 @@ export interface ICrossChainMessenger { ...@@ -828,7 +828,7 @@ export interface ICrossChainMessenger {
amount: NumberLike, amount: NumberLike,
opts?: { opts?: {
recipient?: AddressLike recipient?: AddressLike
overrides?: Overrides overrides?: CallOverrides
} }
): Promise<BigNumber> ): Promise<BigNumber>
} }
......
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