From ca574cceba2d8939538a6542ef7507c1842cfa7d Mon Sep 17 00:00:00 2001 From: Chris Berry Date: Sun, 30 Nov 2025 07:22:59 +0000 Subject: [PATCH 1/3] Update go-eth2-client. --- .gitignore | 3 +++ README.md | 2 +- go.mod | 2 +- go.sum | 7 +++---- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 438d6a7f..bcb57846 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,6 @@ ethereal # Vim *.sw? + +# IntelliJ + friends. +.idea/ \ No newline at end of file diff --git a/README.md b/README.md index 30169d08..105331cb 100644 --- a/README.md +++ b/README.md @@ -1093,7 +1093,7 @@ $ ethereal version ## Maintainers -Jim McDonald: [@mcdee](https://github.com/mcdee). +Chris Berry: [@Bez625](https://github.com/bez625). ## Contribute diff --git a/go.mod b/go.mod index aab9def5..6cbb0744 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ toolchain go1.23.2 require ( github.com/antlr4-go/antlr/v4 v4.13.1 - github.com/attestantio/go-eth2-client v0.24.1 + github.com/attestantio/go-eth2-client v0.27.1 github.com/attestantio/go-execution-client v0.10.2 github.com/ethereum/go-ethereum v1.15.6 github.com/miekg/dns v1.1.63 diff --git a/go.sum b/go.sum index edf30e71..653fbcbb 100644 --- a/go.sum +++ b/go.sum @@ -12,8 +12,8 @@ github.com/allegro/bigcache v1.2.1-0.20190218064605-e24eb225f156 h1:eMwmnE/GDgah github.com/allegro/bigcache v1.2.1-0.20190218064605-e24eb225f156/go.mod h1:Cb/ax3seSYIx7SuZdm2G2xzfwmv3TPSk2ucNfQESPXM= github.com/antlr4-go/antlr/v4 v4.13.1 h1:SqQKkuVZ+zWkMMNkjy5FZe5mr5WURWnlpmOuzYWrPrQ= github.com/antlr4-go/antlr/v4 v4.13.1/go.mod h1:GKmUxMtwp6ZgGwZSva4eWPC5mS6vUAmOABFgjdkM7Nw= -github.com/attestantio/go-eth2-client v0.24.1 h1:DZ/2O83eUcSfPPs63xF6fdXDe4afA4nlt5j0y2cweOI= -github.com/attestantio/go-eth2-client v0.24.1/go.mod h1:/KTLN3WuH1xrJL7ZZrpBoWM1xCCihnFbzequD5L+83o= +github.com/attestantio/go-eth2-client v0.27.1 h1:g7bm+gG/p+gfzYdEuxuAepVWYb8EO+2KojV5/Lo2BxM= +github.com/attestantio/go-eth2-client v0.27.1/go.mod h1:fvULSL9WtNskkOB4i+Yyr6BKpNHXvmpGZj9969fCrfY= github.com/attestantio/go-execution-client v0.10.2 h1:plfOAROLXVE//Yz8Ujp8s8PAr8rzXTnVKrsULt8+OuA= github.com/attestantio/go-execution-client v0.10.2/go.mod h1:ppLo3duaOxEpZYM/N6L7Kg/Ks931JKTY9YZnWBdtWSc= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= @@ -444,9 +444,8 @@ golang.org/x/tools v0.31.0 h1:0EedkvKDbh+qistFTd0Bcwe/YLh4vHwWEkiI0toFIBU= golang.org/x/tools v0.31.0/go.mod h1:naFTU+Cev749tSJRXJlna0T3WxKvb1kWEx15xA4SdmQ= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da h1:noIWHXmPHxILtqtCOPIhSt0ABwskkZKjD3bXGnZGpNY= -golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da/go.mod h1:NDW/Ps6MPRej6fsCIbMTohpP40sJ/P/vI1MoTEGwX90= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= From 4db35b2073c7d6532af0cc8d5eae7c64b10f44a3 Mon Sep 17 00:00:00 2001 From: Chris Berry Date: Mon, 1 Dec 2025 07:18:34 +0000 Subject: [PATCH 2/3] Update the version. --- cmd/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/version.go b/cmd/version.go index c91c0dc1..286d39de 100644 --- a/cmd/version.go +++ b/cmd/version.go @@ -30,7 +30,7 @@ var versionCmd = &cobra.Command{ ethereal version.`, Run: func(_ *cobra.Command, _ []string) { - fmt.Println("2.11.5") + fmt.Println("2.12.0") if viper.GetBool("verbose") { buildInfo, ok := dbg.ReadBuildInfo() if ok { From f98c76dcc5a5f520e0306207d8ec7ecbc2b6342a Mon Sep 17 00:00:00 2001 From: Chris Berry Date: Mon, 1 Dec 2025 11:48:17 +0000 Subject: [PATCH 3/3] Update workflow test. --- .github/workflows/test.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 1e0700a0..099c9ede 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -13,6 +13,8 @@ jobs: - uses: actions/setup-go@v5 with: cache: false - go-version: '^1.23' + go-version: '^1.24' - uses: actions/checkout@v4 - uses: n8maninger/action-golang-test@v2 + with: + args: "-race;-timeout=30m" \ No newline at end of file