Skip to content

Commit ad5d54e

Browse files
authored
fix: solve op-geth compile error on windows system (#306)
1 parent bf194c8 commit ad5d54e

4 files changed

Lines changed: 3 additions & 13 deletions

File tree

cmd/geth/main.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -404,7 +404,6 @@ func geth(ctx *cli.Context) error {
404404
// it unlocks any requested accounts, and starts the RPC/IPC interfaces and the
405405
// miner.
406406
func startNode(ctx *cli.Context, stack *node.Node, backend ethapi.Backend, isConsole bool) {
407-
debug.Memsize.Add("node", stack)
408407

409408
// Start up the node itself
410409
utils.StartNode(ctx, stack, isConsole)

go.mod

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ require (
2828
github.com/ethereum/c-kzg-4844 v0.4.0
2929
github.com/fatih/color v1.15.0
3030
github.com/fjl/gencodec v0.0.0-20230517082657-f9840df7b83e
31-
github.com/fjl/memsize v0.0.0-20190710130421-bcb5799ab5e5
3231
github.com/fsnotify/fsnotify v1.7.0
3332
github.com/gballet/go-libpcsclite v0.0.0-20191108122812-4678299bea08
3433
github.com/gballet/go-verkle v0.1.1-0.20231031103413-a67434b50f46
@@ -64,7 +63,7 @@ require (
6463
github.com/shirou/gopsutil v3.21.11+incompatible
6564
github.com/status-im/keycard-go v0.2.0
6665
github.com/stretchr/testify v1.8.4
67-
github.com/supranational/blst v0.3.11
66+
github.com/supranational/blst v0.3.14
6867
github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d
6968
github.com/tyler-smith/go-bip39 v1.1.0
7069
github.com/urfave/cli/v2 v2.25.7
@@ -110,7 +109,6 @@ require (
110109
github.com/dgraph-io/ristretto v0.0.4-0.20210318174700-74754f61e018 // indirect
111110
github.com/dlclark/regexp2 v1.7.0 // indirect
112111
github.com/dustin/go-humanize v1.0.0 // indirect
113-
github.com/emirpasic/gods v1.18.1 // indirect
114112
github.com/ferranbt/fastssz v0.0.0-20210905181407-59cf6761a7d5 // indirect
115113
github.com/garslo/gogen v0.0.0-20170306192744-1d203ffc1f61 // indirect
116114
github.com/getsentry/sentry-go v0.27.0 // indirect

go.sum

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -350,8 +350,6 @@ github.com/eknkc/amber v0.0.0-20171010120322-cdade1c07385/go.mod h1:0vRUJqYpeSZi
350350
github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc=
351351
github.com/emicklei/dot v0.11.0/go.mod h1:DeV7GvQtIw4h2u73RKBkkFdvVAz0D9fzeJrgPW6gy/s=
352352
github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
353-
github.com/emirpasic/gods v1.18.1 h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc=
354-
github.com/emirpasic/gods v1.18.1/go.mod h1:8tpGGwCnJ5H4r6BWwaV6OrWmMoPhUl5jm/FMNAnJvWQ=
355353
github.com/envoyproxy/go-control-plane v0.6.9/go.mod h1:SBwIajubJHhxtWwsL9s8ss4safvEdbitLhGGK48rN6g=
356354
github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
357355
github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
@@ -378,7 +376,6 @@ github.com/ferranbt/fastssz v0.0.0-20210905181407-59cf6761a7d5 h1:6dVcS0LktRSyEE
378376
github.com/ferranbt/fastssz v0.0.0-20210905181407-59cf6761a7d5/go.mod h1:S8yiDeAXy8f88W4Ul+0dBMPx49S05byYbmZD6Uv94K4=
379377
github.com/fjl/gencodec v0.0.0-20230517082657-f9840df7b83e h1:bBLctRc7kr01YGvaDfgLbTwjFNW5jdp5y5rj8XXBHfY=
380378
github.com/fjl/gencodec v0.0.0-20230517082657-f9840df7b83e/go.mod h1:AzA8Lj6YtixmJWL+wkKoBGsLWy9gFrAzi4g+5bCKwpY=
381-
github.com/fjl/memsize v0.0.0-20190710130421-bcb5799ab5e5 h1:FtmdgXiUlNeRsoNMFlKLDt+S+6hbjVMEW6RGQ7aUf7c=
382379
github.com/fjl/memsize v0.0.0-20190710130421-bcb5799ab5e5/go.mod h1:VvhXpOYNQvB+uIk2RvXzuaQtkQJzzIx6lSBe1xv7hi0=
383380
github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc=
384381
github.com/flynn/noise v1.0.0/go.mod h1:xbMo+0i6+IGbYdJhF31t2eR1BIU0CYc12+BNAKwUTag=
@@ -1390,8 +1387,8 @@ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO
13901387
github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
13911388
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
13921389
github.com/supranational/blst v0.3.5/go.mod h1:jZJtfjgudtNl4en1tzwPIV3KjUnQUvG3/j+w+fVonLw=
1393-
github.com/supranational/blst v0.3.11 h1:LyU6FolezeWAhvQk0k6O/d49jqgO52MSDDfYgbeoEm4=
1394-
github.com/supranational/blst v0.3.11/go.mod h1:jZJtfjgudtNl4en1tzwPIV3KjUnQUvG3/j+w+fVonLw=
1390+
github.com/supranational/blst v0.3.14 h1:xNMoHRJOTwMn63ip6qoWJ2Ymgvj7E2b9jY2FAwY+qRo=
1391+
github.com/supranational/blst v0.3.14/go.mod h1:jZJtfjgudtNl4en1tzwPIV3KjUnQUvG3/j+w+fVonLw=
13951392
github.com/syndtr/goleveldb v1.0.0/go.mod h1:ZVVdQEZoIme9iO1Ch2Jdy24qqXrMMOU6lpPAyBWyWuQ=
13961393
github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7/go.mod h1:q4W45IWZaF22tdD+VEXcAWRA037jwmWEB5VWYORlTpc=
13971394
github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d h1:vfofYNRScrDdvS342BElfbETmL1Aiz3i2t0zfRj16Hs=

internal/debug/flags.go

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,16 +30,13 @@ import (
3030
"github.com/ethereum/go-ethereum/log"
3131
"github.com/ethereum/go-ethereum/metrics"
3232
"github.com/ethereum/go-ethereum/metrics/exp"
33-
"github.com/fjl/memsize/memsizeui"
3433
"github.com/mattn/go-colorable"
3534
"github.com/mattn/go-isatty"
3635
"github.com/urfave/cli/v2"
3736
"golang.org/x/exp/slog"
3837
"gopkg.in/natefinch/lumberjack.v2"
3938
)
4039

41-
var Memsize memsizeui.Handler
42-
4340
var (
4441
verbosityFlag = &cli.IntFlag{
4542
Name: "verbosity",
@@ -313,7 +310,6 @@ func StartPProf(address string, withMetrics bool) {
313310
if withMetrics {
314311
exp.Exp(metrics.DefaultRegistry)
315312
}
316-
http.Handle("/memsize/", http.StripPrefix("/memsize", &Memsize))
317313
log.Info("Starting pprof server", "addr", fmt.Sprintf("http://%s/debug/pprof", address))
318314
go func() {
319315
if err := http.ListenAndServe(address, nil); err != nil {

0 commit comments

Comments
 (0)