Skip to content

Commit

Permalink
hotfix: upgrade testnet dependency
Browse files Browse the repository at this point in the history
  • Loading branch information
@krish-nr
krish-nr committed Apr 17, 2024
1 parent 6695f82 commit f583598
Show file tree
Hide file tree
Showing 214 changed files with 4,045 additions and 1,447 deletions.
2 changes: 1 addition & 1 deletion batch-submitter/batch_submitter.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"github.com/ethereum-optimism/optimism/bss-core/dial"
"github.com/ethereum-optimism/optimism/bss-core/metrics"
"github.com/ethereum-optimism/optimism/bss-core/txmgr"
"github.com/ethereum/go-ethereum/log"
"github.com/ethereum-optimism/optimism/logutil/log"
"github.com/getsentry/sentry-go"
"github.com/urfave/cli"
)
Expand Down
2 changes: 1 addition & 1 deletion batch-submitter/cmd/batch-submitter/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"os"

"github.com/ethereum/go-ethereum/log"
"github.com/ethereum-optimism/optimism/logutil/log"
"github.com/ethereum/go-ethereum/params"
"github.com/urfave/cli"

Expand Down
2 changes: 1 addition & 1 deletion batch-submitter/config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"errors"
"time"

"github.com/ethereum/go-ethereum/log"
"github.com/ethereum-optimism/optimism/logutil/log"
"github.com/urfave/cli"

"github.com/ethereum-optimism/optimism/batch-submitter/flags"
Expand Down
2 changes: 1 addition & 1 deletion batch-submitter/drivers/proposer/driver.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
"github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/ethclient"
"github.com/ethereum/go-ethereum/log"
"github.com/ethereum-optimism/optimism/logutil/log"
)

// stateRootSize is the size in bytes of a state root.
Expand Down
2 changes: 1 addition & 1 deletion batch-submitter/drivers/sequencer/driver.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@ import (
"github.com/ethereum-optimism/optimism/bss-core/metrics"
"github.com/ethereum-optimism/optimism/bss-core/txmgr"
l2ethclient "github.com/ethereum-optimism/optimism/l2geth/ethclient"
"github.com/ethereum-optimism/optimism/logutil/log"
"github.com/ethereum/go-ethereum"
"github.com/ethereum/go-ethereum/accounts/abi"
"github.com/ethereum/go-ethereum/accounts/abi/bind"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/ethclient"
"github.com/ethereum/go-ethereum/log"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion bss-core/crypto.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"github.com/ethereum/go-ethereum/accounts"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/log"
"github.com/ethereum-optimism/optimism/logutil/log"
"github.com/tyler-smith/go-bip39"
)

Expand Down
2 changes: 1 addition & 1 deletion bss-core/dial/l1_client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"strings"

"github.com/ethereum/go-ethereum/ethclient"
"github.com/ethereum/go-ethereum/log"
"github.com/ethereum-optimism/optimism/logutil/log"
"github.com/ethereum/go-ethereum/rpc"
)

Expand Down
2 changes: 1 addition & 1 deletion bss-core/drivers/clear_pending_tx.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ import (
"strings"

"github.com/ethereum-optimism/optimism/bss-core/txmgr"
"github.com/ethereum-optimism/optimism/logutil/log"
"github.com/ethereum/go-ethereum"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/core"
"github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/log"
)

// ErrClearPendingRetry signals that a transaction from a previous running
Expand Down
2 changes: 1 addition & 1 deletion bss-core/sentry_log.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"io"
"time"

"github.com/ethereum/go-ethereum/log"
"github.com/ethereum-optimism/optimism/logutil/log"
"github.com/getsentry/sentry-go"
)

Expand Down
2 changes: 1 addition & 1 deletion bss-core/service.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/ethclient"
"github.com/ethereum/go-ethereum/log"
"github.com/ethereum-optimism/optimism/logutil/log"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion bss-core/txmgr/txmgr.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (

"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/log"
"github.com/ethereum-optimism/optimism/logutil/log"
)

