Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(op-node): fix merge code #124

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions op-program/host/prefetcher/retry.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@ type RetryingL1Source struct {
strategy retry.Strategy
}

func (s *RetryingL1Source) PreFetchReceipts(ctx context.Context, blockHash common.Hash) (bool, error) {
return false, nil
}

func NewRetryingL1Source(logger log.Logger, source L1Source) *RetryingL1Source {
return &RetryingL1Source{
logger: logger,
Expand Down
2 changes: 1 addition & 1 deletion op-service/dial/dial.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ const TxmgrFallbackThreshold int64 = 3
// DialEthClientWithTimeout attempts to dial the L1 provider using the provided
// URL. If the dial doesn't complete within defaultDialTimeout seconds, this
// method will return an error.
func DialEthClientWithTimeout(ctx context.Context, timeout time.Duration, log log.Logger, url string) (client.Client, error) {
func DialEthClientWithTimeout(ctx context.Context, timeout time.Duration, log log.Logger, url string) (*ethclient.Client, error) {
ctx, cancel := context.WithTimeout(ctx, timeout)
defer cancel()

Expand Down