Sitelet https://github.com/ethereum-optimism/optimism/commit/7c65adfea5498834ff5e75cf809e8871200c97ee
Skip to content

Commit 7c65adf

Browse files
sebastianstclaude
sebastianst
and
claude
authored
all: log through op-service/log instead of go-ethereum/log (#23017)
Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
1 parent f90ec53 commit 7c65adf

618 files changed

Lines changed: 781 additions & 849 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.golangci.yaml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ linters:
77
- misspell
88
- errorlint
99
- bigint
10+
- depguard
1011

1112
# Only enabled in specific cases. See settings and exclusions below
1213
- exhaustruct
@@ -23,6 +24,17 @@ linters:
2324
type: "module"
2425
description: "Optimism big.Int checks"
2526
settings: {}
27+
depguard:
28+
rules:
29+
# op-service/log is the monorepo's logging API; logger.go is its one
30+
# binding to the go-ethereum logger.
31+
geth-log:
32+
files:
33+
- $all
34+
- "!**/op-service/log/logger.go"
35+
deny:
36+
- pkg: github.com/ethereum/go-ethereum/log$
37+
desc: import github.com/ethereum-optimism/optimism/op-service/log instead
2638
# Require specifying all fields in op-deployer's OPCM input and output structs
2739
exhaustruct:
2840
include:

‎cannon/cmd/log.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77

88
"golang.org/x/term"
99

10-
"github.com/ethereum/go-ethereum/log"
10+
"github.com/ethereum-optimism/optimism/op-service/log"
1111
)
1212

1313
func Logger(w io.Writer, lvl slog.Level) log.Logger {

‎cannon/cmd/run.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ import (
1515

1616
"github.com/ethereum/go-ethereum/common"
1717
"github.com/ethereum/go-ethereum/common/hexutil"
18-
"github.com/ethereum/go-ethereum/log"
1918
"github.com/urfave/cli/v2"
2019

2120
"github.com/ethereum-optimism/optimism/cannon/mipsevm"
@@ -26,6 +25,7 @@ import (
2625
preimage "github.com/ethereum-optimism/optimism/op-preimage"
2726
"github.com/ethereum-optimism/optimism/op-service/ioutil"
2827
"github.com/ethereum-optimism/optimism/op-service/jsonutil"
28+
"github.com/ethereum-optimism/optimism/op-service/log"
2929
"github.com/ethereum-optimism/optimism/op-service/serialize"
3030
)
3131

‎cannon/mipsevm/iface.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ import (
55

66
"github.com/ethereum/go-ethereum/common"
77
"github.com/ethereum/go-ethereum/common/hexutil"
8-
"github.com/ethereum/go-ethereum/log"
98

109
"github.com/ethereum-optimism/optimism/cannon/mipsevm/arch"
1110
"github.com/ethereum-optimism/optimism/cannon/mipsevm/memory"
11+
"github.com/ethereum-optimism/optimism/op-service/log"
1212
"github.com/ethereum-optimism/optimism/op-service/serialize"
1313
)
1414

‎cannon/mipsevm/logw.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ package mipsevm
22

33
import (
44
"github.com/ethereum/go-ethereum/common/hexutil"
5-
"github.com/ethereum/go-ethereum/log"
5+
6+
"github.com/ethereum-optimism/optimism/op-service/log"
67
)
78

89
// LoggingWriter is a simple util to wrap a logger,

‎cannon/mipsevm/multithreaded/instrumented.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ import (
44
"io"
55

66
"github.com/ethereum/go-ethereum/common/hexutil"
7-
"github.com/ethereum/go-ethereum/log"
87

98
"github.com/ethereum-optimism/optimism/cannon/mipsevm"
109
"github.com/ethereum-optimism/optimism/cannon/mipsevm/arch"
1110
"github.com/ethereum-optimism/optimism/cannon/mipsevm/exec"
11+
"github.com/ethereum-optimism/optimism/op-service/log"
1212
)
1313

1414
type InstructionDetails struct {

‎cannon/mipsevm/multithreaded/mips.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ import (
66

77
"github.com/ethereum/go-ethereum/common"
88
"github.com/ethereum/go-ethereum/common/hexutil"
9-
"github.com/ethereum/go-ethereum/log"
109

1110
"github.com/ethereum-optimism/optimism/cannon/mipsevm"
1211
"github.com/ethereum-optimism/optimism/cannon/mipsevm/arch"
1312
"github.com/ethereum-optimism/optimism/cannon/mipsevm/exec"
1413
"github.com/ethereum-optimism/optimism/cannon/mipsevm/program"
1514
"github.com/ethereum-optimism/optimism/cannon/mipsevm/register"
15+
"github.com/ethereum-optimism/optimism/op-service/log"
1616
)
1717

1818
type Word = arch.Word

‎cannon/mipsevm/multithreaded/state.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ import (
88
"github.com/ethereum/go-ethereum/common"
99
"github.com/ethereum/go-ethereum/common/hexutil"
1010
"github.com/ethereum/go-ethereum/crypto"
11-
"github.com/ethereum/go-ethereum/log"
1211

1312
"github.com/ethereum-optimism/optimism/cannon/mipsevm"
1413
"github.com/ethereum-optimism/optimism/cannon/mipsevm/arch"
1514
"github.com/ethereum-optimism/optimism/cannon/mipsevm/memory"
15+
"github.com/ethereum-optimism/optimism/op-service/log"
1616
"github.com/ethereum-optimism/optimism/op-service/serialize"
1717
)
1818

‎cannon/mipsevm/program/testutil/mocks.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ import (
66

77
"github.com/ethereum/go-ethereum/common"
88
"github.com/ethereum/go-ethereum/common/hexutil"
9-
"github.com/ethereum/go-ethereum/log"
109

1110
"github.com/ethereum-optimism/optimism/cannon/mipsevm"
1211
"github.com/ethereum-optimism/optimism/cannon/mipsevm/arch"
1312
"github.com/ethereum-optimism/optimism/cannon/mipsevm/memory"
13+
"github.com/ethereum-optimism/optimism/op-service/log"
1414
)
1515

1616
// MockELFFile create a mock ELF file with custom program segments

‎cannon/mipsevm/tests/difftester.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ import (
88
"testing"
99

1010
"github.com/ethereum/go-ethereum/core/tracing"
11-
"github.com/ethereum/go-ethereum/log"
1211
"github.com/stretchr/testify/require"
1312

1413
"github.com/ethereum-optimism/optimism/cannon/mipsevm"
1514
"github.com/ethereum-optimism/optimism/cannon/mipsevm/arch"
1615
"github.com/ethereum-optimism/optimism/cannon/mipsevm/multithreaded"
1716
mtutil "github.com/ethereum-optimism/optimism/cannon/mipsevm/multithreaded/testutil"
1817
"github.com/ethereum-optimism/optimism/cannon/mipsevm/testutil"
18+
"github.com/ethereum-optimism/optimism/op-service/log"
1919
)
2020

2121
type TestNamer[T any] func(testCase T) string

0 commit comments

Comments
 (0)