// ErrReverted signals that a mined transaction reverted.
Expand Down
2 changes: 1 addition & 1 deletion endpoint-monitor/cmd/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"os"

oplog "github.com/ethereum-optimism/optimism/op-service/log"
"github.com/ethereum/go-ethereum/log"
"github.com/ethereum-optimism/optimism/logutil/log"
"github.com/urfave/cli"

endpointMonitor "github.com/ethereum-optimism/optimism/endpoint-monitor"
Expand Down
2 changes: 1 addition & 1 deletion endpoint-monitor/endpoint_monitor.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (

oplog "github.com/ethereum-optimism/optimism/op-service/log"
opmetrics "github.com/ethereum-optimism/optimism/op-service/metrics"
"github.com/ethereum/go-ethereum/log"
"github.com/ethereum-optimism/optimism/logutil/log"
"github.com/pkg/errors"
"github.com/prometheus/client_golang/prometheus"
"github.com/urfave/cli"
Expand Down
2 changes: 1 addition & 1 deletion gas-oracle/gasprices/gas_price_updater.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"math/big"
"sync"

"github.com/ethereum/go-ethereum/log"
"github.com/ethereum-optimism/optimism/logutil/log"
)

type GetLatestBlockNumberFn func() (uint64, error)
Expand Down
2 changes: 1 addition & 1 deletion gas-oracle/gasprices/l2_gas_pricer.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"fmt"
"math"

"github.com/ethereum/go-ethereum/log"
"github.com/ethereum-optimism/optimism/logutil/log"
)

type GetTargetGasPerSecond func() float64
Expand Down
2 changes: 1 addition & 1 deletion gas-oracle/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"github.com/ethereum-optimism/optimism/gas-oracle/flags"
ometrics "github.com/ethereum-optimism/optimism/gas-oracle/metrics"
"github.com/ethereum-optimism/optimism/gas-oracle/oracle"
"github.com/ethereum/go-ethereum/log"
"github.com/ethereum-optimism/optimism/logutil/log"
"github.com/ethereum/go-ethereum/metrics/influxdb"
"github.com/ethereum/go-ethereum/params"
"github.com/urfave/cli"
Expand Down
2 changes: 1 addition & 1 deletion gas-oracle/metrics/handler.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"net/http"
"sync"

"github.com/ethereum/go-ethereum/log"
"github.com/ethereum-optimism/optimism/logutil/log"
"github.com/ethereum/go-ethereum/metrics"
"github.com/ethereum/go-ethereum/metrics/prometheus"
)
Expand Down
2 changes: 1 addition & 1 deletion gas-oracle/oracle/base_fee.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import (
"fmt"

"github.com/ethereum-optimism/optimism/gas-oracle/bindings"
"github.com/ethereum-optimism/optimism/logutil/log"
"github.com/ethereum/go-ethereum/accounts/abi/bind"
"github.com/ethereum/go-ethereum/common/hexutil"
"github.com/ethereum/go-ethereum/log"
)

func wrapUpdateBaseFee(l1Backend bind.ContractTransactor, l2Backend DeployContractBackend, cfg *Config) (func() error, error) {
Expand Down
2 changes: 1 addition & 1 deletion gas-oracle/oracle/config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"github.com/ethereum-optimism/optimism/gas-oracle/flags"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/log"
"github.com/ethereum-optimism/optimism/logutil/log"
"github.com/urfave/cli"
)

Expand Down
2 changes: 1 addition & 1 deletion gas-oracle/oracle/gas_price_oracle.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"github.com/ethereum/go-ethereum/accounts/abi/bind"
"github.com/ethereum/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/ethclient"
"github.com/ethereum/go-ethereum/log"
"github.com/ethereum-optimism/optimism/logutil/log"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion gas-oracle/oracle/updater_interface.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"github.com/ethereum/go-ethereum/accounts/abi/bind"
"github.com/ethereum/go-ethereum/common/hexutil"
"github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/log"
"github.com/ethereum-optimism/optimism/logutil/log"
"github.com/ethereum/go-ethereum/metrics"
)

Expand Down
Loading

0 comments on commit f583598

Please sign in to comment.