params: release Geth v 1.13.15

This pull request defines a gentrie for snap sync purpose.

The stackTrie is used to generate the merkle tree nodes upon receiving a state batch. Several additional options have been added into stackTrie to handle incomplete states (either missing states before or after).

In this pull request, these options have been relocated from stackTrie to genTrie, which serves as a wrapper for stackTrie specifically for snap sync purposes.

Further, the logic for managing incomplete state has been enhanced in this change. Originally, there are two cases handled:

-    boundary node filtering
-    internal (covered by extension node) node clearing

This changes adds one more:

- Clearing leftover nodes on the boundaries.

This feature is necessary if there are leftover trie nodes in database, otherwise node inconsistency may break the state healing.

.github/CODEOWNERS

@@ -4,22 +4,19 @@
 accounts/usbwallet              @karalabe
 accounts/scwallet               @gballet
 accounts/abi                    @gballet @MariusVanDerWijden
-beacon/engine                   @lightclient
 cmd/clef                        @holiman
-cmd/evm                         @holiman @MariusVanDerWijden @lightclient
 consensus                       @karalabe
 core/                           @karalabe @holiman @rjl493456442
 eth/                            @karalabe @holiman @rjl493456442
-eth/catalyst/                   @gballet @lightclient
+eth/catalyst/                   @gballet
 eth/tracers/                    @s1na
-core/tracing/                   @s1na
 graphql/                        @s1na
-internal/ethapi                 @lightclient
-internal/era                    @lightclient
 les/                            @zsfelfoldi @rjl493456442
 light/                          @zsfelfoldi @rjl493456442
 node/                           @fjl
 p2p/                            @fjl @zsfelfoldi
-params/                         @fjl @holiman @karalabe @gballet @rjl493456442 @zsfelfoldi
 rpc/                            @fjl @holiman
+p2p/simulations                 @fjl
+p2p/protocols                   @fjl
+p2p/testing                     @fjl
 signer/                         @holiman

.github/workflows/go.yml

@@ -11,12 +11,11 @@ jobs:
   build:
     runs-on: self-hosted
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v2
       - name: Set up Go
-        uses: actions/setup-go@v5
+        uses: actions/setup-go@v2
         with:
-          go-version: 1.23.0
-          cache: false
+          go-version: 1.21.4
       - name: Run tests
         run: go test -short ./...
         env:

.gitignore

@@ -28,14 +28,6 @@ build/_vendor/pkg
 /build/bin/
 /geth*.zip
 
-# used by the build/ci.go archive + upload tool
-/geth*.tar.gz
-/geth*.tar.gz.sig
-/geth*.tar.gz.asc
-/geth*.zip.sig
-/geth*.zip.asc
-
-
 # travis
 profile.tmp
 profile.cov

.golangci.yml

@@ -6,6 +6,8 @@ run:
   # default is true. Enables skipping of directories:
   #   vendor$, third_party$, testdata$, examples$, Godeps$, builtin$
   skip-dirs-use-default: true
+  skip-files:
+    - core/genesis_alloc.go
 
 linters:
   disable-all: true
@@ -23,10 +25,7 @@ linters:
     - durationcheck
     - exportloopref
     - whitespace
-    - revive # only certain checks enabled
 
-    ### linters we tried and will not be using:
-    ###
     # - structcheck # lots of false positives
     # - errcheck #lot of false positives
     # - contextcheck
@@ -39,35 +38,21 @@ linters:
 linters-settings:
   gofmt:
     simplify: true
-  revive:
-    enable-all-rules: false
-    # here we enable specific useful rules
-    # see https://golangci-lint.run/usage/linters/#revive for supported rules
-    rules:
-      - name: receiver-naming
-        severity: warning
-        disabled: false
-        exclude: [""]
 
 issues:
-  exclude-files:
-    - core/genesis_alloc.go
   exclude-rules:
     - path: crypto/bn256/cloudflare/optate.go
       linters:
         - deadcode
         - staticcheck
-    - path: crypto/bn256/
-      linters:
-        - revive
-    - path: cmd/utils/flags.go
-      text: "SA1019: cfg.TxLookupLimit is deprecated: use 'TransactionHistory' instead."
-    - path: cmd/utils/flags.go
-      text: "SA1019: ethconfig.Defaults.TxLookupLimit is deprecated: use 'TransactionHistory' instead."
     - path: internal/build/pgp.go
       text: 'SA1019: "golang.org/x/crypto/openpgp" is deprecated: this package is unmaintained except for security fixes.'
     - path: core/vm/contracts.go
       text: 'SA1019: "golang.org/x/crypto/ripemd160" is deprecated: RIPEMD-160 is a legacy hash and should not be used for new applications.'
+    - path: accounts/usbwallet/trezor.go
+      text: 'SA1019: "github.com/golang/protobuf/proto" is deprecated: Use the "google.golang.org/protobuf/proto" package instead.'
+    - path: accounts/usbwallet/trezor/
+      text: 'SA1019: "github.com/golang/protobuf/proto" is deprecated: Use the "google.golang.org/protobuf/proto" package instead.'
   exclude:
     - 'SA1019: event.TypeMux is deprecated: use Feed'
     - 'SA1019: strings.Title is deprecated'

.mailmap

@@ -56,6 +56,7 @@ Diederik Loerakker <proto@protolambda.com>
 Dimitry Khokhlov <winsvega@mail.ru>
 
 Domino Valdano <dominoplural@gmail.com>
+Domino Valdano <dominoplural@gmail.com> <jeff@okcupid.com>
 
 Edgar Aroutiounian <edgar.factorial@gmail.com>
 

.travis.yml

@@ -15,8 +15,8 @@ jobs:
       if: type = push
       os: linux
       arch: amd64
-      dist: focal
-      go: 1.23.x
+      dist: bionic
+      go: 1.21.x
       env:
         - docker
       services:
@@ -32,8 +32,8 @@ jobs:
       if: type = push
       os: linux
       arch: arm64
-      dist: focal
-      go: 1.23.x
+      dist: bionic
+      go: 1.21.x
       env:
         - docker
       services:
@@ -49,21 +49,21 @@ jobs:
     - stage: build
       if: type = push
       os: linux
-      dist: focal
+      dist: bionic
       sudo: required
-      go: 1.23.x
+      go: 1.21.x
       env:
         - azure-linux
       git:
         submodules: false # avoid cloning ethereum/tests
+      addons:
+        apt:
+          packages:
+            - gcc-multilib
       script:
-        # build amd64
+        # Build for the primary platforms that Trusty can manage
         - go run build/ci.go install -dlgo
         - go run build/ci.go archive -type tar -signer LINUX_SIGNING_KEY -signify SIGNIFY_KEY -upload gethstore/builds
-
-        # build 386
-        - sudo -E apt-get -yq --no-install-suggests --no-install-recommends install gcc-multilib
-        - git status --porcelain
         - go run build/ci.go install -dlgo -arch 386
         - go run build/ci.go archive -arch 386 -type tar -signer LINUX_SIGNING_KEY -signify SIGNIFY_KEY -upload gethstore/builds
 
@@ -85,13 +85,12 @@ jobs:
       if: type = push
       os: osx
       osx_image: xcode14.2
-      go: 1.23.1 # See https://github.com/ethereum/go-ethereum/pull/30478
+      go: 1.21.x
       env:
         - azure-osx
       git:
         submodules: false # avoid cloning ethereum/tests
       script:
-        - ln -sf /Users/travis/gopath/bin/go1.23.1 /usr/local/bin/go # Work around travis go-setup bug
         - go run build/ci.go install -dlgo
         - go run build/ci.go archive -type tar -signer OSX_SIGNING_KEY -signify SIGNIFY_KEY -upload gethstore/builds
         - go run build/ci.go install -dlgo -arch arm64
@@ -99,34 +98,48 @@ jobs:
 
     # These builders run the tests
     - stage: build
-      if: type = push
       os: linux
       arch: amd64
-      dist: focal
-      go: 1.23.x
+      dist: bionic
+      go: 1.21.x
       script:
-        - travis_wait 45 go run build/ci.go test $TEST_PACKAGES
+        - travis_wait 30 go run build/ci.go test $TEST_PACKAGES
 
     - stage: build
-      if: type = push
+      if: type = pull_request
       os: linux
-      dist: focal
-      go: 1.22.x
+      arch: arm64
+      dist: bionic
+      go: 1.20.x
       script:
-        - travis_wait 45 go run build/ci.go test $TEST_PACKAGES
+        - travis_wait 30 go run build/ci.go test $TEST_PACKAGES
+
+    - stage: build
+      os: linux
+      dist: bionic
+      go: 1.20.x
+      script:
+        - travis_wait 30 go run build/ci.go test $TEST_PACKAGES
 
     # This builder does the Ubuntu PPA nightly uploads
     - stage: build
       if: type = cron || (type = push && tag ~= /^v[0-9]/)
       os: linux
-      dist: focal
-      go: 1.23.x
+      dist: bionic
+      go: 1.21.x
       env:
         - ubuntu-ppa
       git:
         submodules: false # avoid cloning ethereum/tests
-      before_install:
-        - sudo -E apt-get -yq --no-install-suggests --no-install-recommends install devscripts debhelper dput fakeroot
+      addons:
+        apt:
+          packages:
+            - devscripts
+            - debhelper
+            - dput
+            - fakeroot
+            - python-bzrlib
+            - python-paramiko
       script:
         - echo '|1|7SiYPr9xl3uctzovOTj4gMwAC1M=|t6ReES75Bo/PxlOPJ6/GsGbTrM0= ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA0aKz5UTUndYgIGG7dQBV+HaeuEZJ2xPHo2DS2iSKvUL4xNMSAY4UguNW+pX56nAQmZKIZZ8MaEvSj6zMEDiq6HFfn5JcTlM80UwlnyKe8B8p7Nk06PPQLrnmQt5fh0HmEcZx+JU9TZsfCHPnX7MNz4ELfZE6cFsclClrKim3BHUIGq//t93DllB+h4O9LHjEUsQ1Sr63irDLSutkLJD6RXchjROXkNirlcNVHH/jwLWR5RcYilNX7S5bIkK8NlWPjsn/8Ua5O7I9/YoE97PpO6i73DTGLh5H9JN/SITwCKBkgSDWUt61uPK3Y11Gty7o2lWsBjhBUm2Y38CBsoGmBw==' >> ~/.ssh/known_hosts
         - go run build/ci.go debsrc -upload ethereum/ethereum -sftp-user geth-ci -signer "Go Ethereum Linux Builder <geth-ci@ethereum.org>"
@@ -135,8 +148,8 @@ jobs:
     - stage: build
       if: type = cron
       os: linux
-      dist: focal
-      go: 1.23.x
+      dist: bionic
+      go: 1.21.x
       env:
         - azure-purge
       git:
@@ -148,9 +161,8 @@ jobs:
     - stage: build
       if: type = cron
       os: linux
-      dist: focal
-      go: 1.23.x
-      env:
-        - racetests
+      dist: bionic
+      go: 1.21.x
       script:
-        - travis_wait 60 go run build/ci.go test -race $TEST_PACKAGES
+        - travis_wait 30 go run build/ci.go test  -race $TEST_PACKAGES
+

Dockerfile

@@ -4,7 +4,7 @@ ARG VERSION=""
 ARG BUILDNUM=""
 
 # Build Geth in a stock Go builder container
-FROM golang:1.23-alpine as builder
+FROM golang:1.21-alpine as builder
 
 RUN apk add --no-cache gcc musl-dev linux-headers git
 
@@ -25,7 +25,7 @@ COPY --from=builder /go-ethereum/build/bin/geth /usr/local/bin/
 EXPOSE 8545 8546 30303 30303/udp
 ENTRYPOINT ["geth"]
 
-# Add some metadata labels to help programmatic image consumption
+# Add some metadata labels to help programatic image consumption
 ARG COMMIT=""
 ARG VERSION=""
 ARG BUILDNUM=""

Dockerfile.alltools

@@ -4,7 +4,7 @@ ARG VERSION=""
 ARG BUILDNUM=""
 
 # Build Geth in a stock Go builder container
-FROM golang:1.23-alpine as builder
+FROM golang:1.21-alpine as builder
 
 RUN apk add --no-cache gcc musl-dev linux-headers git
 
@@ -24,7 +24,7 @@ COPY --from=builder /go-ethereum/build/bin/* /usr/local/bin/
 
 EXPOSE 8545 8546 30303 30303/udp
 
-# Add some metadata labels to help programmatic image consumption
+# Add some metadata labels to help programatic image consumption
 ARG COMMIT=""
 ARG VERSION=""
 ARG BUILDNUM=""

Makefile

@@ -2,35 +2,31 @@
 # with Go source code. If you know what GOPATH is then you probably
 # don't need to bother with make.
 
-.PHONY: geth all test lint fmt clean devtools help
+.PHONY: geth android ios evm all test clean
 
 GOBIN = ./build/bin
 GO ?= latest
 GORUN = go run
 
-#? geth: Build geth.
+#? geth: Build geth
 geth:
 	$(GORUN) build/ci.go install ./cmd/geth
 	@echo "Done building."
 	@echo "Run \"$(GOBIN)/geth\" to launch geth."
 
-#? all: Build all packages and executables.
+#? all: Build all packages and executables
 all:
 	$(GORUN) build/ci.go install
 
-#? test: Run the tests.
+#? test: Run the tests
 test: all
 	$(GORUN) build/ci.go test
 
-#? lint: Run certain pre-selected linters.
+#? lint: Run certain pre-selected linters
 lint: ## Run linters.
 	$(GORUN) build/ci.go lint
 
-#? fmt: Ensure consistent code formatting.
-fmt:
-	gofmt -s -w $(shell find . -name "*.go")
-
-#? clean: Clean go cache, built executables, and the auto generated folder.
+#? clean: Clean go cache, built executables, and the auto generated folder
 clean:
 	go clean -cache
 	rm -fr build/_workspace/pkg/ $(GOBIN)/*
@@ -38,20 +34,17 @@ clean:
 # The devtools target installs tools required for 'go generate'.
 # You need to put $GOBIN (or $GOPATH/bin) in your PATH to use 'go generate'.
 
-#? devtools: Install recommended developer tools.
+#? devtools: Install recommended developer tools
 devtools:
 	env GOBIN= go install golang.org/x/tools/cmd/stringer@latest
 	env GOBIN= go install github.com/fjl/gencodec@latest
-	env GOBIN= go install google.golang.org/protobuf/cmd/protoc-gen-go@latest
+	env GOBIN= go install github.com/golang/protobuf/protoc-gen-go@latest
 	env GOBIN= go install ./cmd/abigen
 	@type "solc" 2> /dev/null || echo 'Please install solc'
 	@type "protoc" 2> /dev/null || echo 'Please install protoc'
 
 #? help: Get more info on make commands.
 help: Makefile
-	@echo ''
-	@echo 'Usage:'
-	@echo '  make [target]'
-	@echo ''
-	@echo 'Targets:'
+	@echo " Choose a command run in go-ethereum:"
 	@sed -n 's/^#?//p' $< | column -t -s ':' |  sort | sed -e 's/^/ /'
+.PHONY: help

README.md

@@ -16,7 +16,7 @@ archives are published at https://geth.ethereum.org/downloads/.
 
 For prerequisites and detailed build instructions please read the [Installation Instructions](https://geth.ethereum.org/docs/getting-started/installing-geth).
 
-Building `geth` requires both a Go (version 1.22 or later) and a C compiler. You can install
+Building `geth` requires both a Go (version 1.19 or later) and a C compiler. You can install
 them using your favourite package manager. Once the dependencies are installed, run
 
 ```shell
@@ -89,7 +89,7 @@ This command will:
    This tool is optional and if you leave it out you can always attach it to an already running
    `geth` instance with `geth attach`.
 
-### A Full node on the Holesky test network
+### A Full node on the Görli test network
 
 Transitioning towards developers, if you'd like to play around with creating Ethereum
 contracts, you almost certainly would like to do that without any real money involved until
@@ -98,23 +98,23 @@ network, you want to join the **test** network with your node, which is fully eq
 the main network, but with play-Ether only.
 
 ```shell
-$ geth --holesky console
+$ geth --goerli console
 ```
 
 The `console` subcommand has the same meaning as above and is equally
 useful on the testnet too.
 
-Specifying the `--holesky` flag, however, will reconfigure your `geth` instance a bit:
+Specifying the `--goerli` flag, however, will reconfigure your `geth` instance a bit:
 
- * Instead of connecting to the main Ethereum network, the client will connect to the Holesky 
+ * Instead of connecting to the main Ethereum network, the client will connect to the Görli
    test network, which uses different P2P bootnodes, different network IDs and genesis
    states.
  * Instead of using the default data directory (`~/.ethereum` on Linux for example), `geth`
-   will nest itself one level deeper into a `holesky` subfolder (`~/.ethereum/holesky` on
+   will nest itself one level deeper into a `goerli` subfolder (`~/.ethereum/goerli` on
    Linux). Note, on OSX and Linux this also means that attaching to a running testnet node
    requires the use of a custom endpoint since `geth attach` will try to attach to a
    production node endpoint by default, e.g.,
-   `geth attach <datadir>/holesky/geth.ipc`. Windows users are not affected by
+   `geth attach <datadir>/goerli/geth.ipc`. Windows users are not affected by
    this.
 
 *Note: Although some internal protective measures prevent transactions from

SECURITY.md

@@ -171,5 +171,5 @@ i4O1UeWKs9owWttan9+PI47ozBSKOTxmMqLSQ0f56Np9FJsV0ilGxRKfjhzJ4KniOMUBA7mP
 epy6lH7HmxjjOR7eo0DaSxQGQpThAtFGwkWkFh8yki8j3E42kkrxvEyyYZDXn2YcI3bpqhJx
 PtwCMZUJ3kc/skOrs6bOI19iBNaEoNX5Dllm7UHjOgWNDQkcCuOCxucKano=
 =arte
------END PGP PUBLIC KEY BLOCK-----
+-----END PGP PUBLIC KEY BLOCK------
 ```

accounts/abi/abi_test.go

@@ -1218,10 +1218,3 @@ func TestUnpackRevert(t *testing.T) {
 		})
 	}
 }
-
-func TestInternalContractType(t *testing.T) {
-	jsonData := `[{"inputs":[{"components":[{"internalType":"uint256","name":"dailyLimit","type":"uint256"},{"internalType":"uint256","name":"txLimit","type":"uint256"},{"internalType":"uint256","name":"accountDailyLimit","type":"uint256"},{"internalType":"uint256","name":"minAmount","type":"uint256"},{"internalType":"bool","name":"onlyWhitelisted","type":"bool"}],"internalType":"struct IMessagePassingBridge.BridgeLimits","name":"bridgeLimits","type":"tuple"},{"components":[{"internalType":"uint256","name":"lastTransferReset","type":"uint256"},{"internalType":"uint256","name":"bridged24Hours","type":"uint256"}],"internalType":"struct IMessagePassingBridge.AccountLimit","name":"accountDailyLimit","type":"tuple"},{"components":[{"internalType":"uint256","name":"lastTransferReset","type":"uint256"},{"internalType":"uint256","name":"bridged24Hours","type":"uint256"}],"internalType":"struct IMessagePassingBridge.BridgeDailyLimit","name":"bridgeDailyLimit","type":"tuple"},{"internalType":"contract INameService","name":"nameService","type":"INameService"},{"internalType":"bool","name":"isClosed","type":"bool"},{"internalType":"address","name":"from","type":"address"},{"internalType":"uint256","name":"amount","type":"uint256"}],"name":"canBridge","outputs":[{"internalType":"bool","name":"isWithinLimit","type":"bool"},{"internalType":"string","name":"error","type":"string"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint256","name":"amount","type":"uint256"},{"internalType":"uint8","name":"decimals","type":"uint8"}],"name":"normalizeFrom18ToTokenDecimals","outputs":[{"internalType":"uint256","name":"normalized","type":"uint256"}],"stateMutability":"pure","type":"function"},{"inputs":[{"internalType":"uint256","name":"amount","type":"uint256"},{"internalType":"uint8","name":"decimals","type":"uint8"}],"name":"normalizeFromTokenTo18Decimals","outputs":[{"internalType":"uint256","name":"normalized","type":"uint256"}],"stateMutability":"pure","type":"function"}]`
-	if _, err := JSON(strings.NewReader(jsonData)); err != nil {
-		t.Fatal(err)
-	}
-}

accounts/abi/argument.go

@@ -127,7 +127,7 @@ func (arguments Arguments) Copy(v interface{}, values []interface{}) error {
 	return arguments.copyAtomic(v, values[0])
 }
 
-// copyAtomic copies ( hexdata -> go ) a single value
+// unpackAtomic unpacks ( hexdata -> go ) a single value
 func (arguments Arguments) copyAtomic(v interface{}, marshalledValues interface{}) error {
 	dst := reflect.ValueOf(v).Elem()
 	src := reflect.ValueOf(marshalledValues)

accounts/abi/bind/auth.go

@@ -142,10 +142,10 @@ func NewKeyStoreTransactorWithChainID(keystore *keystore.KeyStore, account accou
 // NewKeyedTransactorWithChainID is a utility method to easily create a transaction signer
 // from a single private key.
 func NewKeyedTransactorWithChainID(key *ecdsa.PrivateKey, chainID *big.Int) (*TransactOpts, error) {
+	keyAddr := crypto.PubkeyToAddress(key.PublicKey)
 	if chainID == nil {
 		return nil, ErrNoChainID
 	}
-	keyAddr := crypto.PubkeyToAddress(key.PublicKey)
 	signer := types.LatestSignerForChainID(chainID)
 	return &TransactOpts{
 		From: keyAddr,

accounts/abi/bind/base.go

@@ -59,12 +59,11 @@ type TransactOpts struct {
 	Nonce  *big.Int       // Nonce to use for the transaction execution (nil = use pending state)
 	Signer SignerFn       // Method to use for signing the transaction (mandatory)
 
-	Value      *big.Int         // Funds to transfer along the transaction (nil = 0 = no funds)
-	GasPrice   *big.Int         // Gas price to use for the transaction execution (nil = gas price oracle)
-	GasFeeCap  *big.Int         // Gas fee cap to use for the 1559 transaction execution (nil = gas price oracle)
-	GasTipCap  *big.Int         // Gas priority fee cap to use for the 1559 transaction execution (nil = gas price oracle)
-	GasLimit   uint64           // Gas limit to set for the transaction execution (0 = estimate)
-	AccessList types.AccessList // Access list to set for the transaction execution (nil = no access list)
+	Value     *big.Int // Funds to transfer along the transaction (nil = 0 = no funds)
+	GasPrice  *big.Int // Gas price to use for the transaction execution (nil = gas price oracle)
+	GasFeeCap *big.Int // Gas fee cap to use for the 1559 transaction execution (nil = gas price oracle)
+	GasTipCap *big.Int // Gas priority fee cap to use for the 1559 transaction execution (nil = gas price oracle)
+	GasLimit  uint64   // Gas limit to set for the transaction execution (0 = estimate)
 
 	Context context.Context // Network context to support cancellation and timeouts (nil = no timeout)
 
@@ -301,21 +300,20 @@ func (c *BoundContract) createDynamicTx(opts *TransactOpts, contract *common.Add
 		return nil, err
 	}
 	baseTx := &types.DynamicFeeTx{
-		To:         contract,
-		Nonce:      nonce,
-		GasFeeCap:  gasFeeCap,
-		GasTipCap:  gasTipCap,
-		Gas:        gasLimit,
-		Value:      value,
-		Data:       input,
-		AccessList: opts.AccessList,
+		To:        contract,
+		Nonce:     nonce,
+		GasFeeCap: gasFeeCap,
+		GasTipCap: gasTipCap,
+		Gas:       gasLimit,
+		Value:     value,
+		Data:      input,
 	}
 	return types.NewTx(baseTx), nil
 }
 
 func (c *BoundContract) createLegacyTx(opts *TransactOpts, contract *common.Address, input []byte) (*types.Transaction, error) {
-	if opts.GasFeeCap != nil || opts.GasTipCap != nil || opts.AccessList != nil {
-		return nil, errors.New("maxFeePerGas or maxPriorityFeePerGas or accessList specified but london is not active yet")
+	if opts.GasFeeCap != nil || opts.GasTipCap != nil {
+		return nil, errors.New("maxFeePerGas or maxPriorityFeePerGas specified but london is not active yet")
 	}
 	// Normalize value
 	value := opts.Value
@@ -463,7 +461,7 @@ func (c *BoundContract) FilterLogs(opts *FilterOpts, name string, query ...[]int
 	if err != nil {
 		return nil, nil, err
 	}
-	sub := event.NewSubscription(func(quit <-chan struct{}) error {
+	sub, err := event.NewSubscription(func(quit <-chan struct{}) error {
 		for _, log := range buff {
 			select {
 			case logs <- log:
@@ -472,8 +470,11 @@ func (c *BoundContract) FilterLogs(opts *FilterOpts, name string, query ...[]int
 			}
 		}
 		return nil
-	})
+	}), nil
 
+	if err != nil {
+		return nil, nil, err
+	}
 	return logs, sub, nil
 }
 

accounts/abi/bind/source.go.tpl

@@ -1,487 +0,0 @@
-// Code generated - DO NOT EDIT.
-// This file is a generated binding and any manual changes will be lost.
-
-package {{.Package}}
-
-import (
-	"math/big"
-	"strings"
-	"errors"
-
-	ethereum "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/event"
-)
-
-// Reference imports to suppress errors if they are not otherwise used.
-var (
-	_ = errors.New
-	_ = big.NewInt
-	_ = strings.NewReader
-	_ = ethereum.NotFound
-	_ = bind.Bind
-	_ = common.Big1
-	_ = types.BloomLookup
-	_ = event.NewSubscription
-	_ = abi.ConvertType
-)
-
-{{$structs := .Structs}}
-{{range $structs}}
-	// {{.Name}} is an auto generated low-level Go binding around an user-defined struct.
-	type {{.Name}} struct {
-	{{range $field := .Fields}}
-	{{$field.Name}} {{$field.Type}}{{end}}
-	}
-{{end}}
-
-{{range $contract := .Contracts}}
-	// {{.Type}}MetaData contains all meta data concerning the {{.Type}} contract.
-	var {{.Type}}MetaData = &bind.MetaData{
-		ABI: "{{.InputABI}}",
-		{{if $contract.FuncSigs -}}
-		Sigs: map[string]string{
-			{{range $strsig, $binsig := .FuncSigs}}"{{$binsig}}": "{{$strsig}}",
-			{{end}}
-		},
-		{{end -}}
-		{{if .InputBin -}}
-		Bin: "0x{{.InputBin}}",
-		{{end}}
-	}
-	// {{.Type}}ABI is the input ABI used to generate the binding from.
-	// Deprecated: Use {{.Type}}MetaData.ABI instead.
-	var {{.Type}}ABI = {{.Type}}MetaData.ABI
-
-	{{if $contract.FuncSigs}}
-		// Deprecated: Use {{.Type}}MetaData.Sigs instead.
-		// {{.Type}}FuncSigs maps the 4-byte function signature to its string representation.
-		var {{.Type}}FuncSigs = {{.Type}}MetaData.Sigs
-	{{end}}
-
-	{{if .InputBin}}
-		// {{.Type}}Bin is the compiled bytecode used for deploying new contracts.
-		// Deprecated: Use {{.Type}}MetaData.Bin instead.
-		var {{.Type}}Bin = {{.Type}}MetaData.Bin
-
-		// Deploy{{.Type}} deploys a new Ethereum contract, binding an instance of {{.Type}} to it.
-		func Deploy{{.Type}}(auth *bind.TransactOpts, backend bind.ContractBackend {{range .Constructor.Inputs}}, {{.Name}} {{bindtype .Type $structs}}{{end}}) (common.Address, *types.Transaction, *{{.Type}}, error) {
-		  parsed, err := {{.Type}}MetaData.GetAbi()
-		  if err != nil {
-		    return common.Address{}, nil, nil, err
-		  }
-		  if parsed == nil {
-			return common.Address{}, nil, nil, errors.New("GetABI returned nil")
-		  }
-		  {{range $pattern, $name := .Libraries}}
-			{{decapitalise $name}}Addr, _, _, _ := Deploy{{capitalise $name}}(auth, backend)
-			{{$contract.Type}}Bin = strings.ReplaceAll({{$contract.Type}}Bin, "__${{$pattern}}$__", {{decapitalise $name}}Addr.String()[2:])
-		  {{end}}
-		  address, tx, contract, err := bind.DeployContract(auth, *parsed, common.FromHex({{.Type}}Bin), backend {{range .Constructor.Inputs}}, {{.Name}}{{end}})
-		  if err != nil {
-		    return common.Address{}, nil, nil, err
-		  }
-		  return address, tx, &{{.Type}}{ {{.Type}}Caller: {{.Type}}Caller{contract: contract}, {{.Type}}Transactor: {{.Type}}Transactor{contract: contract}, {{.Type}}Filterer: {{.Type}}Filterer{contract: contract} }, nil
-		}
-	{{end}}
-
-	// {{.Type}} is an auto generated Go binding around an Ethereum contract.
-	type {{.Type}} struct {
-	  {{.Type}}Caller     // Read-only binding to the contract
-	  {{.Type}}Transactor // Write-only binding to the contract
-	  {{.Type}}Filterer   // Log filterer for contract events
-	}
-
-	// {{.Type}}Caller is an auto generated read-only Go binding around an Ethereum contract.
-	type {{.Type}}Caller struct {
-	  contract *bind.BoundContract // Generic contract wrapper for the low level calls
-	}
-
-	// {{.Type}}Transactor is an auto generated write-only Go binding around an Ethereum contract.
-	type {{.Type}}Transactor struct {
-	  contract *bind.BoundContract // Generic contract wrapper for the low level calls
-	}
-
-	// {{.Type}}Filterer is an auto generated log filtering Go binding around an Ethereum contract events.
-	type {{.Type}}Filterer struct {
-	  contract *bind.BoundContract // Generic contract wrapper for the low level calls
-	}
-
-	// {{.Type}}Session is an auto generated Go binding around an Ethereum contract,
-	// with pre-set call and transact options.
-	type {{.Type}}Session struct {
-	  Contract     *{{.Type}}        // Generic contract binding to set the session for
-	  CallOpts     bind.CallOpts     // Call options to use throughout this session
-	  TransactOpts bind.TransactOpts // Transaction auth options to use throughout this session
-	}
-
-	// {{.Type}}CallerSession is an auto generated read-only Go binding around an Ethereum contract,
-	// with pre-set call options.
-	type {{.Type}}CallerSession struct {
-	  Contract *{{.Type}}Caller // Generic contract caller binding to set the session for
-	  CallOpts bind.CallOpts    // Call options to use throughout this session
-	}
-
-	// {{.Type}}TransactorSession is an auto generated write-only Go binding around an Ethereum contract,
-	// with pre-set transact options.
-	type {{.Type}}TransactorSession struct {
-	  Contract     *{{.Type}}Transactor // Generic contract transactor binding to set the session for
-	  TransactOpts bind.TransactOpts    // Transaction auth options to use throughout this session
-	}
-
-	// {{.Type}}Raw is an auto generated low-level Go binding around an Ethereum contract.
-	type {{.Type}}Raw struct {
-	  Contract *{{.Type}} // Generic contract binding to access the raw methods on
-	}
-
-	// {{.Type}}CallerRaw is an auto generated low-level read-only Go binding around an Ethereum contract.
-	type {{.Type}}CallerRaw struct {
-		Contract *{{.Type}}Caller // Generic read-only contract binding to access the raw methods on
-	}
-
-	// {{.Type}}TransactorRaw is an auto generated low-level write-only Go binding around an Ethereum contract.
-	type {{.Type}}TransactorRaw struct {
-		Contract *{{.Type}}Transactor // Generic write-only contract binding to access the raw methods on
-	}
-
-	// New{{.Type}} creates a new instance of {{.Type}}, bound to a specific deployed contract.
-	func New{{.Type}}(address common.Address, backend bind.ContractBackend) (*{{.Type}}, error) {
-	  contract, err := bind{{.Type}}(address, backend, backend, backend)
-	  if err != nil {
-	    return nil, err
-	  }
-	  return &{{.Type}}{ {{.Type}}Caller: {{.Type}}Caller{contract: contract}, {{.Type}}Transactor: {{.Type}}Transactor{contract: contract}, {{.Type}}Filterer: {{.Type}}Filterer{contract: contract} }, nil
-	}
-
-	// New{{.Type}}Caller creates a new read-only instance of {{.Type}}, bound to a specific deployed contract.
-	func New{{.Type}}Caller(address common.Address, caller bind.ContractCaller) (*{{.Type}}Caller, error) {
-	  contract, err := bind{{.Type}}(address, caller, nil, nil)
-	  if err != nil {
-	    return nil, err
-	  }
-	  return &{{.Type}}Caller{contract: contract}, nil
-	}
-
-	// New{{.Type}}Transactor creates a new write-only instance of {{.Type}}, bound to a specific deployed contract.
-	func New{{.Type}}Transactor(address common.Address, transactor bind.ContractTransactor) (*{{.Type}}Transactor, error) {
-	  contract, err := bind{{.Type}}(address, nil, transactor, nil)
-	  if err != nil {
-	    return nil, err
-	  }
-	  return &{{.Type}}Transactor{contract: contract}, nil
-	}
-
-	// New{{.Type}}Filterer creates a new log filterer instance of {{.Type}}, bound to a specific deployed contract.
- 	func New{{.Type}}Filterer(address common.Address, filterer bind.ContractFilterer) (*{{.Type}}Filterer, error) {
- 	  contract, err := bind{{.Type}}(address, nil, nil, filterer)
- 	  if err != nil {
- 	    return nil, err
- 	  }
- 	  return &{{.Type}}Filterer{contract: contract}, nil
- 	}
-
-	// bind{{.Type}} binds a generic wrapper to an already deployed contract.
-	func bind{{.Type}}(address common.Address, caller bind.ContractCaller, transactor bind.ContractTransactor, filterer bind.ContractFilterer) (*bind.BoundContract, error) {
-	  parsed, err := {{.Type}}MetaData.GetAbi()
-	  if err != nil {
-	    return nil, err
-	  }
-	  return bind.NewBoundContract(address, *parsed, caller, transactor, filterer), nil
-	}
-
-	// Call invokes the (constant) contract method with params as input values and
-	// sets the output to result. The result type might be a single field for simple
-	// returns, a slice of interfaces for anonymous returns and a struct for named
-	// returns.
-	func (_{{$contract.Type}} *{{$contract.Type}}Raw) Call(opts *bind.CallOpts, result *[]interface{}, method string, params ...interface{}) error {
-		return _{{$contract.Type}}.Contract.{{$contract.Type}}Caller.contract.Call(opts, result, method, params...)
-	}
-
-	// Transfer initiates a plain transaction to move funds to the contract, calling
-	// its default method if one is available.
-	func (_{{$contract.Type}} *{{$contract.Type}}Raw) Transfer(opts *bind.TransactOpts) (*types.Transaction, error) {
-		return _{{$contract.Type}}.Contract.{{$contract.Type}}Transactor.contract.Transfer(opts)
-	}
-
-	// Transact invokes the (paid) contract method with params as input values.
-	func (_{{$contract.Type}} *{{$contract.Type}}Raw) Transact(opts *bind.TransactOpts, method string, params ...interface{}) (*types.Transaction, error) {
-		return _{{$contract.Type}}.Contract.{{$contract.Type}}Transactor.contract.Transact(opts, method, params...)
-	}
-
-	// Call invokes the (constant) contract method with params as input values and
-	// sets the output to result. The result type might be a single field for simple
-	// returns, a slice of interfaces for anonymous returns and a struct for named
-	// returns.
-	func (_{{$contract.Type}} *{{$contract.Type}}CallerRaw) Call(opts *bind.CallOpts, result *[]interface{}, method string, params ...interface{}) error {
-		return _{{$contract.Type}}.Contract.contract.Call(opts, result, method, params...)
-	}
-
-	// Transfer initiates a plain transaction to move funds to the contract, calling
-	// its default method if one is available.
-	func (_{{$contract.Type}} *{{$contract.Type}}TransactorRaw) Transfer(opts *bind.TransactOpts) (*types.Transaction, error) {
-		return _{{$contract.Type}}.Contract.contract.Transfer(opts)
-	}
-
-	// Transact invokes the (paid) contract method with params as input values.
-	func (_{{$contract.Type}} *{{$contract.Type}}TransactorRaw) Transact(opts *bind.TransactOpts, method string, params ...interface{}) (*types.Transaction, error) {
-		return _{{$contract.Type}}.Contract.contract.Transact(opts, method, params...)
-	}
-
-	{{range .Calls}}
-		// {{.Normalized.Name}} is a free data retrieval call binding the contract method 0x{{printf "%x" .Original.ID}}.
-		//
-		// Solidity: {{.Original.String}}
-		func (_{{$contract.Type}} *{{$contract.Type}}Caller) {{.Normalized.Name}}(opts *bind.CallOpts {{range .Normalized.Inputs}}, {{.Name}} {{bindtype .Type $structs}} {{end}}) ({{if .Structured}}struct{ {{range .Normalized.Outputs}}{{.Name}} {{bindtype .Type $structs}};{{end}} },{{else}}{{range .Normalized.Outputs}}{{bindtype .Type $structs}},{{end}}{{end}} error) {
-			var out []interface{}
-			err := _{{$contract.Type}}.contract.Call(opts, &out, "{{.Original.Name}}" {{range .Normalized.Inputs}}, {{.Name}}{{end}})
-			{{if .Structured}}
-			outstruct := new(struct{ {{range .Normalized.Outputs}} {{.Name}} {{bindtype .Type $structs}}; {{end}} })
-			if err != nil {
-				return *outstruct, err
-			}
-			{{range $i, $t := .Normalized.Outputs}}
-			outstruct.{{.Name}} = *abi.ConvertType(out[{{$i}}], new({{bindtype .Type $structs}})).(*{{bindtype .Type $structs}}){{end}}
-
-			return *outstruct, err
-			{{else}}
-			if err != nil {
-				return {{range $i, $_ := .Normalized.Outputs}}*new({{bindtype .Type $structs}}), {{end}} err
-			}
-			{{range $i, $t := .Normalized.Outputs}}
-			out{{$i}} := *abi.ConvertType(out[{{$i}}], new({{bindtype .Type $structs}})).(*{{bindtype .Type $structs}}){{end}}
-
-			return {{range $i, $t := .Normalized.Outputs}}out{{$i}}, {{end}} err
-			{{end}}
-		}
-
-		// {{.Normalized.Name}} is a free data retrieval call binding the contract method 0x{{printf "%x" .Original.ID}}.
-		//
-		// Solidity: {{.Original.String}}
-		func (_{{$contract.Type}} *{{$contract.Type}}Session) {{.Normalized.Name}}({{range $i, $_ := .Normalized.Inputs}}{{if ne $i 0}},{{end}} {{.Name}} {{bindtype .Type $structs}} {{end}}) ({{if .Structured}}struct{ {{range .Normalized.Outputs}}{{.Name}} {{bindtype .Type $structs}};{{end}} }, {{else}} {{range .Normalized.Outputs}}{{bindtype .Type $structs}},{{end}} {{end}} error) {
-		  return _{{$contract.Type}}.Contract.{{.Normalized.Name}}(&_{{$contract.Type}}.CallOpts {{range .Normalized.Inputs}}, {{.Name}}{{end}})
-		}
-
-		// {{.Normalized.Name}} is a free data retrieval call binding the contract method 0x{{printf "%x" .Original.ID}}.
-		//
-		// Solidity: {{.Original.String}}
-		func (_{{$contract.Type}} *{{$contract.Type}}CallerSession) {{.Normalized.Name}}({{range $i, $_ := .Normalized.Inputs}}{{if ne $i 0}},{{end}} {{.Name}} {{bindtype .Type $structs}} {{end}}) ({{if .Structured}}struct{ {{range .Normalized.Outputs}}{{.Name}} {{bindtype .Type $structs}};{{end}} }, {{else}} {{range .Normalized.Outputs}}{{bindtype .Type $structs}},{{end}} {{end}} error) {
-		  return _{{$contract.Type}}.Contract.{{.Normalized.Name}}(&_{{$contract.Type}}.CallOpts {{range .Normalized.Inputs}}, {{.Name}}{{end}})
-		}
-	{{end}}
-
-	{{range .Transacts}}
-		// {{.Normalized.Name}} is a paid mutator transaction binding the contract method 0x{{printf "%x" .Original.ID}}.
-		//
-		// Solidity: {{.Original.String}}
-		func (_{{$contract.Type}} *{{$contract.Type}}Transactor) {{.Normalized.Name}}(opts *bind.TransactOpts {{range .Normalized.Inputs}}, {{.Name}} {{bindtype .Type $structs}} {{end}}) (*types.Transaction, error) {
-			return _{{$contract.Type}}.contract.Transact(opts, "{{.Original.Name}}" {{range .Normalized.Inputs}}, {{.Name}}{{end}})
-		}
-
-		// {{.Normalized.Name}} is a paid mutator transaction binding the contract method 0x{{printf "%x" .Original.ID}}.
-		//
-		// Solidity: {{.Original.String}}
-		func (_{{$contract.Type}} *{{$contract.Type}}Session) {{.Normalized.Name}}({{range $i, $_ := .Normalized.Inputs}}{{if ne $i 0}},{{end}} {{.Name}} {{bindtype .Type $structs}} {{end}}) (*types.Transaction, error) {
-		  return _{{$contract.Type}}.Contract.{{.Normalized.Name}}(&_{{$contract.Type}}.TransactOpts {{range $i, $_ := .Normalized.Inputs}}, {{.Name}}{{end}})
-		}
-
-		// {{.Normalized.Name}} is a paid mutator transaction binding the contract method 0x{{printf "%x" .Original.ID}}.
-		//
-		// Solidity: {{.Original.String}}
-		func (_{{$contract.Type}} *{{$contract.Type}}TransactorSession) {{.Normalized.Name}}({{range $i, $_ := .Normalized.Inputs}}{{if ne $i 0}},{{end}} {{.Name}} {{bindtype .Type $structs}} {{end}}) (*types.Transaction, error) {
-		  return _{{$contract.Type}}.Contract.{{.Normalized.Name}}(&_{{$contract.Type}}.TransactOpts {{range $i, $_ := .Normalized.Inputs}}, {{.Name}}{{end}})
-		}
-	{{end}}
-
-	{{if .Fallback}}
-		// Fallback is a paid mutator transaction binding the contract fallback function.
-		//
-		// Solidity: {{.Fallback.Original.String}}
-		func (_{{$contract.Type}} *{{$contract.Type}}Transactor) Fallback(opts *bind.TransactOpts, calldata []byte) (*types.Transaction, error) {
-			return _{{$contract.Type}}.contract.RawTransact(opts, calldata)
-		}
-
-		// Fallback is a paid mutator transaction binding the contract fallback function.
-		//
-		// Solidity: {{.Fallback.Original.String}}
-		func (_{{$contract.Type}} *{{$contract.Type}}Session) Fallback(calldata []byte) (*types.Transaction, error) {
-		  return _{{$contract.Type}}.Contract.Fallback(&_{{$contract.Type}}.TransactOpts, calldata)
-		}
-
-		// Fallback is a paid mutator transaction binding the contract fallback function.
-		//
-		// Solidity: {{.Fallback.Original.String}}
-		func (_{{$contract.Type}} *{{$contract.Type}}TransactorSession) Fallback(calldata []byte) (*types.Transaction, error) {
-		  return _{{$contract.Type}}.Contract.Fallback(&_{{$contract.Type}}.TransactOpts, calldata)
-		}
-	{{end}}
-
-	{{if .Receive}}
-		// Receive is a paid mutator transaction binding the contract receive function.
-		//
-		// Solidity: {{.Receive.Original.String}}
-		func (_{{$contract.Type}} *{{$contract.Type}}Transactor) Receive(opts *bind.TransactOpts) (*types.Transaction, error) {
-			return _{{$contract.Type}}.contract.RawTransact(opts, nil) // calldata is disallowed for receive function
-		}
-
-		// Receive is a paid mutator transaction binding the contract receive function.
-		//
-		// Solidity: {{.Receive.Original.String}}
-		func (_{{$contract.Type}} *{{$contract.Type}}Session) Receive() (*types.Transaction, error) {
-		  return _{{$contract.Type}}.Contract.Receive(&_{{$contract.Type}}.TransactOpts)
-		}
-
-		// Receive is a paid mutator transaction binding the contract receive function.
-		//
-		// Solidity: {{.Receive.Original.String}}
-		func (_{{$contract.Type}} *{{$contract.Type}}TransactorSession) Receive() (*types.Transaction, error) {
-		  return _{{$contract.Type}}.Contract.Receive(&_{{$contract.Type}}.TransactOpts)
-		}
-	{{end}}
-
-	{{range .Events}}
-		// {{$contract.Type}}{{.Normalized.Name}}Iterator is returned from Filter{{.Normalized.Name}} and is used to iterate over the raw logs and unpacked data for {{.Normalized.Name}} events raised by the {{$contract.Type}} contract.
-		type {{$contract.Type}}{{.Normalized.Name}}Iterator struct {
-			Event *{{$contract.Type}}{{.Normalized.Name}} // Event containing the contract specifics and raw log
-
-			contract *bind.BoundContract // Generic contract to use for unpacking event data
-			event    string              // Event name to use for unpacking event data
-
-			logs chan types.Log        // Log channel receiving the found contract events
-			sub  ethereum.Subscription // Subscription for errors, completion and termination
-			done bool                  // Whether the subscription completed delivering logs
-			fail error                 // Occurred error to stop iteration
-		}
-		// Next advances the iterator to the subsequent event, returning whether there
-		// are any more events found. In case of a retrieval or parsing error, false is
-		// returned and Error() can be queried for the exact failure.
-		func (it *{{$contract.Type}}{{.Normalized.Name}}Iterator) Next() bool {
-			// If the iterator failed, stop iterating
-			if (it.fail != nil) {
-				return false
-			}
-			// If the iterator completed, deliver directly whatever's available
-			if (it.done) {
-				select {
-				case log := <-it.logs:
-					it.Event = new({{$contract.Type}}{{.Normalized.Name}})
-					if err := it.contract.UnpackLog(it.Event, it.event, log); err != nil {
-						it.fail = err
-						return false
-					}
-					it.Event.Raw = log
-					return true
-
-				default:
-					return false
-				}
-			}
-			// Iterator still in progress, wait for either a data or an error event
-			select {
-			case log := <-it.logs:
-				it.Event = new({{$contract.Type}}{{.Normalized.Name}})
-				if err := it.contract.UnpackLog(it.Event, it.event, log); err != nil {
-					it.fail = err
-					return false
-				}
-				it.Event.Raw = log
-				return true
-
-			case err := <-it.sub.Err():
-				it.done = true
-				it.fail = err
-				return it.Next()
-			}
-		}
-		// Error returns any retrieval or parsing error occurred during filtering.
-		func (it *{{$contract.Type}}{{.Normalized.Name}}Iterator) Error() error {
-			return it.fail
-		}
-		// Close terminates the iteration process, releasing any pending underlying
-		// resources.
-		func (it *{{$contract.Type}}{{.Normalized.Name}}Iterator) Close() error {
-			it.sub.Unsubscribe()
-			return nil
-		}
-
-		// {{$contract.Type}}{{.Normalized.Name}} represents a {{.Normalized.Name}} event raised by the {{$contract.Type}} contract.
-		type {{$contract.Type}}{{.Normalized.Name}} struct { {{range .Normalized.Inputs}}
-			{{capitalise .Name}} {{if .Indexed}}{{bindtopictype .Type $structs}}{{else}}{{bindtype .Type $structs}}{{end}}; {{end}}
-			Raw types.Log // Blockchain specific contextual infos
-		}
-
-		// Filter{{.Normalized.Name}} is a free log retrieval operation binding the contract event 0x{{printf "%x" .Original.ID}}.
-		//
-		// Solidity: {{.Original.String}}
- 		func (_{{$contract.Type}} *{{$contract.Type}}Filterer) Filter{{.Normalized.Name}}(opts *bind.FilterOpts{{range .Normalized.Inputs}}{{if .Indexed}}, {{.Name}} []{{bindtype .Type $structs}}{{end}}{{end}}) (*{{$contract.Type}}{{.Normalized.Name}}Iterator, error) {
-			{{range .Normalized.Inputs}}
-			{{if .Indexed}}var {{.Name}}Rule []interface{}
-			for _, {{.Name}}Item := range {{.Name}} {
-				{{.Name}}Rule = append({{.Name}}Rule, {{.Name}}Item)
-			}{{end}}{{end}}
-
-			logs, sub, err := _{{$contract.Type}}.contract.FilterLogs(opts, "{{.Original.Name}}"{{range .Normalized.Inputs}}{{if .Indexed}}, {{.Name}}Rule{{end}}{{end}})
-			if err != nil {
-				return nil, err
-			}
-			return &{{$contract.Type}}{{.Normalized.Name}}Iterator{contract: _{{$contract.Type}}.contract, event: "{{.Original.Name}}", logs: logs, sub: sub}, nil
- 		}
-
-		// Watch{{.Normalized.Name}} is a free log subscription operation binding the contract event 0x{{printf "%x" .Original.ID}}.
-		//
-		// Solidity: {{.Original.String}}
-		func (_{{$contract.Type}} *{{$contract.Type}}Filterer) Watch{{.Normalized.Name}}(opts *bind.WatchOpts, sink chan<- *{{$contract.Type}}{{.Normalized.Name}}{{range .Normalized.Inputs}}{{if .Indexed}}, {{.Name}} []{{bindtype .Type $structs}}{{end}}{{end}}) (event.Subscription, error) {
-			{{range .Normalized.Inputs}}
-			{{if .Indexed}}var {{.Name}}Rule []interface{}
-			for _, {{.Name}}Item := range {{.Name}} {
-				{{.Name}}Rule = append({{.Name}}Rule, {{.Name}}Item)
-			}{{end}}{{end}}
-
-			logs, sub, err := _{{$contract.Type}}.contract.WatchLogs(opts, "{{.Original.Name}}"{{range .Normalized.Inputs}}{{if .Indexed}}, {{.Name}}Rule{{end}}{{end}})
-			if err != nil {
-				return nil, err
-			}
-			return event.NewSubscription(func(quit <-chan struct{}) error {
-				defer sub.Unsubscribe()
-				for {
-					select {
-					case log := <-logs:
-						// New log arrived, parse the event and forward to the user
-						event := new({{$contract.Type}}{{.Normalized.Name}})
-						if err := _{{$contract.Type}}.contract.UnpackLog(event, "{{.Original.Name}}", log); err != nil {
-							return err
-						}
-						event.Raw = log
-
-						select {
-						case sink <- event:
-						case err := <-sub.Err():
-							return err
-						case <-quit:
-							return nil
-						}
-					case err := <-sub.Err():
-						return err
-					case <-quit:
-						return nil
-					}
-				}
-			}), nil
-		}
-
-		// Parse{{.Normalized.Name}} is a log parse operation binding the contract event 0x{{printf "%x" .Original.ID}}.
-		//
-		// Solidity: {{.Original.String}}
-		func (_{{$contract.Type}} *{{$contract.Type}}Filterer) Parse{{.Normalized.Name}}(log types.Log) (*{{$contract.Type}}{{.Normalized.Name}}, error) {
-			event := new({{$contract.Type}}{{.Normalized.Name}})
-			if err := _{{$contract.Type}}.contract.UnpackLog(event, "{{.Original.Name}}", log); err != nil {
-				return nil, err
-			}
-			event.Raw = log
-			return event, nil
-		}
-
- 	{{end}}
-{{end}}

accounts/abi/bind/template.go

@@ -16,11 +16,7 @@
 
 package bind
 
-import (
-	_ "embed"
-
-	"github.com/ethereum/go-ethereum/accounts/abi"
-)
+import "github.com/ethereum/go-ethereum/accounts/abi"
 
 // tmplData is the data structure required to fill the binding template.
 type tmplData struct {
@@ -84,6 +80,492 @@ var tmplSource = map[Lang]string{
 
 // tmplSourceGo is the Go source template that the generated Go contract binding
 // is based on.
-//
-//go:embed source.go.tpl
-var tmplSourceGo string
+const tmplSourceGo = `
+// Code generated - DO NOT EDIT.
+// This file is a generated binding and any manual changes will be lost.
+
+package {{.Package}}
+
+import (
+	"math/big"
+	"strings"
+	"errors"
+
+	ethereum "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/event"
+)
+
+// Reference imports to suppress errors if they are not otherwise used.
+var (
+	_ = errors.New
+	_ = big.NewInt
+	_ = strings.NewReader
+	_ = ethereum.NotFound
+	_ = bind.Bind
+	_ = common.Big1
+	_ = types.BloomLookup
+	_ = event.NewSubscription
+	_ = abi.ConvertType
+)
+
+{{$structs := .Structs}}
+{{range $structs}}
+	// {{.Name}} is an auto generated low-level Go binding around an user-defined struct.
+	type {{.Name}} struct {
+	{{range $field := .Fields}}
+	{{$field.Name}} {{$field.Type}}{{end}}
+	}
+{{end}}
+
+{{range $contract := .Contracts}}
+	// {{.Type}}MetaData contains all meta data concerning the {{.Type}} contract.
+	var {{.Type}}MetaData = &bind.MetaData{
+		ABI: "{{.InputABI}}",
+		{{if $contract.FuncSigs -}}
+		Sigs: map[string]string{
+			{{range $strsig, $binsig := .FuncSigs}}"{{$binsig}}": "{{$strsig}}",
+			{{end}}
+		},
+		{{end -}}
+		{{if .InputBin -}}
+		Bin: "0x{{.InputBin}}",
+		{{end}}
+	}
+	// {{.Type}}ABI is the input ABI used to generate the binding from.
+	// Deprecated: Use {{.Type}}MetaData.ABI instead.
+	var {{.Type}}ABI = {{.Type}}MetaData.ABI
+
+	{{if $contract.FuncSigs}}
+		// Deprecated: Use {{.Type}}MetaData.Sigs instead.
+		// {{.Type}}FuncSigs maps the 4-byte function signature to its string representation.
+		var {{.Type}}FuncSigs = {{.Type}}MetaData.Sigs
+	{{end}}
+
+	{{if .InputBin}}
+		// {{.Type}}Bin is the compiled bytecode used for deploying new contracts.
+		// Deprecated: Use {{.Type}}MetaData.Bin instead.
+		var {{.Type}}Bin = {{.Type}}MetaData.Bin
+
+		// Deploy{{.Type}} deploys a new Ethereum contract, binding an instance of {{.Type}} to it.
+		func Deploy{{.Type}}(auth *bind.TransactOpts, backend bind.ContractBackend {{range .Constructor.Inputs}}, {{.Name}} {{bindtype .Type $structs}}{{end}}) (common.Address, *types.Transaction, *{{.Type}}, error) {
+		  parsed, err := {{.Type}}MetaData.GetAbi()
+		  if err != nil {
+		    return common.Address{}, nil, nil, err
+		  }
+		  if parsed == nil {
+			return common.Address{}, nil, nil, errors.New("GetABI returned nil")
+		  }
+		  {{range $pattern, $name := .Libraries}}
+			{{decapitalise $name}}Addr, _, _, _ := Deploy{{capitalise $name}}(auth, backend)
+			{{$contract.Type}}Bin = strings.ReplaceAll({{$contract.Type}}Bin, "__${{$pattern}}$__", {{decapitalise $name}}Addr.String()[2:])
+		  {{end}}
+		  address, tx, contract, err := bind.DeployContract(auth, *parsed, common.FromHex({{.Type}}Bin), backend {{range .Constructor.Inputs}}, {{.Name}}{{end}})
+		  if err != nil {
+		    return common.Address{}, nil, nil, err
+		  }
+		  return address, tx, &{{.Type}}{ {{.Type}}Caller: {{.Type}}Caller{contract: contract}, {{.Type}}Transactor: {{.Type}}Transactor{contract: contract}, {{.Type}}Filterer: {{.Type}}Filterer{contract: contract} }, nil
+		}
+	{{end}}
+
+	// {{.Type}} is an auto generated Go binding around an Ethereum contract.
+	type {{.Type}} struct {
+	  {{.Type}}Caller     // Read-only binding to the contract
+	  {{.Type}}Transactor // Write-only binding to the contract
+	  {{.Type}}Filterer   // Log filterer for contract events
+	}
+
+	// {{.Type}}Caller is an auto generated read-only Go binding around an Ethereum contract.
+	type {{.Type}}Caller struct {
+	  contract *bind.BoundContract // Generic contract wrapper for the low level calls
+	}
+
+	// {{.Type}}Transactor is an auto generated write-only Go binding around an Ethereum contract.
+	type {{.Type}}Transactor struct {
+	  contract *bind.BoundContract // Generic contract wrapper for the low level calls
+	}
+
+	// {{.Type}}Filterer is an auto generated log filtering Go binding around an Ethereum contract events.
+	type {{.Type}}Filterer struct {
+	  contract *bind.BoundContract // Generic contract wrapper for the low level calls
+	}
+
+	// {{.Type}}Session is an auto generated Go binding around an Ethereum contract,
+	// with pre-set call and transact options.
+	type {{.Type}}Session struct {
+	  Contract     *{{.Type}}        // Generic contract binding to set the session for
+	  CallOpts     bind.CallOpts     // Call options to use throughout this session
+	  TransactOpts bind.TransactOpts // Transaction auth options to use throughout this session
+	}
+
+	// {{.Type}}CallerSession is an auto generated read-only Go binding around an Ethereum contract,
+	// with pre-set call options.
+	type {{.Type}}CallerSession struct {
+	  Contract *{{.Type}}Caller // Generic contract caller binding to set the session for
+	  CallOpts bind.CallOpts    // Call options to use throughout this session
+	}
+
+	// {{.Type}}TransactorSession is an auto generated write-only Go binding around an Ethereum contract,
+	// with pre-set transact options.
+	type {{.Type}}TransactorSession struct {
+	  Contract     *{{.Type}}Transactor // Generic contract transactor binding to set the session for
+	  TransactOpts bind.TransactOpts    // Transaction auth options to use throughout this session
+	}
+
+	// {{.Type}}Raw is an auto generated low-level Go binding around an Ethereum contract.
+	type {{.Type}}Raw struct {
+	  Contract *{{.Type}} // Generic contract binding to access the raw methods on
+	}
+
+	// {{.Type}}CallerRaw is an auto generated low-level read-only Go binding around an Ethereum contract.
+	type {{.Type}}CallerRaw struct {
+		Contract *{{.Type}}Caller // Generic read-only contract binding to access the raw methods on
+	}
+
+	// {{.Type}}TransactorRaw is an auto generated low-level write-only Go binding around an Ethereum contract.
+	type {{.Type}}TransactorRaw struct {
+		Contract *{{.Type}}Transactor // Generic write-only contract binding to access the raw methods on
+	}
+
+	// New{{.Type}} creates a new instance of {{.Type}}, bound to a specific deployed contract.
+	func New{{.Type}}(address common.Address, backend bind.ContractBackend) (*{{.Type}}, error) {
+	  contract, err := bind{{.Type}}(address, backend, backend, backend)
+	  if err != nil {
+	    return nil, err
+	  }
+	  return &{{.Type}}{ {{.Type}}Caller: {{.Type}}Caller{contract: contract}, {{.Type}}Transactor: {{.Type}}Transactor{contract: contract}, {{.Type}}Filterer: {{.Type}}Filterer{contract: contract} }, nil
+	}
+
+	// New{{.Type}}Caller creates a new read-only instance of {{.Type}}, bound to a specific deployed contract.
+	func New{{.Type}}Caller(address common.Address, caller bind.ContractCaller) (*{{.Type}}Caller, error) {
+	  contract, err := bind{{.Type}}(address, caller, nil, nil)
+	  if err != nil {
+	    return nil, err
+	  }
+	  return &{{.Type}}Caller{contract: contract}, nil
+	}
+
+	// New{{.Type}}Transactor creates a new write-only instance of {{.Type}}, bound to a specific deployed contract.
+	func New{{.Type}}Transactor(address common.Address, transactor bind.ContractTransactor) (*{{.Type}}Transactor, error) {
+	  contract, err := bind{{.Type}}(address, nil, transactor, nil)
+	  if err != nil {
+	    return nil, err
+	  }
+	  return &{{.Type}}Transactor{contract: contract}, nil
+	}
+
+	// New{{.Type}}Filterer creates a new log filterer instance of {{.Type}}, bound to a specific deployed contract.
+ 	func New{{.Type}}Filterer(address common.Address, filterer bind.ContractFilterer) (*{{.Type}}Filterer, error) {
+ 	  contract, err := bind{{.Type}}(address, nil, nil, filterer)
+ 	  if err != nil {
+ 	    return nil, err
+ 	  }
+ 	  return &{{.Type}}Filterer{contract: contract}, nil
+ 	}
+
+	// bind{{.Type}} binds a generic wrapper to an already deployed contract.
+	func bind{{.Type}}(address common.Address, caller bind.ContractCaller, transactor bind.ContractTransactor, filterer bind.ContractFilterer) (*bind.BoundContract, error) {
+	  parsed, err := {{.Type}}MetaData.GetAbi()
+	  if err != nil {
+	    return nil, err
+	  }
+	  return bind.NewBoundContract(address, *parsed, caller, transactor, filterer), nil
+	}
+
+	// Call invokes the (constant) contract method with params as input values and
+	// sets the output to result. The result type might be a single field for simple
+	// returns, a slice of interfaces for anonymous returns and a struct for named
+	// returns.
+	func (_{{$contract.Type}} *{{$contract.Type}}Raw) Call(opts *bind.CallOpts, result *[]interface{}, method string, params ...interface{}) error {
+		return _{{$contract.Type}}.Contract.{{$contract.Type}}Caller.contract.Call(opts, result, method, params...)
+	}
+
+	// Transfer initiates a plain transaction to move funds to the contract, calling
+	// its default method if one is available.
+	func (_{{$contract.Type}} *{{$contract.Type}}Raw) Transfer(opts *bind.TransactOpts) (*types.Transaction, error) {
+		return _{{$contract.Type}}.Contract.{{$contract.Type}}Transactor.contract.Transfer(opts)
+	}
+
+	// Transact invokes the (paid) contract method with params as input values.
+	func (_{{$contract.Type}} *{{$contract.Type}}Raw) Transact(opts *bind.TransactOpts, method string, params ...interface{}) (*types.Transaction, error) {
+		return _{{$contract.Type}}.Contract.{{$contract.Type}}Transactor.contract.Transact(opts, method, params...)
+	}
+
+	// Call invokes the (constant) contract method with params as input values and
+	// sets the output to result. The result type might be a single field for simple
+	// returns, a slice of interfaces for anonymous returns and a struct for named
+	// returns.
+	func (_{{$contract.Type}} *{{$contract.Type}}CallerRaw) Call(opts *bind.CallOpts, result *[]interface{}, method string, params ...interface{}) error {
+		return _{{$contract.Type}}.Contract.contract.Call(opts, result, method, params...)
+	}
+
+	// Transfer initiates a plain transaction to move funds to the contract, calling
+	// its default method if one is available.
+	func (_{{$contract.Type}} *{{$contract.Type}}TransactorRaw) Transfer(opts *bind.TransactOpts) (*types.Transaction, error) {
+		return _{{$contract.Type}}.Contract.contract.Transfer(opts)
+	}
+
+	// Transact invokes the (paid) contract method with params as input values.
+	func (_{{$contract.Type}} *{{$contract.Type}}TransactorRaw) Transact(opts *bind.TransactOpts, method string, params ...interface{}) (*types.Transaction, error) {
+		return _{{$contract.Type}}.Contract.contract.Transact(opts, method, params...)
+	}
+
+	{{range .Calls}}
+		// {{.Normalized.Name}} is a free data retrieval call binding the contract method 0x{{printf "%x" .Original.ID}}.
+		//
+		// Solidity: {{.Original.String}}
+		func (_{{$contract.Type}} *{{$contract.Type}}Caller) {{.Normalized.Name}}(opts *bind.CallOpts {{range .Normalized.Inputs}}, {{.Name}} {{bindtype .Type $structs}} {{end}}) ({{if .Structured}}struct{ {{range .Normalized.Outputs}}{{.Name}} {{bindtype .Type $structs}};{{end}} },{{else}}{{range .Normalized.Outputs}}{{bindtype .Type $structs}},{{end}}{{end}} error) {
+			var out []interface{}
+			err := _{{$contract.Type}}.contract.Call(opts, &out, "{{.Original.Name}}" {{range .Normalized.Inputs}}, {{.Name}}{{end}})
+			{{if .Structured}}
+			outstruct := new(struct{ {{range .Normalized.Outputs}} {{.Name}} {{bindtype .Type $structs}}; {{end}} })
+			if err != nil {
+				return *outstruct, err
+			}
+			{{range $i, $t := .Normalized.Outputs}}
+			outstruct.{{.Name}} = *abi.ConvertType(out[{{$i}}], new({{bindtype .Type $structs}})).(*{{bindtype .Type $structs}}){{end}}
+
+			return *outstruct, err
+			{{else}}
+			if err != nil {
+				return {{range $i, $_ := .Normalized.Outputs}}*new({{bindtype .Type $structs}}), {{end}} err
+			}
+			{{range $i, $t := .Normalized.Outputs}}
+			out{{$i}} := *abi.ConvertType(out[{{$i}}], new({{bindtype .Type $structs}})).(*{{bindtype .Type $structs}}){{end}}
+
+			return {{range $i, $t := .Normalized.Outputs}}out{{$i}}, {{end}} err
+			{{end}}
+		}
+
+		// {{.Normalized.Name}} is a free data retrieval call binding the contract method 0x{{printf "%x" .Original.ID}}.
+		//
+		// Solidity: {{.Original.String}}
+		func (_{{$contract.Type}} *{{$contract.Type}}Session) {{.Normalized.Name}}({{range $i, $_ := .Normalized.Inputs}}{{if ne $i 0}},{{end}} {{.Name}} {{bindtype .Type $structs}} {{end}}) ({{if .Structured}}struct{ {{range .Normalized.Outputs}}{{.Name}} {{bindtype .Type $structs}};{{end}} }, {{else}} {{range .Normalized.Outputs}}{{bindtype .Type $structs}},{{end}} {{end}} error) {
+		  return _{{$contract.Type}}.Contract.{{.Normalized.Name}}(&_{{$contract.Type}}.CallOpts {{range .Normalized.Inputs}}, {{.Name}}{{end}})
+		}
+
+		// {{.Normalized.Name}} is a free data retrieval call binding the contract method 0x{{printf "%x" .Original.ID}}.
+		//
+		// Solidity: {{.Original.String}}
+		func (_{{$contract.Type}} *{{$contract.Type}}CallerSession) {{.Normalized.Name}}({{range $i, $_ := .Normalized.Inputs}}{{if ne $i 0}},{{end}} {{.Name}} {{bindtype .Type $structs}} {{end}}) ({{if .Structured}}struct{ {{range .Normalized.Outputs}}{{.Name}} {{bindtype .Type $structs}};{{end}} }, {{else}} {{range .Normalized.Outputs}}{{bindtype .Type $structs}},{{end}} {{end}} error) {
+		  return _{{$contract.Type}}.Contract.{{.Normalized.Name}}(&_{{$contract.Type}}.CallOpts {{range .Normalized.Inputs}}, {{.Name}}{{end}})
+		}
+	{{end}}
+
+	{{range .Transacts}}
+		// {{.Normalized.Name}} is a paid mutator transaction binding the contract method 0x{{printf "%x" .Original.ID}}.
+		//
+		// Solidity: {{.Original.String}}
+		func (_{{$contract.Type}} *{{$contract.Type}}Transactor) {{.Normalized.Name}}(opts *bind.TransactOpts {{range .Normalized.Inputs}}, {{.Name}} {{bindtype .Type $structs}} {{end}}) (*types.Transaction, error) {
+			return _{{$contract.Type}}.contract.Transact(opts, "{{.Original.Name}}" {{range .Normalized.Inputs}}, {{.Name}}{{end}})
+		}
+
+		// {{.Normalized.Name}} is a paid mutator transaction binding the contract method 0x{{printf "%x" .Original.ID}}.
+		//
+		// Solidity: {{.Original.String}}
+		func (_{{$contract.Type}} *{{$contract.Type}}Session) {{.Normalized.Name}}({{range $i, $_ := .Normalized.Inputs}}{{if ne $i 0}},{{end}} {{.Name}} {{bindtype .Type $structs}} {{end}}) (*types.Transaction, error) {
+		  return _{{$contract.Type}}.Contract.{{.Normalized.Name}}(&_{{$contract.Type}}.TransactOpts {{range $i, $_ := .Normalized.Inputs}}, {{.Name}}{{end}})
+		}
+
+		// {{.Normalized.Name}} is a paid mutator transaction binding the contract method 0x{{printf "%x" .Original.ID}}.
+		//
+		// Solidity: {{.Original.String}}
+		func (_{{$contract.Type}} *{{$contract.Type}}TransactorSession) {{.Normalized.Name}}({{range $i, $_ := .Normalized.Inputs}}{{if ne $i 0}},{{end}} {{.Name}} {{bindtype .Type $structs}} {{end}}) (*types.Transaction, error) {
+		  return _{{$contract.Type}}.Contract.{{.Normalized.Name}}(&_{{$contract.Type}}.TransactOpts {{range $i, $_ := .Normalized.Inputs}}, {{.Name}}{{end}})
+		}
+	{{end}}
+
+	{{if .Fallback}}
+		// Fallback is a paid mutator transaction binding the contract fallback function.
+		//
+		// Solidity: {{.Fallback.Original.String}}
+		func (_{{$contract.Type}} *{{$contract.Type}}Transactor) Fallback(opts *bind.TransactOpts, calldata []byte) (*types.Transaction, error) {
+			return _{{$contract.Type}}.contract.RawTransact(opts, calldata)
+		}
+
+		// Fallback is a paid mutator transaction binding the contract fallback function.
+		//
+		// Solidity: {{.Fallback.Original.String}}
+		func (_{{$contract.Type}} *{{$contract.Type}}Session) Fallback(calldata []byte) (*types.Transaction, error) {
+		  return _{{$contract.Type}}.Contract.Fallback(&_{{$contract.Type}}.TransactOpts, calldata)
+		}
+
+		// Fallback is a paid mutator transaction binding the contract fallback function.
+		//
+		// Solidity: {{.Fallback.Original.String}}
+		func (_{{$contract.Type}} *{{$contract.Type}}TransactorSession) Fallback(calldata []byte) (*types.Transaction, error) {
+		  return _{{$contract.Type}}.Contract.Fallback(&_{{$contract.Type}}.TransactOpts, calldata)
+		}
+	{{end}}
+
+	{{if .Receive}}
+		// Receive is a paid mutator transaction binding the contract receive function.
+		//
+		// Solidity: {{.Receive.Original.String}}
+		func (_{{$contract.Type}} *{{$contract.Type}}Transactor) Receive(opts *bind.TransactOpts) (*types.Transaction, error) {
+			return _{{$contract.Type}}.contract.RawTransact(opts, nil) // calldata is disallowed for receive function
+		}
+
+		// Receive is a paid mutator transaction binding the contract receive function.
+		//
+		// Solidity: {{.Receive.Original.String}}
+		func (_{{$contract.Type}} *{{$contract.Type}}Session) Receive() (*types.Transaction, error) {
+		  return _{{$contract.Type}}.Contract.Receive(&_{{$contract.Type}}.TransactOpts)
+		}
+
+		// Receive is a paid mutator transaction binding the contract receive function.
+		//
+		// Solidity: {{.Receive.Original.String}}
+		func (_{{$contract.Type}} *{{$contract.Type}}TransactorSession) Receive() (*types.Transaction, error) {
+		  return _{{$contract.Type}}.Contract.Receive(&_{{$contract.Type}}.TransactOpts)
+		}
+	{{end}}
+
+	{{range .Events}}
+		// {{$contract.Type}}{{.Normalized.Name}}Iterator is returned from Filter{{.Normalized.Name}} and is used to iterate over the raw logs and unpacked data for {{.Normalized.Name}} events raised by the {{$contract.Type}} contract.
+		type {{$contract.Type}}{{.Normalized.Name}}Iterator struct {
+			Event *{{$contract.Type}}{{.Normalized.Name}} // Event containing the contract specifics and raw log
+
+			contract *bind.BoundContract // Generic contract to use for unpacking event data
+			event    string              // Event name to use for unpacking event data
+
+			logs chan types.Log        // Log channel receiving the found contract events
+			sub  ethereum.Subscription // Subscription for errors, completion and termination
+			done bool                  // Whether the subscription completed delivering logs
+			fail error                 // Occurred error to stop iteration
+		}
+		// Next advances the iterator to the subsequent event, returning whether there
+		// are any more events found. In case of a retrieval or parsing error, false is
+		// returned and Error() can be queried for the exact failure.
+		func (it *{{$contract.Type}}{{.Normalized.Name}}Iterator) Next() bool {
+			// If the iterator failed, stop iterating
+			if (it.fail != nil) {
+				return false
+			}
+			// If the iterator completed, deliver directly whatever's available
+			if (it.done) {
+				select {
+				case log := <-it.logs:
+					it.Event = new({{$contract.Type}}{{.Normalized.Name}})
+					if err := it.contract.UnpackLog(it.Event, it.event, log); err != nil {
+						it.fail = err
+						return false
+					}
+					it.Event.Raw = log
+					return true
+
+				default:
+					return false
+				}
+			}
+			// Iterator still in progress, wait for either a data or an error event
+			select {
+			case log := <-it.logs:
+				it.Event = new({{$contract.Type}}{{.Normalized.Name}})
+				if err := it.contract.UnpackLog(it.Event, it.event, log); err != nil {
+					it.fail = err
+					return false
+				}
+				it.Event.Raw = log
+				return true
+
+			case err := <-it.sub.Err():
+				it.done = true
+				it.fail = err
+				return it.Next()
+			}
+		}
+		// Error returns any retrieval or parsing error occurred during filtering.
+		func (it *{{$contract.Type}}{{.Normalized.Name}}Iterator) Error() error {
+			return it.fail
+		}
+		// Close terminates the iteration process, releasing any pending underlying
+		// resources.
+		func (it *{{$contract.Type}}{{.Normalized.Name}}Iterator) Close() error {
+			it.sub.Unsubscribe()
+			return nil
+		}
+
+		// {{$contract.Type}}{{.Normalized.Name}} represents a {{.Normalized.Name}} event raised by the {{$contract.Type}} contract.
+		type {{$contract.Type}}{{.Normalized.Name}} struct { {{range .Normalized.Inputs}}
+			{{capitalise .Name}} {{if .Indexed}}{{bindtopictype .Type $structs}}{{else}}{{bindtype .Type $structs}}{{end}}; {{end}}
+			Raw types.Log // Blockchain specific contextual infos
+		}
+
+		// Filter{{.Normalized.Name}} is a free log retrieval operation binding the contract event 0x{{printf "%x" .Original.ID}}.
+		//
+		// Solidity: {{.Original.String}}
+ 		func (_{{$contract.Type}} *{{$contract.Type}}Filterer) Filter{{.Normalized.Name}}(opts *bind.FilterOpts{{range .Normalized.Inputs}}{{if .Indexed}}, {{.Name}} []{{bindtype .Type $structs}}{{end}}{{end}}) (*{{$contract.Type}}{{.Normalized.Name}}Iterator, error) {
+			{{range .Normalized.Inputs}}
+			{{if .Indexed}}var {{.Name}}Rule []interface{}
+			for _, {{.Name}}Item := range {{.Name}} {
+				{{.Name}}Rule = append({{.Name}}Rule, {{.Name}}Item)
+			}{{end}}{{end}}
+
+			logs, sub, err := _{{$contract.Type}}.contract.FilterLogs(opts, "{{.Original.Name}}"{{range .Normalized.Inputs}}{{if .Indexed}}, {{.Name}}Rule{{end}}{{end}})
+			if err != nil {
+				return nil, err
+			}
+			return &{{$contract.Type}}{{.Normalized.Name}}Iterator{contract: _{{$contract.Type}}.contract, event: "{{.Original.Name}}", logs: logs, sub: sub}, nil
+ 		}
+
+		// Watch{{.Normalized.Name}} is a free log subscription operation binding the contract event 0x{{printf "%x" .Original.ID}}.
+		//
+		// Solidity: {{.Original.String}}
+		func (_{{$contract.Type}} *{{$contract.Type}}Filterer) Watch{{.Normalized.Name}}(opts *bind.WatchOpts, sink chan<- *{{$contract.Type}}{{.Normalized.Name}}{{range .Normalized.Inputs}}{{if .Indexed}}, {{.Name}} []{{bindtype .Type $structs}}{{end}}{{end}}) (event.Subscription, error) {
+			{{range .Normalized.Inputs}}
+			{{if .Indexed}}var {{.Name}}Rule []interface{}
+			for _, {{.Name}}Item := range {{.Name}} {
+				{{.Name}}Rule = append({{.Name}}Rule, {{.Name}}Item)
+			}{{end}}{{end}}
+
+			logs, sub, err := _{{$contract.Type}}.contract.WatchLogs(opts, "{{.Original.Name}}"{{range .Normalized.Inputs}}{{if .Indexed}}, {{.Name}}Rule{{end}}{{end}})
+			if err != nil {
+				return nil, err
+			}
+			return event.NewSubscription(func(quit <-chan struct{}) error {
+				defer sub.Unsubscribe()
+				for {
+					select {
+					case log := <-logs:
+						// New log arrived, parse the event and forward to the user
+						event := new({{$contract.Type}}{{.Normalized.Name}})
+						if err := _{{$contract.Type}}.contract.UnpackLog(event, "{{.Original.Name}}", log); err != nil {
+							return err
+						}
+						event.Raw = log
+
+						select {
+						case sink <- event:
+						case err := <-sub.Err():
+							return err
+						case <-quit:
+							return nil
+						}
+					case err := <-sub.Err():
+						return err
+					case <-quit:
+						return nil
+					}
+				}
+			}), nil
+		}
+
+		// Parse{{.Normalized.Name}} is a log parse operation binding the contract event 0x{{printf "%x" .Original.ID}}.
+		//
+		// Solidity: {{.Original.String}}
+		func (_{{$contract.Type}} *{{$contract.Type}}Filterer) Parse{{.Normalized.Name}}(log types.Log) (*{{$contract.Type}}{{.Normalized.Name}}, error) {
+			event := new({{$contract.Type}}{{.Normalized.Name}})
+			if err := _{{$contract.Type}}.contract.UnpackLog(event, "{{.Original.Name}}", log); err != nil {
+				return nil, err
+			}
+			event.Raw = log
+			return event, nil
+		}
+
+ 	{{end}}
+{{end}}
+`

accounts/abi/bind/util_test.go

@@ -82,9 +82,7 @@ func TestWaitDeployed(t *testing.T) {
 		}()
 
 		// Send and mine the transaction.
-		if err := backend.Client().SendTransaction(ctx, tx); err != nil {
-			t.Errorf("test %q: failed to send transaction: %v", name, err)
-		}
+		backend.Client().SendTransaction(ctx, tx)
 		backend.Commit()
 
 		select {
@@ -118,9 +116,7 @@ func TestWaitDeployedCornerCases(t *testing.T) {
 	tx, _ = types.SignTx(tx, types.LatestSigner(params.AllDevChainProtocolChanges), testKey)
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
-	if err := backend.Client().SendTransaction(ctx, tx); err != nil {
-		t.Errorf("failed to send transaction: %q", err)
-	}
+	backend.Client().SendTransaction(ctx, tx)
 	backend.Commit()
 	notContractCreation := errors.New("tx is not contract creation")
 	if _, err := bind.WaitDeployed(ctx, backend.Client(), tx); err.Error() != notContractCreation.Error() {
@@ -138,8 +134,6 @@ func TestWaitDeployedCornerCases(t *testing.T) {
 		}
 	}()
 
-	if err := backend.Client().SendTransaction(ctx, tx); err != nil {
-		t.Errorf("failed to send transaction: %q", err)
-	}
+	backend.Client().SendTransaction(ctx, tx)
 	cancel()
 }

accounts/abi/reflect.go

@@ -24,7 +24,7 @@ import (
 	"strings"
 )
 
-// ConvertType converts an interface of a runtime type into an interface of the
+// ConvertType converts an interface of a runtime type into a interface of the
 // given type, e.g. turn this code:
 //
 //	var fields []reflect.StructField
@@ -33,7 +33,7 @@ import (
 //			Name: "X",
 //			Type: reflect.TypeOf(new(big.Int)),
 //			Tag:  reflect.StructTag("json:\"" + "x" + "\""),
-//	})
+//	}
 //
 // into:
 //

accounts/abi/type.go

@@ -64,9 +64,6 @@ type Type struct {
 var (
 	// typeRegex parses the abi sub types
 	typeRegex = regexp.MustCompile("([a-zA-Z]+)(([0-9]+)(x([0-9]+))?)?")
-
-	// sliceSizeRegex grab the slice size
-	sliceSizeRegex = regexp.MustCompile("[0-9]+")
 )
 
 // NewType creates a new reflection type of abi type given in t.
@@ -94,7 +91,8 @@ func NewType(t string, internalType string, components []ArgumentMarshaling) (ty
 		// grab the last cell and create a type from there
 		sliced := t[i:]
 		// grab the slice size with regexp
-		intz := sliceSizeRegex.FindAllString(sliced, -1)
+		re := regexp.MustCompile("[0-9]+")
+		intz := re.FindAllString(sliced, -1)
 
 		if len(intz) == 0 {
 			// is a slice
@@ -181,6 +179,9 @@ func NewType(t string, internalType string, components []ArgumentMarshaling) (ty
 				return Type{}, errors.New("abi: purely anonymous or underscored field is not supported")
 			}
 			fieldName := ResolveNameConflict(name, func(s string) bool { return used[s] })
+			if err != nil {
+				return Type{}, err
+			}
 			used[fieldName] = true
 			if !isValidFieldName(fieldName) {
 				return Type{}, fmt.Errorf("field %d has invalid name", idx)
@@ -219,12 +220,7 @@ func NewType(t string, internalType string, components []ArgumentMarshaling) (ty
 		typ.T = FunctionTy
 		typ.Size = 24
 	default:
-		if strings.HasPrefix(internalType, "contract ") {
-			typ.Size = 20
-			typ.T = AddressTy
-		} else {
-			return Type{}, fmt.Errorf("unsupported arg type: %s", t)
-		}
+		return Type{}, fmt.Errorf("unsupported arg type: %s", t)
 	}
 
 	return

accounts/abi/type_test.go

@@ -25,7 +25,7 @@ import (
 	"github.com/ethereum/go-ethereum/common"
 )
 
-// typeWithoutStringer is an alias for the Type type which simply doesn't implement
+// typeWithoutStringer is a alias for the Type type which simply doesn't implement
 // the stringer interface to allow printing type details in the tests below.
 type typeWithoutStringer Type
 

accounts/accounts.go

@@ -195,7 +195,7 @@ func TextHash(data []byte) []byte {
 //
 // This gives context to the signed message and prevents signing of transactions.
 func TextAndHash(data []byte) ([]byte, string) {
-	msg := fmt.Sprintf("\x19Ethereum Signed Message:\n%d%s", len(data), data)
+	msg := fmt.Sprintf("\x19Ethereum Signed Message:\n%d%s", len(data), string(data))
 	hasher := sha3.NewLegacyKeccak256()
 	hasher.Write([]byte(msg))
 	return hasher.Sum(nil), msg

accounts/external/backend.go

@@ -205,7 +205,7 @@ func (api *ExternalSigner) SignTx(account accounts.Account, tx *types.Transactio
 		to = &t
 	}
 	args := &apitypes.SendTxArgs{
-		Input: &data,
+		Data:  &data,
 		Nonce: hexutil.Uint64(tx.Nonce()),
 		Value: hexutil.Big(*tx.Value()),
 		Gas:   hexutil.Uint64(tx.Gas()),
@@ -215,7 +215,7 @@ func (api *ExternalSigner) SignTx(account accounts.Account, tx *types.Transactio
 	switch tx.Type() {
 	case types.LegacyTxType, types.AccessListTxType:
 		args.GasPrice = (*hexutil.Big)(tx.GasPrice())
-	case types.DynamicFeeTxType, types.BlobTxType:
+	case types.DynamicFeeTxType:
 		args.MaxFeePerGas = (*hexutil.Big)(tx.GasFeeCap())
 		args.MaxPriorityFeePerGas = (*hexutil.Big)(tx.GasTipCap())
 	default:
@@ -235,17 +235,6 @@ func (api *ExternalSigner) SignTx(account accounts.Account, tx *types.Transactio
 		accessList := tx.AccessList()
 		args.AccessList = &accessList
 	}
-	if tx.Type() == types.BlobTxType {
-		args.BlobHashes = tx.BlobHashes()
-		sidecar := tx.BlobTxSidecar()
-		if sidecar == nil {
-			return nil, errors.New("blobs must be present for signing")
-		}
-		args.Blobs = sidecar.Blobs
-		args.Commitments = sidecar.Commitments
-		args.Proofs = sidecar.Proofs
-	}
-
 	var res signTransactionResult
 	if err := api.client.Call(&res, "account_signTransaction", args); err != nil {
 		return nil, err

accounts/keystore/account_cache.go

@@ -22,7 +22,6 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
-	"slices"
 	"sort"
 	"strings"
 	"sync"
@@ -32,6 +31,7 @@ import (
 	"github.com/ethereum/go-ethereum/accounts"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/log"
+	"golang.org/x/exp/slices"
 )
 
 // Minimum amount of time between cache reloads. This limit applies if the platform does

accounts/keystore/account_cache_test.go

@@ -23,7 +23,6 @@ import (
 	"os"
 	"path/filepath"
 	"reflect"
-	"slices"
 	"testing"
 	"time"
 
@@ -31,6 +30,7 @@ import (
 	"github.com/davecgh/go-spew/spew"
 	"github.com/ethereum/go-ethereum/accounts"
 	"github.com/ethereum/go-ethereum/common"
+	"golang.org/x/exp/slices"
 )
 
 var (
@@ -51,7 +51,7 @@ var (
 	}
 )
 
-// waitWatcherStart waits up to 1s for the keystore watcher to start.
+// waitWatcherStarts waits up to 1s for the keystore watcher to start.
 func waitWatcherStart(ks *KeyStore) bool {
 	// On systems where file watch is not supported, just return "ok".
 	if !ks.cache.watcher.enabled() {
@@ -86,7 +86,7 @@ func waitForAccounts(wantAccounts []accounts.Account, ks *KeyStore) error {
 func TestWatchNewFile(t *testing.T) {
 	t.Parallel()
 
-	dir, ks := tmpKeyStore(t)
+	dir, ks := tmpKeyStore(t, false)
 
 	// Ensure the watcher is started before adding any files.
 	ks.Accounts()
@@ -114,7 +114,7 @@ func TestWatchNewFile(t *testing.T) {
 func TestWatchNoDir(t *testing.T) {
 	t.Parallel()
 	// Create ks but not the directory that it watches.
-	dir := filepath.Join(t.TempDir(), fmt.Sprintf("eth-keystore-watchnodir-test-%d-%d", os.Getpid(), rand.Int()))
+	dir := filepath.Join(os.TempDir(), fmt.Sprintf("eth-keystore-watchnodir-test-%d-%d", os.Getpid(), rand.Int()))
 	ks := NewKeyStore(dir, LightScryptN, LightScryptP)
 	list := ks.Accounts()
 	if len(list) > 0 {
@@ -126,6 +126,7 @@ func TestWatchNoDir(t *testing.T) {
 	}
 	// Create the directory and copy a key file into it.
 	os.MkdirAll(dir, 0700)
+	defer os.RemoveAll(dir)
 	file := filepath.Join(dir, "aaa")
 	if err := cp.CopyFile(file, cachetestAccounts[0].URL.Path); err != nil {
 		t.Fatal(err)
@@ -324,8 +325,7 @@ func TestUpdatedKeyfileContents(t *testing.T) {
 	t.Parallel()
 
 	// Create a temporary keystore to test with
-	dir := t.TempDir()
-
+	dir := filepath.Join(os.TempDir(), fmt.Sprintf("eth-keystore-updatedkeyfilecontents-test-%d-%d", os.Getpid(), rand.Int()))
 	ks := NewKeyStore(dir, LightScryptN, LightScryptP)
 
 	list := ks.Accounts()
@@ -335,7 +335,9 @@ func TestUpdatedKeyfileContents(t *testing.T) {
 	if !waitWatcherStart(ks) {
 		t.Fatal("keystore watcher didn't start in time")
 	}
-	// Copy a key file into it
+	// Create the directory and copy a key file into it.
+	os.MkdirAll(dir, 0700)
+	defer os.RemoveAll(dir)
 	file := filepath.Join(dir, "aaa")
 
 	// Place one of our testfiles in there

accounts/keystore/keystore.go

@@ -87,6 +87,15 @@ func NewKeyStore(keydir string, scryptN, scryptP int) *KeyStore {
 	return ks
 }
 
+// NewPlaintextKeyStore creates a keystore for the given directory.
+// Deprecated: Use NewKeyStore.
+func NewPlaintextKeyStore(keydir string) *KeyStore {
+	keydir, _ = filepath.Abs(keydir)
+	ks := &KeyStore{storage: &keyStorePlain{keydir}}
+	ks.init(keydir)
+	return ks
+}
+
 func (ks *KeyStore) init(keydir string) {
 	// Lock the mutex since the account cache might call back with events
 	ks.mu.Lock()
@@ -312,10 +321,11 @@ func (ks *KeyStore) Unlock(a accounts.Account, passphrase string) error {
 // Lock removes the private key with the given address from memory.
 func (ks *KeyStore) Lock(addr common.Address) error {
 	ks.mu.Lock()
-	unl, found := ks.unlocked[addr]
-	ks.mu.Unlock()
-	if found {
+	if unl, found := ks.unlocked[addr]; found {
+		ks.mu.Unlock()
 		ks.expire(addr, unl, time.Duration(0)*time.Nanosecond)
+	} else {
+		ks.mu.Unlock()
 	}
 	return nil
 }
@@ -499,5 +509,7 @@ func (ks *KeyStore) isUpdating() bool {
 // zeroKey zeroes a private key in memory.
 func zeroKey(k *ecdsa.PrivateKey) {
 	b := k.D.Bits()
-	clear(b)
+	for i := range b {
+		b[i] = 0
+	}
 }

accounts/keystore/keystore_test.go

@@ -20,7 +20,6 @@ import (
 	"math/rand"
 	"os"
 	"runtime"
-	"slices"
 	"strings"
 	"sync"
 	"sync/atomic"
@@ -31,13 +30,14 @@ import (
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/ethereum/go-ethereum/event"
+	"golang.org/x/exp/slices"
 )
 
 var testSigData = make([]byte, 32)
 
 func TestKeyStore(t *testing.T) {
 	t.Parallel()
-	dir, ks := tmpKeyStore(t)
+	dir, ks := tmpKeyStore(t, true)
 
 	a, err := ks.NewAccount("foo")
 	if err != nil {
@@ -72,7 +72,7 @@ func TestKeyStore(t *testing.T) {
 
 func TestSign(t *testing.T) {
 	t.Parallel()
-	_, ks := tmpKeyStore(t)
+	_, ks := tmpKeyStore(t, true)
 
 	pass := "" // not used but required by API
 	a1, err := ks.NewAccount(pass)
@@ -89,7 +89,7 @@ func TestSign(t *testing.T) {
 
 func TestSignWithPassphrase(t *testing.T) {
 	t.Parallel()
-	_, ks := tmpKeyStore(t)
+	_, ks := tmpKeyStore(t, true)
 
 	pass := "passwd"
 	acc, err := ks.NewAccount(pass)
@@ -117,7 +117,7 @@ func TestSignWithPassphrase(t *testing.T) {
 
 func TestTimedUnlock(t *testing.T) {
 	t.Parallel()
-	_, ks := tmpKeyStore(t)
+	_, ks := tmpKeyStore(t, true)
 
 	pass := "foo"
 	a1, err := ks.NewAccount(pass)
@@ -152,7 +152,7 @@ func TestTimedUnlock(t *testing.T) {
 
 func TestOverrideUnlock(t *testing.T) {
 	t.Parallel()
-	_, ks := tmpKeyStore(t)
+	_, ks := tmpKeyStore(t, false)
 
 	pass := "foo"
 	a1, err := ks.NewAccount(pass)
@@ -193,7 +193,7 @@ func TestOverrideUnlock(t *testing.T) {
 // This test should fail under -race if signing races the expiration goroutine.
 func TestSignRace(t *testing.T) {
 	t.Parallel()
-	_, ks := tmpKeyStore(t)
+	_, ks := tmpKeyStore(t, false)
 
 	// Create a test account.
 	a1, err := ks.NewAccount("")
@@ -238,7 +238,7 @@ func waitForKsUpdating(t *testing.T, ks *KeyStore, wantStatus bool, maxTime time
 func TestWalletNotifierLifecycle(t *testing.T) {
 	t.Parallel()
 	// Create a temporary keystore to test with
-	_, ks := tmpKeyStore(t)
+	_, ks := tmpKeyStore(t, false)
 
 	// Ensure that the notification updater is not running yet
 	time.Sleep(250 * time.Millisecond)
@@ -284,7 +284,7 @@ type walletEvent struct {
 // or deleted from the keystore.
 func TestWalletNotifications(t *testing.T) {
 	t.Parallel()
-	_, ks := tmpKeyStore(t)
+	_, ks := tmpKeyStore(t, false)
 
 	// Subscribe to the wallet feed and collect events.
 	var (
@@ -343,10 +343,10 @@ func TestWalletNotifications(t *testing.T) {
 	checkEvents(t, wantEvents, events)
 }
 
-// TestImportECDSA tests the import functionality of a keystore.
+// TestImportExport tests the import functionality of a keystore.
 func TestImportECDSA(t *testing.T) {
 	t.Parallel()
-	_, ks := tmpKeyStore(t)
+	_, ks := tmpKeyStore(t, true)
 	key, err := crypto.GenerateKey()
 	if err != nil {
 		t.Fatalf("failed to generate key: %v", key)
@@ -362,10 +362,10 @@ func TestImportECDSA(t *testing.T) {
 	}
 }
 
-// TestImportExport tests the import and export functionality of a keystore.
+// TestImportECDSA tests the import and export functionality of a keystore.
 func TestImportExport(t *testing.T) {
 	t.Parallel()
-	_, ks := tmpKeyStore(t)
+	_, ks := tmpKeyStore(t, true)
 	acc, err := ks.NewAccount("old")
 	if err != nil {
 		t.Fatalf("failed to create account: %v", acc)
@@ -374,7 +374,7 @@ func TestImportExport(t *testing.T) {
 	if err != nil {
 		t.Fatalf("failed to export account: %v", acc)
 	}
-	_, ks2 := tmpKeyStore(t)
+	_, ks2 := tmpKeyStore(t, true)
 	if _, err = ks2.Import(json, "old", "old"); err == nil {
 		t.Errorf("importing with invalid password succeeded")
 	}
@@ -394,7 +394,7 @@ func TestImportExport(t *testing.T) {
 // This test should fail under -race if importing races.
 func TestImportRace(t *testing.T) {
 	t.Parallel()
-	_, ks := tmpKeyStore(t)
+	_, ks := tmpKeyStore(t, true)
 	acc, err := ks.NewAccount("old")
 	if err != nil {
 		t.Fatalf("failed to create account: %v", acc)
@@ -403,7 +403,7 @@ func TestImportRace(t *testing.T) {
 	if err != nil {
 		t.Fatalf("failed to export account: %v", acc)
 	}
-	_, ks2 := tmpKeyStore(t)
+	_, ks2 := tmpKeyStore(t, true)
 	var atom atomic.Uint32
 	var wg sync.WaitGroup
 	wg.Add(2)
@@ -457,7 +457,11 @@ func checkEvents(t *testing.T, want []walletEvent, have []walletEvent) {
 	}
 }
 
-func tmpKeyStore(t *testing.T) (string, *KeyStore) {
+func tmpKeyStore(t *testing.T, encrypted bool) (string, *KeyStore) {
 	d := t.TempDir()
-	return d, NewKeyStore(d, veryLightScryptN, veryLightScryptP)
+	newKs := NewPlaintextKeyStore
+	if encrypted {
+		newKs = func(kd string) *KeyStore { return NewKeyStore(kd, veryLightScryptN, veryLightScryptP) }
+	}
+	return d, newKs(d)
 }

accounts/scwallet/hub.go

@@ -95,7 +95,6 @@ func (hub *Hub) readPairings() error {
 		}
 		return err
 	}
-	defer pairingFile.Close()
 
 	pairingData, err := io.ReadAll(pairingFile)
 	if err != nil {

accounts/scwallet/securechannel.go

@@ -20,6 +20,7 @@ import (
 	"bytes"
 	"crypto/aes"
 	"crypto/cipher"
+	"crypto/elliptic"
 	"crypto/rand"
 	"crypto/sha256"
 	"crypto/sha512"
@@ -71,11 +72,11 @@ func NewSecureChannelSession(card *pcsc.Card, keyData []byte) (*SecureChannelSes
 	if err != nil {
 		return nil, fmt.Errorf("could not unmarshal public key from card: %v", err)
 	}
-	secret, _ := crypto.S256().ScalarMult(cardPublic.X, cardPublic.Y, key.D.Bytes())
+	secret, _ := key.Curve.ScalarMult(cardPublic.X, cardPublic.Y, key.D.Bytes())
 	return &SecureChannelSession{
 		card:      card,
 		secret:    secret.Bytes(),
-		publicKey: crypto.FromECDSAPub(&key.PublicKey),
+		publicKey: elliptic.Marshal(crypto.S256(), key.PublicKey.X, key.PublicKey.Y),
 	}, nil
 }
 

accounts/scwallet/wallet.go

@@ -73,14 +73,6 @@ var (
 	DerivationSignatureHash = sha256.Sum256(common.Hash{}.Bytes())
 )
 
-var (
-	// PinRegexp is the regular expression used to validate PIN codes.
-	pinRegexp = regexp.MustCompile(`^[0-9]{6,}$`)
-
-	// PukRegexp is the regular expression used to validate PUK codes.
-	pukRegexp = regexp.MustCompile(`^[0-9]{12,}$`)
-)
-
 // List of APDU command-related constants
 const (
 	claISO7816  = 0
@@ -388,7 +380,7 @@ func (w *Wallet) Open(passphrase string) error {
 	case passphrase == "":
 		return ErrPINUnblockNeeded
 	case status.PinRetryCount > 0:
-		if !pinRegexp.MatchString(passphrase) {
+		if !regexp.MustCompile(`^[0-9]{6,}$`).MatchString(passphrase) {
 			w.log.Error("PIN needs to be at least 6 digits")
 			return ErrPINNeeded
 		}
@@ -396,7 +388,7 @@ func (w *Wallet) Open(passphrase string) error {
 			return err
 		}
 	default:
-		if !pukRegexp.MatchString(passphrase) {
+		if !regexp.MustCompile(`^[0-9]{12,}$`).MatchString(passphrase) {
 			w.log.Error("PUK needs to be at least 12 digits")
 			return ErrPINUnblockNeeded
 		}

accounts/usbwallet/hub.go

@@ -26,7 +26,7 @@ import (
 	"github.com/ethereum/go-ethereum/accounts"
 	"github.com/ethereum/go-ethereum/event"
 	"github.com/ethereum/go-ethereum/log"
-	"github.com/karalabe/hid"
+	"github.com/karalabe/usb"
 )
 
 // LedgerScheme is the protocol scheme prefixing account and wallet URLs.
@@ -109,7 +109,7 @@ func NewTrezorHubWithWebUSB() (*Hub, error) {
 
 // newHub creates a new hardware wallet manager for generic USB devices.
 func newHub(scheme string, vendorID uint16, productIDs []uint16, usageID uint16, endpointID int, makeDriver func(log.Logger) driver) (*Hub, error) {
-	if !hid.Supported() {
+	if !usb.Supported() {
 		return nil, errors.New("unsupported platform")
 	}
 	hub := &Hub{
@@ -155,7 +155,7 @@ func (hub *Hub) refreshWallets() {
 		return
 	}
 	// Retrieve the current list of USB wallet devices
-	var devices []hid.DeviceInfo
+	var devices []usb.DeviceInfo
 
 	if runtime.GOOS == "linux" {
 		// hidapi on Linux opens the device during enumeration to retrieve some infos,
@@ -170,7 +170,7 @@ func (hub *Hub) refreshWallets() {
 			return
 		}
 	}
-	infos, err := hid.Enumerate(hub.vendorID, 0)
+	infos, err := usb.Enumerate(hub.vendorID, 0)
 	if err != nil {
 		failcount := hub.enumFails.Add(1)
 		if runtime.GOOS == "linux" {

accounts/usbwallet/ledger.go

@@ -16,7 +16,7 @@
 
 // This file contains the implementation for interacting with the Ledger hardware
 // wallets. The wire protocol spec can be found in the Ledger Blue GitHub repo:
-// https://github.com/LedgerHQ/app-ethereum/blob/develop/doc/ethapp.adoc
+// https://raw.githubusercontent.com/LedgerHQ/blue-app-eth/master/doc/ethapp.asc
 
 package usbwallet
 

accounts/usbwallet/trezor.go

@@ -33,7 +33,7 @@ import (
 	"github.com/ethereum/go-ethereum/common/hexutil"
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/log"
-	"google.golang.org/protobuf/proto"
+	"github.com/golang/protobuf/proto"
 )
 
 // ErrTrezorPINNeeded is returned if opening the trezor requires a PIN code. In

accounts/usbwallet/trezor/messages-common.proto

@@ -5,8 +5,6 @@
 syntax = "proto2";
 package hw.trezor.messages.common;
 
-option go_package  = "github.com/ethereum/go-ethereum/accounts/usbwallet/trezor";
-
 /**
  * Response: Success of the previous request
  * @end

accounts/usbwallet/trezor/messages-ethereum.proto

@@ -5,8 +5,6 @@
 syntax = "proto2";
 package hw.trezor.messages.ethereum;
 
-option go_package  = "github.com/ethereum/go-ethereum/accounts/usbwallet/trezor";
-
 // Sugar for easier handling in Java
 option java_package = "com.satoshilabs.trezor.lib.protobuf";
 option java_outer_classname = "TrezorMessageEthereum";

accounts/usbwallet/trezor/messages-management.proto

@@ -5,8 +5,6 @@
 syntax = "proto2";
 package hw.trezor.messages.management;
 
-option go_package  = "github.com/ethereum/go-ethereum/accounts/usbwallet/trezor";
-
 // Sugar for easier handling in Java
 option java_package = "com.satoshilabs.trezor.lib.protobuf";
 option java_outer_classname = "TrezorMessageManagement";

accounts/usbwallet/trezor/messages.proto

@@ -9,13 +9,10 @@ package hw.trezor.messages;
  * Messages for TREZOR communication
  */
 
-option go_package  = "github.com/ethereum/go-ethereum/accounts/usbwallet/trezor";
-
 // Sugar for easier handling in Java
 option java_package = "com.satoshilabs.trezor.lib.protobuf";
 option java_outer_classname = "TrezorMessage";
 
-
 import "google/protobuf/descriptor.proto";
 
 /**

accounts/usbwallet/trezor/trezor.go

@@ -39,10 +39,10 @@
 //   - Download the latest protoc https://github.com/protocolbuffers/protobuf/releases
 //   - Build with the usual `./configure && make` and ensure it's on your $PATH
 //   - Delete all the .proto and .pb.go files, pull in fresh ones from Trezor
-//   - Grab the latest Go plugin `go get -u google.golang.org/protobuf/cmd/protoc-gen-go`
-//   - Vendor in the latest Go plugin `govendor fetch google.golang.org/protobuf/...`
+//   - Grab the latest Go plugin `go get -u github.com/golang/protobuf/protoc-gen-go`
+//   - Vendor in the latest Go plugin `govendor fetch github.com/golang/protobuf/...`
 
-//go:generate protoc -I/usr/local/include:. --go_out=paths=source_relative:. messages.proto messages-common.proto messages-management.proto messages-ethereum.proto
+//go:generate protoc -I/usr/local/include:. --go_out=import_path=trezor:. messages.proto messages-common.proto messages-management.proto messages-ethereum.proto
 
 // Package trezor contains the wire protocol.
 package trezor
@@ -50,7 +50,7 @@ package trezor
 import (
 	"reflect"
 
-	"google.golang.org/protobuf/proto"
+	"github.com/golang/protobuf/proto"
 )
 
 // Type returns the protocol buffer type number of a specific message. If the

accounts/usbwallet/wallet.go

@@ -31,7 +31,7 @@ import (
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/ethereum/go-ethereum/log"
-	"github.com/karalabe/hid"
+	"github.com/karalabe/usb"
 )
 
 // Maximum time between wallet health checks to detect USB unplugs.
@@ -79,8 +79,8 @@ type wallet struct {
 	driver driver        // Hardware implementation of the low level device operations
 	url    *accounts.URL // Textual URL uniquely identifying this wallet
 
-	info   hid.DeviceInfo // Known USB device infos about the wallet
-	device hid.Device     // USB device advertising itself as a hardware wallet
+	info   usb.DeviceInfo // Known USB device infos about the wallet
+	device usb.Device     // USB device advertising itself as a hardware wallet
 
 	accounts []accounts.Account                         // List of derive accounts pinned on the hardware wallet
 	paths    map[common.Address]accounts.DerivationPath // Known derivation paths for signing operations

appveyor.yml

@@ -24,10 +24,9 @@ for:
         - image: Ubuntu
     build_script:
       - go run build/ci.go lint
-      - go run build/ci.go generate -verify
       - go run build/ci.go install -dlgo
     test_script:
-      - go run build/ci.go test -dlgo -short
+      - go run build/ci.go test -dlgo
 
   # linux/386 is disabled.
   - matrix:

beacon/blsync/block_sync.go

@@ -1,163 +0,0 @@
-// Copyright 2023 The go-ethereum Authors
-// This file is part of the go-ethereum library.
-//
-// The go-ethereum library is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// The go-ethereum library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public License
-// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
-
-package blsync
-
-import (
-	"github.com/ethereum/go-ethereum/beacon/light/request"
-	"github.com/ethereum/go-ethereum/beacon/light/sync"
-	"github.com/ethereum/go-ethereum/beacon/params"
-	"github.com/ethereum/go-ethereum/beacon/types"
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/common/lru"
-	"github.com/ethereum/go-ethereum/event"
-	"github.com/ethereum/go-ethereum/log"
-)
-
-// beaconBlockSync implements request.Module; it fetches the beacon blocks belonging
-// to the validated and prefetch heads.
-type beaconBlockSync struct {
-	recentBlocks *lru.Cache[common.Hash, *types.BeaconBlock]
-	locked       map[common.Hash]request.ServerAndID
-	serverHeads  map[request.Server]common.Hash
-	headTracker  headTracker
-
-	lastHeadInfo  types.HeadInfo
-	chainHeadFeed event.FeedOf[types.ChainHeadEvent]
-}
-
-type headTracker interface {
-	PrefetchHead() types.HeadInfo
-	ValidatedOptimistic() (types.OptimisticUpdate, bool)
-	ValidatedFinality() (types.FinalityUpdate, bool)
-}
-
-// newBeaconBlockSync returns a new beaconBlockSync.
-func newBeaconBlockSync(headTracker headTracker) *beaconBlockSync {
-	return &beaconBlockSync{
-		headTracker:  headTracker,
-		recentBlocks: lru.NewCache[common.Hash, *types.BeaconBlock](10),
-		locked:       make(map[common.Hash]request.ServerAndID),
-		serverHeads:  make(map[request.Server]common.Hash),
-	}
-}
-
-func (s *beaconBlockSync) SubscribeChainHead(ch chan<- types.ChainHeadEvent) event.Subscription {
-	return s.chainHeadFeed.Subscribe(ch)
-}
-
-// Process implements request.Module.
-func (s *beaconBlockSync) Process(requester request.Requester, events []request.Event) {
-	for _, event := range events {
-		switch event.Type {
-		case request.EvResponse, request.EvFail, request.EvTimeout:
-			sid, req, resp := event.RequestInfo()
-			blockRoot := common.Hash(req.(sync.ReqBeaconBlock))
-			log.Debug("Beacon block event", "type", event.Type.Name, "hash", blockRoot)
-			if resp != nil {
-				s.recentBlocks.Add(blockRoot, resp.(*types.BeaconBlock))
-			}
-			if s.locked[blockRoot] == sid {
-				delete(s.locked, blockRoot)
-			}
-		case sync.EvNewHead:
-			s.serverHeads[event.Server] = event.Data.(types.HeadInfo).BlockRoot
-		case request.EvUnregistered:
-			delete(s.serverHeads, event.Server)
-		}
-	}
-	s.updateEventFeed()
-	// request validated head block if unavailable and not yet requested
-	if vh, ok := s.headTracker.ValidatedOptimistic(); ok {
-		s.tryRequestBlock(requester, vh.Attested.Hash(), false)
-	}
-	// request prefetch head if the given server has announced it
-	if prefetchHead := s.headTracker.PrefetchHead().BlockRoot; prefetchHead != (common.Hash{}) {
-		s.tryRequestBlock(requester, prefetchHead, true)
-	}
-}
-
-func (s *beaconBlockSync) tryRequestBlock(requester request.Requester, blockRoot common.Hash, needSameHead bool) {
-	if _, ok := s.recentBlocks.Get(blockRoot); ok {
-		return
-	}
-	if _, ok := s.locked[blockRoot]; ok {
-		return
-	}
-	for _, server := range requester.CanSendTo() {
-		if needSameHead && (s.serverHeads[server] != blockRoot) {
-			continue
-		}
-		id := requester.Send(server, sync.ReqBeaconBlock(blockRoot))
-		s.locked[blockRoot] = request.ServerAndID{Server: server, ID: id}
-		return
-	}
-}
-
-func blockHeadInfo(block *types.BeaconBlock) types.HeadInfo {
-	if block == nil {
-		return types.HeadInfo{}
-	}
-	return types.HeadInfo{Slot: block.Slot(), BlockRoot: block.Root()}
-}
-
-func (s *beaconBlockSync) updateEventFeed() {
-	optimistic, ok := s.headTracker.ValidatedOptimistic()
-	if !ok {
-		return
-	}
-
-	validatedHead := optimistic.Attested.Hash()
-	headBlock, ok := s.recentBlocks.Get(validatedHead)
-	if !ok {
-		return
-	}
-
-	var finalizedHash common.Hash
-	if finality, ok := s.headTracker.ValidatedFinality(); ok {
-		he := optimistic.Attested.Epoch()
-		fe := finality.Attested.Header.Epoch()
-		switch {
-		case he == fe:
-			finalizedHash = finality.Finalized.PayloadHeader.BlockHash()
-		case he < fe:
-			return
-		case he == fe+1:
-			parent, ok := s.recentBlocks.Get(optimistic.Attested.ParentRoot)
-			if !ok || parent.Slot()/params.EpochLength == fe {
-				return // head is at first slot of next epoch, wait for finality update
-			}
-		}
-	}
-
-	headInfo := blockHeadInfo(headBlock)
-	if headInfo == s.lastHeadInfo {
-		return
-	}
-	s.lastHeadInfo = headInfo
-
-	// new head block and finality info available; extract executable data and send event to feed
-	execBlock, err := headBlock.ExecutionPayload()
-	if err != nil {
-		log.Error("Error extracting execution block from validated beacon block", "error", err)
-		return
-	}
-	s.chainHeadFeed.Send(types.ChainHeadEvent{
-		BeaconHead: optimistic.Attested.Header,
-		Block:      execBlock,
-		Finalized:  finalizedHash,
-	})
-}

beacon/blsync/block_sync_test.go

@@ -1,163 +0,0 @@
-// Copyright 2023 The go-ethereum Authors
-// This file is part of the go-ethereum library.
-//
-// The go-ethereum library is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// The go-ethereum library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public License
-// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
-
-package blsync
-
-import (
-	"testing"
-
-	"github.com/ethereum/go-ethereum/beacon/light/request"
-	"github.com/ethereum/go-ethereum/beacon/light/sync"
-	"github.com/ethereum/go-ethereum/beacon/types"
-	"github.com/ethereum/go-ethereum/common"
-	zrntcommon "github.com/protolambda/zrnt/eth2/beacon/common"
-	"github.com/protolambda/zrnt/eth2/beacon/deneb"
-)
-
-var (
-	testServer1 = testServer("testServer1")
-	testServer2 = testServer("testServer2")
-
-	testBlock1 = types.NewBeaconBlock(&deneb.BeaconBlock{
-		Slot: 123,
-		Body: deneb.BeaconBlockBody{
-			ExecutionPayload: deneb.ExecutionPayload{
-				BlockNumber: 456,
-				BlockHash:   zrntcommon.Hash32(common.HexToHash("905ac721c4058d9ed40b27b6b9c1bdd10d4333e4f3d9769100bf9dfb80e5d1f6")),
-			},
-		},
-	})
-	testBlock2 = types.NewBeaconBlock(&deneb.BeaconBlock{
-		Slot: 124,
-		Body: deneb.BeaconBlockBody{
-			ExecutionPayload: deneb.ExecutionPayload{
-				BlockNumber: 457,
-				BlockHash:   zrntcommon.Hash32(common.HexToHash("011703f39c664efc1c6cf5f49ca09b595581eec572d4dfddd3d6179a9e63e655")),
-			},
-		},
-	})
-)
-
-type testServer string
-
-func (t testServer) Name() string {
-	return string(t)
-}
-
-func TestBlockSync(t *testing.T) {
-	ht := &testHeadTracker{}
-	blockSync := newBeaconBlockSync(ht)
-	headCh := make(chan types.ChainHeadEvent, 16)
-	blockSync.SubscribeChainHead(headCh)
-	ts := sync.NewTestScheduler(t, blockSync)
-	ts.AddServer(testServer1, 1)
-	ts.AddServer(testServer2, 1)
-
-	expHeadBlock := func(expHead *types.BeaconBlock) {
-		t.Helper()
-		var expNumber, headNumber uint64
-		if expHead != nil {
-			p, err := expHead.ExecutionPayload()
-			if err != nil {
-				t.Fatalf("expHead.ExecutionPayload() failed: %v", err)
-			}
-			expNumber = p.NumberU64()
-		}
-		select {
-		case event := <-headCh:
-			headNumber = event.Block.NumberU64()
-		default:
-		}
-		if headNumber != expNumber {
-			t.Errorf("Wrong head block, expected block number %d, got %d)", expNumber, headNumber)
-		}
-	}
-
-	// no block requests expected until head tracker knows about a head
-	ts.Run(1)
-	expHeadBlock(nil)
-
-	// set block 1 as prefetch head, announced by server 2
-	head1 := blockHeadInfo(testBlock1)
-	ht.prefetch = head1
-	ts.ServerEvent(sync.EvNewHead, testServer2, head1)
-
-	// expect request to server 2 which has announced the head
-	ts.Run(2, testServer2, sync.ReqBeaconBlock(head1.BlockRoot))
-
-	// valid response
-	ts.RequestEvent(request.EvResponse, ts.Request(2, 1), testBlock1)
-	ts.AddAllowance(testServer2, 1)
-	ts.Run(3)
-	// head block still not expected as the fetched block is not the validated head yet
-	expHeadBlock(nil)
-
-	// set as validated head, expect no further requests but block 1 set as head block
-	ht.validated.Header = testBlock1.Header()
-	ts.Run(4)
-	expHeadBlock(testBlock1)
-
-	// set block 2 as prefetch head, announced by server 1
-	head2 := blockHeadInfo(testBlock2)
-	ht.prefetch = head2
-	ts.ServerEvent(sync.EvNewHead, testServer1, head2)
-	// expect request to server 1
-	ts.Run(5, testServer1, sync.ReqBeaconBlock(head2.BlockRoot))
-
-	// req2 fails, no further requests expected because server 2 has not announced it
-	ts.RequestEvent(request.EvFail, ts.Request(5, 1), nil)
-	ts.Run(6)
-
-	// set as validated head before retrieving block; now it's assumed to be available from server 2 too
-	ht.validated.Header = testBlock2.Header()
-	// expect req2 retry to server 2
-	ts.Run(7, testServer2, sync.ReqBeaconBlock(head2.BlockRoot))
-	// now head block should be unavailable again
-	expHeadBlock(nil)
-
-	// valid response, now head block should be block 2 immediately as it is already validated
-	ts.RequestEvent(request.EvResponse, ts.Request(7, 1), testBlock2)
-	ts.Run(8)
-	expHeadBlock(testBlock2)
-}
-
-type testHeadTracker struct {
-	prefetch  types.HeadInfo
-	validated types.SignedHeader
-}
-
-func (h *testHeadTracker) PrefetchHead() types.HeadInfo {
-	return h.prefetch
-}
-
-func (h *testHeadTracker) ValidatedOptimistic() (types.OptimisticUpdate, bool) {
-	return types.OptimisticUpdate{
-		Attested:      types.HeaderWithExecProof{Header: h.validated.Header},
-		Signature:     h.validated.Signature,
-		SignatureSlot: h.validated.SignatureSlot,
-	}, h.validated.Header != (types.Header{})
-}
-
-// TODO add test case for finality
-func (h *testHeadTracker) ValidatedFinality() (types.FinalityUpdate, bool) {
-	finalized := types.NewExecutionHeader(new(deneb.ExecutionPayloadHeader))
-	return types.FinalityUpdate{
-		Attested:      types.HeaderWithExecProof{Header: h.validated.Header},
-		Finalized:     types.HeaderWithExecProof{PayloadHeader: finalized},
-		Signature:     h.validated.Signature,
-		SignatureSlot: h.validated.SignatureSlot,
-	}, h.validated.Header != (types.Header{})
-}

beacon/blsync/client.go

@@ -1,115 +0,0 @@
-// Copyright 2024 The go-ethereum Authors
-// This file is part of the go-ethereum library.
-//
-// The go-ethereum library is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// The go-ethereum library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public License
-// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
-
-package blsync
-
-import (
-	"strings"
-
-	"github.com/ethereum/go-ethereum/beacon/light"
-	"github.com/ethereum/go-ethereum/beacon/light/api"
-	"github.com/ethereum/go-ethereum/beacon/light/request"
-	"github.com/ethereum/go-ethereum/beacon/light/sync"
-	"github.com/ethereum/go-ethereum/beacon/types"
-	"github.com/ethereum/go-ethereum/cmd/utils"
-	"github.com/ethereum/go-ethereum/common/mclock"
-	"github.com/ethereum/go-ethereum/ethdb/memorydb"
-	"github.com/ethereum/go-ethereum/event"
-	"github.com/ethereum/go-ethereum/rpc"
-	"github.com/urfave/cli/v2"
-)
-
-type Client struct {
-	urls         []string
-	customHeader map[string]string
-	chainConfig  *lightClientConfig
-	scheduler    *request.Scheduler
-	blockSync    *beaconBlockSync
-	engineRPC    *rpc.Client
-
-	chainHeadSub event.Subscription
-	engineClient *engineClient
-}
-
-func NewClient(ctx *cli.Context) *Client {
-	if !ctx.IsSet(utils.BeaconApiFlag.Name) {
-		utils.Fatalf("Beacon node light client API URL not specified")
-	}
-	var (
-		chainConfig  = makeChainConfig(ctx)
-		customHeader = make(map[string]string)
-	)
-	for _, s := range ctx.StringSlice(utils.BeaconApiHeaderFlag.Name) {
-		kv := strings.Split(s, ":")
-		if len(kv) != 2 {
-			utils.Fatalf("Invalid custom API header entry: %s", s)
-		}
-		customHeader[strings.TrimSpace(kv[0])] = strings.TrimSpace(kv[1])
-	}
-
-	// create data structures
-	var (
-		db             = memorydb.New()
-		threshold      = ctx.Int(utils.BeaconThresholdFlag.Name)
-		committeeChain = light.NewCommitteeChain(db, chainConfig.ChainConfig, threshold, !ctx.Bool(utils.BeaconNoFilterFlag.Name))
-		headTracker    = light.NewHeadTracker(committeeChain, threshold)
-	)
-	headSync := sync.NewHeadSync(headTracker, committeeChain)
-
-	// set up scheduler and sync modules
-	scheduler := request.NewScheduler()
-	checkpointInit := sync.NewCheckpointInit(committeeChain, chainConfig.Checkpoint)
-	forwardSync := sync.NewForwardUpdateSync(committeeChain)
-	beaconBlockSync := newBeaconBlockSync(headTracker)
-	scheduler.RegisterTarget(headTracker)
-	scheduler.RegisterTarget(committeeChain)
-	scheduler.RegisterModule(checkpointInit, "checkpointInit")
-	scheduler.RegisterModule(forwardSync, "forwardSync")
-	scheduler.RegisterModule(headSync, "headSync")
-	scheduler.RegisterModule(beaconBlockSync, "beaconBlockSync")
-
-	return &Client{
-		scheduler:    scheduler,
-		urls:         ctx.StringSlice(utils.BeaconApiFlag.Name),
-		customHeader: customHeader,
-		chainConfig:  &chainConfig,
-		blockSync:    beaconBlockSync,
-	}
-}
-
-func (c *Client) SetEngineRPC(engine *rpc.Client) {
-	c.engineRPC = engine
-}
-
-func (c *Client) Start() error {
-	headCh := make(chan types.ChainHeadEvent, 16)
-	c.chainHeadSub = c.blockSync.SubscribeChainHead(headCh)
-	c.engineClient = startEngineClient(c.chainConfig, c.engineRPC, headCh)
-
-	c.scheduler.Start()
-	for _, url := range c.urls {
-		beaconApi := api.NewBeaconLightApi(url, c.customHeader)
-		c.scheduler.RegisterServer(request.NewServer(api.NewApiServer(beaconApi), &mclock.System{}))
-	}
-	return nil
-}
-
-func (c *Client) Stop() error {
-	c.engineClient.stop()
-	c.chainHeadSub.Unsubscribe()
-	c.scheduler.Stop()
-	return nil
-}

beacon/blsync/config.go

@@ -1,114 +0,0 @@
-// Copyright 2022 The go-ethereum Authors
-// This file is part of the go-ethereum library.
-//
-// The go-ethereum library is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// The go-ethereum library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public License
-// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
-
-package blsync
-
-import (
-	"github.com/ethereum/go-ethereum/beacon/types"
-	"github.com/ethereum/go-ethereum/cmd/utils"
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/common/hexutil"
-	"github.com/urfave/cli/v2"
-)
-
-// lightClientConfig contains beacon light client configuration
-type lightClientConfig struct {
-	*types.ChainConfig
-	Checkpoint common.Hash
-}
-
-var (
-	MainnetConfig = lightClientConfig{
-		ChainConfig: (&types.ChainConfig{
-			GenesisValidatorsRoot: common.HexToHash("0x4b363db94e286120d76eb905340fdd4e54bfe9f06bf33ff6cf5ad27f511bfe95"),
-			GenesisTime:           1606824023,
-		}).
-			AddFork("GENESIS", 0, []byte{0, 0, 0, 0}).
-			AddFork("ALTAIR", 74240, []byte{1, 0, 0, 0}).
-			AddFork("BELLATRIX", 144896, []byte{2, 0, 0, 0}).
-			AddFork("CAPELLA", 194048, []byte{3, 0, 0, 0}).
-			AddFork("DENEB", 269568, []byte{4, 0, 0, 0}),
-		Checkpoint: common.HexToHash("0x388be41594ec7d6a6894f18c73f3469f07e2c19a803de4755d335817ed8e2e5a"),
-	}
-
-	SepoliaConfig = lightClientConfig{
-		ChainConfig: (&types.ChainConfig{
-			GenesisValidatorsRoot: common.HexToHash("0xd8ea171f3c94aea21ebc42a1ed61052acf3f9209c00e4efbaaddac09ed9b8078"),
-			GenesisTime:           1655733600,
-		}).
-			AddFork("GENESIS", 0, []byte{144, 0, 0, 105}).
-			AddFork("ALTAIR", 50, []byte{144, 0, 0, 112}).
-			AddFork("BELLATRIX", 100, []byte{144, 0, 0, 113}).
-			AddFork("CAPELLA", 56832, []byte{144, 0, 0, 114}).
-			AddFork("DENEB", 132608, []byte{144, 0, 0, 115}),
-		Checkpoint: common.HexToHash("0x1005a6d9175e96bfbce4d35b80f468e9bff0b674e1e861d16e09e10005a58e81"),
-	}
-)
-
-func makeChainConfig(ctx *cli.Context) lightClientConfig {
-	var config lightClientConfig
-	customConfig := ctx.IsSet(utils.BeaconConfigFlag.Name)
-	utils.CheckExclusive(ctx, utils.MainnetFlag, utils.SepoliaFlag, utils.BeaconConfigFlag)
-	switch {
-	case ctx.Bool(utils.MainnetFlag.Name):
-		config = MainnetConfig
-	case ctx.Bool(utils.SepoliaFlag.Name):
-		config = SepoliaConfig
-	default:
-		if !customConfig {
-			config = MainnetConfig
-		}
-	}
-	// Genesis root and time should always be specified together with custom chain config
-	if customConfig {
-		if !ctx.IsSet(utils.BeaconGenesisRootFlag.Name) {
-			utils.Fatalf("Custom beacon chain config is specified but genesis root is missing")
-		}
-		if !ctx.IsSet(utils.BeaconGenesisTimeFlag.Name) {
-			utils.Fatalf("Custom beacon chain config is specified but genesis time is missing")
-		}
-		if !ctx.IsSet(utils.BeaconCheckpointFlag.Name) {
-			utils.Fatalf("Custom beacon chain config is specified but checkpoint is missing")
-		}
-		config.ChainConfig = &types.ChainConfig{
-			GenesisTime: ctx.Uint64(utils.BeaconGenesisTimeFlag.Name),
-		}
-		if c, err := hexutil.Decode(ctx.String(utils.BeaconGenesisRootFlag.Name)); err == nil && len(c) <= 32 {
-			copy(config.GenesisValidatorsRoot[:len(c)], c)
-		} else {
-			utils.Fatalf("Invalid hex string", "beacon.genesis.gvroot", ctx.String(utils.BeaconGenesisRootFlag.Name), "error", err)
-		}
-		if err := config.ChainConfig.LoadForks(ctx.String(utils.BeaconConfigFlag.Name)); err != nil {
-			utils.Fatalf("Could not load beacon chain config file", "file name", ctx.String(utils.BeaconConfigFlag.Name), "error", err)
-		}
-	} else {
-		if ctx.IsSet(utils.BeaconGenesisRootFlag.Name) {
-			utils.Fatalf("Genesis root is specified but custom beacon chain config is missing")
-		}
-		if ctx.IsSet(utils.BeaconGenesisTimeFlag.Name) {
-			utils.Fatalf("Genesis time is specified but custom beacon chain config is missing")
-		}
-	}
-	// Checkpoint is required with custom chain config and is optional with pre-defined config
-	if ctx.IsSet(utils.BeaconCheckpointFlag.Name) {
-		if c, err := hexutil.Decode(ctx.String(utils.BeaconCheckpointFlag.Name)); err == nil && len(c) <= 32 {
-			copy(config.Checkpoint[:len(c)], c)
-		} else {
-			utils.Fatalf("Invalid hex string", "beacon.checkpoint", ctx.String(utils.BeaconCheckpointFlag.Name), "error", err)
-		}
-	}
-	return config
-}

beacon/blsync/engineclient.go

@@ -1,150 +0,0 @@
-// Copyright 2024 The go-ethereum Authors
-// This file is part of the go-ethereum library.
-//
-// The go-ethereum library is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// The go-ethereum library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public License
-// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
-
-package blsync
-
-import (
-	"context"
-	"strings"
-	"sync"
-	"time"
-
-	"github.com/ethereum/go-ethereum/beacon/engine"
-	"github.com/ethereum/go-ethereum/beacon/types"
-	"github.com/ethereum/go-ethereum/common"
-	ctypes "github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/log"
-	"github.com/ethereum/go-ethereum/rpc"
-)
-
-type engineClient struct {
-	config     *lightClientConfig
-	rpc        *rpc.Client
-	rootCtx    context.Context
-	cancelRoot context.CancelFunc
-	wg         sync.WaitGroup
-}
-
-func startEngineClient(config *lightClientConfig, rpc *rpc.Client, headCh <-chan types.ChainHeadEvent) *engineClient {
-	ctx, cancel := context.WithCancel(context.Background())
-	ec := &engineClient{
-		config:     config,
-		rpc:        rpc,
-		rootCtx:    ctx,
-		cancelRoot: cancel,
-	}
-	ec.wg.Add(1)
-	go ec.updateLoop(headCh)
-	return ec
-}
-
-func (ec *engineClient) stop() {
-	ec.cancelRoot()
-	ec.wg.Wait()
-}
-
-func (ec *engineClient) updateLoop(headCh <-chan types.ChainHeadEvent) {
-	defer ec.wg.Done()
-
-	for {
-		select {
-		case <-ec.rootCtx.Done():
-			log.Debug("Stopping engine API update loop")
-			return
-
-		case event := <-headCh:
-			if ec.rpc == nil { // dry run, no engine API specified
-				log.Info("New execution block retrieved", "number", event.Block.NumberU64(), "hash", event.Block.Hash(), "finalized", event.Finalized)
-				continue
-			}
-
-			fork := ec.config.ForkAtEpoch(event.BeaconHead.Epoch())
-			forkName := strings.ToLower(fork.Name)
-
-			log.Debug("Calling NewPayload", "number", event.Block.NumberU64(), "hash", event.Block.Hash())
-			if status, err := ec.callNewPayload(forkName, event); err == nil {
-				log.Info("Successful NewPayload", "number", event.Block.NumberU64(), "hash", event.Block.Hash(), "status", status)
-			} else {
-				log.Error("Failed NewPayload", "number", event.Block.NumberU64(), "hash", event.Block.Hash(), "error", err)
-			}
-
-			log.Debug("Calling ForkchoiceUpdated", "head", event.Block.Hash())
-			if status, err := ec.callForkchoiceUpdated(forkName, event); err == nil {
-				log.Info("Successful ForkchoiceUpdated", "head", event.Block.Hash(), "status", status)
-			} else {
-				log.Error("Failed ForkchoiceUpdated", "head", event.Block.Hash(), "error", err)
-			}
-		}
-	}
-}
-
-func (ec *engineClient) callNewPayload(fork string, event types.ChainHeadEvent) (string, error) {
-	execData := engine.BlockToExecutableData(event.Block, nil, nil).ExecutionPayload
-
-	var (
-		method string
-		params = []any{execData}
-	)
-	switch fork {
-	case "deneb":
-		method = "engine_newPayloadV3"
-		parentBeaconRoot := event.BeaconHead.ParentRoot
-		blobHashes := collectBlobHashes(event.Block)
-		params = append(params, blobHashes, parentBeaconRoot)
-	case "capella":
-		method = "engine_newPayloadV2"
-	default:
-		method = "engine_newPayloadV1"
-	}
-
-	ctx, cancel := context.WithTimeout(ec.rootCtx, time.Second*5)
-	defer cancel()
-	var resp engine.PayloadStatusV1
-	err := ec.rpc.CallContext(ctx, &resp, method, params...)
-	return resp.Status, err
-}
-
-func collectBlobHashes(b *ctypes.Block) []common.Hash {
-	list := make([]common.Hash, 0)
-	for _, tx := range b.Transactions() {
-		list = append(list, tx.BlobHashes()...)
-	}
-	return list
-}
-
-func (ec *engineClient) callForkchoiceUpdated(fork string, event types.ChainHeadEvent) (string, error) {
-	update := engine.ForkchoiceStateV1{
-		HeadBlockHash:      event.Block.Hash(),
-		SafeBlockHash:      event.Finalized,
-		FinalizedBlockHash: event.Finalized,
-	}
-
-	var method string
-	switch fork {
-	case "deneb":
-		method = "engine_forkchoiceUpdatedV3"
-	case "capella":
-		method = "engine_forkchoiceUpdatedV2"
-	default:
-		method = "engine_forkchoiceUpdatedV1"
-	}
-
-	ctx, cancel := context.WithTimeout(ec.rootCtx, time.Second*5)
-	defer cancel()
-	var resp engine.ForkChoiceResponse
-	err := ec.rpc.CallContext(ctx, &resp, method, update, nil)
-	return resp.PayloadStatus.Status, err
-}

beacon/engine/gen_ed.go

@@ -17,25 +17,23 @@ var _ = (*executableDataMarshaling)(nil)
 // MarshalJSON marshals as JSON.
 func (e ExecutableData) MarshalJSON() ([]byte, error) {
 	type ExecutableData struct {
-		ParentHash       common.Hash             `json:"parentHash"    gencodec:"required"`
-		FeeRecipient     common.Address          `json:"feeRecipient"  gencodec:"required"`
-		StateRoot        common.Hash             `json:"stateRoot"     gencodec:"required"`
-		ReceiptsRoot     common.Hash             `json:"receiptsRoot"  gencodec:"required"`
-		LogsBloom        hexutil.Bytes           `json:"logsBloom"     gencodec:"required"`
-		Random           common.Hash             `json:"prevRandao"    gencodec:"required"`
-		Number           hexutil.Uint64          `json:"blockNumber"   gencodec:"required"`
-		GasLimit         hexutil.Uint64          `json:"gasLimit"      gencodec:"required"`
-		GasUsed          hexutil.Uint64          `json:"gasUsed"       gencodec:"required"`
-		Timestamp        hexutil.Uint64          `json:"timestamp"     gencodec:"required"`
-		ExtraData        hexutil.Bytes           `json:"extraData"     gencodec:"required"`
-		BaseFeePerGas    *hexutil.Big            `json:"baseFeePerGas" gencodec:"required"`
-		BlockHash        common.Hash             `json:"blockHash"     gencodec:"required"`
-		Transactions     []hexutil.Bytes         `json:"transactions"  gencodec:"required"`
-		Withdrawals      []*types.Withdrawal     `json:"withdrawals"`
-		BlobGasUsed      *hexutil.Uint64         `json:"blobGasUsed"`
-		ExcessBlobGas    *hexutil.Uint64         `json:"excessBlobGas"`
-		Deposits         types.Deposits          `json:"depositRequests"`
-		ExecutionWitness *types.ExecutionWitness `json:"executionWitness,omitempty"`
+		ParentHash    common.Hash         `json:"parentHash"    gencodec:"required"`
+		FeeRecipient  common.Address      `json:"feeRecipient"  gencodec:"required"`
+		StateRoot     common.Hash         `json:"stateRoot"     gencodec:"required"`
+		ReceiptsRoot  common.Hash         `json:"receiptsRoot"  gencodec:"required"`
+		LogsBloom     hexutil.Bytes       `json:"logsBloom"     gencodec:"required"`
+		Random        common.Hash         `json:"prevRandao"    gencodec:"required"`
+		Number        hexutil.Uint64      `json:"blockNumber"   gencodec:"required"`
+		GasLimit      hexutil.Uint64      `json:"gasLimit"      gencodec:"required"`
+		GasUsed       hexutil.Uint64      `json:"gasUsed"       gencodec:"required"`
+		Timestamp     hexutil.Uint64      `json:"timestamp"     gencodec:"required"`
+		ExtraData     hexutil.Bytes       `json:"extraData"     gencodec:"required"`
+		BaseFeePerGas *hexutil.Big        `json:"baseFeePerGas" gencodec:"required"`
+		BlockHash     common.Hash         `json:"blockHash"     gencodec:"required"`
+		Transactions  []hexutil.Bytes     `json:"transactions"  gencodec:"required"`
+		Withdrawals   []*types.Withdrawal `json:"withdrawals"`
+		BlobGasUsed   *hexutil.Uint64     `json:"blobGasUsed"`
+		ExcessBlobGas *hexutil.Uint64     `json:"excessBlobGas"`
 	}
 	var enc ExecutableData
 	enc.ParentHash = e.ParentHash
@@ -60,33 +58,29 @@ func (e ExecutableData) MarshalJSON() ([]byte, error) {
 	enc.Withdrawals = e.Withdrawals
 	enc.BlobGasUsed = (*hexutil.Uint64)(e.BlobGasUsed)
 	enc.ExcessBlobGas = (*hexutil.Uint64)(e.ExcessBlobGas)
-	enc.Deposits = e.Deposits
-	enc.ExecutionWitness = e.ExecutionWitness
 	return json.Marshal(&enc)
 }
 
 // UnmarshalJSON unmarshals from JSON.
 func (e *ExecutableData) UnmarshalJSON(input []byte) error {
 	type ExecutableData struct {
-		ParentHash       *common.Hash            `json:"parentHash"    gencodec:"required"`
-		FeeRecipient     *common.Address         `json:"feeRecipient"  gencodec:"required"`
-		StateRoot        *common.Hash            `json:"stateRoot"     gencodec:"required"`
-		ReceiptsRoot     *common.Hash            `json:"receiptsRoot"  gencodec:"required"`
-		LogsBloom        *hexutil.Bytes          `json:"logsBloom"     gencodec:"required"`
-		Random           *common.Hash            `json:"prevRandao"    gencodec:"required"`
-		Number           *hexutil.Uint64         `json:"blockNumber"   gencodec:"required"`
-		GasLimit         *hexutil.Uint64         `json:"gasLimit"      gencodec:"required"`
-		GasUsed          *hexutil.Uint64         `json:"gasUsed"       gencodec:"required"`
-		Timestamp        *hexutil.Uint64         `json:"timestamp"     gencodec:"required"`
-		ExtraData        *hexutil.Bytes          `json:"extraData"     gencodec:"required"`
-		BaseFeePerGas    *hexutil.Big            `json:"baseFeePerGas" gencodec:"required"`
-		BlockHash        *common.Hash            `json:"blockHash"     gencodec:"required"`
-		Transactions     []hexutil.Bytes         `json:"transactions"  gencodec:"required"`
-		Withdrawals      []*types.Withdrawal     `json:"withdrawals"`
-		BlobGasUsed      *hexutil.Uint64         `json:"blobGasUsed"`
-		ExcessBlobGas    *hexutil.Uint64         `json:"excessBlobGas"`
-		Deposits         *types.Deposits         `json:"depositRequests"`
-		ExecutionWitness *types.ExecutionWitness `json:"executionWitness,omitempty"`
+		ParentHash    *common.Hash        `json:"parentHash"    gencodec:"required"`
+		FeeRecipient  *common.Address     `json:"feeRecipient"  gencodec:"required"`
+		StateRoot     *common.Hash        `json:"stateRoot"     gencodec:"required"`
+		ReceiptsRoot  *common.Hash        `json:"receiptsRoot"  gencodec:"required"`
+		LogsBloom     *hexutil.Bytes      `json:"logsBloom"     gencodec:"required"`
+		Random        *common.Hash        `json:"prevRandao"    gencodec:"required"`
+		Number        *hexutil.Uint64     `json:"blockNumber"   gencodec:"required"`
+		GasLimit      *hexutil.Uint64     `json:"gasLimit"      gencodec:"required"`
+		GasUsed       *hexutil.Uint64     `json:"gasUsed"       gencodec:"required"`
+		Timestamp     *hexutil.Uint64     `json:"timestamp"     gencodec:"required"`
+		ExtraData     *hexutil.Bytes      `json:"extraData"     gencodec:"required"`
+		BaseFeePerGas *hexutil.Big        `json:"baseFeePerGas" gencodec:"required"`
+		BlockHash     *common.Hash        `json:"blockHash"     gencodec:"required"`
+		Transactions  []hexutil.Bytes     `json:"transactions"  gencodec:"required"`
+		Withdrawals   []*types.Withdrawal `json:"withdrawals"`
+		BlobGasUsed   *hexutil.Uint64     `json:"blobGasUsed"`
+		ExcessBlobGas *hexutil.Uint64     `json:"excessBlobGas"`
 	}
 	var dec ExecutableData
 	if err := json.Unmarshal(input, &dec); err != nil {
@@ -160,11 +154,5 @@ func (e *ExecutableData) UnmarshalJSON(input []byte) error {
 	if dec.ExcessBlobGas != nil {
 		e.ExcessBlobGas = (*uint64)(dec.ExcessBlobGas)
 	}
-	if dec.Deposits != nil {
-		e.Deposits = *dec.Deposits
-	}
-	if dec.ExecutionWitness != nil {
-		e.ExecutionWitness = dec.ExecutionWitness
-	}
 	return nil
 }

beacon/engine/gen_epe.go

@@ -19,14 +19,12 @@ func (e ExecutionPayloadEnvelope) MarshalJSON() ([]byte, error) {
 		BlockValue       *hexutil.Big    `json:"blockValue"  gencodec:"required"`
 		BlobsBundle      *BlobsBundleV1  `json:"blobsBundle"`
 		Override         bool            `json:"shouldOverrideBuilder"`
-		Witness          *hexutil.Bytes  `json:"witness"`
 	}
 	var enc ExecutionPayloadEnvelope
 	enc.ExecutionPayload = e.ExecutionPayload
 	enc.BlockValue = (*hexutil.Big)(e.BlockValue)
 	enc.BlobsBundle = e.BlobsBundle
 	enc.Override = e.Override
-	enc.Witness = e.Witness
 	return json.Marshal(&enc)
 }
 
@@ -37,7 +35,6 @@ func (e *ExecutionPayloadEnvelope) UnmarshalJSON(input []byte) error {
 		BlockValue       *hexutil.Big    `json:"blockValue"  gencodec:"required"`
 		BlobsBundle      *BlobsBundleV1  `json:"blobsBundle"`
 		Override         *bool           `json:"shouldOverrideBuilder"`
-		Witness          *hexutil.Bytes  `json:"witness"`
 	}
 	var dec ExecutionPayloadEnvelope
 	if err := json.Unmarshal(input, &dec); err != nil {
@@ -57,8 +54,5 @@ func (e *ExecutionPayloadEnvelope) UnmarshalJSON(input []byte) error {
 	if dec.Override != nil {
 		e.Override = *dec.Override
 	}
-	if dec.Witness != nil {
-		e.Witness = dec.Witness
-	}
 	return nil
 }

beacon/engine/types.go

@@ -19,12 +19,10 @@ package engine
 import (
 	"fmt"
 	"math/big"
-	"slices"
 
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/common/hexutil"
 	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/params"
 	"github.com/ethereum/go-ethereum/trie"
 )
 
@@ -59,25 +57,23 @@ type payloadAttributesMarshaling struct {
 
 // ExecutableData is the data necessary to execute an EL payload.
 type ExecutableData struct {
-	ParentHash       common.Hash             `json:"parentHash"    gencodec:"required"`
-	FeeRecipient     common.Address          `json:"feeRecipient"  gencodec:"required"`
-	StateRoot        common.Hash             `json:"stateRoot"     gencodec:"required"`
-	ReceiptsRoot     common.Hash             `json:"receiptsRoot"  gencodec:"required"`
-	LogsBloom        []byte                  `json:"logsBloom"     gencodec:"required"`
-	Random           common.Hash             `json:"prevRandao"    gencodec:"required"`
-	Number           uint64                  `json:"blockNumber"   gencodec:"required"`
-	GasLimit         uint64                  `json:"gasLimit"      gencodec:"required"`
-	GasUsed          uint64                  `json:"gasUsed"       gencodec:"required"`
-	Timestamp        uint64                  `json:"timestamp"     gencodec:"required"`
-	ExtraData        []byte                  `json:"extraData"     gencodec:"required"`
-	BaseFeePerGas    *big.Int                `json:"baseFeePerGas" gencodec:"required"`
-	BlockHash        common.Hash             `json:"blockHash"     gencodec:"required"`
-	Transactions     [][]byte                `json:"transactions"  gencodec:"required"`
-	Withdrawals      []*types.Withdrawal     `json:"withdrawals"`
-	BlobGasUsed      *uint64                 `json:"blobGasUsed"`
-	ExcessBlobGas    *uint64                 `json:"excessBlobGas"`
-	Deposits         types.Deposits          `json:"depositRequests"`
-	ExecutionWitness *types.ExecutionWitness `json:"executionWitness,omitempty"`
+	ParentHash    common.Hash         `json:"parentHash"    gencodec:"required"`
+	FeeRecipient  common.Address      `json:"feeRecipient"  gencodec:"required"`
+	StateRoot     common.Hash         `json:"stateRoot"     gencodec:"required"`
+	ReceiptsRoot  common.Hash         `json:"receiptsRoot"  gencodec:"required"`
+	LogsBloom     []byte              `json:"logsBloom"     gencodec:"required"`
+	Random        common.Hash         `json:"prevRandao"    gencodec:"required"`
+	Number        uint64              `json:"blockNumber"   gencodec:"required"`
+	GasLimit      uint64              `json:"gasLimit"      gencodec:"required"`
+	GasUsed       uint64              `json:"gasUsed"       gencodec:"required"`
+	Timestamp     uint64              `json:"timestamp"     gencodec:"required"`
+	ExtraData     []byte              `json:"extraData"     gencodec:"required"`
+	BaseFeePerGas *big.Int            `json:"baseFeePerGas" gencodec:"required"`
+	BlockHash     common.Hash         `json:"blockHash"     gencodec:"required"`
+	Transactions  [][]byte            `json:"transactions"  gencodec:"required"`
+	Withdrawals   []*types.Withdrawal `json:"withdrawals"`
+	BlobGasUsed   *uint64             `json:"blobGasUsed"`
+	ExcessBlobGas *uint64             `json:"excessBlobGas"`
 }
 
 // JSON type overrides for executableData.
@@ -94,14 +90,6 @@ type executableDataMarshaling struct {
 	ExcessBlobGas *hexutil.Uint64
 }
 
-// StatelessPayloadStatusV1 is the result of a stateless payload execution.
-type StatelessPayloadStatusV1 struct {
-	Status          string      `json:"status"`
-	StateRoot       common.Hash `json:"stateRoot"`
-	ReceiptsRoot    common.Hash `json:"receiptsRoot"`
-	ValidationError *string     `json:"validationError"`
-}
-
 //go:generate go run github.com/fjl/gencodec -type ExecutionPayloadEnvelope -field-override executionPayloadEnvelopeMarshaling -out gen_epe.go
 
 type ExecutionPayloadEnvelope struct {
@@ -109,7 +97,6 @@ type ExecutionPayloadEnvelope struct {
 	BlockValue       *big.Int        `json:"blockValue"  gencodec:"required"`
 	BlobsBundle      *BlobsBundleV1  `json:"blobsBundle"`
 	Override         bool            `json:"shouldOverrideBuilder"`
-	Witness          *hexutil.Bytes  `json:"witness"`
 }
 
 type BlobsBundleV1 struct {
@@ -124,10 +111,9 @@ type executionPayloadEnvelopeMarshaling struct {
 }
 
 type PayloadStatusV1 struct {
-	Status          string         `json:"status"`
-	Witness         *hexutil.Bytes `json:"witness"`
-	LatestValidHash *common.Hash   `json:"latestValidHash"`
-	ValidationError *string        `json:"validationError"`
+	Status          string       `json:"status"`
+	LatestValidHash *common.Hash `json:"latestValidHash"`
+	ValidationError *string      `json:"validationError"`
 }
 
 type TransitionConfigurationV1 struct {
@@ -146,7 +132,12 @@ func (b PayloadID) Version() PayloadVersion {
 
 // Is returns whether the identifier matches any of provided payload versions.
 func (b PayloadID) Is(versions ...PayloadVersion) bool {
-	return slices.Contains(versions, b.Version())
+	for _, v := range versions {
+		if v == b.Version() {
+			return true
+		}
+	}
+	return false
 }
 
 func (b PayloadID) String() string {
@@ -206,37 +197,23 @@ func decodeTransactions(enc [][]byte) ([]*types.Transaction, error) {
 //
 // and that the blockhash of the constructed block matches the parameters. Nil
 // Withdrawals value will propagate through the returned block. Empty
-// Withdrawals value must be passed via non-nil, length 0 value in data.
-func ExecutableDataToBlock(data ExecutableData, versionedHashes []common.Hash, beaconRoot *common.Hash) (*types.Block, error) {
-	block, err := ExecutableDataToBlockNoHash(data, versionedHashes, beaconRoot)
+// Withdrawals value must be passed via non-nil, length 0 value in params.
+func ExecutableDataToBlock(params ExecutableData, versionedHashes []common.Hash, beaconRoot *common.Hash) (*types.Block, error) {
+	txs, err := decodeTransactions(params.Transactions)
 	if err != nil {
 		return nil, err
 	}
-	if block.Hash() != data.BlockHash {
-		return nil, fmt.Errorf("blockhash mismatch, want %x, got %x", data.BlockHash, block.Hash())
+	if len(params.ExtraData) > 32 {
+		return nil, fmt.Errorf("invalid extradata length: %v", len(params.ExtraData))
 	}
-	return block, nil
-}
-
-// ExecutableDataToBlockNoHash is analogous to ExecutableDataToBlock, but is used
-// for stateless execution, so it skips checking if the executable data hashes to
-// the requested hash (stateless has to *compute* the root hash, it's not given).
-func ExecutableDataToBlockNoHash(data ExecutableData, versionedHashes []common.Hash, beaconRoot *common.Hash) (*types.Block, error) {
-	txs, err := decodeTransactions(data.Transactions)
-	if err != nil {
-		return nil, err
-	}
-	if len(data.ExtraData) > int(params.MaximumExtraDataSize) {
-		return nil, fmt.Errorf("invalid extradata length: %v", len(data.ExtraData))
-	}
-	if len(data.LogsBloom) != 256 {
-		return nil, fmt.Errorf("invalid logsBloom length: %v", len(data.LogsBloom))
+	if len(params.LogsBloom) != 256 {
+		return nil, fmt.Errorf("invalid logsBloom length: %v", len(params.LogsBloom))
 	}
 	// Check that baseFeePerGas is not negative or too big
-	if data.BaseFeePerGas != nil && (data.BaseFeePerGas.Sign() == -1 || data.BaseFeePerGas.BitLen() > 256) {
-		return nil, fmt.Errorf("invalid baseFeePerGas: %v", data.BaseFeePerGas)
+	if params.BaseFeePerGas != nil && (params.BaseFeePerGas.Sign() == -1 || params.BaseFeePerGas.BitLen() > 256) {
+		return nil, fmt.Errorf("invalid baseFeePerGas: %v", params.BaseFeePerGas)
 	}
-	var blobHashes = make([]common.Hash, 0, len(txs))
+	var blobHashes []common.Hash
 	for _, tx := range txs {
 		blobHashes = append(blobHashes, tx.BlobHashes()...)
 	}
@@ -252,73 +229,59 @@ func ExecutableDataToBlockNoHash(data ExecutableData, versionedHashes []common.H
 	// ExecutableData before withdrawals are enabled by marshaling
 	// Withdrawals as the json null value.
 	var withdrawalsRoot *common.Hash
-	if data.Withdrawals != nil {
-		h := types.DeriveSha(types.Withdrawals(data.Withdrawals), trie.NewStackTrie(nil))
+	if params.Withdrawals != nil {
+		h := types.DeriveSha(types.Withdrawals(params.Withdrawals), trie.NewStackTrie(nil))
 		withdrawalsRoot = &h
 	}
-	// Compute requestsHash if any requests are non-nil.
-	var (
-		requestsHash *common.Hash
-		requests     types.Requests
-	)
-	if data.Deposits != nil {
-		requests = make(types.Requests, 0)
-		for _, d := range data.Deposits {
-			requests = append(requests, types.NewRequest(d))
-		}
-		h := types.DeriveSha(requests, trie.NewStackTrie(nil))
-		requestsHash = &h
-	}
 	header := &types.Header{
-		ParentHash:       data.ParentHash,
+		ParentHash:       params.ParentHash,
 		UncleHash:        types.EmptyUncleHash,
-		Coinbase:         data.FeeRecipient,
-		Root:             data.StateRoot,
+		Coinbase:         params.FeeRecipient,
+		Root:             params.StateRoot,
 		TxHash:           types.DeriveSha(types.Transactions(txs), trie.NewStackTrie(nil)),
-		ReceiptHash:      data.ReceiptsRoot,
-		Bloom:            types.BytesToBloom(data.LogsBloom),
+		ReceiptHash:      params.ReceiptsRoot,
+		Bloom:            types.BytesToBloom(params.LogsBloom),
 		Difficulty:       common.Big0,
-		Number:           new(big.Int).SetUint64(data.Number),
-		GasLimit:         data.GasLimit,
-		GasUsed:          data.GasUsed,
-		Time:             data.Timestamp,
-		BaseFee:          data.BaseFeePerGas,
-		Extra:            data.ExtraData,
-		MixDigest:        data.Random,
+		Number:           new(big.Int).SetUint64(params.Number),
+		GasLimit:         params.GasLimit,
+		GasUsed:          params.GasUsed,
+		Time:             params.Timestamp,
+		BaseFee:          params.BaseFeePerGas,
+		Extra:            params.ExtraData,
+		MixDigest:        params.Random,
 		WithdrawalsHash:  withdrawalsRoot,
-		ExcessBlobGas:    data.ExcessBlobGas,
-		BlobGasUsed:      data.BlobGasUsed,
+		ExcessBlobGas:    params.ExcessBlobGas,
+		BlobGasUsed:      params.BlobGasUsed,
 		ParentBeaconRoot: beaconRoot,
-		RequestsHash:     requestsHash,
 	}
-	return types.NewBlockWithHeader(header).
-			WithBody(types.Body{Transactions: txs, Uncles: nil, Withdrawals: data.Withdrawals, Requests: requests}).
-			WithWitness(data.ExecutionWitness),
-		nil
+	block := types.NewBlockWithHeader(header).WithBody(txs, nil /* uncles */).WithWithdrawals(params.Withdrawals)
+	if block.Hash() != params.BlockHash {
+		return nil, fmt.Errorf("blockhash mismatch, want %x, got %x", params.BlockHash, block.Hash())
+	}
+	return block, nil
 }
 
 // BlockToExecutableData constructs the ExecutableData structure by filling the
 // fields from the given block. It assumes the given block is post-merge block.
 func BlockToExecutableData(block *types.Block, fees *big.Int, sidecars []*types.BlobTxSidecar) *ExecutionPayloadEnvelope {
 	data := &ExecutableData{
-		BlockHash:        block.Hash(),
-		ParentHash:       block.ParentHash(),
-		FeeRecipient:     block.Coinbase(),
-		StateRoot:        block.Root(),
-		Number:           block.NumberU64(),
-		GasLimit:         block.GasLimit(),
-		GasUsed:          block.GasUsed(),
-		BaseFeePerGas:    block.BaseFee(),
-		Timestamp:        block.Time(),
-		ReceiptsRoot:     block.ReceiptHash(),
-		LogsBloom:        block.Bloom().Bytes(),
-		Transactions:     encodeTransactions(block.Transactions()),
-		Random:           block.MixDigest(),
-		ExtraData:        block.Extra(),
-		Withdrawals:      block.Withdrawals(),
-		BlobGasUsed:      block.BlobGasUsed(),
-		ExcessBlobGas:    block.ExcessBlobGas(),
-		ExecutionWitness: block.ExecutionWitness(),
+		BlockHash:     block.Hash(),
+		ParentHash:    block.ParentHash(),
+		FeeRecipient:  block.Coinbase(),
+		StateRoot:     block.Root(),
+		Number:        block.NumberU64(),
+		GasLimit:      block.GasLimit(),
+		GasUsed:       block.GasUsed(),
+		BaseFeePerGas: block.BaseFee(),
+		Timestamp:     block.Time(),
+		ReceiptsRoot:  block.ReceiptHash(),
+		LogsBloom:     block.Bloom().Bytes(),
+		Transactions:  encodeTransactions(block.Transactions()),
+		Random:        block.MixDigest(),
+		ExtraData:     block.Extra(),
+		Withdrawals:   block.Withdrawals(),
+		BlobGasUsed:   block.BlobGasUsed(),
+		ExcessBlobGas: block.ExcessBlobGas(),
 	}
 	bundle := BlobsBundleV1{
 		Commitments: make([]hexutil.Bytes, 0),
@@ -332,30 +295,13 @@ func BlockToExecutableData(block *types.Block, fees *big.Int, sidecars []*types.
 			bundle.Proofs = append(bundle.Proofs, hexutil.Bytes(sidecar.Proofs[j][:]))
 		}
 	}
-	setRequests(block.Requests(), data)
 	return &ExecutionPayloadEnvelope{ExecutionPayload: data, BlockValue: fees, BlobsBundle: &bundle, Override: false}
 }
 
-// setRequests differentiates the different request types and
-// assigns them to the associated fields in ExecutableData.
-func setRequests(requests types.Requests, data *ExecutableData) {
-	if requests != nil {
-		// If requests is non-nil, it means deposits are available in block and we
-		// should return an empty slice instead of nil if there are no deposits.
-		data.Deposits = make(types.Deposits, 0)
-	}
-	for _, r := range requests {
-		if d, ok := r.Inner().(*types.Deposit); ok {
-			data.Deposits = append(data.Deposits, d)
-		}
-	}
-}
-
-// ExecutionPayloadBody is used in the response to GetPayloadBodiesByHash and GetPayloadBodiesByRange
-type ExecutionPayloadBody struct {
+// ExecutionPayloadBodyV1 is used in the response to GetPayloadBodiesByHashV1 and GetPayloadBodiesByRangeV1
+type ExecutionPayloadBodyV1 struct {
 	TransactionData []hexutil.Bytes     `json:"transactions"`
 	Withdrawals     []*types.Withdrawal `json:"withdrawals"`
-	Deposits        types.Deposits      `json:"depositRequests"`
 }
 
 // Client identifiers to support ClientVersionV1.
@@ -367,7 +313,7 @@ const (
 // ClientVersionV1 contains information which identifies a client implementation.
 type ClientVersionV1 struct {
 	Code    string `json:"code"`
-	Name    string `json:"name"`
+	Name    string `json:"clientName"`
 	Version string `json:"version"`
 	Commit  string `json:"commit"`
 }

beacon/light/api/api_server.go

@@ -1,114 +0,0 @@
-// Copyright 2023 The go-ethereum Authors
-// This file is part of the go-ethereum library.
-//
-// The go-ethereum library is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// The go-ethereum library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public License
-// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
-
-package api
-
-import (
-	"reflect"
-
-	"github.com/ethereum/go-ethereum/beacon/light/request"
-	"github.com/ethereum/go-ethereum/beacon/light/sync"
-	"github.com/ethereum/go-ethereum/beacon/types"
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/log"
-)
-
-// ApiServer is a wrapper around BeaconLightApi that implements request.requestServer.
-type ApiServer struct {
-	api           *BeaconLightApi
-	eventCallback func(event request.Event)
-	unsubscribe   func()
-}
-
-// NewApiServer creates a new ApiServer.
-func NewApiServer(api *BeaconLightApi) *ApiServer {
-	return &ApiServer{api: api}
-}
-
-// Subscribe implements request.requestServer.
-func (s *ApiServer) Subscribe(eventCallback func(event request.Event)) {
-	s.eventCallback = eventCallback
-	listener := HeadEventListener{
-		OnNewHead: func(slot uint64, blockRoot common.Hash) {
-			log.Debug("New head received", "slot", slot, "blockRoot", blockRoot)
-			eventCallback(request.Event{Type: sync.EvNewHead, Data: types.HeadInfo{Slot: slot, BlockRoot: blockRoot}})
-		},
-		OnOptimistic: func(update types.OptimisticUpdate) {
-			log.Debug("New optimistic update received", "slot", update.Attested.Slot, "blockRoot", update.Attested.Hash(), "signerCount", update.Signature.SignerCount())
-			eventCallback(request.Event{Type: sync.EvNewOptimisticUpdate, Data: update})
-		},
-		OnFinality: func(update types.FinalityUpdate) {
-			log.Debug("New finality update received", "slot", update.Attested.Slot, "blockRoot", update.Attested.Hash(), "signerCount", update.Signature.SignerCount())
-			eventCallback(request.Event{Type: sync.EvNewFinalityUpdate, Data: update})
-		},
-		OnError: func(err error) {
-			log.Warn("Head event stream error", "err", err)
-		},
-	}
-	s.unsubscribe = s.api.StartHeadListener(listener)
-}
-
-// SendRequest implements request.requestServer.
-func (s *ApiServer) SendRequest(id request.ID, req request.Request) {
-	go func() {
-		var resp request.Response
-		var err error
-		switch data := req.(type) {
-		case sync.ReqUpdates:
-			log.Debug("Beacon API: requesting light client update", "reqid", id, "period", data.FirstPeriod, "count", data.Count)
-			var r sync.RespUpdates
-			r.Updates, r.Committees, err = s.api.GetBestUpdatesAndCommittees(data.FirstPeriod, data.Count)
-			resp = r
-		case sync.ReqHeader:
-			var r sync.RespHeader
-			log.Debug("Beacon API: requesting header", "reqid", id, "hash", common.Hash(data))
-			r.Header, r.Canonical, r.Finalized, err = s.api.GetHeader(common.Hash(data))
-			resp = r
-		case sync.ReqCheckpointData:
-			log.Debug("Beacon API: requesting checkpoint data", "reqid", id, "hash", common.Hash(data))
-			resp, err = s.api.GetCheckpointData(common.Hash(data))
-		case sync.ReqBeaconBlock:
-			log.Debug("Beacon API: requesting block", "reqid", id, "hash", common.Hash(data))
-			resp, err = s.api.GetBeaconBlock(common.Hash(data))
-		case sync.ReqFinality:
-			log.Debug("Beacon API: requesting finality update")
-			resp, err = s.api.GetFinalityUpdate()
-		default:
-		}
-
-		if err != nil {
-			log.Warn("Beacon API request failed", "type", reflect.TypeOf(req), "reqid", id, "err", err)
-			s.eventCallback(request.Event{Type: request.EvFail, Data: request.RequestResponse{ID: id, Request: req}})
-		} else {
-			log.Debug("Beacon API request answered", "type", reflect.TypeOf(req), "reqid", id)
-			s.eventCallback(request.Event{Type: request.EvResponse, Data: request.RequestResponse{ID: id, Request: req, Response: resp}})
-		}
-	}()
-}
-
-// Unsubscribe implements request.requestServer.
-// Note: Unsubscribe should not be called concurrently with Subscribe.
-func (s *ApiServer) Unsubscribe() {
-	if s.unsubscribe != nil {
-		s.unsubscribe()
-		s.unsubscribe = nil
-	}
-}
-
-// Name implements request.Server
-func (s *ApiServer) Name() string {
-	return s.api.url
-}

beacon/light/api/light_api.go

@@ -1,599 +0,0 @@
-// Copyright 2022 The go-ethereum Authors
-// This file is part of the go-ethereum library.
-//
-// The go-ethereum library is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// The go-ethereum library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more detaiapi.
-//
-// You should have received a copy of the GNU Lesser General Public License
-// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
-
-package api
-
-import (
-	"context"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"io"
-	"net/http"
-	"net/url"
-	"strconv"
-	"sync"
-	"time"
-
-	"github.com/donovanhide/eventsource"
-	"github.com/ethereum/go-ethereum/beacon/merkle"
-	"github.com/ethereum/go-ethereum/beacon/params"
-	"github.com/ethereum/go-ethereum/beacon/types"
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/common/hexutil"
-	"github.com/ethereum/go-ethereum/log"
-)
-
-var (
-	ErrNotFound = errors.New("404 Not Found")
-	ErrInternal = errors.New("500 Internal Server Error")
-)
-
-type CommitteeUpdate struct {
-	Version           string
-	Update            types.LightClientUpdate
-	NextSyncCommittee types.SerializedSyncCommittee
-}
-
-// See data structure definition here:
-// https://github.com/ethereum/consensus-specs/blob/dev/specs/altair/light-client/sync-protocol.md#lightclientupdate
-type committeeUpdateJson struct {
-	Version string              `json:"version"`
-	Data    committeeUpdateData `json:"data"`
-}
-
-type committeeUpdateData struct {
-	Header                  jsonBeaconHeader              `json:"attested_header"`
-	NextSyncCommittee       types.SerializedSyncCommittee `json:"next_sync_committee"`
-	NextSyncCommitteeBranch merkle.Values                 `json:"next_sync_committee_branch"`
-	FinalizedHeader         *jsonBeaconHeader             `json:"finalized_header,omitempty"`
-	FinalityBranch          merkle.Values                 `json:"finality_branch,omitempty"`
-	SyncAggregate           types.SyncAggregate           `json:"sync_aggregate"`
-	SignatureSlot           common.Decimal                `json:"signature_slot"`
-}
-
-type jsonBeaconHeader struct {
-	Beacon types.Header `json:"beacon"`
-}
-
-type jsonHeaderWithExecProof struct {
-	Beacon          types.Header    `json:"beacon"`
-	Execution       json.RawMessage `json:"execution"`
-	ExecutionBranch merkle.Values   `json:"execution_branch"`
-}
-
-// UnmarshalJSON unmarshals from JSON.
-func (u *CommitteeUpdate) UnmarshalJSON(input []byte) error {
-	var dec committeeUpdateJson
-	if err := json.Unmarshal(input, &dec); err != nil {
-		return err
-	}
-	u.Version = dec.Version
-	u.NextSyncCommittee = dec.Data.NextSyncCommittee
-	u.Update = types.LightClientUpdate{
-		AttestedHeader: types.SignedHeader{
-			Header:        dec.Data.Header.Beacon,
-			Signature:     dec.Data.SyncAggregate,
-			SignatureSlot: uint64(dec.Data.SignatureSlot),
-		},
-		NextSyncCommitteeRoot:   u.NextSyncCommittee.Root(),
-		NextSyncCommitteeBranch: dec.Data.NextSyncCommitteeBranch,
-		FinalityBranch:          dec.Data.FinalityBranch,
-	}
-	if dec.Data.FinalizedHeader != nil {
-		u.Update.FinalizedHeader = &dec.Data.FinalizedHeader.Beacon
-	}
-	return nil
-}
-
-// fetcher is an interface useful for debug-harnessing the http api.
-type fetcher interface {
-	Do(req *http.Request) (*http.Response, error)
-}
-
-// BeaconLightApi requests light client information from a beacon node REST API.
-// Note: all required API endpoints are currently only implemented by Lodestar.
-type BeaconLightApi struct {
-	url           string
-	client        fetcher
-	customHeaders map[string]string
-}
-
-func NewBeaconLightApi(url string, customHeaders map[string]string) *BeaconLightApi {
-	return &BeaconLightApi{
-		url: url,
-		client: &http.Client{
-			Timeout: time.Second * 10,
-		},
-		customHeaders: customHeaders,
-	}
-}
-
-func (api *BeaconLightApi) httpGet(path string, params url.Values) ([]byte, error) {
-	uri, err := api.buildURL(path, params)
-	if err != nil {
-		return nil, err
-	}
-	req, err := http.NewRequest("GET", uri, nil)
-	if err != nil {
-		return nil, err
-	}
-	for k, v := range api.customHeaders {
-		req.Header.Set(k, v)
-	}
-	resp, err := api.client.Do(req)
-	if err != nil {
-		return nil, err
-	}
-	defer resp.Body.Close()
-	switch resp.StatusCode {
-	case 200:
-		return io.ReadAll(resp.Body)
-	case 404:
-		return nil, ErrNotFound
-	case 500:
-		return nil, ErrInternal
-	default:
-		return nil, fmt.Errorf("unexpected error from API endpoint \"%s\": status code %d", path, resp.StatusCode)
-	}
-}
-
-// GetBestUpdatesAndCommittees fetches and validates LightClientUpdate for given
-// period and full serialized committee for the next period (committee root hash
-// equals update.NextSyncCommitteeRoot).
-// Note that the results are validated but the update signature should be verified
-// by the caller as its validity depends on the update chain.
-func (api *BeaconLightApi) GetBestUpdatesAndCommittees(firstPeriod, count uint64) ([]*types.LightClientUpdate, []*types.SerializedSyncCommittee, error) {
-	resp, err := api.httpGet("/eth/v1/beacon/light_client/updates", map[string][]string{
-		"start_period": {strconv.FormatUint(firstPeriod, 10)},
-		"count":        {strconv.FormatUint(count, 10)},
-	})
-	if err != nil {
-		return nil, nil, err
-	}
-
-	var data []CommitteeUpdate
-	if err := json.Unmarshal(resp, &data); err != nil {
-		return nil, nil, err
-	}
-	if len(data) != int(count) {
-		return nil, nil, errors.New("invalid number of committee updates")
-	}
-	updates := make([]*types.LightClientUpdate, int(count))
-	committees := make([]*types.SerializedSyncCommittee, int(count))
-	for i, d := range data {
-		if d.Update.AttestedHeader.Header.SyncPeriod() != firstPeriod+uint64(i) {
-			return nil, nil, errors.New("wrong committee update header period")
-		}
-		if err := d.Update.Validate(); err != nil {
-			return nil, nil, err
-		}
-		if d.NextSyncCommittee.Root() != d.Update.NextSyncCommitteeRoot {
-			return nil, nil, errors.New("wrong sync committee root")
-		}
-		updates[i], committees[i] = new(types.LightClientUpdate), new(types.SerializedSyncCommittee)
-		*updates[i], *committees[i] = d.Update, d.NextSyncCommittee
-	}
-	return updates, committees, nil
-}
-
-// GetOptimisticUpdate fetches the latest available optimistic update.
-// Note that the signature should be verified by the caller as its validity
-// depends on the update chain.
-//
-// See data structure definition here:
-// https://github.com/ethereum/consensus-specs/blob/dev/specs/altair/light-client/sync-protocol.md#lightclientoptimisticupdate
-func (api *BeaconLightApi) GetOptimisticUpdate() (types.OptimisticUpdate, error) {
-	resp, err := api.httpGet("/eth/v1/beacon/light_client/optimistic_update", nil)
-	if err != nil {
-		return types.OptimisticUpdate{}, err
-	}
-	return decodeOptimisticUpdate(resp)
-}
-
-func decodeOptimisticUpdate(enc []byte) (types.OptimisticUpdate, error) {
-	var data struct {
-		Version string
-		Data    struct {
-			Attested      jsonHeaderWithExecProof `json:"attested_header"`
-			Aggregate     types.SyncAggregate     `json:"sync_aggregate"`
-			SignatureSlot common.Decimal          `json:"signature_slot"`
-		} `json:"data"`
-	}
-	if err := json.Unmarshal(enc, &data); err != nil {
-		return types.OptimisticUpdate{}, err
-	}
-	// Decode the execution payload headers.
-	attestedExecHeader, err := types.ExecutionHeaderFromJSON(data.Version, data.Data.Attested.Execution)
-	if err != nil {
-		return types.OptimisticUpdate{}, fmt.Errorf("invalid attested header: %v", err)
-	}
-	if data.Data.Attested.Beacon.StateRoot == (common.Hash{}) {
-		// workaround for different event encoding format in Lodestar
-		if err := json.Unmarshal(enc, &data.Data); err != nil {
-			return types.OptimisticUpdate{}, err
-		}
-	}
-
-	if len(data.Data.Aggregate.Signers) != params.SyncCommitteeBitmaskSize {
-		return types.OptimisticUpdate{}, errors.New("invalid sync_committee_bits length")
-	}
-	if len(data.Data.Aggregate.Signature) != params.BLSSignatureSize {
-		return types.OptimisticUpdate{}, errors.New("invalid sync_committee_signature length")
-	}
-	return types.OptimisticUpdate{
-		Attested: types.HeaderWithExecProof{
-			Header:        data.Data.Attested.Beacon,
-			PayloadHeader: attestedExecHeader,
-			PayloadBranch: data.Data.Attested.ExecutionBranch,
-		},
-		Signature:     data.Data.Aggregate,
-		SignatureSlot: uint64(data.Data.SignatureSlot),
-	}, nil
-}
-
-// GetFinalityUpdate fetches the latest available finality update.
-//
-// See data structure definition here:
-// https://github.com/ethereum/consensus-specs/blob/dev/specs/altair/light-client/sync-protocol.md#lightclientfinalityupdate
-func (api *BeaconLightApi) GetFinalityUpdate() (types.FinalityUpdate, error) {
-	resp, err := api.httpGet("/eth/v1/beacon/light_client/finality_update", nil)
-	if err != nil {
-		return types.FinalityUpdate{}, err
-	}
-	return decodeFinalityUpdate(resp)
-}
-
-func decodeFinalityUpdate(enc []byte) (types.FinalityUpdate, error) {
-	var data struct {
-		Version string
-		Data    struct {
-			Attested       jsonHeaderWithExecProof `json:"attested_header"`
-			Finalized      jsonHeaderWithExecProof `json:"finalized_header"`
-			FinalityBranch merkle.Values           `json:"finality_branch"`
-			Aggregate      types.SyncAggregate     `json:"sync_aggregate"`
-			SignatureSlot  common.Decimal          `json:"signature_slot"`
-		}
-	}
-	if err := json.Unmarshal(enc, &data); err != nil {
-		return types.FinalityUpdate{}, err
-	}
-	// Decode the execution payload headers.
-	attestedExecHeader, err := types.ExecutionHeaderFromJSON(data.Version, data.Data.Attested.Execution)
-	if err != nil {
-		return types.FinalityUpdate{}, fmt.Errorf("invalid attested header: %v", err)
-	}
-	finalizedExecHeader, err := types.ExecutionHeaderFromJSON(data.Version, data.Data.Finalized.Execution)
-	if err != nil {
-		return types.FinalityUpdate{}, fmt.Errorf("invalid finalized header: %v", err)
-	}
-	// Perform sanity checks.
-	if len(data.Data.Aggregate.Signers) != params.SyncCommitteeBitmaskSize {
-		return types.FinalityUpdate{}, errors.New("invalid sync_committee_bits length")
-	}
-	if len(data.Data.Aggregate.Signature) != params.BLSSignatureSize {
-		return types.FinalityUpdate{}, errors.New("invalid sync_committee_signature length")
-	}
-
-	return types.FinalityUpdate{
-		Attested: types.HeaderWithExecProof{
-			Header:        data.Data.Attested.Beacon,
-			PayloadHeader: attestedExecHeader,
-			PayloadBranch: data.Data.Attested.ExecutionBranch,
-		},
-		Finalized: types.HeaderWithExecProof{
-			Header:        data.Data.Finalized.Beacon,
-			PayloadHeader: finalizedExecHeader,
-			PayloadBranch: data.Data.Finalized.ExecutionBranch,
-		},
-		FinalityBranch: data.Data.FinalityBranch,
-		Signature:      data.Data.Aggregate,
-		SignatureSlot:  uint64(data.Data.SignatureSlot),
-	}, nil
-}
-
-// GetHeader fetches and validates the beacon header with the given blockRoot.
-// If blockRoot is null hash then the latest head header is fetched.
-// The values of the canonical and finalized flags are also returned. Note that
-// these flags are not validated.
-func (api *BeaconLightApi) GetHeader(blockRoot common.Hash) (types.Header, bool, bool, error) {
-	var blockId string
-	if blockRoot == (common.Hash{}) {
-		blockId = "head"
-	} else {
-		blockId = blockRoot.Hex()
-	}
-	resp, err := api.httpGet(fmt.Sprintf("/eth/v1/beacon/headers/%s", blockId), nil)
-	if err != nil {
-		return types.Header{}, false, false, err
-	}
-
-	var data struct {
-		Finalized bool `json:"finalized"`
-		Data      struct {
-			Root      common.Hash `json:"root"`
-			Canonical bool        `json:"canonical"`
-			Header    struct {
-				Message   types.Header  `json:"message"`
-				Signature hexutil.Bytes `json:"signature"`
-			} `json:"header"`
-		} `json:"data"`
-	}
-	if err := json.Unmarshal(resp, &data); err != nil {
-		return types.Header{}, false, false, err
-	}
-	header := data.Data.Header.Message
-	if blockRoot == (common.Hash{}) {
-		blockRoot = data.Data.Root
-	}
-	if header.Hash() != blockRoot {
-		return types.Header{}, false, false, errors.New("retrieved beacon header root does not match")
-	}
-	return header, data.Data.Canonical, data.Finalized, nil
-}
-
-// GetCheckpointData fetches and validates bootstrap data belonging to the given checkpoint.
-func (api *BeaconLightApi) GetCheckpointData(checkpointHash common.Hash) (*types.BootstrapData, error) {
-	resp, err := api.httpGet(fmt.Sprintf("/eth/v1/beacon/light_client/bootstrap/0x%x", checkpointHash[:]), nil)
-	if err != nil {
-		return nil, err
-	}
-
-	// See data structure definition here:
-	// https://github.com/ethereum/consensus-specs/blob/dev/specs/altair/light-client/sync-protocol.md#lightclientbootstrap
-	type bootstrapData struct {
-		Data struct {
-			Header          jsonBeaconHeader               `json:"header"`
-			Committee       *types.SerializedSyncCommittee `json:"current_sync_committee"`
-			CommitteeBranch merkle.Values                  `json:"current_sync_committee_branch"`
-		} `json:"data"`
-	}
-
-	var data bootstrapData
-	if err := json.Unmarshal(resp, &data); err != nil {
-		return nil, err
-	}
-	if data.Data.Committee == nil {
-		return nil, errors.New("sync committee is missing")
-	}
-	header := data.Data.Header.Beacon
-	if header.Hash() != checkpointHash {
-		return nil, fmt.Errorf("invalid checkpoint block header, have %v want %v", header.Hash(), checkpointHash)
-	}
-	checkpoint := &types.BootstrapData{
-		Header:          header,
-		CommitteeBranch: data.Data.CommitteeBranch,
-		CommitteeRoot:   data.Data.Committee.Root(),
-		Committee:       data.Data.Committee,
-	}
-	if err := checkpoint.Validate(); err != nil {
-		return nil, fmt.Errorf("invalid checkpoint: %w", err)
-	}
-	if checkpoint.Header.Hash() != checkpointHash {
-		return nil, errors.New("wrong checkpoint hash")
-	}
-	return checkpoint, nil
-}
-
-func (api *BeaconLightApi) GetBeaconBlock(blockRoot common.Hash) (*types.BeaconBlock, error) {
-	resp, err := api.httpGet(fmt.Sprintf("/eth/v2/beacon/blocks/0x%x", blockRoot), nil)
-	if err != nil {
-		return nil, err
-	}
-
-	var beaconBlockMessage struct {
-		Version string
-		Data    struct {
-			Message json.RawMessage `json:"message"`
-		}
-	}
-	if err := json.Unmarshal(resp, &beaconBlockMessage); err != nil {
-		return nil, fmt.Errorf("invalid block json data: %v", err)
-	}
-	block, err := types.BlockFromJSON(beaconBlockMessage.Version, beaconBlockMessage.Data.Message)
-	if err != nil {
-		return nil, err
-	}
-	computedRoot := block.Root()
-	if computedRoot != blockRoot {
-		return nil, fmt.Errorf("Beacon block root hash mismatch (expected: %x, got: %x)", blockRoot, computedRoot)
-	}
-	return block, nil
-}
-
-func decodeHeadEvent(enc []byte) (uint64, common.Hash, error) {
-	var data struct {
-		Slot  common.Decimal `json:"slot"`
-		Block common.Hash    `json:"block"`
-	}
-	if err := json.Unmarshal(enc, &data); err != nil {
-		return 0, common.Hash{}, err
-	}
-	return uint64(data.Slot), data.Block, nil
-}
-
-type HeadEventListener struct {
-	OnNewHead    func(slot uint64, blockRoot common.Hash)
-	OnOptimistic func(head types.OptimisticUpdate)
-	OnFinality   func(head types.FinalityUpdate)
-	OnError      func(err error)
-}
-
-// StartHeadListener creates an event subscription for heads and signed (optimistic)
-// head updates and calls the specified callback functions when they are received.
-// The callbacks are also called for the current head and optimistic head at startup.
-// They are never called concurrently.
-func (api *BeaconLightApi) StartHeadListener(listener HeadEventListener) func() {
-	var (
-		ctx, closeCtx = context.WithCancel(context.Background())
-		streamCh      = make(chan *eventsource.Stream, 1)
-		wg            sync.WaitGroup
-	)
-
-	// When connected to a Lodestar node the subscription blocks until the first actual
-	// event arrives; therefore we create the subscription in a separate goroutine while
-	// letting the main goroutine sync up to the current head.
-	wg.Add(1)
-	go func() {
-		defer wg.Done()
-		stream := api.startEventStream(ctx, &listener)
-		if stream == nil {
-			// This case happens when the context was closed.
-			return
-		}
-		// Stream was opened, wait for close signal.
-		streamCh <- stream
-		<-ctx.Done()
-		stream.Close()
-	}()
-
-	wg.Add(1)
-	go func() {
-		defer wg.Done()
-
-		// Request initial data.
-		log.Trace("Requesting initial head header")
-		if head, _, _, err := api.GetHeader(common.Hash{}); err == nil {
-			log.Trace("Retrieved initial head header", "slot", head.Slot, "hash", head.Hash())
-			listener.OnNewHead(head.Slot, head.Hash())
-		} else {
-			log.Debug("Failed to retrieve initial head header", "error", err)
-		}
-		log.Trace("Requesting initial optimistic update")
-		if optimisticUpdate, err := api.GetOptimisticUpdate(); err == nil {
-			log.Trace("Retrieved initial optimistic update", "slot", optimisticUpdate.Attested.Slot, "hash", optimisticUpdate.Attested.Hash())
-			listener.OnOptimistic(optimisticUpdate)
-		} else {
-			log.Debug("Failed to retrieve initial optimistic update", "error", err)
-		}
-		log.Trace("Requesting initial finality update")
-		if finalityUpdate, err := api.GetFinalityUpdate(); err == nil {
-			log.Trace("Retrieved initial finality update", "slot", finalityUpdate.Finalized.Slot, "hash", finalityUpdate.Finalized.Hash())
-			listener.OnFinality(finalityUpdate)
-		} else {
-			log.Debug("Failed to retrieve initial finality update", "error", err)
-		}
-
-		log.Trace("Starting event stream processing loop")
-		// Receive the stream.
-		var stream *eventsource.Stream
-		select {
-		case stream = <-streamCh:
-		case <-ctx.Done():
-			log.Trace("Stopping event stream processing loop")
-			return
-		}
-
-		for {
-			select {
-			case event, ok := <-stream.Events:
-				if !ok {
-					log.Trace("Event stream closed")
-					return
-				}
-				log.Trace("New event received from event stream", "type", event.Event())
-				switch event.Event() {
-				case "head":
-					slot, blockRoot, err := decodeHeadEvent([]byte(event.Data()))
-					if err == nil {
-						listener.OnNewHead(slot, blockRoot)
-					} else {
-						listener.OnError(fmt.Errorf("error decoding head event: %v", err))
-					}
-				case "light_client_optimistic_update":
-					optimisticUpdate, err := decodeOptimisticUpdate([]byte(event.Data()))
-					if err == nil {
-						listener.OnOptimistic(optimisticUpdate)
-					} else {
-						listener.OnError(fmt.Errorf("error decoding optimistic update event: %v", err))
-					}
-				case "light_client_finality_update":
-					finalityUpdate, err := decodeFinalityUpdate([]byte(event.Data()))
-					if err == nil {
-						listener.OnFinality(finalityUpdate)
-					} else {
-						listener.OnError(fmt.Errorf("error decoding finality update event: %v", err))
-					}
-				default:
-					listener.OnError(fmt.Errorf("unexpected event: %s", event.Event()))
-				}
-
-			case err, ok := <-stream.Errors:
-				if !ok {
-					return
-				}
-				listener.OnError(err)
-			}
-		}
-	}()
-
-	return func() {
-		closeCtx()
-		wg.Wait()
-	}
-}
-
-// startEventStream establishes an event stream. This will keep retrying until the stream has been
-// established. It can only return nil when the context is canceled.
-func (api *BeaconLightApi) startEventStream(ctx context.Context, listener *HeadEventListener) *eventsource.Stream {
-	for retry := true; retry; retry = ctxSleep(ctx, 5*time.Second) {
-		log.Trace("Sending event subscription request")
-		uri, err := api.buildURL("/eth/v1/events", map[string][]string{"topics": {"head", "light_client_finality_update", "light_client_optimistic_update"}})
-		if err != nil {
-			listener.OnError(fmt.Errorf("error creating event subscription URL: %v", err))
-			continue
-		}
-		req, err := http.NewRequestWithContext(ctx, "GET", uri, nil)
-		if err != nil {
-			listener.OnError(fmt.Errorf("error creating event subscription request: %v", err))
-			continue
-		}
-		for k, v := range api.customHeaders {
-			req.Header.Set(k, v)
-		}
-		stream, err := eventsource.SubscribeWithRequest("", req)
-		if err != nil {
-			listener.OnError(fmt.Errorf("error creating event subscription: %v", err))
-			continue
-		}
-		log.Trace("Successfully created event stream")
-		return stream
-	}
-	return nil
-}
-
-func ctxSleep(ctx context.Context, timeout time.Duration) (ok bool) {
-	timer := time.NewTimer(timeout)
-	defer timer.Stop()
-	select {
-	case <-timer.C:
-		return true
-	case <-ctx.Done():
-		return false
-	}
-}
-
-func (api *BeaconLightApi) buildURL(path string, params url.Values) (string, error) {
-	uri, err := url.Parse(api.url)
-	if err != nil {
-		return "", err
-	}
-	uri = uri.JoinPath(path)
-	if params != nil {
-		uri.RawQuery = params.Encode()
-	}
-	return uri.String(), nil
-}

beacon/light/committee_chain.go

@@ -70,7 +70,6 @@ type CommitteeChain struct {
 	committees          *canonicalStore[*types.SerializedSyncCommittee]
 	fixedCommitteeRoots *canonicalStore[common.Hash]
 	committeeCache      *lru.Cache[uint64, syncCommittee] // cache deserialized committees
-	changeCounter       uint64
 
 	clock       mclock.Clock         // monotonic clock (simulated clock in tests)
 	unixNano    func() int64         // system clock (simulated clock in tests)
@@ -87,11 +86,6 @@ func NewCommitteeChain(db ethdb.KeyValueStore, config *types.ChainConfig, signer
 	return newCommitteeChain(db, config, signerThreshold, enforceTime, blsVerifier{}, &mclock.System{}, func() int64 { return time.Now().UnixNano() })
 }
 
-// NewTestCommitteeChain creates a new CommitteeChain for testing.
-func NewTestCommitteeChain(db ethdb.KeyValueStore, config *types.ChainConfig, signerThreshold int, enforceTime bool, clock *mclock.Simulated) *CommitteeChain {
-	return newCommitteeChain(db, config, signerThreshold, enforceTime, dummyVerifier{}, clock, func() int64 { return int64(clock.Now()) })
-}
-
 // newCommitteeChain creates a new CommitteeChain with the option of replacing the
 // clock source and signature verification for testing purposes.
 func newCommitteeChain(db ethdb.KeyValueStore, config *types.ChainConfig, signerThreshold int, enforceTime bool, sigVerifier committeeSigVerifier, clock mclock.Clock, unixNano func() int64) *CommitteeChain {
@@ -187,20 +181,20 @@ func (s *CommitteeChain) Reset() {
 	if err := s.rollback(0); err != nil {
 		log.Error("Error writing batch into chain database", "error", err)
 	}
-	s.changeCounter++
 }
 
-// CheckpointInit initializes a CommitteeChain based on a checkpoint.
+// CheckpointInit initializes a CommitteeChain based on the checkpoint.
 // Note: if the chain is already initialized and the committees proven by the
 // checkpoint do match the existing chain then the chain is retained and the
 // new checkpoint becomes fixed.
-func (s *CommitteeChain) CheckpointInit(bootstrap types.BootstrapData) error {
+func (s *CommitteeChain) CheckpointInit(bootstrap *types.BootstrapData) error {
 	s.chainmu.Lock()
 	defer s.chainmu.Unlock()
 
 	if err := bootstrap.Validate(); err != nil {
 		return err
 	}
+
 	period := bootstrap.Header.SyncPeriod()
 	if err := s.deleteFixedCommitteeRootsFrom(period + 2); err != nil {
 		s.Reset()
@@ -221,7 +215,6 @@ func (s *CommitteeChain) CheckpointInit(bootstrap types.BootstrapData) error {
 		s.Reset()
 		return err
 	}
-	s.changeCounter++
 	return nil
 }
 
@@ -374,7 +367,6 @@ func (s *CommitteeChain) InsertUpdate(update *types.LightClientUpdate, nextCommi
 			return ErrWrongCommitteeRoot
 		}
 	}
-	s.changeCounter++
 	if reorg {
 		if err := s.rollback(period + 1); err != nil {
 			return err
@@ -413,13 +405,6 @@ func (s *CommitteeChain) NextSyncPeriod() (uint64, bool) {
 	return s.committees.periods.End - 1, true
 }
 
-func (s *CommitteeChain) ChangeCounter() uint64 {
-	s.chainmu.RLock()
-	defer s.chainmu.RUnlock()
-
-	return s.changeCounter
-}
-
 // rollback removes all committees and fixed roots from the given period and updates
 // starting from the previous period.
 func (s *CommitteeChain) rollback(period uint64) error {
@@ -467,12 +452,12 @@ func (s *CommitteeChain) getSyncCommittee(period uint64) (syncCommittee, error)
 	if sc, ok := s.committees.get(s.db, period); ok {
 		c, err := s.sigVerifier.deserializeSyncCommittee(sc)
 		if err != nil {
-			return nil, fmt.Errorf("sync committee #%d deserialization error: %v", period, err)
+			return nil, fmt.Errorf("Sync committee #%d deserialization error: %v", period, err)
 		}
 		s.committeeCache.Add(period, c)
 		return c, nil
 	}
-	return nil, fmt.Errorf("missing serialized sync committee #%d", period)
+	return nil, fmt.Errorf("Missing serialized sync committee #%d", period)
 }
 
 // VerifySignedHeader returns true if the given signed header has a valid signature

beacon/light/committee_chain_test.go

@@ -241,12 +241,12 @@ func newCommitteeChainTest(t *testing.T, config types.ChainConfig, signerThresho
 		signerThreshold: signerThreshold,
 		enforceTime:     enforceTime,
 	}
-	c.chain = NewTestCommitteeChain(c.db, &config, signerThreshold, enforceTime, c.clock)
+	c.chain = newCommitteeChain(c.db, &config, signerThreshold, enforceTime, dummyVerifier{}, c.clock, func() int64 { return int64(c.clock.Now()) })
 	return c
 }
 
 func (c *committeeChainTest) reloadChain() {
-	c.chain = NewTestCommitteeChain(c.db, &c.config, c.signerThreshold, c.enforceTime, c.clock)
+	c.chain = newCommitteeChain(c.db, &c.config, c.signerThreshold, c.enforceTime, dummyVerifier{}, c.clock, func() int64 { return int64(c.clock.Now()) })
 }
 
 func (c *committeeChainTest) setClockPeriod(period float64) {

beacon/light/head_tracker.go

@@ -1,161 +0,0 @@
-// Copyright 2023 The go-ethereum Authors
-// This file is part of the go-ethereum library.
-//
-// The go-ethereum library is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// The go-ethereum library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public License
-// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
-
-package light
-
-import (
-	"errors"
-	"sync"
-	"time"
-
-	"github.com/ethereum/go-ethereum/beacon/types"
-	"github.com/ethereum/go-ethereum/log"
-)
-
-// HeadTracker keeps track of the latest validated head and the "prefetch" head
-// which is the (not necessarily validated) head announced by the majority of
-// servers.
-type HeadTracker struct {
-	lock                sync.RWMutex
-	committeeChain      *CommitteeChain
-	minSignerCount      int
-	optimisticUpdate    types.OptimisticUpdate
-	hasOptimisticUpdate bool
-	finalityUpdate      types.FinalityUpdate
-	hasFinalityUpdate   bool
-	prefetchHead        types.HeadInfo
-	changeCounter       uint64
-}
-
-// NewHeadTracker creates a new HeadTracker.
-func NewHeadTracker(committeeChain *CommitteeChain, minSignerCount int) *HeadTracker {
-	return &HeadTracker{
-		committeeChain: committeeChain,
-		minSignerCount: minSignerCount,
-	}
-}
-
-// ValidatedOptimistic returns the latest validated optimistic update.
-func (h *HeadTracker) ValidatedOptimistic() (types.OptimisticUpdate, bool) {
-	h.lock.RLock()
-	defer h.lock.RUnlock()
-
-	return h.optimisticUpdate, h.hasOptimisticUpdate
-}
-
-// ValidatedFinality returns the latest validated finality update.
-func (h *HeadTracker) ValidatedFinality() (types.FinalityUpdate, bool) {
-	h.lock.RLock()
-	defer h.lock.RUnlock()
-
-	return h.finalityUpdate, h.hasFinalityUpdate
-}
-
-// ValidateOptimistic validates the given optimistic update. If the update is
-// successfully validated and it is better than the old validated update (higher
-// slot or same slot and more signers) then ValidatedOptimistic is updated.
-// The boolean return flag signals if ValidatedOptimistic has been changed.
-func (h *HeadTracker) ValidateOptimistic(update types.OptimisticUpdate) (bool, error) {
-	h.lock.Lock()
-	defer h.lock.Unlock()
-
-	if err := update.Validate(); err != nil {
-		return false, err
-	}
-	replace, err := h.validate(update.SignedHeader(), h.optimisticUpdate.SignedHeader())
-	if replace {
-		h.optimisticUpdate, h.hasOptimisticUpdate = update, true
-		h.changeCounter++
-	}
-	return replace, err
-}
-
-// ValidateFinality validates the given finality update. If the update is
-// successfully validated and it is better than the old validated update (higher
-// slot or same slot and more signers) then ValidatedFinality is updated.
-// The boolean return flag signals if ValidatedFinality has been changed.
-func (h *HeadTracker) ValidateFinality(update types.FinalityUpdate) (bool, error) {
-	h.lock.Lock()
-	defer h.lock.Unlock()
-
-	if err := update.Validate(); err != nil {
-		return false, err
-	}
-	replace, err := h.validate(update.SignedHeader(), h.finalityUpdate.SignedHeader())
-	if replace {
-		h.finalityUpdate, h.hasFinalityUpdate = update, true
-		h.changeCounter++
-	}
-	return replace, err
-}
-
-func (h *HeadTracker) validate(head, oldHead types.SignedHeader) (bool, error) {
-	signerCount := head.Signature.SignerCount()
-	if signerCount < h.minSignerCount {
-		return false, errors.New("low signer count")
-	}
-	if head.Header.Slot < oldHead.Header.Slot || (head.Header.Slot == oldHead.Header.Slot && signerCount <= oldHead.Signature.SignerCount()) {
-		return false, nil
-	}
-	sigOk, age, err := h.committeeChain.VerifySignedHeader(head)
-	if err != nil {
-		return false, err
-	}
-	if age < 0 {
-		log.Warn("Future signed head received", "age", age)
-	}
-	if age > time.Minute*2 {
-		log.Warn("Old signed head received", "age", age)
-	}
-	if !sigOk {
-		return false, errors.New("invalid header signature")
-	}
-	return true, nil
-}
-
-// PrefetchHead returns the latest known prefetch head's head info.
-// This head can be used to start fetching related data hoping that it will be
-// validated soon.
-// Note that the prefetch head cannot be validated cryptographically so it should
-// only be used as a performance optimization hint.
-func (h *HeadTracker) PrefetchHead() types.HeadInfo {
-	h.lock.RLock()
-	defer h.lock.RUnlock()
-
-	return h.prefetchHead
-}
-
-// SetPrefetchHead sets the prefetch head info.
-// Note that HeadTracker does not verify the prefetch head, just acts as a thread
-// safe bulletin board.
-func (h *HeadTracker) SetPrefetchHead(head types.HeadInfo) {
-	h.lock.Lock()
-	defer h.lock.Unlock()
-
-	if head == h.prefetchHead {
-		return
-	}
-	h.prefetchHead = head
-	h.changeCounter++
-}
-
-// ChangeCounter implements request.targetData
-func (h *HeadTracker) ChangeCounter() uint64 {
-	h.lock.RLock()
-	defer h.lock.RUnlock()
-
-	return h.changeCounter
-}

beacon/light/request/scheduler.go

@@ -1,403 +0,0 @@
-// Copyright 2023 The go-ethereum Authors
-// This file is part of the go-ethereum library.
-//
-// The go-ethereum library is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// The go-ethereum library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public License
-// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
-
-package request
-
-import (
-	"sync"
-
-	"github.com/ethereum/go-ethereum/log"
-)
-
-// Module represents a mechanism which is typically responsible for downloading
-// and updating a passive data structure. It does not directly interact with the
-// servers. It can start requests using the Requester interface, maintain its
-// internal state by receiving and processing Events and update its target data
-// structure based on the obtained data.
-// It is the Scheduler's responsibility to feed events to the modules, call
-// Process as long as there might be something to process and then generate request
-// candidates using MakeRequest and start the best possible requests.
-// Modules are called by Scheduler whenever a global trigger is fired. All events
-// fire the trigger. Changing a target data structure also triggers a next
-// processing round as it could make further actions possible either by the same
-// or another Module.
-type Module interface {
-	// Process is a non-blocking function responsible for starting requests,
-	// processing events and updating the target data structures(s) and the
-	// internal state of the module. Module state typically consists of information
-	// about pending requests and registered servers.
-	// Process is always called after an event is received or after a target data
-	// structure has been changed.
-	//
-	// Note: Process functions of different modules are never called concurrently;
-	// they are called by Scheduler in the same order of priority as they were
-	// registered in.
-	Process(Requester, []Event)
-}
-
-// Requester allows Modules to obtain the list of momentarily available servers,
-// start new requests and report server failure when a response has been proven
-// to be invalid in the processing phase.
-// Note that all Requester functions should be safe to call from Module.Process.
-type Requester interface {
-	CanSendTo() []Server
-	Send(Server, Request) ID
-	Fail(Server, string)
-}
-
-// Scheduler is a modular network data retrieval framework that coordinates multiple
-// servers and retrieval mechanisms (modules). It implements a trigger mechanism
-// that calls the Process function of registered modules whenever either the state
-// of existing data structures or events coming from registered servers could
-// allow new operations.
-type Scheduler struct {
-	lock    sync.Mutex
-	modules []Module // first has the highest priority
-	names   map[Module]string
-	servers map[server]struct{}
-	targets map[targetData]uint64
-
-	requesterLock sync.RWMutex
-	serverOrder   []server
-	pending       map[ServerAndID]pendingRequest
-
-	// eventLock guards access to the events list. Note that eventLock can be
-	// locked either while lock is locked or unlocked but lock cannot be locked
-	// while eventLock is locked.
-	eventLock sync.Mutex
-	events    []Event
-	stopCh    chan chan struct{}
-
-	triggerCh chan struct{} // restarts waiting sync loop
-	// if trigger has already been fired then send to testWaitCh blocks until
-	// the triggered processing round is finished
-	testWaitCh chan struct{}
-}
-
-type (
-	// Server identifies a server without allowing any direct interaction.
-	// Note: server interface is used by Scheduler and Tracker but not used by
-	// the modules that do not interact with them directly.
-	// In order to make module testing easier, Server interface is used in
-	// events and modules.
-	Server interface {
-		Name() string
-	}
-	Request     any
-	Response    any
-	ID          uint64
-	ServerAndID struct {
-		Server Server
-		ID     ID
-	}
-)
-
-// targetData represents a registered target data structure that increases its
-// ChangeCounter whenever it has been changed.
-type targetData interface {
-	ChangeCounter() uint64
-}
-
-// pendingRequest keeps track of sent and not yet finalized requests and their
-// sender modules.
-type pendingRequest struct {
-	request Request
-	module  Module
-}
-
-// NewScheduler creates a new Scheduler.
-func NewScheduler() *Scheduler {
-	s := &Scheduler{
-		servers: make(map[server]struct{}),
-		names:   make(map[Module]string),
-		pending: make(map[ServerAndID]pendingRequest),
-		targets: make(map[targetData]uint64),
-		stopCh:  make(chan chan struct{}),
-		// Note: testWaitCh should not have capacity in order to ensure
-		// that after a trigger happens testWaitCh will block until the resulting
-		// processing round has been finished
-		triggerCh:  make(chan struct{}, 1),
-		testWaitCh: make(chan struct{}),
-	}
-	return s
-}
-
-// RegisterTarget registers a target data structure, ensuring that any changes
-// made to it trigger a new round of Module.Process calls, giving a chance to
-// modules to react to the changes.
-func (s *Scheduler) RegisterTarget(t targetData) {
-	s.lock.Lock()
-	defer s.lock.Unlock()
-
-	s.targets[t] = 0
-}
-
-// RegisterModule registers a module. Should be called before starting the scheduler.
-// In each processing round the order of module processing depends on the order of
-// registration.
-func (s *Scheduler) RegisterModule(m Module, name string) {
-	s.lock.Lock()
-	defer s.lock.Unlock()
-
-	s.modules = append(s.modules, m)
-	s.names[m] = name
-}
-
-// RegisterServer registers a new server.
-func (s *Scheduler) RegisterServer(server server) {
-	s.lock.Lock()
-	defer s.lock.Unlock()
-
-	s.addEvent(Event{Type: EvRegistered, Server: server})
-	server.subscribe(func(event Event) {
-		event.Server = server
-		s.addEvent(event)
-	})
-}
-
-// UnregisterServer removes a registered server.
-func (s *Scheduler) UnregisterServer(server server) {
-	s.lock.Lock()
-	defer s.lock.Unlock()
-
-	server.unsubscribe()
-	s.addEvent(Event{Type: EvUnregistered, Server: server})
-}
-
-// Start starts the scheduler. It should be called after registering all modules
-// and before registering any servers.
-func (s *Scheduler) Start() {
-	go s.syncLoop()
-}
-
-// Stop stops the scheduler.
-func (s *Scheduler) Stop() {
-	stop := make(chan struct{})
-	s.stopCh <- stop
-	<-stop
-	s.lock.Lock()
-	for server := range s.servers {
-		server.unsubscribe()
-	}
-	s.servers = nil
-	s.lock.Unlock()
-}
-
-// syncLoop is the main event loop responsible for event/data processing and
-// sending new requests.
-// A round of processing starts whenever the global trigger is fired. Triggers
-// fired during a processing round ensure that there is going to be a next round.
-func (s *Scheduler) syncLoop() {
-	for {
-		s.lock.Lock()
-		s.processRound()
-		s.lock.Unlock()
-	loop:
-		for {
-			select {
-			case stop := <-s.stopCh:
-				close(stop)
-				return
-			case <-s.triggerCh:
-				break loop
-			case <-s.testWaitCh:
-			}
-		}
-	}
-}
-
-// targetChanged returns true if a registered target data structure has been
-// changed since the last call to this function.
-func (s *Scheduler) targetChanged() (changed bool) {
-	for target, counter := range s.targets {
-		if newCounter := target.ChangeCounter(); newCounter != counter {
-			s.targets[target] = newCounter
-			changed = true
-		}
-	}
-	return
-}
-
-// processRound runs an entire processing round. It calls the Process functions
-// of all modules, passing all relevant events and repeating Process calls as
-// long as any changes have been made to the registered target data structures.
-// Once all events have been processed and a stable state has been achieved,
-// requests are generated and sent if necessary and possible.
-func (s *Scheduler) processRound() {
-	for {
-		log.Trace("Processing modules")
-		filteredEvents := s.filterEvents()
-		for _, module := range s.modules {
-			log.Trace("Processing module", "name", s.names[module], "events", len(filteredEvents[module]))
-			module.Process(requester{s, module}, filteredEvents[module])
-		}
-		if !s.targetChanged() {
-			break
-		}
-	}
-}
-
-// Trigger starts a new processing round. If fired during processing, it ensures
-// another full round of processing all modules.
-func (s *Scheduler) Trigger() {
-	select {
-	case s.triggerCh <- struct{}{}:
-	default:
-	}
-}
-
-// addEvent adds an event to be processed in the next round. Note that it can be
-// called regardless of the state of the lock mutex, making it safe for use in
-// the server event callback.
-func (s *Scheduler) addEvent(event Event) {
-	s.eventLock.Lock()
-	s.events = append(s.events, event)
-	s.eventLock.Unlock()
-	s.Trigger()
-}
-
-// filterEvent sorts each Event either as a request event or a server event,
-// depending on its type. Request events are also sorted in a map based on the
-// module that originally initiated the request. It also ensures that no events
-// related to a server are returned before EvRegistered or after EvUnregistered.
-// In case of an EvUnregistered server event it also closes all pending requests
-// to the given server by adding a failed request event (EvFail), ensuring that
-// all requests get finalized and thereby allowing the module logic to be safe
-// and simple.
-func (s *Scheduler) filterEvents() map[Module][]Event {
-	s.eventLock.Lock()
-	events := s.events
-	s.events = nil
-	s.eventLock.Unlock()
-
-	s.requesterLock.Lock()
-	defer s.requesterLock.Unlock()
-
-	filteredEvents := make(map[Module][]Event)
-	for _, event := range events {
-		server := event.Server.(server)
-		if _, ok := s.servers[server]; !ok && event.Type != EvRegistered {
-			continue // before EvRegister or after EvUnregister, discard
-		}
-
-		if event.IsRequestEvent() {
-			sid, _, _ := event.RequestInfo()
-			pending, ok := s.pending[sid]
-			if !ok {
-				continue // request already closed, ignore further events
-			}
-			if event.Type == EvResponse || event.Type == EvFail {
-				delete(s.pending, sid) // final event, close pending request
-			}
-			filteredEvents[pending.module] = append(filteredEvents[pending.module], event)
-		} else {
-			switch event.Type {
-			case EvRegistered:
-				s.servers[server] = struct{}{}
-				s.serverOrder = append(s.serverOrder, nil)
-				copy(s.serverOrder[1:], s.serverOrder[:len(s.serverOrder)-1])
-				s.serverOrder[0] = server
-			case EvUnregistered:
-				s.closePending(event.Server, filteredEvents)
-				delete(s.servers, server)
-				for i, srv := range s.serverOrder {
-					if srv == server {
-						copy(s.serverOrder[i:len(s.serverOrder)-1], s.serverOrder[i+1:])
-						s.serverOrder = s.serverOrder[:len(s.serverOrder)-1]
-						break
-					}
-				}
-			}
-			for _, module := range s.modules {
-				filteredEvents[module] = append(filteredEvents[module], event)
-			}
-		}
-	}
-	return filteredEvents
-}
-
-// closePending closes all pending requests to the given server and adds an EvFail
-// event to properly finalize them
-func (s *Scheduler) closePending(server Server, filteredEvents map[Module][]Event) {
-	for sid, pending := range s.pending {
-		if sid.Server == server {
-			filteredEvents[pending.module] = append(filteredEvents[pending.module], Event{
-				Type:   EvFail,
-				Server: server,
-				Data: RequestResponse{
-					ID:      sid.ID,
-					Request: pending.request,
-				},
-			})
-			delete(s.pending, sid)
-		}
-	}
-}
-
-// requester implements Requester. Note that while requester basically wraps
-// Scheduler (with the added information of the currently processed Module), all
-// functions are safe to call from Module.Process which is running while
-// the Scheduler.lock mutex is held.
-type requester struct {
-	*Scheduler
-	module Module
-}
-
-// CanSendTo returns the list of currently available servers. It also returns
-// them in an order of least to most recently used, ensuring a round-robin usage
-// of suitable servers if the module always chooses the first suitable one.
-func (s requester) CanSendTo() []Server {
-	s.requesterLock.RLock()
-	defer s.requesterLock.RUnlock()
-
-	list := make([]Server, 0, len(s.serverOrder))
-	for _, server := range s.serverOrder {
-		if server.canRequestNow() {
-			list = append(list, server)
-		}
-	}
-	return list
-}
-
-// Send sends a request and adds an entry to Scheduler.pending map, ensuring that
-// related request events will be delivered to the sender Module.
-func (s requester) Send(srv Server, req Request) ID {
-	s.requesterLock.Lock()
-	defer s.requesterLock.Unlock()
-
-	server := srv.(server)
-	id := server.sendRequest(req)
-	sid := ServerAndID{Server: srv, ID: id}
-	s.pending[sid] = pendingRequest{request: req, module: s.module}
-	for i, ss := range s.serverOrder {
-		if ss == server {
-			copy(s.serverOrder[i:len(s.serverOrder)-1], s.serverOrder[i+1:])
-			s.serverOrder[len(s.serverOrder)-1] = server
-			return id
-		}
-	}
-	log.Error("Target server not found in ordered list of registered servers")
-	return id
-}
-
-// Fail should be called when a server delivers invalid or useless information.
-// Calling Fail disables the given server for a period that is initially short
-// but is exponentially growing if it happens frequently. This results in a
-// somewhat fault tolerant operation that avoids hammering servers with requests
-// that they cannot serve but still gives them a chance periodically.
-func (s requester) Fail(srv Server, desc string) {
-	srv.(server).fail(desc)
-}

beacon/light/request/scheduler_test.go

@@ -1,126 +0,0 @@
-package request
-
-import (
-	"reflect"
-	"testing"
-)
-
-func TestEventFilter(t *testing.T) {
-	s := NewScheduler()
-	module1 := &testModule{name: "module1"}
-	module2 := &testModule{name: "module2"}
-	s.RegisterModule(module1, "module1")
-	s.RegisterModule(module2, "module2")
-	s.Start()
-	// startup process round without events
-	s.testWaitCh <- struct{}{}
-	module1.expProcess(t, nil)
-	module2.expProcess(t, nil)
-	srv := &testServer{}
-	// register server; both modules should receive server event
-	s.RegisterServer(srv)
-	s.testWaitCh <- struct{}{}
-	module1.expProcess(t, []Event{
-		{Type: EvRegistered, Server: srv},
-	})
-	module2.expProcess(t, []Event{
-		{Type: EvRegistered, Server: srv},
-	})
-	// let module1 send a request
-	srv.canRequest = 1
-	module1.sendReq = testRequest
-	s.Trigger()
-	// in first triggered round module1 sends the request, no events yet
-	s.testWaitCh <- struct{}{}
-	module1.expProcess(t, nil)
-	module2.expProcess(t, nil)
-	// server emits EvTimeout; only module1 should receive it
-	srv.eventCb(Event{Type: EvTimeout, Data: RequestResponse{ID: 1, Request: testRequest}})
-	s.testWaitCh <- struct{}{}
-	module1.expProcess(t, []Event{
-		{Type: EvTimeout, Server: srv, Data: RequestResponse{ID: 1, Request: testRequest}},
-	})
-	module2.expProcess(t, nil)
-	// unregister server; both modules should receive server event
-	s.UnregisterServer(srv)
-	s.testWaitCh <- struct{}{}
-	module1.expProcess(t, []Event{
-		// module1 should also receive EvFail on its pending request
-		{Type: EvFail, Server: srv, Data: RequestResponse{ID: 1, Request: testRequest}},
-		{Type: EvUnregistered, Server: srv},
-	})
-	module2.expProcess(t, []Event{
-		{Type: EvUnregistered, Server: srv},
-	})
-	// response after server unregistered; should be discarded
-	srv.eventCb(Event{Type: EvResponse, Data: RequestResponse{ID: 1, Request: testRequest, Response: testResponse}})
-	s.testWaitCh <- struct{}{}
-	module1.expProcess(t, nil)
-	module2.expProcess(t, nil)
-	// no more process rounds expected; shut down
-	s.testWaitCh <- struct{}{}
-	module1.expNoMoreProcess(t)
-	module2.expNoMoreProcess(t)
-	s.Stop()
-}
-
-type testServer struct {
-	eventCb    func(Event)
-	lastID     ID
-	canRequest int
-}
-
-func (s *testServer) Name() string {
-	return ""
-}
-
-func (s *testServer) subscribe(eventCb func(Event)) {
-	s.eventCb = eventCb
-}
-
-func (s *testServer) canRequestNow() bool {
-	return s.canRequest > 0
-}
-
-func (s *testServer) sendRequest(req Request) ID {
-	s.canRequest--
-	s.lastID++
-	return s.lastID
-}
-
-func (s *testServer) fail(string)  {}
-func (s *testServer) unsubscribe() {}
-
-type testModule struct {
-	name      string
-	processed [][]Event
-	sendReq   Request
-}
-
-func (m *testModule) Process(requester Requester, events []Event) {
-	m.processed = append(m.processed, events)
-	if m.sendReq != nil {
-		if cs := requester.CanSendTo(); len(cs) > 0 {
-			requester.Send(cs[0], m.sendReq)
-		}
-	}
-}
-
-func (m *testModule) expProcess(t *testing.T, expEvents []Event) {
-	if len(m.processed) == 0 {
-		t.Errorf("Missing call to %s.Process", m.name)
-		return
-	}
-	events := m.processed[0]
-	m.processed = m.processed[1:]
-	if !reflect.DeepEqual(events, expEvents) {
-		t.Errorf("Call to %s.Process with wrong events (expected %v, got %v)", m.name, expEvents, events)
-	}
-}
-
-func (m *testModule) expNoMoreProcess(t *testing.T) {
-	for len(m.processed) > 0 {
-		t.Errorf("Unexpected call to %s.Process with events %v", m.name, m.processed[0])
-		m.processed = m.processed[1:]
-	}
-}

beacon/light/request/server.go

@@ -1,451 +0,0 @@
-// Copyright 2023 The go-ethereum Authors
-// This file is part of the go-ethereum library.
-//
-// The go-ethereum library is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// The go-ethereum library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public License
-// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
-
-package request
-
-import (
-	"math"
-	"sync"
-	"time"
-
-	"github.com/ethereum/go-ethereum/common/mclock"
-	"github.com/ethereum/go-ethereum/log"
-)
-
-var (
-	// request events
-	EvResponse = &EventType{Name: "response", requestEvent: true} // data: RequestResponse; sent by requestServer
-	EvFail     = &EventType{Name: "fail", requestEvent: true}     // data: RequestResponse; sent by requestServer
-	EvTimeout  = &EventType{Name: "timeout", requestEvent: true}  // data: RequestResponse; sent by serverWithTimeout
-	// server events
-	EvRegistered      = &EventType{Name: "registered"}      // data: nil; sent by Scheduler
-	EvUnregistered    = &EventType{Name: "unregistered"}    // data: nil; sent by Scheduler
-	EvCanRequestAgain = &EventType{Name: "canRequestAgain"} // data: nil; sent by serverWithLimits
-)
-
-const (
-	softRequestTimeout = time.Second      // allow resending request to a different server but do not cancel yet
-	hardRequestTimeout = time.Second * 10 // cancel request
-)
-
-const (
-	// serverWithLimits parameters
-	parallelAdjustUp     = 0.1                    // adjust parallelLimit up in case of success under full load
-	parallelAdjustDown   = 1                      // adjust parallelLimit down in case of timeout/failure
-	minParallelLimit     = 1                      // parallelLimit lower bound
-	defaultParallelLimit = 3                      // parallelLimit initial value
-	minFailureDelay      = time.Millisecond * 100 // minimum disable time in case of request failure
-	maxFailureDelay      = time.Minute            // maximum disable time in case of request failure
-	maxServerEventBuffer = 5                      // server event allowance buffer limit
-	maxServerEventRate   = time.Second            // server event allowance buffer recharge rate
-)
-
-// requestServer can send requests in a non-blocking way and feed back events
-// through the event callback. After each request it should send back either
-// EvResponse or EvFail. Additionally, it may also send application-defined
-// events that the Modules can interpret.
-type requestServer interface {
-	Name() string
-	Subscribe(eventCallback func(Event))
-	SendRequest(ID, Request)
-	Unsubscribe()
-}
-
-// server is implemented by a requestServer wrapped into serverWithTimeout and
-// serverWithLimits and is used by Scheduler.
-// In addition to requestServer functionality, server can also handle timeouts,
-// limit the number of parallel in-flight requests and temporarily disable
-// new requests based on timeouts and response failures.
-type server interface {
-	Server
-	subscribe(eventCallback func(Event))
-	canRequestNow() bool
-	sendRequest(Request) ID
-	fail(string)
-	unsubscribe()
-}
-
-// NewServer wraps a requestServer and returns a server
-func NewServer(rs requestServer, clock mclock.Clock) server {
-	s := &serverWithLimits{}
-	s.parent = rs
-	s.serverWithTimeout.init(clock)
-	s.init()
-	return s
-}
-
-// EventType identifies an event type, either related to a request or the server
-// in general. Server events can also be externally defined.
-type EventType struct {
-	Name         string
-	requestEvent bool // all request events are pre-defined in request package
-}
-
-// Event describes an event where the type of Data depends on Type.
-// Server field is not required when sent through the event callback; it is filled
-// out when processed by the Scheduler. Note that the Scheduler can also create
-// and send events (EvRegistered, EvUnregistered) directly.
-type Event struct {
-	Type   *EventType
-	Server Server // filled by Scheduler
-	Data   any
-}
-
-// IsRequestEvent returns true if the event is a request event
-func (e *Event) IsRequestEvent() bool {
-	return e.Type.requestEvent
-}
-
-// RequestInfo assumes that the event is a request event and returns its contents
-// in a convenient form.
-func (e *Event) RequestInfo() (ServerAndID, Request, Response) {
-	data := e.Data.(RequestResponse)
-	return ServerAndID{Server: e.Server, ID: data.ID}, data.Request, data.Response
-}
-
-// RequestResponse is the Data type of request events.
-type RequestResponse struct {
-	ID       ID
-	Request  Request
-	Response Response
-}
-
-// serverWithTimeout wraps a requestServer and introduces timeouts.
-// The request's lifecycle is concluded if EvResponse or EvFail emitted by the
-// parent requestServer. If this does not happen until softRequestTimeout then
-// EvTimeout is emitted, after which the final EvResponse or EvFail is still
-// guaranteed to follow.
-// If the parent fails to send this final event for hardRequestTimeout then
-// serverWithTimeout emits EvFail and discards any further events from the
-// parent related to the given request.
-type serverWithTimeout struct {
-	parent       requestServer
-	lock         sync.Mutex
-	clock        mclock.Clock
-	childEventCb func(event Event)
-	timeouts     map[ID]mclock.Timer
-	lastID       ID
-}
-
-// Name implements request.Server
-func (s *serverWithTimeout) Name() string {
-	return s.parent.Name()
-}
-
-// init initializes serverWithTimeout
-func (s *serverWithTimeout) init(clock mclock.Clock) {
-	s.clock = clock
-	s.timeouts = make(map[ID]mclock.Timer)
-}
-
-// subscribe subscribes to events which include parent (requestServer) events
-// plus EvTimeout.
-func (s *serverWithTimeout) subscribe(eventCallback func(event Event)) {
-	s.lock.Lock()
-	defer s.lock.Unlock()
-
-	s.childEventCb = eventCallback
-	s.parent.Subscribe(s.eventCallback)
-}
-
-// sendRequest generated a new request ID, emits EvRequest, sets up the timeout
-// timer, then sends the request through the parent (requestServer).
-func (s *serverWithTimeout) sendRequest(request Request) (reqId ID) {
-	s.lock.Lock()
-	s.lastID++
-	id := s.lastID
-	s.startTimeout(RequestResponse{ID: id, Request: request})
-	s.lock.Unlock()
-	s.parent.SendRequest(id, request)
-	return id
-}
-
-// eventCallback is called by parent (requestServer) event subscription.
-func (s *serverWithTimeout) eventCallback(event Event) {
-	s.lock.Lock()
-	defer s.lock.Unlock()
-
-	switch event.Type {
-	case EvResponse, EvFail:
-		id := event.Data.(RequestResponse).ID
-		if timer, ok := s.timeouts[id]; ok {
-			// Note: if stopping the timer is unsuccessful then the resulting AfterFunc
-			// call will just do nothing
-			timer.Stop()
-			delete(s.timeouts, id)
-			if s.childEventCb != nil {
-				s.childEventCb(event)
-			}
-		}
-	default:
-		if s.childEventCb != nil {
-			s.childEventCb(event)
-		}
-	}
-}
-
-// startTimeout starts a timeout timer for the given request.
-func (s *serverWithTimeout) startTimeout(reqData RequestResponse) {
-	id := reqData.ID
-	s.timeouts[id] = s.clock.AfterFunc(softRequestTimeout, func() {
-		s.lock.Lock()
-		if _, ok := s.timeouts[id]; !ok {
-			s.lock.Unlock()
-			return
-		}
-		s.timeouts[id] = s.clock.AfterFunc(hardRequestTimeout-softRequestTimeout, func() {
-			s.lock.Lock()
-			if _, ok := s.timeouts[id]; !ok {
-				s.lock.Unlock()
-				return
-			}
-			delete(s.timeouts, id)
-			childEventCb := s.childEventCb
-			s.lock.Unlock()
-			if childEventCb != nil {
-				childEventCb(Event{Type: EvFail, Data: reqData})
-			}
-		})
-		childEventCb := s.childEventCb
-		s.lock.Unlock()
-		if childEventCb != nil {
-			childEventCb(Event{Type: EvTimeout, Data: reqData})
-		}
-	})
-}
-
-// unsubscribe stops all goroutines associated with the server.
-func (s *serverWithTimeout) unsubscribe() {
-	s.lock.Lock()
-	for _, timer := range s.timeouts {
-		if timer != nil {
-			timer.Stop()
-		}
-	}
-	s.lock.Unlock()
-	s.parent.Unsubscribe()
-}
-
-// serverWithLimits wraps serverWithTimeout and implements server. It limits the
-// number of parallel in-flight requests and prevents sending new requests when a
-// pending one has already timed out. Server events are also rate limited.
-// It also implements a failure delay mechanism that adds an exponentially growing
-// delay each time a request fails (wrong answer or hard timeout). This makes the
-// syncing mechanism less brittle as temporary failures of the server might happen
-// sometimes, but still avoids hammering a non-functional server with requests.
-type serverWithLimits struct {
-	serverWithTimeout
-	lock                       sync.Mutex
-	childEventCb               func(event Event)
-	softTimeouts               map[ID]struct{}
-	pendingCount, timeoutCount int
-	parallelLimit              float32
-	sendEvent                  bool
-	delayTimer                 mclock.Timer
-	delayCounter               int
-	failureDelayEnd            mclock.AbsTime
-	failureDelay               float64
-	serverEventBuffer          int
-	eventBufferUpdated         mclock.AbsTime
-}
-
-// init initializes serverWithLimits
-func (s *serverWithLimits) init() {
-	s.softTimeouts = make(map[ID]struct{})
-	s.parallelLimit = defaultParallelLimit
-	s.serverEventBuffer = maxServerEventBuffer
-}
-
-// subscribe subscribes to events which include parent (serverWithTimeout) events
-// plus EvCanRequestAgain.
-func (s *serverWithLimits) subscribe(eventCallback func(event Event)) {
-	s.lock.Lock()
-	defer s.lock.Unlock()
-
-	s.childEventCb = eventCallback
-	s.serverWithTimeout.subscribe(s.eventCallback)
-}
-
-// eventCallback is called by parent (serverWithTimeout) event subscription.
-func (s *serverWithLimits) eventCallback(event Event) {
-	s.lock.Lock()
-	var sendCanRequestAgain bool
-	passEvent := true
-	switch event.Type {
-	case EvTimeout:
-		id := event.Data.(RequestResponse).ID
-		s.softTimeouts[id] = struct{}{}
-		s.timeoutCount++
-		s.parallelLimit -= parallelAdjustDown
-		if s.parallelLimit < minParallelLimit {
-			s.parallelLimit = minParallelLimit
-		}
-		log.Debug("Server timeout", "count", s.timeoutCount, "parallelLimit", s.parallelLimit)
-	case EvResponse, EvFail:
-		id := event.Data.(RequestResponse).ID
-		if _, ok := s.softTimeouts[id]; ok {
-			delete(s.softTimeouts, id)
-			s.timeoutCount--
-			log.Debug("Server timeout finalized", "count", s.timeoutCount, "parallelLimit", s.parallelLimit)
-		}
-		if event.Type == EvResponse && s.pendingCount >= int(s.parallelLimit) {
-			s.parallelLimit += parallelAdjustUp
-		}
-		s.pendingCount--
-		if s.canRequest() {
-			sendCanRequestAgain = s.sendEvent
-			s.sendEvent = false
-		}
-		if event.Type == EvFail {
-			s.failLocked("failed request")
-		}
-	default:
-		// server event; check rate limit
-		if s.serverEventBuffer < maxServerEventBuffer {
-			now := s.clock.Now()
-			sinceUpdate := time.Duration(now - s.eventBufferUpdated)
-			if sinceUpdate >= maxServerEventRate*time.Duration(maxServerEventBuffer-s.serverEventBuffer) {
-				s.serverEventBuffer = maxServerEventBuffer
-				s.eventBufferUpdated = now
-			} else {
-				addBuffer := int(sinceUpdate / maxServerEventRate)
-				s.serverEventBuffer += addBuffer
-				s.eventBufferUpdated += mclock.AbsTime(maxServerEventRate * time.Duration(addBuffer))
-			}
-		}
-		if s.serverEventBuffer > 0 {
-			s.serverEventBuffer--
-		} else {
-			passEvent = false
-		}
-	}
-	childEventCb := s.childEventCb
-	s.lock.Unlock()
-	if passEvent && childEventCb != nil {
-		childEventCb(event)
-	}
-	if sendCanRequestAgain && childEventCb != nil {
-		childEventCb(Event{Type: EvCanRequestAgain})
-	}
-}
-
-// sendRequest sends a request through the parent (serverWithTimeout).
-func (s *serverWithLimits) sendRequest(request Request) (reqId ID) {
-	s.lock.Lock()
-	s.pendingCount++
-	s.lock.Unlock()
-	return s.serverWithTimeout.sendRequest(request)
-}
-
-// unsubscribe stops all goroutines associated with the server.
-func (s *serverWithLimits) unsubscribe() {
-	s.lock.Lock()
-	if s.delayTimer != nil {
-		s.delayTimer.Stop()
-		s.delayTimer = nil
-	}
-	s.childEventCb = nil
-	s.lock.Unlock()
-	s.serverWithTimeout.unsubscribe()
-}
-
-// canRequest checks whether a new request can be started.
-func (s *serverWithLimits) canRequest() bool {
-	if s.delayTimer != nil || s.pendingCount >= int(s.parallelLimit) || s.timeoutCount > 0 {
-		return false
-	}
-	if s.parallelLimit < minParallelLimit {
-		s.parallelLimit = minParallelLimit
-	}
-	return true
-}
-
-// canRequestNow checks whether a new request can be started, according to the
-// current in-flight request count and parallelLimit, and also the failure delay
-// timer.
-// If it returns false then it is guaranteed that an EvCanRequestAgain will be
-// sent whenever the server becomes available for requesting again.
-func (s *serverWithLimits) canRequestNow() bool {
-	var sendCanRequestAgain bool
-	s.lock.Lock()
-	canRequest := s.canRequest()
-	if canRequest {
-		sendCanRequestAgain = s.sendEvent
-		s.sendEvent = false
-	}
-	childEventCb := s.childEventCb
-	s.lock.Unlock()
-	if sendCanRequestAgain && childEventCb != nil {
-		childEventCb(Event{Type: EvCanRequestAgain})
-	}
-	return canRequest
-}
-
-// delay sets the delay timer to the given duration, disabling new requests for
-// the given period.
-func (s *serverWithLimits) delay(delay time.Duration) {
-	if s.delayTimer != nil {
-		// Note: if stopping the timer is unsuccessful then the resulting AfterFunc
-		// call will just do nothing
-		s.delayTimer.Stop()
-		s.delayTimer = nil
-	}
-
-	s.delayCounter++
-	delayCounter := s.delayCounter
-	log.Debug("Server delay started", "length", delay)
-	s.delayTimer = s.clock.AfterFunc(delay, func() {
-		log.Debug("Server delay ended", "length", delay)
-		var sendCanRequestAgain bool
-		s.lock.Lock()
-		if s.delayTimer != nil && s.delayCounter == delayCounter { // do nothing if there is a new timer now
-			s.delayTimer = nil
-			if s.canRequest() {
-				sendCanRequestAgain = s.sendEvent
-				s.sendEvent = false
-			}
-		}
-		childEventCb := s.childEventCb
-		s.lock.Unlock()
-		if sendCanRequestAgain && childEventCb != nil {
-			childEventCb(Event{Type: EvCanRequestAgain})
-		}
-	})
-}
-
-// fail reports that a response from the server was found invalid by the processing
-// Module, disabling new requests for a dynamically adjusted time period.
-func (s *serverWithLimits) fail(desc string) {
-	s.lock.Lock()
-	defer s.lock.Unlock()
-
-	s.failLocked(desc)
-}
-
-// failLocked calculates the dynamic failure delay and applies it.
-func (s *serverWithLimits) failLocked(desc string) {
-	log.Debug("Server error", "description", desc)
-	s.failureDelay *= 2
-	now := s.clock.Now()
-	if now > s.failureDelayEnd {
-		s.failureDelay *= math.Pow(2, -float64(now-s.failureDelayEnd)/float64(maxFailureDelay))
-	}
-	if s.failureDelay < float64(minFailureDelay) {
-		s.failureDelay = float64(minFailureDelay)
-	}
-	s.failureDelayEnd = now + mclock.AbsTime(s.failureDelay)
-	s.delay(time.Duration(s.failureDelay))
-}

beacon/light/request/server_test.go

@@ -1,182 +0,0 @@
-package request
-
-import (
-	"testing"
-
-	"github.com/ethereum/go-ethereum/common/mclock"
-)
-
-const (
-	testRequest  = "Life, the Universe, and Everything"
-	testResponse = 42
-)
-
-var testEventType = &EventType{Name: "testEvent"}
-
-func TestServerEvents(t *testing.T) {
-	rs := &testRequestServer{}
-	clock := &mclock.Simulated{}
-	srv := NewServer(rs, clock)
-	var lastEventType *EventType
-	srv.subscribe(func(event Event) { lastEventType = event.Type })
-	evTypeName := func(evType *EventType) string {
-		if evType == nil {
-			return "none"
-		}
-		return evType.Name
-	}
-	expEvent := func(expType *EventType) {
-		if lastEventType != expType {
-			t.Errorf("Wrong event type (expected %s, got %s)", evTypeName(expType), evTypeName(lastEventType))
-		}
-		lastEventType = nil
-	}
-	// user events should simply be passed through
-	rs.eventCb(Event{Type: testEventType})
-	expEvent(testEventType)
-	// send request, soft timeout, then valid response
-	srv.sendRequest(testRequest)
-	clock.WaitForTimers(1)
-	clock.Run(softRequestTimeout)
-	expEvent(EvTimeout)
-	rs.eventCb(Event{Type: EvResponse, Data: RequestResponse{ID: 1, Request: testRequest, Response: testResponse}})
-	expEvent(EvResponse)
-	// send request, hard timeout (response after hard timeout should be ignored)
-	srv.sendRequest(testRequest)
-	clock.WaitForTimers(1)
-	clock.Run(softRequestTimeout)
-	expEvent(EvTimeout)
-	clock.WaitForTimers(1)
-	clock.Run(hardRequestTimeout)
-	expEvent(EvFail)
-	rs.eventCb(Event{Type: EvResponse, Data: RequestResponse{ID: 1, Request: testRequest, Response: testResponse}})
-	expEvent(nil)
-	srv.unsubscribe()
-}
-
-func TestServerParallel(t *testing.T) {
-	rs := &testRequestServer{}
-	srv := NewServer(rs, &mclock.Simulated{})
-	srv.subscribe(func(event Event) {})
-
-	expSend := func(expSent int) {
-		var sent int
-		for sent <= expSent {
-			if !srv.canRequestNow() {
-				break
-			}
-			sent++
-			srv.sendRequest(testRequest)
-		}
-		if sent != expSent {
-			t.Errorf("Wrong number of parallel requests accepted (expected %d, got %d)", expSent, sent)
-		}
-	}
-	// max out parallel allowance
-	expSend(defaultParallelLimit)
-	// 1 answered, should accept 1 more
-	rs.eventCb(Event{Type: EvResponse, Data: RequestResponse{ID: 1, Request: testRequest, Response: testResponse}})
-	expSend(1)
-	// 2 answered, should accept 2 more
-	rs.eventCb(Event{Type: EvResponse, Data: RequestResponse{ID: 2, Request: testRequest, Response: testResponse}})
-	rs.eventCb(Event{Type: EvResponse, Data: RequestResponse{ID: 3, Request: testRequest, Response: testResponse}})
-	expSend(2)
-	// failed request, should decrease allowance and not accept more
-	rs.eventCb(Event{Type: EvFail, Data: RequestResponse{ID: 4, Request: testRequest}})
-	expSend(0)
-	srv.unsubscribe()
-}
-
-func TestServerFail(t *testing.T) {
-	rs := &testRequestServer{}
-	clock := &mclock.Simulated{}
-	srv := NewServer(rs, clock)
-	srv.subscribe(func(event Event) {})
-	expCanRequest := func(expCanRequest bool) {
-		if canRequest := srv.canRequestNow(); canRequest != expCanRequest {
-			t.Errorf("Wrong result for canRequestNow (expected %v, got %v)", expCanRequest, canRequest)
-		}
-	}
-	// timed out request
-	expCanRequest(true)
-	srv.sendRequest(testRequest)
-	clock.WaitForTimers(1)
-	expCanRequest(true)
-	clock.Run(softRequestTimeout)
-	expCanRequest(false) // cannot request when there is a timed out request
-	rs.eventCb(Event{Type: EvResponse, Data: RequestResponse{ID: 1, Request: testRequest, Response: testResponse}})
-	expCanRequest(true)
-	// explicit server.Fail
-	srv.fail("")
-	clock.WaitForTimers(1)
-	expCanRequest(false) // cannot request for a while after a failure
-	clock.Run(minFailureDelay)
-	expCanRequest(true)
-	// request returned with EvFail
-	srv.sendRequest(testRequest)
-	rs.eventCb(Event{Type: EvFail, Data: RequestResponse{ID: 2, Request: testRequest}})
-	clock.WaitForTimers(1)
-	expCanRequest(false) // EvFail should also start failure delay
-	clock.Run(minFailureDelay)
-	expCanRequest(false) // second failure delay is longer, should still be disabled
-	clock.Run(minFailureDelay)
-	expCanRequest(true)
-	srv.unsubscribe()
-}
-
-func TestServerEventRateLimit(t *testing.T) {
-	rs := &testRequestServer{}
-	clock := &mclock.Simulated{}
-	srv := NewServer(rs, clock)
-	var eventCount int
-	srv.subscribe(func(event Event) {
-		eventCount++
-	})
-	expEvents := func(send, expAllowed int) {
-		eventCount = 0
-		for sent := 0; sent < send; sent++ {
-			rs.eventCb(Event{Type: testEventType})
-		}
-		if eventCount != expAllowed {
-			t.Errorf("Wrong number of server events passing rate limitation (sent %d, expected %d, got %d)", send, expAllowed, eventCount)
-		}
-	}
-	expEvents(maxServerEventBuffer+5, maxServerEventBuffer)
-	clock.Run(maxServerEventRate)
-	expEvents(5, 1)
-	clock.Run(maxServerEventRate * maxServerEventBuffer * 2)
-	expEvents(maxServerEventBuffer+5, maxServerEventBuffer)
-	srv.unsubscribe()
-}
-
-func TestServerUnsubscribe(t *testing.T) {
-	rs := &testRequestServer{}
-	clock := &mclock.Simulated{}
-	srv := NewServer(rs, clock)
-	var eventCount int
-	srv.subscribe(func(event Event) {
-		eventCount++
-	})
-	eventCb := rs.eventCb
-	eventCb(Event{Type: testEventType})
-	if eventCount != 1 {
-		t.Errorf("Server event callback not called before unsubscribe")
-	}
-	srv.unsubscribe()
-	if rs.eventCb != nil {
-		t.Errorf("Server event callback not removed after unsubscribe")
-	}
-	eventCb(Event{Type: testEventType})
-	if eventCount != 1 {
-		t.Errorf("Server event callback called after unsubscribe")
-	}
-}
-
-type testRequestServer struct {
-	eventCb func(Event)
-}
-
-func (rs *testRequestServer) Name() string                  { return "" }
-func (rs *testRequestServer) Subscribe(eventCb func(Event)) { rs.eventCb = eventCb }
-func (rs *testRequestServer) SendRequest(ID, Request)       {}
-func (rs *testRequestServer) Unsubscribe()                  { rs.eventCb = nil }

beacon/light/sync/head_sync.go

@@ -1,202 +0,0 @@
-// Copyright 2023 The go-ethereum Authors
-// This file is part of the go-ethereum library.
-//
-// The go-ethereum library is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// The go-ethereum library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public License
-// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
-
-package sync
-
-import (
-	"github.com/ethereum/go-ethereum/beacon/light/request"
-	"github.com/ethereum/go-ethereum/beacon/types"
-	"github.com/ethereum/go-ethereum/log"
-)
-
-type headTracker interface {
-	ValidateOptimistic(update types.OptimisticUpdate) (bool, error)
-	ValidateFinality(head types.FinalityUpdate) (bool, error)
-	ValidatedFinality() (types.FinalityUpdate, bool)
-	SetPrefetchHead(head types.HeadInfo)
-}
-
-// HeadSync implements request.Module; it updates the validated and prefetch
-// heads of HeadTracker based on the EvHead and EvSignedHead events coming from
-// registered servers.
-// It can also postpone the validation of the latest announced signed head
-// until the committee chain is synced up to at least the required period.
-type HeadSync struct {
-	headTracker           headTracker
-	chain                 committeeChain
-	nextSyncPeriod        uint64
-	chainInit             bool
-	unvalidatedOptimistic map[request.Server]types.OptimisticUpdate
-	unvalidatedFinality   map[request.Server]types.FinalityUpdate
-	serverHeads           map[request.Server]types.HeadInfo
-	reqFinalityEpoch      map[request.Server]uint64 // next epoch to request finality update
-	headServerCount       map[types.HeadInfo]headServerCount
-	headCounter           uint64
-	prefetchHead          types.HeadInfo
-}
-
-// headServerCount is associated with most recently seen head infos; it counts
-// the number of servers currently having the given head info as their announced
-// head and a counter signaling how recent that head is.
-// This data is used for selecting the prefetch head.
-type headServerCount struct {
-	serverCount int
-	headCounter uint64
-}
-
-// NewHeadSync creates a new HeadSync.
-func NewHeadSync(headTracker headTracker, chain committeeChain) *HeadSync {
-	s := &HeadSync{
-		headTracker:           headTracker,
-		chain:                 chain,
-		unvalidatedOptimistic: make(map[request.Server]types.OptimisticUpdate),
-		unvalidatedFinality:   make(map[request.Server]types.FinalityUpdate),
-		serverHeads:           make(map[request.Server]types.HeadInfo),
-		headServerCount:       make(map[types.HeadInfo]headServerCount),
-		reqFinalityEpoch:      make(map[request.Server]uint64),
-	}
-	return s
-}
-
-// Process implements request.Module.
-func (s *HeadSync) Process(requester request.Requester, events []request.Event) {
-	nextPeriod, chainInit := s.chain.NextSyncPeriod()
-	if nextPeriod != s.nextSyncPeriod || chainInit != s.chainInit {
-		s.nextSyncPeriod, s.chainInit = nextPeriod, chainInit
-		s.processUnvalidatedUpdates()
-	}
-
-	for _, event := range events {
-		switch event.Type {
-		case EvNewHead:
-			s.setServerHead(event.Server, event.Data.(types.HeadInfo))
-		case EvNewOptimisticUpdate:
-			update := event.Data.(types.OptimisticUpdate)
-			s.newOptimisticUpdate(event.Server, update)
-			epoch := update.Attested.Epoch()
-			if epoch < s.reqFinalityEpoch[event.Server] {
-				continue
-			}
-			if finality, ok := s.headTracker.ValidatedFinality(); ok && finality.Attested.Header.Epoch() >= epoch {
-				continue
-			}
-			requester.Send(event.Server, ReqFinality{})
-			s.reqFinalityEpoch[event.Server] = epoch + 1
-		case EvNewFinalityUpdate:
-			s.newFinalityUpdate(event.Server, event.Data.(types.FinalityUpdate))
-		case request.EvResponse:
-			_, _, resp := event.RequestInfo()
-			s.newFinalityUpdate(event.Server, resp.(types.FinalityUpdate))
-		case request.EvUnregistered:
-			s.setServerHead(event.Server, types.HeadInfo{})
-			delete(s.serverHeads, event.Server)
-			delete(s.unvalidatedOptimistic, event.Server)
-			delete(s.unvalidatedFinality, event.Server)
-		}
-	}
-}
-
-// newOptimisticUpdate handles received optimistic update; either validates it if
-// the chain is properly synced or stores it for further validation.
-func (s *HeadSync) newOptimisticUpdate(server request.Server, optimisticUpdate types.OptimisticUpdate) {
-	if !s.chainInit || types.SyncPeriod(optimisticUpdate.SignatureSlot) > s.nextSyncPeriod {
-		s.unvalidatedOptimistic[server] = optimisticUpdate
-		return
-	}
-	if _, err := s.headTracker.ValidateOptimistic(optimisticUpdate); err != nil {
-		log.Debug("Error validating optimistic update", "error", err)
-	}
-}
-
-// newFinalityUpdate handles received finality update; either validates it if
-// the chain is properly synced or stores it for further validation.
-func (s *HeadSync) newFinalityUpdate(server request.Server, finalityUpdate types.FinalityUpdate) {
-	if !s.chainInit || types.SyncPeriod(finalityUpdate.SignatureSlot) > s.nextSyncPeriod {
-		s.unvalidatedFinality[server] = finalityUpdate
-		return
-	}
-	if _, err := s.headTracker.ValidateFinality(finalityUpdate); err != nil {
-		log.Debug("Error validating finality update", "error", err)
-	}
-}
-
-// processUnvalidatedUpdates iterates the list of unvalidated updates and validates
-// those which can be validated.
-func (s *HeadSync) processUnvalidatedUpdates() {
-	if !s.chainInit {
-		return
-	}
-	for server, optimisticUpdate := range s.unvalidatedOptimistic {
-		if types.SyncPeriod(optimisticUpdate.SignatureSlot) <= s.nextSyncPeriod {
-			if _, err := s.headTracker.ValidateOptimistic(optimisticUpdate); err != nil {
-				log.Debug("Error validating deferred optimistic update", "error", err)
-			}
-			delete(s.unvalidatedOptimistic, server)
-		}
-	}
-	for server, finalityUpdate := range s.unvalidatedFinality {
-		if types.SyncPeriod(finalityUpdate.SignatureSlot) <= s.nextSyncPeriod {
-			if _, err := s.headTracker.ValidateFinality(finalityUpdate); err != nil {
-				log.Debug("Error validating deferred finality update", "error", err)
-			}
-			delete(s.unvalidatedFinality, server)
-		}
-	}
-}
-
-// setServerHead processes non-validated server head announcements and updates
-// the prefetch head if necessary.
-func (s *HeadSync) setServerHead(server request.Server, head types.HeadInfo) bool {
-	if oldHead, ok := s.serverHeads[server]; ok {
-		if head == oldHead {
-			return false
-		}
-		h := s.headServerCount[oldHead]
-		if h.serverCount--; h.serverCount > 0 {
-			s.headServerCount[oldHead] = h
-		} else {
-			delete(s.headServerCount, oldHead)
-		}
-	}
-	if head != (types.HeadInfo{}) {
-		h, ok := s.headServerCount[head]
-		if !ok {
-			s.headCounter++
-			h.headCounter = s.headCounter
-		}
-		h.serverCount++
-		s.headServerCount[head] = h
-		s.serverHeads[server] = head
-	} else {
-		delete(s.serverHeads, server)
-	}
-	var (
-		bestHead     types.HeadInfo
-		bestHeadInfo headServerCount
-	)
-	for head, headServerCount := range s.headServerCount {
-		if headServerCount.serverCount > bestHeadInfo.serverCount ||
-			(headServerCount.serverCount == bestHeadInfo.serverCount && headServerCount.headCounter > bestHeadInfo.headCounter) {
-			bestHead, bestHeadInfo = head, headServerCount
-		}
-	}
-	if bestHead == s.prefetchHead {
-		return false
-	}
-	s.prefetchHead = bestHead
-	s.headTracker.SetPrefetchHead(bestHead)
-	return true
-}

beacon/light/sync/head_sync_test.go

@@ -1,183 +0,0 @@
-// Copyright 2023 The go-ethereum Authors
-// This file is part of the go-ethereum library.
-//
-// The go-ethereum library is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// The go-ethereum library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public License
-// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
-
-package sync
-
-import (
-	"testing"
-
-	"github.com/ethereum/go-ethereum/beacon/light/request"
-	"github.com/ethereum/go-ethereum/beacon/types"
-	"github.com/ethereum/go-ethereum/common"
-)
-
-var (
-	testServer1 = testServer("testServer1")
-	testServer2 = testServer("testServer2")
-	testServer3 = testServer("testServer3")
-	testServer4 = testServer("testServer4")
-	testServer5 = testServer("testServer5")
-
-	testHead0 = types.HeadInfo{}
-	testHead1 = types.HeadInfo{Slot: 123, BlockRoot: common.Hash{1}}
-	testHead2 = types.HeadInfo{Slot: 124, BlockRoot: common.Hash{2}}
-	testHead3 = types.HeadInfo{Slot: 124, BlockRoot: common.Hash{3}}
-	testHead4 = types.HeadInfo{Slot: 125, BlockRoot: common.Hash{4}}
-
-	testOptUpdate1 = types.OptimisticUpdate{SignatureSlot: 0x0124, Attested: types.HeaderWithExecProof{Header: types.Header{Slot: 0x0123, StateRoot: common.Hash{1}}}}
-	testOptUpdate2 = types.OptimisticUpdate{SignatureSlot: 0x2010, Attested: types.HeaderWithExecProof{Header: types.Header{Slot: 0x200e, StateRoot: common.Hash{2}}}}
-	// testOptUpdate3 is at the end of period 1 but signed in period 2
-	testOptUpdate3 = types.OptimisticUpdate{SignatureSlot: 0x4000, Attested: types.HeaderWithExecProof{Header: types.Header{Slot: 0x3fff, StateRoot: common.Hash{3}}}}
-	testOptUpdate4 = types.OptimisticUpdate{SignatureSlot: 0x6444, Attested: types.HeaderWithExecProof{Header: types.Header{Slot: 0x6443, StateRoot: common.Hash{4}}}}
-)
-
-func finality(opt types.OptimisticUpdate) types.FinalityUpdate {
-	return types.FinalityUpdate{
-		SignatureSlot: opt.SignatureSlot,
-		Attested:      opt.Attested,
-		Finalized:     types.HeaderWithExecProof{Header: types.Header{Slot: (opt.Attested.Header.Slot - 64) & uint64(0xffffffffffffffe0)}},
-	}
-}
-
-type testServer string
-
-func (t testServer) Name() string {
-	return string(t)
-}
-
-func TestValidatedHead(t *testing.T) {
-	chain := &TestCommitteeChain{}
-	ht := &TestHeadTracker{}
-	headSync := NewHeadSync(ht, chain)
-	ts := NewTestScheduler(t, headSync)
-
-	ht.ExpValidated(t, 0, nil)
-
-	ts.AddServer(testServer1, 1)
-	ts.ServerEvent(EvNewOptimisticUpdate, testServer1, testOptUpdate1)
-	ts.Run(1, testServer1, ReqFinality{})
-	// announced head should be queued because of uninitialized chain
-	ht.ExpValidated(t, 1, nil)
-
-	chain.SetNextSyncPeriod(0) // initialize chain
-	ts.Run(2)
-	// expect previously queued head to be validated
-	ht.ExpValidated(t, 2, []types.OptimisticUpdate{testOptUpdate1})
-
-	chain.SetNextSyncPeriod(1)
-	ts.ServerEvent(EvNewFinalityUpdate, testServer1, finality(testOptUpdate2))
-	ts.ServerEvent(EvNewOptimisticUpdate, testServer1, testOptUpdate2)
-	ts.AddServer(testServer2, 1)
-	ts.ServerEvent(EvNewOptimisticUpdate, testServer2, testOptUpdate2)
-	ts.Run(3)
-	// expect both head announcements to be validated instantly
-	ht.ExpValidated(t, 3, []types.OptimisticUpdate{testOptUpdate2, testOptUpdate2})
-
-	ts.ServerEvent(EvNewOptimisticUpdate, testServer1, testOptUpdate3)
-	ts.AddServer(testServer3, 1)
-	ts.ServerEvent(EvNewOptimisticUpdate, testServer3, testOptUpdate4)
-	// finality should be requested from both servers
-	ts.Run(4, testServer1, ReqFinality{}, testServer3, ReqFinality{})
-	// future period announced heads should be queued
-	ht.ExpValidated(t, 4, nil)
-
-	chain.SetNextSyncPeriod(2)
-	ts.Run(5)
-	// testOptUpdate3 can be validated now but not testOptUpdate4
-	ht.ExpValidated(t, 5, []types.OptimisticUpdate{testOptUpdate3})
-
-	ts.AddServer(testServer4, 1)
-	ts.ServerEvent(EvNewOptimisticUpdate, testServer4, testOptUpdate3)
-	// new server joined with recent optimistic update but still no finality; should be requested
-	ts.Run(6, testServer4, ReqFinality{})
-	ht.ExpValidated(t, 6, []types.OptimisticUpdate{testOptUpdate3})
-
-	ts.AddServer(testServer5, 1)
-	ts.RequestEvent(request.EvResponse, ts.Request(6, 1), finality(testOptUpdate3))
-	ts.ServerEvent(EvNewOptimisticUpdate, testServer5, testOptUpdate3)
-	// finality update request answered; new server should not be requested
-	ts.Run(7)
-	ht.ExpValidated(t, 7, []types.OptimisticUpdate{testOptUpdate3})
-
-	// server 3 disconnected without proving period 3, its announced head should be dropped
-	ts.RemoveServer(testServer3)
-	ts.Run(8)
-	ht.ExpValidated(t, 8, nil)
-
-	chain.SetNextSyncPeriod(3)
-	ts.Run(9)
-	// testOptUpdate4 could be validated now but it's not queued by any registered server
-	ht.ExpValidated(t, 9, nil)
-
-	ts.ServerEvent(EvNewFinalityUpdate, testServer2, finality(testOptUpdate4))
-	ts.ServerEvent(EvNewOptimisticUpdate, testServer2, testOptUpdate4)
-	ts.Run(10)
-	// now testOptUpdate4 should be validated
-	ht.ExpValidated(t, 10, []types.OptimisticUpdate{testOptUpdate4})
-}
-
-func TestPrefetchHead(t *testing.T) {
-	chain := &TestCommitteeChain{}
-	ht := &TestHeadTracker{}
-	headSync := NewHeadSync(ht, chain)
-	ts := NewTestScheduler(t, headSync)
-
-	ht.ExpPrefetch(t, 0, testHead0) // no servers registered
-
-	ts.AddServer(testServer1, 1)
-	ts.ServerEvent(EvNewHead, testServer1, testHead1)
-	ts.Run(1)
-	ht.ExpPrefetch(t, 1, testHead1) // s1: h1
-
-	ts.AddServer(testServer2, 1)
-	ts.ServerEvent(EvNewHead, testServer2, testHead2)
-	ts.Run(2)
-	ht.ExpPrefetch(t, 2, testHead2) // s1: h1, s2: h2
-
-	ts.ServerEvent(EvNewHead, testServer1, testHead2)
-	ts.Run(3)
-	ht.ExpPrefetch(t, 3, testHead2) // s1: h2, s2: h2
-
-	ts.AddServer(testServer3, 1)
-	ts.ServerEvent(EvNewHead, testServer3, testHead3)
-	ts.Run(4)
-	ht.ExpPrefetch(t, 4, testHead2) // s1: h2, s2: h2, s3: h3
-
-	ts.AddServer(testServer4, 1)
-	ts.ServerEvent(EvNewHead, testServer4, testHead4)
-	ts.Run(5)
-	ht.ExpPrefetch(t, 5, testHead2) // s1: h2, s2: h2, s3: h3, s4: h4
-
-	ts.ServerEvent(EvNewHead, testServer2, testHead3)
-	ts.Run(6)
-	ht.ExpPrefetch(t, 6, testHead3) // s1: h2, s2: h3, s3: h3, s4: h4
-
-	ts.RemoveServer(testServer3)
-	ts.Run(7)
-	ht.ExpPrefetch(t, 7, testHead4) // s1: h2, s2: h3, s4: h4
-
-	ts.RemoveServer(testServer1)
-	ts.Run(8)
-	ht.ExpPrefetch(t, 8, testHead4) // s2: h3, s4: h4
-
-	ts.RemoveServer(testServer4)
-	ts.Run(9)
-	ht.ExpPrefetch(t, 9, testHead3) // s2: h3
-
-	ts.RemoveServer(testServer2)
-	ts.Run(10)
-	ht.ExpPrefetch(t, 10, testHead0) // no servers registered
-}

beacon/light/sync/test_helpers.go

@@ -1,259 +0,0 @@
-// Copyright 2023 The go-ethereum Authors
-// This file is part of the go-ethereum library.
-//
-// The go-ethereum library is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// The go-ethereum library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public License
-// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
-
-package sync
-
-import (
-	"reflect"
-	"testing"
-
-	"github.com/ethereum/go-ethereum/beacon/light"
-	"github.com/ethereum/go-ethereum/beacon/light/request"
-	"github.com/ethereum/go-ethereum/beacon/types"
-)
-
-type requestWithID struct {
-	sid     request.ServerAndID
-	request request.Request
-}
-
-type TestScheduler struct {
-	t         *testing.T
-	module    request.Module
-	events    []request.Event
-	servers   []request.Server
-	allowance map[request.Server]int
-	sent      map[int][]requestWithID
-	testIndex int
-	expFail   map[request.Server]int // expected Server.Fail calls during next Run
-	lastId    request.ID
-}
-
-func NewTestScheduler(t *testing.T, module request.Module) *TestScheduler {
-	return &TestScheduler{
-		t:         t,
-		module:    module,
-		allowance: make(map[request.Server]int),
-		expFail:   make(map[request.Server]int),
-		sent:      make(map[int][]requestWithID),
-	}
-}
-
-func (ts *TestScheduler) Run(testIndex int, exp ...any) {
-	expReqs := make([]requestWithID, len(exp)/2)
-	id := ts.lastId
-	for i := range expReqs {
-		id++
-		expReqs[i] = requestWithID{
-			sid:     request.ServerAndID{Server: exp[i*2].(request.Server), ID: id},
-			request: exp[i*2+1].(request.Request),
-		}
-	}
-	if len(expReqs) == 0 {
-		expReqs = nil
-	}
-
-	ts.testIndex = testIndex
-	ts.module.Process(ts, ts.events)
-	ts.events = nil
-
-	for server, count := range ts.expFail {
-		delete(ts.expFail, server)
-		if count == 0 {
-			continue
-		}
-		ts.t.Errorf("Missing %d Server.Fail(s) from server %s in test case #%d", count, server.Name(), testIndex)
-	}
-
-	if !reflect.DeepEqual(ts.sent[testIndex], expReqs) {
-		ts.t.Errorf("Wrong sent requests in test case #%d (expected %v, got %v)", testIndex, expReqs, ts.sent[testIndex])
-	}
-}
-
-func (ts *TestScheduler) CanSendTo() (cs []request.Server) {
-	for _, server := range ts.servers {
-		if ts.allowance[server] > 0 {
-			cs = append(cs, server)
-		}
-	}
-	return
-}
-
-func (ts *TestScheduler) Send(server request.Server, req request.Request) request.ID {
-	ts.lastId++
-	ts.sent[ts.testIndex] = append(ts.sent[ts.testIndex], requestWithID{
-		sid:     request.ServerAndID{Server: server, ID: ts.lastId},
-		request: req,
-	})
-	ts.allowance[server]--
-	return ts.lastId
-}
-
-func (ts *TestScheduler) Fail(server request.Server, desc string) {
-	if ts.expFail[server] == 0 {
-		ts.t.Errorf("Unexpected Fail from server %s in test case #%d: %s", server.Name(), ts.testIndex, desc)
-		return
-	}
-	ts.expFail[server]--
-}
-
-func (ts *TestScheduler) Request(testIndex, reqIndex int) requestWithID {
-	if len(ts.sent[testIndex]) < reqIndex {
-		ts.t.Errorf("Missing request from test case %d index %d", testIndex, reqIndex)
-		return requestWithID{}
-	}
-	return ts.sent[testIndex][reqIndex-1]
-}
-
-func (ts *TestScheduler) ServerEvent(evType *request.EventType, server request.Server, data any) {
-	ts.events = append(ts.events, request.Event{
-		Type:   evType,
-		Server: server,
-		Data:   data,
-	})
-}
-
-func (ts *TestScheduler) RequestEvent(evType *request.EventType, req requestWithID, resp request.Response) {
-	if req.request == nil {
-		return
-	}
-	ts.events = append(ts.events, request.Event{
-		Type:   evType,
-		Server: req.sid.Server,
-		Data: request.RequestResponse{
-			ID:       req.sid.ID,
-			Request:  req.request,
-			Response: resp,
-		},
-	})
-}
-
-func (ts *TestScheduler) AddServer(server request.Server, allowance int) {
-	ts.servers = append(ts.servers, server)
-	ts.allowance[server] = allowance
-	ts.ServerEvent(request.EvRegistered, server, nil)
-}
-
-func (ts *TestScheduler) RemoveServer(server request.Server) {
-	ts.servers = append(ts.servers, server)
-	for i, s := range ts.servers {
-		if s == server {
-			copy(ts.servers[i:len(ts.servers)-1], ts.servers[i+1:])
-			ts.servers = ts.servers[:len(ts.servers)-1]
-			break
-		}
-	}
-	delete(ts.allowance, server)
-	ts.ServerEvent(request.EvUnregistered, server, nil)
-}
-
-func (ts *TestScheduler) AddAllowance(server request.Server, allowance int) {
-	ts.allowance[server] += allowance
-}
-
-func (ts *TestScheduler) ExpFail(server request.Server) {
-	ts.expFail[server]++
-}
-
-type TestCommitteeChain struct {
-	fsp, nsp uint64
-	init     bool
-}
-
-func (tc *TestCommitteeChain) CheckpointInit(bootstrap types.BootstrapData) error {
-	tc.fsp, tc.nsp, tc.init = bootstrap.Header.SyncPeriod(), bootstrap.Header.SyncPeriod()+2, true
-	return nil
-}
-
-func (tc *TestCommitteeChain) InsertUpdate(update *types.LightClientUpdate, nextCommittee *types.SerializedSyncCommittee) error {
-	period := update.AttestedHeader.Header.SyncPeriod()
-	if period < tc.fsp || period > tc.nsp || !tc.init {
-		return light.ErrInvalidPeriod
-	}
-	if period == tc.nsp {
-		tc.nsp++
-	}
-	return nil
-}
-
-func (tc *TestCommitteeChain) NextSyncPeriod() (uint64, bool) {
-	return tc.nsp, tc.init
-}
-
-func (tc *TestCommitteeChain) ExpInit(t *testing.T, ExpInit bool) {
-	if tc.init != ExpInit {
-		t.Errorf("Incorrect init flag (expected %v, got %v)", ExpInit, tc.init)
-	}
-}
-
-func (tc *TestCommitteeChain) SetNextSyncPeriod(nsp uint64) {
-	tc.init, tc.nsp = true, nsp
-}
-
-func (tc *TestCommitteeChain) ExpNextSyncPeriod(t *testing.T, expNsp uint64) {
-	tc.ExpInit(t, true)
-	if tc.nsp != expNsp {
-		t.Errorf("Incorrect NextSyncPeriod (expected %d, got %d)", expNsp, tc.nsp)
-	}
-}
-
-type TestHeadTracker struct {
-	phead     types.HeadInfo
-	validated []types.OptimisticUpdate
-	finality  types.FinalityUpdate
-}
-
-func (ht *TestHeadTracker) ValidateOptimistic(update types.OptimisticUpdate) (bool, error) {
-	ht.validated = append(ht.validated, update)
-	return true, nil
-}
-
-func (ht *TestHeadTracker) ValidateFinality(update types.FinalityUpdate) (bool, error) {
-	ht.finality = update
-	return true, nil
-}
-
-func (ht *TestHeadTracker) ValidatedFinality() (types.FinalityUpdate, bool) {
-	return ht.finality, ht.finality.Attested.Header != (types.Header{})
-}
-
-func (ht *TestHeadTracker) ExpValidated(t *testing.T, tci int, expHeads []types.OptimisticUpdate) {
-	for i, expHead := range expHeads {
-		if i >= len(ht.validated) {
-			t.Errorf("Missing validated head in test case #%d index #%d (expected {slot %d blockRoot %x}, got none)", tci, i, expHead.Attested.Header.Slot, expHead.Attested.Header.Hash())
-			continue
-		}
-		if !reflect.DeepEqual(ht.validated[i], expHead) {
-			vhead := ht.validated[i].Attested.Header
-			t.Errorf("Wrong validated head in test case #%d index #%d (expected {slot %d blockRoot %x}, got {slot %d blockRoot %x})", tci, i, expHead.Attested.Header.Slot, expHead.Attested.Header.Hash(), vhead.Slot, vhead.Hash())
-		}
-	}
-	for i := len(expHeads); i < len(ht.validated); i++ {
-		vhead := ht.validated[i].Attested.Header
-		t.Errorf("Unexpected validated head in test case #%d index #%d (expected none, got {slot %d blockRoot %x})", tci, i, vhead.Slot, vhead.Hash())
-	}
-	ht.validated = nil
-}
-
-func (ht *TestHeadTracker) SetPrefetchHead(head types.HeadInfo) {
-	ht.phead = head
-}
-
-func (ht *TestHeadTracker) ExpPrefetch(t *testing.T, tci int, exp types.HeadInfo) {
-	if ht.phead != exp {
-		t.Errorf("Wrong prefetch head in test case #%d (expected {slot %d blockRoot %x}, got {slot %d blockRoot %x})", tci, exp.Slot, exp.BlockRoot, ht.phead.Slot, ht.phead.BlockRoot)
-	}
-}

beacon/light/sync/types.go

@@ -1,47 +0,0 @@
-// Copyright 2023 The go-ethereum Authors
-// This file is part of the go-ethereum library.
-//
-// The go-ethereum library is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// The go-ethereum library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public License
-// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
-
-package sync
-
-import (
-	"github.com/ethereum/go-ethereum/beacon/light/request"
-	"github.com/ethereum/go-ethereum/beacon/types"
-	"github.com/ethereum/go-ethereum/common"
-)
-
-var (
-	EvNewHead             = &request.EventType{Name: "newHead"}             // data: types.HeadInfo
-	EvNewOptimisticUpdate = &request.EventType{Name: "newOptimisticUpdate"} // data: types.OptimisticUpdate
-	EvNewFinalityUpdate   = &request.EventType{Name: "newFinalityUpdate"}   // data: types.FinalityUpdate
-)
-
-type (
-	ReqUpdates struct {
-		FirstPeriod, Count uint64
-	}
-	RespUpdates struct {
-		Updates    []*types.LightClientUpdate
-		Committees []*types.SerializedSyncCommittee
-	}
-	ReqHeader  common.Hash
-	RespHeader struct {
-		Header               types.Header
-		Canonical, Finalized bool
-	}
-	ReqCheckpointData common.Hash
-	ReqBeaconBlock    common.Hash
-	ReqFinality       struct{}
-)

beacon/light/sync/update_sync.go

@@ -1,398 +0,0 @@
-// Copyright 2023 The go-ethereum Authors
-// This file is part of the go-ethereum library.
-//
-// The go-ethereum library is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// The go-ethereum library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public License
-// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
-
-package sync
-
-import (
-	"sort"
-
-	"github.com/ethereum/go-ethereum/beacon/light"
-	"github.com/ethereum/go-ethereum/beacon/light/request"
-	"github.com/ethereum/go-ethereum/beacon/params"
-	"github.com/ethereum/go-ethereum/beacon/types"
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/log"
-)
-
-const maxUpdateRequest = 8 // maximum number of updates requested in a single request
-
-type committeeChain interface {
-	CheckpointInit(bootstrap types.BootstrapData) error
-	InsertUpdate(update *types.LightClientUpdate, nextCommittee *types.SerializedSyncCommittee) error
-	NextSyncPeriod() (uint64, bool)
-}
-
-// CheckpointInit implements request.Module; it fetches the light client bootstrap
-// data belonging to the given checkpoint hash and initializes the committee chain
-// if successful.
-type CheckpointInit struct {
-	chain          committeeChain
-	checkpointHash common.Hash
-	locked         request.ServerAndID
-	initialized    bool
-	// per-server state is used to track the state of requesting checkpoint header
-	// info. Part of this info (canonical and finalized state) is not validated
-	// and therefore it is requested from each server separately after it has
-	// reported a missing checkpoint (which is also not validated info).
-	serverState map[request.Server]serverState
-	// the following fields are used to determine whether the checkpoint is on
-	// epoch boundary. This information is validated and therefore stored globally.
-	parentHash                  common.Hash
-	hasEpochInfo, epochBoundary bool
-	cpSlot, parentSlot          uint64
-}
-
-const (
-	ssDefault         = iota // no action yet or checkpoint requested
-	ssNeedHeader             // checkpoint req failed, need cp header
-	ssHeaderRequested        // cp header requested
-	ssNeedParent             // cp header slot %32 != 0, need parent to check epoch boundary
-	ssParentRequested        // cp parent header requested
-	ssPrintStatus            // has all necessary info, print log message if init still not successful
-	ssDone                   // log message printed, no more action required
-)
-
-type serverState struct {
-	state                           int
-	hasHeader, canonical, finalized bool // stored per server because not validated
-}
-
-// NewCheckpointInit creates a new CheckpointInit.
-func NewCheckpointInit(chain committeeChain, checkpointHash common.Hash) *CheckpointInit {
-	return &CheckpointInit{
-		chain:          chain,
-		checkpointHash: checkpointHash,
-		serverState:    make(map[request.Server]serverState),
-	}
-}
-
-// Process implements request.Module.
-func (s *CheckpointInit) Process(requester request.Requester, events []request.Event) {
-	if s.initialized {
-		return
-	}
-
-	for _, event := range events {
-		switch event.Type {
-		case request.EvResponse, request.EvFail, request.EvTimeout:
-			sid, req, resp := event.RequestInfo()
-			if s.locked == sid {
-				s.locked = request.ServerAndID{}
-			}
-			if event.Type == request.EvTimeout {
-				continue
-			}
-			switch s.serverState[sid.Server].state {
-			case ssDefault:
-				if resp != nil {
-					if checkpoint := resp.(*types.BootstrapData); checkpoint.Header.Hash() == common.Hash(req.(ReqCheckpointData)) {
-						s.chain.CheckpointInit(*checkpoint)
-						s.initialized = true
-						return
-					}
-					requester.Fail(event.Server, "invalid checkpoint data")
-				}
-				s.serverState[sid.Server] = serverState{state: ssNeedHeader}
-			case ssHeaderRequested:
-				if resp == nil {
-					s.serverState[sid.Server] = serverState{state: ssPrintStatus}
-					continue
-				}
-				newState := serverState{
-					hasHeader: true,
-					canonical: resp.(RespHeader).Canonical,
-					finalized: resp.(RespHeader).Finalized,
-				}
-				s.cpSlot, s.parentHash = resp.(RespHeader).Header.Slot, resp.(RespHeader).Header.ParentRoot
-				if s.cpSlot%params.EpochLength == 0 {
-					s.hasEpochInfo, s.epochBoundary = true, true
-				}
-				if s.hasEpochInfo {
-					newState.state = ssPrintStatus
-				} else {
-					newState.state = ssNeedParent
-				}
-				s.serverState[sid.Server] = newState
-			case ssParentRequested:
-				s.parentSlot = resp.(RespHeader).Header.Slot
-				s.hasEpochInfo, s.epochBoundary = true, s.cpSlot/params.EpochLength > s.parentSlot/params.EpochLength
-				newState := s.serverState[sid.Server]
-				newState.state = ssPrintStatus
-				s.serverState[sid.Server] = newState
-			}
-
-		case request.EvUnregistered:
-			delete(s.serverState, event.Server)
-		}
-	}
-
-	// start a request if possible
-	for _, server := range requester.CanSendTo() {
-		switch s.serverState[server].state {
-		case ssDefault:
-			if s.locked == (request.ServerAndID{}) {
-				id := requester.Send(server, ReqCheckpointData(s.checkpointHash))
-				s.locked = request.ServerAndID{Server: server, ID: id}
-			}
-		case ssNeedHeader:
-			requester.Send(server, ReqHeader(s.checkpointHash))
-			newState := s.serverState[server]
-			newState.state = ssHeaderRequested
-			s.serverState[server] = newState
-		case ssNeedParent:
-			requester.Send(server, ReqHeader(s.parentHash))
-			newState := s.serverState[server]
-			newState.state = ssParentRequested
-			s.serverState[server] = newState
-		}
-	}
-
-	// print log message if necessary
-	for server, state := range s.serverState {
-		if state.state != ssPrintStatus {
-			continue
-		}
-		switch {
-		case !state.hasHeader:
-			log.Error("blsync: checkpoint block is not available, reported as unknown", "server", server.Name())
-		case !state.canonical:
-			log.Error("blsync: checkpoint block is not available, reported as non-canonical", "server", server.Name())
-		case !s.hasEpochInfo:
-			// should be available if hasHeader is true and state is ssPrintStatus
-			panic("checkpoint epoch info not available when printing retrieval status")
-		case !s.epochBoundary:
-			log.Error("blsync: checkpoint block is not first of epoch", "slot", s.cpSlot, "parent", s.parentSlot, "server", server.Name())
-		case !state.finalized:
-			log.Error("blsync: checkpoint block is reported as non-finalized", "server", server.Name())
-		default:
-			log.Error("blsync: checkpoint not available, but reported as finalized; specified checkpoint hash might be too old", "server", server.Name())
-		}
-		s.serverState[server] = serverState{state: ssDone}
-	}
-}
-
-// ForwardUpdateSync implements request.Module; it fetches updates between the
-// committee chain head and each server's announced head. Updates are fetched
-// in batches and multiple batches can also be requested in parallel.
-// Out of order responses are also handled; if a batch of updates cannot be added
-// to the chain immediately because of a gap then the future updates are
-// remembered until they can be processed.
-type ForwardUpdateSync struct {
-	chain          committeeChain
-	rangeLock      rangeLock
-	lockedIDs      map[request.ServerAndID]struct{}
-	processQueue   []updateResponse
-	nextSyncPeriod map[request.Server]uint64
-}
-
-// NewForwardUpdateSync creates a new ForwardUpdateSync.
-func NewForwardUpdateSync(chain committeeChain) *ForwardUpdateSync {
-	return &ForwardUpdateSync{
-		chain:          chain,
-		rangeLock:      make(rangeLock),
-		lockedIDs:      make(map[request.ServerAndID]struct{}),
-		nextSyncPeriod: make(map[request.Server]uint64),
-	}
-}
-
-// rangeLock allows locking sections of an integer space, preventing the syncing
-// mechanism from making requests again for sections where a not timed out request
-// is already pending or where already fetched and unprocessed data is available.
-type rangeLock map[uint64]int
-
-// lock locks or unlocks the given section, depending on the sign of the add parameter.
-func (r rangeLock) lock(first, count uint64, add int) {
-	for i := first; i < first+count; i++ {
-		if v := r[i] + add; v > 0 {
-			r[i] = v
-		} else {
-			delete(r, i)
-		}
-	}
-}
-
-// firstUnlocked returns the first unlocked section starting at or after start
-// and not longer than maxCount.
-func (r rangeLock) firstUnlocked(start, maxCount uint64) (first, count uint64) {
-	first = start
-	for {
-		if _, ok := r[first]; !ok {
-			break
-		}
-		first++
-	}
-	for {
-		count++
-		if count == maxCount {
-			break
-		}
-		if _, ok := r[first+count]; ok {
-			break
-		}
-	}
-	return
-}
-
-// lockRange locks the range belonging to the given update request, unless the
-// same request has already been locked
-func (s *ForwardUpdateSync) lockRange(sid request.ServerAndID, req ReqUpdates) {
-	if _, ok := s.lockedIDs[sid]; ok {
-		return
-	}
-	s.lockedIDs[sid] = struct{}{}
-	s.rangeLock.lock(req.FirstPeriod, req.Count, 1)
-}
-
-// unlockRange unlocks the range belonging to the given update request, unless
-// same request has already been unlocked
-func (s *ForwardUpdateSync) unlockRange(sid request.ServerAndID, req ReqUpdates) {
-	if _, ok := s.lockedIDs[sid]; !ok {
-		return
-	}
-	delete(s.lockedIDs, sid)
-	s.rangeLock.lock(req.FirstPeriod, req.Count, -1)
-}
-
-// verifyRange returns true if the number of updates and the individual update
-// periods in the response match the requested section.
-func (s *ForwardUpdateSync) verifyRange(request ReqUpdates, response RespUpdates) bool {
-	if uint64(len(response.Updates)) != request.Count || uint64(len(response.Committees)) != request.Count {
-		return false
-	}
-	for i, update := range response.Updates {
-		if update.AttestedHeader.Header.SyncPeriod() != request.FirstPeriod+uint64(i) {
-			return false
-		}
-	}
-	return true
-}
-
-// updateResponse is a response that has passed initial verification and has been
-// queued for processing. Note that an update response cannot be processed until
-// the previous updates have also been added to the chain.
-type updateResponse struct {
-	sid      request.ServerAndID
-	request  ReqUpdates
-	response RespUpdates
-}
-
-// updateResponseList implements sort.Sort and sorts update request/response events by FirstPeriod.
-type updateResponseList []updateResponse
-
-func (u updateResponseList) Len() int      { return len(u) }
-func (u updateResponseList) Swap(i, j int) { u[i], u[j] = u[j], u[i] }
-func (u updateResponseList) Less(i, j int) bool {
-	return u[i].request.FirstPeriod < u[j].request.FirstPeriod
-}
-
-// Process implements request.Module.
-func (s *ForwardUpdateSync) Process(requester request.Requester, events []request.Event) {
-	for _, event := range events {
-		switch event.Type {
-		case request.EvResponse, request.EvFail, request.EvTimeout:
-			sid, rq, rs := event.RequestInfo()
-			req := rq.(ReqUpdates)
-			var queued bool
-			if event.Type == request.EvResponse {
-				resp := rs.(RespUpdates)
-				if s.verifyRange(req, resp) {
-					// there is a response with a valid format; put it in the process queue
-					s.processQueue = append(s.processQueue, updateResponse{sid: sid, request: req, response: resp})
-					s.lockRange(sid, req)
-					queued = true
-				} else {
-					requester.Fail(event.Server, "invalid update range")
-				}
-			}
-			if !queued {
-				s.unlockRange(sid, req)
-			}
-		case EvNewOptimisticUpdate:
-			update := event.Data.(types.OptimisticUpdate)
-			s.nextSyncPeriod[event.Server] = types.SyncPeriod(update.SignatureSlot + 256)
-		case request.EvUnregistered:
-			delete(s.nextSyncPeriod, event.Server)
-		}
-	}
-
-	// try processing ordered list of available responses
-	sort.Sort(updateResponseList(s.processQueue))
-	for s.processQueue != nil {
-		u := s.processQueue[0]
-		if !s.processResponse(requester, u) {
-			break
-		}
-		s.unlockRange(u.sid, u.request)
-		s.processQueue = s.processQueue[1:]
-		if len(s.processQueue) == 0 {
-			s.processQueue = nil
-		}
-	}
-
-	// start new requests if possible
-	startPeriod, chainInit := s.chain.NextSyncPeriod()
-	if !chainInit {
-		return
-	}
-	for {
-		firstPeriod, maxCount := s.rangeLock.firstUnlocked(startPeriod, maxUpdateRequest)
-		var (
-			sendTo    request.Server
-			bestCount uint64
-		)
-		for _, server := range requester.CanSendTo() {
-			nextPeriod := s.nextSyncPeriod[server]
-			if nextPeriod <= firstPeriod {
-				continue
-			}
-			count := maxCount
-			if nextPeriod < firstPeriod+maxCount {
-				count = nextPeriod - firstPeriod
-			}
-			if count > bestCount {
-				sendTo, bestCount = server, count
-			}
-		}
-		if sendTo == nil {
-			return
-		}
-		req := ReqUpdates{FirstPeriod: firstPeriod, Count: bestCount}
-		id := requester.Send(sendTo, req)
-		s.lockRange(request.ServerAndID{Server: sendTo, ID: id}, req)
-	}
-}
-
-// processResponse adds the fetched updates and committees to the committee chain.
-// Returns true in case of full or partial success.
-func (s *ForwardUpdateSync) processResponse(requester request.Requester, u updateResponse) (success bool) {
-	for i, update := range u.response.Updates {
-		if err := s.chain.InsertUpdate(update, u.response.Committees[i]); err != nil {
-			if err == light.ErrInvalidPeriod {
-				// there is a gap in the update periods; stop processing without
-				// failing and try again next time
-				return
-			}
-			if err == light.ErrInvalidUpdate || err == light.ErrWrongCommitteeRoot || err == light.ErrCannotReorg {
-				requester.Fail(u.sid.Server, "invalid update received")
-			} else {
-				log.Error("Unexpected InsertUpdate error", "error", err)
-			}
-			return
-		}
-		success = true
-	}
-	return
-}

beacon/light/sync/update_sync_test.go

@@ -1,247 +0,0 @@
-// Copyright 2024 The go-ethereum Authors
-// This file is part of the go-ethereum library.
-//
-// The go-ethereum library is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// The go-ethereum library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public License
-// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
-
-package sync
-
-import (
-	"testing"
-
-	"github.com/ethereum/go-ethereum/beacon/light/request"
-	"github.com/ethereum/go-ethereum/beacon/types"
-)
-
-func TestCheckpointInit(t *testing.T) {
-	chain := &TestCommitteeChain{}
-	checkpoint := &types.BootstrapData{Header: types.Header{Slot: 0x2000*4 + 0x1000}} // period 4
-	checkpointHash := checkpoint.Header.Hash()
-	chkInit := NewCheckpointInit(chain, checkpointHash)
-	ts := NewTestScheduler(t, chkInit)
-	// add 2 servers
-	ts.AddServer(testServer1, 1)
-	ts.AddServer(testServer2, 1)
-
-	// expect bootstrap request to server 1
-	ts.Run(1, testServer1, ReqCheckpointData(checkpointHash))
-
-	// server 1 times out; expect request to server 2
-	ts.RequestEvent(request.EvTimeout, ts.Request(1, 1), nil)
-	ts.Run(2, testServer2, ReqCheckpointData(checkpointHash))
-
-	// invalid response from server 2; expect init state to still be false
-	ts.RequestEvent(request.EvResponse, ts.Request(2, 1), &types.BootstrapData{Header: types.Header{Slot: 123456}})
-	ts.ExpFail(testServer2)
-	ts.Run(3)
-	chain.ExpInit(t, false)
-
-	// server 1 fails (hard timeout)
-	ts.RequestEvent(request.EvFail, ts.Request(1, 1), nil)
-	ts.Run(4)
-	chain.ExpInit(t, false)
-
-	// server 3 is registered; expect bootstrap request to server 3
-	ts.AddServer(testServer3, 1)
-	ts.Run(5, testServer3, ReqCheckpointData(checkpointHash))
-
-	// valid response from server 3; expect chain to be initialized
-	ts.RequestEvent(request.EvResponse, ts.Request(5, 1), checkpoint)
-	ts.Run(6)
-	chain.ExpInit(t, true)
-}
-
-func TestUpdateSyncParallel(t *testing.T) {
-	chain := &TestCommitteeChain{}
-	chain.SetNextSyncPeriod(0)
-	updateSync := NewForwardUpdateSync(chain)
-	ts := NewTestScheduler(t, updateSync)
-	// add 2 servers, head at period 100; allow 3-3 parallel requests for each
-	ts.AddServer(testServer1, 3)
-	ts.ServerEvent(EvNewOptimisticUpdate, testServer1, types.OptimisticUpdate{SignatureSlot: 0x2000*100 + 0x1000})
-	ts.AddServer(testServer2, 3)
-	ts.ServerEvent(EvNewOptimisticUpdate, testServer2, types.OptimisticUpdate{SignatureSlot: 0x2000*100 + 0x1000})
-
-	// expect 6 requests to be sent
-	ts.Run(1,
-		testServer1, ReqUpdates{FirstPeriod: 0, Count: 8},
-		testServer1, ReqUpdates{FirstPeriod: 8, Count: 8},
-		testServer1, ReqUpdates{FirstPeriod: 16, Count: 8},
-		testServer2, ReqUpdates{FirstPeriod: 24, Count: 8},
-		testServer2, ReqUpdates{FirstPeriod: 32, Count: 8},
-		testServer2, ReqUpdates{FirstPeriod: 40, Count: 8})
-
-	// valid response to request 1; expect 8 periods synced and a new request started
-	ts.RequestEvent(request.EvResponse, ts.Request(1, 1), testRespUpdate(ts.Request(1, 1)))
-	ts.AddAllowance(testServer1, 1)
-	ts.Run(2, testServer1, ReqUpdates{FirstPeriod: 48, Count: 8})
-	chain.ExpNextSyncPeriod(t, 8)
-
-	// valid response to requests 4 and 5
-	ts.RequestEvent(request.EvResponse, ts.Request(1, 4), testRespUpdate(ts.Request(1, 4)))
-	ts.RequestEvent(request.EvResponse, ts.Request(1, 5), testRespUpdate(ts.Request(1, 5)))
-	ts.AddAllowance(testServer2, 2)
-	// expect 2 more requests but no sync progress (responses 4 and 5 cannot be added before 2 and 3)
-	ts.Run(3,
-		testServer2, ReqUpdates{FirstPeriod: 56, Count: 8},
-		testServer2, ReqUpdates{FirstPeriod: 64, Count: 8})
-	chain.ExpNextSyncPeriod(t, 8)
-
-	// soft timeout for requests 2 and 3 (server 1 is overloaded)
-	ts.RequestEvent(request.EvTimeout, ts.Request(1, 2), nil)
-	ts.RequestEvent(request.EvTimeout, ts.Request(1, 3), nil)
-	// no allowance, no more requests
-	ts.Run(4)
-
-	// valid response to requests 6 and 8 and 9
-	ts.RequestEvent(request.EvResponse, ts.Request(1, 6), testRespUpdate(ts.Request(1, 6)))
-	ts.RequestEvent(request.EvResponse, ts.Request(3, 1), testRespUpdate(ts.Request(3, 1)))
-	ts.RequestEvent(request.EvResponse, ts.Request(3, 2), testRespUpdate(ts.Request(3, 2)))
-	ts.AddAllowance(testServer2, 3)
-	// server 2 can now resend requests 2 and 3 (timed out by server 1) and also send a new one
-	ts.Run(5,
-		testServer2, ReqUpdates{FirstPeriod: 8, Count: 8},
-		testServer2, ReqUpdates{FirstPeriod: 16, Count: 8},
-		testServer2, ReqUpdates{FirstPeriod: 72, Count: 8})
-
-	// server 1 finally answers timed out request 2
-	ts.RequestEvent(request.EvResponse, ts.Request(1, 2), testRespUpdate(ts.Request(1, 2)))
-	ts.AddAllowance(testServer1, 1)
-	// expect sync progress and one new request
-	ts.Run(6, testServer1, ReqUpdates{FirstPeriod: 80, Count: 8})
-	chain.ExpNextSyncPeriod(t, 16)
-
-	// server 2 answers requests 11 and 12 (resends of requests 2 and 3)
-	ts.RequestEvent(request.EvResponse, ts.Request(5, 1), testRespUpdate(ts.Request(5, 1)))
-	ts.RequestEvent(request.EvResponse, ts.Request(5, 2), testRespUpdate(ts.Request(5, 2)))
-	ts.AddAllowance(testServer2, 2)
-	ts.Run(7,
-		testServer2, ReqUpdates{FirstPeriod: 88, Count: 8},
-		testServer2, ReqUpdates{FirstPeriod: 96, Count: 4})
-	// finally the gap is filled, update can process responses up to req6
-	chain.ExpNextSyncPeriod(t, 48)
-
-	// all remaining requests are answered
-	ts.RequestEvent(request.EvResponse, ts.Request(1, 3), testRespUpdate(ts.Request(1, 3)))
-	ts.RequestEvent(request.EvResponse, ts.Request(2, 1), testRespUpdate(ts.Request(2, 1)))
-	ts.RequestEvent(request.EvResponse, ts.Request(5, 3), testRespUpdate(ts.Request(5, 3)))
-	ts.RequestEvent(request.EvResponse, ts.Request(6, 1), testRespUpdate(ts.Request(6, 1)))
-	ts.RequestEvent(request.EvResponse, ts.Request(7, 1), testRespUpdate(ts.Request(7, 1)))
-	ts.RequestEvent(request.EvResponse, ts.Request(7, 2), testRespUpdate(ts.Request(7, 2)))
-	ts.Run(8)
-	// expect chain to be fully synced
-	chain.ExpNextSyncPeriod(t, 100)
-}
-
-func TestUpdateSyncDifferentHeads(t *testing.T) {
-	chain := &TestCommitteeChain{}
-	chain.SetNextSyncPeriod(10)
-	updateSync := NewForwardUpdateSync(chain)
-	ts := NewTestScheduler(t, updateSync)
-	// add 3 servers with different announced head periods
-	ts.AddServer(testServer1, 1)
-	ts.ServerEvent(EvNewOptimisticUpdate, testServer1, types.OptimisticUpdate{SignatureSlot: 0x2000*15 + 0x1000})
-	ts.AddServer(testServer2, 1)
-	ts.ServerEvent(EvNewOptimisticUpdate, testServer2, types.OptimisticUpdate{SignatureSlot: 0x2000*16 + 0x1000})
-	ts.AddServer(testServer3, 1)
-	ts.ServerEvent(EvNewOptimisticUpdate, testServer3, types.OptimisticUpdate{SignatureSlot: 0x2000*17 + 0x1000})
-
-	// expect request to the best announced head
-	ts.Run(1, testServer3, ReqUpdates{FirstPeriod: 10, Count: 7})
-
-	// request times out, expect request to the next best head
-	ts.RequestEvent(request.EvTimeout, ts.Request(1, 1), nil)
-	ts.Run(2, testServer2, ReqUpdates{FirstPeriod: 10, Count: 6})
-
-	// request times out, expect request to the last available server
-	ts.RequestEvent(request.EvTimeout, ts.Request(2, 1), nil)
-	ts.Run(3, testServer1, ReqUpdates{FirstPeriod: 10, Count: 5})
-
-	// valid response to request 3, expect chain synced to period 15
-	ts.RequestEvent(request.EvResponse, ts.Request(3, 1), testRespUpdate(ts.Request(3, 1)))
-	ts.AddAllowance(testServer1, 1)
-	ts.Run(4)
-	chain.ExpNextSyncPeriod(t, 15)
-
-	// invalid response to request 1, server can only deliver updates up to period 15 despite announced head
-	truncated := ts.Request(1, 1)
-	truncated.request = ReqUpdates{FirstPeriod: 10, Count: 5}
-	ts.RequestEvent(request.EvResponse, ts.Request(1, 1), testRespUpdate(truncated))
-	ts.ExpFail(testServer3)
-	ts.Run(5)
-	// expect no progress of chain head
-	chain.ExpNextSyncPeriod(t, 15)
-
-	// valid response to request 2, expect chain synced to period 16
-	ts.RequestEvent(request.EvResponse, ts.Request(2, 1), testRespUpdate(ts.Request(2, 1)))
-	ts.AddAllowance(testServer2, 1)
-	ts.Run(6)
-	chain.ExpNextSyncPeriod(t, 16)
-
-	// a new server is registered with announced head period 17
-	ts.AddServer(testServer4, 1)
-	ts.ServerEvent(EvNewOptimisticUpdate, testServer4, types.OptimisticUpdate{SignatureSlot: 0x2000*17 + 0x1000})
-	// expect request to sync one more period
-	ts.Run(7, testServer4, ReqUpdates{FirstPeriod: 16, Count: 1})
-
-	// valid response, expect chain synced to period 17
-	ts.RequestEvent(request.EvResponse, ts.Request(7, 1), testRespUpdate(ts.Request(7, 1)))
-	ts.AddAllowance(testServer4, 1)
-	ts.Run(8)
-	chain.ExpNextSyncPeriod(t, 17)
-}
-
-func TestRangeLock(t *testing.T) {
-	r := make(rangeLock)
-
-	// Lock from 0 to 99.
-	r.lock(0, 100, 1)
-	for i := 0; i < 100; i++ {
-		if v, ok := r[uint64(i)]; v <= 0 || !ok {
-			t.Fatalf("integer space: %d not locked", i)
-		}
-	}
-
-	// Unlock from 0 to 99.
-	r.lock(0, 100, -1)
-	for i := 0; i < 100; i++ {
-		if v, ok := r[uint64(i)]; v > 0 || ok {
-			t.Fatalf("integer space: %d is locked", i)
-		}
-	}
-
-	// Lock from 0 to 99 then unlock from 10 to 59.
-	r.lock(0, 100, 1)
-	r.lock(10, 50, -1)
-	first, count := r.firstUnlocked(0, 100)
-	if first != 10 || count != 50 {
-		t.Fatalf("unexpected first: %d or count: %d", first, count)
-	}
-}
-
-func testRespUpdate(request requestWithID) request.Response {
-	var resp RespUpdates
-	if request.request == nil {
-		return resp
-	}
-	req := request.request.(ReqUpdates)
-	resp.Updates = make([]*types.LightClientUpdate, int(req.Count))
-	resp.Committees = make([]*types.SerializedSyncCommittee, int(req.Count))
-	period := req.FirstPeriod
-	for i := range resp.Updates {
-		resp.Updates[i] = &types.LightClientUpdate{AttestedHeader: types.SignedHeader{Header: types.Header{Slot: 0x2000*period + 0x1000}}}
-		resp.Committees[i] = new(types.SerializedSyncCommittee)
-		period++
-	}
-	return resp
-}

beacon/params/params.go

@@ -41,6 +41,4 @@ const (
 	StateIndexNextSyncCommittee = 55
 	StateIndexExecPayload       = 56
 	StateIndexExecHead          = 908
-
-	BodyIndexExecPayload = 25
 )

beacon/types/beacon_block.go

@@ -1,110 +0,0 @@
-// Copyright 2024 The go-ethereum Authors
-// This file is part of the go-ethereum library.
-//
-// The go-ethereum library is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// The go-ethereum library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public License
-// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
-
-package types
-
-import (
-	"encoding/json"
-	"fmt"
-
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/protolambda/zrnt/eth2/beacon/capella"
-	zrntcommon "github.com/protolambda/zrnt/eth2/beacon/common"
-	"github.com/protolambda/zrnt/eth2/beacon/deneb"
-	"github.com/protolambda/zrnt/eth2/configs"
-	"github.com/protolambda/ztyp/tree"
-)
-
-type blockObject interface {
-	HashTreeRoot(spec *zrntcommon.Spec, hFn tree.HashFn) zrntcommon.Root
-	Header(spec *zrntcommon.Spec) *zrntcommon.BeaconBlockHeader
-}
-
-// BeaconBlock represents a full block in the beacon chain.
-type BeaconBlock struct {
-	blockObj blockObject
-}
-
-// BlockFromJSON decodes a beacon block from JSON.
-func BlockFromJSON(forkName string, data []byte) (*BeaconBlock, error) {
-	var obj blockObject
-	switch forkName {
-	case "deneb":
-		obj = new(deneb.BeaconBlock)
-	case "capella":
-		obj = new(capella.BeaconBlock)
-	default:
-		return nil, fmt.Errorf("unsupported fork: %s", forkName)
-	}
-	if err := json.Unmarshal(data, obj); err != nil {
-		return nil, err
-	}
-	return &BeaconBlock{obj}, nil
-}
-
-// NewBeaconBlock wraps a ZRNT block.
-func NewBeaconBlock(obj blockObject) *BeaconBlock {
-	switch obj := obj.(type) {
-	case *capella.BeaconBlock:
-		return &BeaconBlock{obj}
-	case *deneb.BeaconBlock:
-		return &BeaconBlock{obj}
-	default:
-		panic(fmt.Errorf("unsupported block type %T", obj))
-	}
-}
-
-// Slot returns the slot number of the block.
-func (b *BeaconBlock) Slot() uint64 {
-	switch obj := b.blockObj.(type) {
-	case *capella.BeaconBlock:
-		return uint64(obj.Slot)
-	case *deneb.BeaconBlock:
-		return uint64(obj.Slot)
-	default:
-		panic(fmt.Errorf("unsupported block type %T", b.blockObj))
-	}
-}
-
-// ExecutionPayload parses and returns the execution payload of the block.
-func (b *BeaconBlock) ExecutionPayload() (*types.Block, error) {
-	switch obj := b.blockObj.(type) {
-	case *capella.BeaconBlock:
-		return convertPayload(&obj.Body.ExecutionPayload, &obj.ParentRoot)
-	case *deneb.BeaconBlock:
-		return convertPayload(&obj.Body.ExecutionPayload, &obj.ParentRoot)
-	default:
-		panic(fmt.Errorf("unsupported block type %T", b.blockObj))
-	}
-}
-
-// Header returns the block's header data.
-func (b *BeaconBlock) Header() Header {
-	switch obj := b.blockObj.(type) {
-	case *capella.BeaconBlock:
-		return headerFromZRNT(obj.Header(configs.Mainnet))
-	case *deneb.BeaconBlock:
-		return headerFromZRNT(obj.Header(configs.Mainnet))
-	default:
-		panic(fmt.Errorf("unsupported block type %T", b.blockObj))
-	}
-}
-
-// Root computes the SSZ root hash of the block.
-func (b *BeaconBlock) Root() common.Hash {
-	return common.Hash(b.blockObj.HashTreeRoot(configs.Mainnet, tree.GetHashFn()))
-}

beacon/types/beacon_block_test.go

@@ -1,77 +0,0 @@
-// Copyright 2024 The go-ethereum Authors
-// This file is part of the go-ethereum library.
-//
-// The go-ethereum library is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// The go-ethereum library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public License
-// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
-
-package types
-
-import (
-	"os"
-	"path/filepath"
-	"testing"
-
-	"github.com/ethereum/go-ethereum/common"
-)
-
-func TestBlockFromJSON(t *testing.T) {
-	type blocktest struct {
-		file            string
-		version         string
-		wantSlot        uint64
-		wantBlockNumber uint64
-		wantBlockHash   common.Hash
-	}
-	tests := []blocktest{
-		{
-			file:            "block_deneb.json",
-			version:         "deneb",
-			wantSlot:        8631513,
-			wantBlockNumber: 19431837,
-			wantBlockHash:   common.HexToHash("0x4cf7d9108fc01b50023ab7cab9b372a96068fddcadec551630393b65acb1f34c"),
-		},
-		{
-			file:            "block_capella.json",
-			version:         "capella",
-			wantSlot:        7378495,
-			wantBlockNumber: 18189758,
-			wantBlockHash:   common.HexToHash("0x802acf5c350f4252e31d83c431fcb259470250fa0edf49e8391cfee014239820"),
-		},
-	}
-
-	for _, test := range tests {
-		t.Run(test.file, func(t *testing.T) {
-			data, err := os.ReadFile(filepath.Join("testdata", test.file))
-			if err != nil {
-				t.Fatal(err)
-			}
-			beaconBlock, err := BlockFromJSON(test.version, data)
-			if err != nil {
-				t.Fatal(err)
-			}
-			if beaconBlock.Slot() != test.wantSlot {
-				t.Errorf("wrong slot number %d", beaconBlock.Slot())
-			}
-			execBlock, err := beaconBlock.ExecutionPayload()
-			if err != nil {
-				t.Fatalf("payload extraction failed: %v", err)
-			}
-			if execBlock.NumberU64() != test.wantBlockNumber {
-				t.Errorf("wrong block number: %v", execBlock.NumberU64())
-			}
-			if execBlock.Hash() != test.wantBlockHash {
-				t.Errorf("wrong block hash: %v", execBlock.Hash())
-			}
-		})
-	}
-}

beacon/types/config.go

@@ -19,9 +19,7 @@ package types
 import (
 	"crypto/sha256"
 	"fmt"
-	"math"
 	"os"
-	"slices"
 	"sort"
 	"strconv"
 	"strings"
@@ -29,7 +27,6 @@ import (
 	"github.com/ethereum/go-ethereum/beacon/merkle"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/common/hexutil"
-	"github.com/ethereum/go-ethereum/log"
 	"gopkg.in/yaml.v3"
 )
 
@@ -37,12 +34,10 @@ import (
 // across signing different data structures.
 const syncCommitteeDomain = 7
 
-var knownForks = []string{"GENESIS", "ALTAIR", "BELLATRIX", "CAPELLA", "DENEB"}
-
 // Fork describes a single beacon chain fork and also stores the calculated
 // signature domain used after this fork.
 type Fork struct {
-	// Name of the fork in the chain config (config.yaml) file
+	// Name of the fork in the chain config (config.yaml) file{
 	Name string
 
 	// Epoch when given fork version is activated
@@ -51,9 +46,6 @@ type Fork struct {
 	// Fork version, see https://github.com/ethereum/consensus-specs/blob/dev/specs/phase0/beacon-chain.md#custom-types
 	Version []byte
 
-	// index in list of known forks or MaxInt if unknown
-	knownIndex int
-
 	// calculated by computeDomain, based on fork version and genesis validators root
 	domain merkle.Value
 }
@@ -107,14 +99,9 @@ func (f Forks) SigningRoot(header Header) (common.Hash, error) {
 	return signingRoot, nil
 }
 
-func (f Forks) Len() int      { return len(f) }
-func (f Forks) Swap(i, j int) { f[i], f[j] = f[j], f[i] }
-func (f Forks) Less(i, j int) bool {
-	if f[i].Epoch != f[j].Epoch {
-		return f[i].Epoch < f[j].Epoch
-	}
-	return f[i].knownIndex < f[j].knownIndex
-}
+func (f Forks) Len() int           { return len(f) }
+func (f Forks) Swap(i, j int)      { f[i], f[j] = f[j], f[i] }
+func (f Forks) Less(i, j int) bool { return f[i].Epoch < f[j].Epoch }
 
 // ChainConfig contains the beacon chain configuration.
 type ChainConfig struct {
@@ -123,34 +110,18 @@ type ChainConfig struct {
 	Forks                 Forks
 }
 
-// ForkAtEpoch returns the latest active fork at the given epoch.
-func (c *ChainConfig) ForkAtEpoch(epoch uint64) Fork {
-	for i := len(c.Forks) - 1; i >= 0; i-- {
-		if c.Forks[i].Epoch <= epoch {
-			return *c.Forks[i]
-		}
-	}
-	return Fork{}
-}
-
 // AddFork adds a new item to the list of forks.
 func (c *ChainConfig) AddFork(name string, epoch uint64, version []byte) *ChainConfig {
-	knownIndex := slices.Index(knownForks, name)
-	if knownIndex == -1 {
-		knownIndex = math.MaxInt // assume that the unknown fork happens after the known ones
-		if epoch != math.MaxUint64 {
-			log.Warn("Unknown fork in config.yaml", "fork name", name, "known forks", knownForks)
-		}
-	}
 	fork := &Fork{
-		Name:       name,
-		Epoch:      epoch,
-		Version:    version,
-		knownIndex: knownIndex,
+		Name:    name,
+		Epoch:   epoch,
+		Version: version,
 	}
 	fork.computeDomain(c.GenesisValidatorsRoot)
+
 	c.Forks = append(c.Forks, fork)
 	sort.Sort(c.Forks)
+
 	return c
 }
 
@@ -200,5 +171,6 @@ func (c *ChainConfig) LoadForks(path string) error {
 	for name := range versions {
 		return fmt.Errorf("epoch number missing for fork %q in beacon chain config file", name)
 	}
+	sort.Sort(c.Forks)
 	return nil
 }

beacon/types/exec_header.go

@@ -1,80 +0,0 @@
-// Copyright 2024 The go-ethereum Authors
-// This file is part of the go-ethereum library.
-//
-// The go-ethereum library is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// The go-ethereum library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public License
-// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
-
-package types
-
-import (
-	"encoding/json"
-	"fmt"
-
-	"github.com/ethereum/go-ethereum/beacon/merkle"
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/protolambda/zrnt/eth2/beacon/capella"
-	zrntcommon "github.com/protolambda/zrnt/eth2/beacon/common"
-	"github.com/protolambda/zrnt/eth2/beacon/deneb"
-	"github.com/protolambda/ztyp/tree"
-)
-
-type headerObject interface {
-	HashTreeRoot(hFn tree.HashFn) zrntcommon.Root
-}
-
-type ExecutionHeader struct {
-	obj headerObject
-}
-
-// ExecutionHeaderFromJSON decodes an execution header from JSON data provided by
-// the beacon chain API.
-func ExecutionHeaderFromJSON(forkName string, data []byte) (*ExecutionHeader, error) {
-	var obj headerObject
-	switch forkName {
-	case "capella":
-		obj = new(capella.ExecutionPayloadHeader)
-	case "deneb":
-		obj = new(deneb.ExecutionPayloadHeader)
-	default:
-		return nil, fmt.Errorf("unsupported fork: %s", forkName)
-	}
-	if err := json.Unmarshal(data, obj); err != nil {
-		return nil, err
-	}
-	return &ExecutionHeader{obj: obj}, nil
-}
-
-func NewExecutionHeader(obj headerObject) *ExecutionHeader {
-	switch obj.(type) {
-	case *capella.ExecutionPayloadHeader:
-	case *deneb.ExecutionPayloadHeader:
-	default:
-		panic(fmt.Errorf("unsupported ExecutionPayloadHeader type %T", obj))
-	}
-	return &ExecutionHeader{obj: obj}
-}
-
-func (eh *ExecutionHeader) PayloadRoot() merkle.Value {
-	return merkle.Value(eh.obj.HashTreeRoot(tree.GetHashFn()))
-}
-
-func (eh *ExecutionHeader) BlockHash() common.Hash {
-	switch obj := eh.obj.(type) {
-	case *capella.ExecutionPayloadHeader:
-		return common.Hash(obj.BlockHash)
-	case *deneb.ExecutionPayloadHeader:
-		return common.Hash(obj.BlockHash)
-	default:
-		panic(fmt.Errorf("unsupported ExecutionPayloadHeader type %T", obj))
-	}
-}

beacon/types/exec_payload.go

@@ -1,141 +0,0 @@
-// Copyright 2024 The go-ethereum Authors
-// This file is part of the go-ethereum library.
-//
-// The go-ethereum library is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// The go-ethereum library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public License
-// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
-
-package types
-
-import (
-	"fmt"
-	"math/big"
-
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/trie"
-	"github.com/holiman/uint256"
-	"github.com/protolambda/zrnt/eth2/beacon/capella"
-	zrntcommon "github.com/protolambda/zrnt/eth2/beacon/common"
-	"github.com/protolambda/zrnt/eth2/beacon/deneb"
-)
-
-type payloadType interface {
-	*capella.ExecutionPayload | *deneb.ExecutionPayload
-}
-
-// convertPayload converts a beacon chain execution payload to types.Block.
-func convertPayload[T payloadType](payload T, parentRoot *zrntcommon.Root) (*types.Block, error) {
-	var (
-		header       types.Header
-		transactions []*types.Transaction
-		withdrawals  []*types.Withdrawal
-		expectedHash [32]byte
-		err          error
-	)
-	switch p := any(payload).(type) {
-	case *capella.ExecutionPayload:
-		convertCapellaHeader(p, &header)
-		transactions, err = convertTransactions(p.Transactions, &header)
-		if err != nil {
-			return nil, err
-		}
-		withdrawals = convertWithdrawals(p.Withdrawals, &header)
-		expectedHash = p.BlockHash
-	case *deneb.ExecutionPayload:
-		convertDenebHeader(p, common.Hash(*parentRoot), &header)
-		transactions, err = convertTransactions(p.Transactions, &header)
-		if err != nil {
-			return nil, err
-		}
-		withdrawals = convertWithdrawals(p.Withdrawals, &header)
-		expectedHash = p.BlockHash
-	default:
-		panic("unsupported block type")
-	}
-
-	block := types.NewBlockWithHeader(&header).WithBody(types.Body{Transactions: transactions, Withdrawals: withdrawals})
-	if hash := block.Hash(); hash != expectedHash {
-		return nil, fmt.Errorf("sanity check failed, payload hash does not match (expected %x, got %x)", expectedHash, hash)
-	}
-	return block, nil
-}
-
-func convertCapellaHeader(payload *capella.ExecutionPayload, h *types.Header) {
-	// note: h.TxHash is set in convertTransactions
-	h.ParentHash = common.Hash(payload.ParentHash)
-	h.UncleHash = types.EmptyUncleHash
-	h.Coinbase = common.Address(payload.FeeRecipient)
-	h.Root = common.Hash(payload.StateRoot)
-	h.ReceiptHash = common.Hash(payload.ReceiptsRoot)
-	h.Bloom = types.Bloom(payload.LogsBloom)
-	h.Difficulty = common.Big0
-	h.Number = new(big.Int).SetUint64(uint64(payload.BlockNumber))
-	h.GasLimit = uint64(payload.GasLimit)
-	h.GasUsed = uint64(payload.GasUsed)
-	h.Time = uint64(payload.Timestamp)
-	h.Extra = []byte(payload.ExtraData)
-	h.MixDigest = common.Hash(payload.PrevRandao)
-	h.Nonce = types.BlockNonce{}
-	h.BaseFee = (*uint256.Int)(&payload.BaseFeePerGas).ToBig()
-}
-
-func convertDenebHeader(payload *deneb.ExecutionPayload, parentRoot common.Hash, h *types.Header) {
-	// note: h.TxHash is set in convertTransactions
-	h.ParentHash = common.Hash(payload.ParentHash)
-	h.UncleHash = types.EmptyUncleHash
-	h.Coinbase = common.Address(payload.FeeRecipient)
-	h.Root = common.Hash(payload.StateRoot)
-	h.ReceiptHash = common.Hash(payload.ReceiptsRoot)
-	h.Bloom = types.Bloom(payload.LogsBloom)
-	h.Difficulty = common.Big0
-	h.Number = new(big.Int).SetUint64(uint64(payload.BlockNumber))
-	h.GasLimit = uint64(payload.GasLimit)
-	h.GasUsed = uint64(payload.GasUsed)
-	h.Time = uint64(payload.Timestamp)
-	h.Extra = []byte(payload.ExtraData)
-	h.MixDigest = common.Hash(payload.PrevRandao)
-	h.Nonce = types.BlockNonce{}
-	h.BaseFee = (*uint256.Int)(&payload.BaseFeePerGas).ToBig()
-	// new in deneb
-	h.BlobGasUsed = (*uint64)(&payload.BlobGasUsed)
-	h.ExcessBlobGas = (*uint64)(&payload.ExcessBlobGas)
-	h.ParentBeaconRoot = &parentRoot
-}
-
-func convertTransactions(list zrntcommon.PayloadTransactions, execHeader *types.Header) ([]*types.Transaction, error) {
-	txs := make([]*types.Transaction, len(list))
-	for i, opaqueTx := range list {
-		var tx types.Transaction
-		if err := tx.UnmarshalBinary(opaqueTx); err != nil {
-			return nil, fmt.Errorf("failed to parse tx %d: %v", i, err)
-		}
-		txs[i] = &tx
-	}
-	execHeader.TxHash = types.DeriveSha(types.Transactions(txs), trie.NewStackTrie(nil))
-	return txs, nil
-}
-
-func convertWithdrawals(list zrntcommon.Withdrawals, execHeader *types.Header) []*types.Withdrawal {
-	withdrawals := make([]*types.Withdrawal, len(list))
-	for i, w := range list {
-		withdrawals[i] = &types.Withdrawal{
-			Index:     uint64(w.Index),
-			Validator: uint64(w.ValidatorIndex),
-			Address:   common.Address(w.Address),
-			Amount:    uint64(w.Amount),
-		}
-	}
-	wroot := types.DeriveSha(types.Withdrawals(withdrawals), trie.NewStackTrie(nil))
-	execHeader.WithdrawalsHash = &wroot
-	return withdrawals
-}

beacon/types/header.go

@@ -24,7 +24,6 @@ import (
 	"github.com/ethereum/go-ethereum/beacon/merkle"
 	"github.com/ethereum/go-ethereum/beacon/params"
 	"github.com/ethereum/go-ethereum/common"
-	zrntcommon "github.com/protolambda/zrnt/eth2/beacon/common"
 )
 
 //go:generate go run github.com/fjl/gencodec -type Header -field-override headerMarshaling -out gen_header_json.go
@@ -58,16 +57,6 @@ type Header struct {
 	BodyRoot common.Hash `gencodec:"required" json:"body_root"`
 }
 
-func headerFromZRNT(zh *zrntcommon.BeaconBlockHeader) Header {
-	return Header{
-		Slot:          uint64(zh.Slot),
-		ProposerIndex: uint64(zh.ProposerIndex),
-		ParentRoot:    common.Hash(zh.ParentRoot),
-		StateRoot:     common.Hash(zh.StateRoot),
-		BodyRoot:      common.Hash(zh.BodyRoot),
-	}
-}
-
 // headerMarshaling is a field type overrides for gencodec.
 type headerMarshaling struct {
 	Slot          common.Decimal

beacon/types/light_sync.go

@@ -23,15 +23,8 @@ import (
 	"github.com/ethereum/go-ethereum/beacon/merkle"
 	"github.com/ethereum/go-ethereum/beacon/params"
 	"github.com/ethereum/go-ethereum/common"
-	ctypes "github.com/ethereum/go-ethereum/core/types"
 )
 
-// HeadInfo represents an unvalidated new head announcement.
-type HeadInfo struct {
-	Slot      uint64
-	BlockRoot common.Hash
-}
-
 // BootstrapData contains a sync committee where light sync can be started,
 // together with a proof through a beacon header and corresponding state.
 // Note: BootstrapData is fetched from a server based on a known checkpoint hash.
@@ -141,96 +134,3 @@ func (u UpdateScore) BetterThan(w UpdateScore) bool {
 	}
 	return u.SignerCount > w.SignerCount
 }
-
-// HeaderWithExecProof contains a beacon header and proves the belonging execution
-// payload header with a Merkle proof.
-type HeaderWithExecProof struct {
-	Header
-	PayloadHeader *ExecutionHeader
-	PayloadBranch merkle.Values
-}
-
-// Validate verifies the Merkle proof of the execution payload header.
-func (h *HeaderWithExecProof) Validate() error {
-	return merkle.VerifyProof(h.BodyRoot, params.BodyIndexExecPayload, h.PayloadBranch, h.PayloadHeader.PayloadRoot())
-}
-
-// OptimisticUpdate proves sync committee commitment on the attested beacon header.
-// It also proves the belonging execution payload header with a Merkle proof.
-//
-// See data structure definition here:
-// https://github.com/ethereum/consensus-specs/blob/dev/specs/altair/light-client/sync-protocol.md#lightclientoptimisticupdate
-type OptimisticUpdate struct {
-	Attested HeaderWithExecProof
-	// Sync committee BLS signature aggregate
-	Signature SyncAggregate
-	// Slot in which the signature has been created (newer than Header.Slot,
-	// determines the signing sync committee)
-	SignatureSlot uint64
-}
-
-// SignedHeader returns the signed attested header of the update.
-func (u *OptimisticUpdate) SignedHeader() SignedHeader {
-	return SignedHeader{
-		Header:        u.Attested.Header,
-		Signature:     u.Signature,
-		SignatureSlot: u.SignatureSlot,
-	}
-}
-
-// Validate verifies the Merkle proof proving the execution payload header.
-// Note that the sync committee signature of the attested header should be
-// verified separately by a synced committee chain.
-func (u *OptimisticUpdate) Validate() error {
-	return u.Attested.Validate()
-}
-
-// FinalityUpdate proves a finalized beacon header by a sync committee commitment
-// on an attested beacon header, referring to the latest finalized header with a
-// Merkle proof.
-// It also proves the execution payload header belonging to both the attested and
-// the finalized beacon header with Merkle proofs.
-//
-// See data structure definition here:
-// https://github.com/ethereum/consensus-specs/blob/dev/specs/altair/light-client/sync-protocol.md#lightclientfinalityupdate
-type FinalityUpdate struct {
-	Attested, Finalized HeaderWithExecProof
-	FinalityBranch      merkle.Values
-	// Sync committee BLS signature aggregate
-	Signature SyncAggregate
-	// Slot in which the signature has been created (newer than Header.Slot,
-	// determines the signing sync committee)
-	SignatureSlot uint64
-}
-
-// SignedHeader returns the signed attested header of the update.
-func (u *FinalityUpdate) SignedHeader() SignedHeader {
-	return SignedHeader{
-		Header:        u.Attested.Header,
-		Signature:     u.Signature,
-		SignatureSlot: u.SignatureSlot,
-	}
-}
-
-// Validate verifies the Merkle proofs proving the finalized beacon header and
-// the execution payload headers belonging to the attested and finalized headers.
-// Note that the sync committee signature of the attested header should be
-// verified separately by a synced committee chain.
-func (u *FinalityUpdate) Validate() error {
-	if err := u.Attested.Validate(); err != nil {
-		return err
-	}
-	if err := u.Finalized.Validate(); err != nil {
-		return err
-	}
-	return merkle.VerifyProof(u.Attested.StateRoot, params.StateIndexFinalBlock, u.FinalityBranch, merkle.Value(u.Finalized.Hash()))
-}
-
-// ChainHeadEvent returns an authenticated execution payload associated with the
-// latest accepted head of the beacon chain, along with the hash of the latest
-// finalized execution block.
-type ChainHeadEvent struct {
-	BeaconHead Header
-	Block      *ctypes.Block
-	Finalized  common.Hash
-}

build/checksums.txt

@@ -5,123 +5,61 @@
 # https://github.com/ethereum/execution-spec-tests/releases/download/v2.1.0/
 ca89c76851b0900bfcc3cbb9a26cbece1f3d7c64a3bed38723e914713290df6c  fixtures_develop.tar.gz
 
-# version:golang 1.23.1
+# version:golang 1.21.6
 # https://go.dev/dl/
-6ee44e298379d146a5e5aa6b1c5b5d5f5d0a3365eabdd70741e6e21340ec3b0d  go1.23.1.src.tar.gz
-f17f2791717c15728ec63213a014e244c35f9c8846fb29f5a1b63d0c0556f756  go1.23.1.aix-ppc64.tar.gz
-dd9e772686ed908bcff94b6144322d4e2473a7dcd7c696b7e8b6d12f23c887fd  go1.23.1.darwin-amd64.pkg
-488d9e4ca3e3ed513ee4edd91bef3a2360c65fa6d6be59cf79640bf840130a58  go1.23.1.darwin-amd64.tar.gz
-be34b488157ec69d94e26e1554558219a2c90789bcb7e3686965a7f9c8cfcbe7  go1.23.1.darwin-arm64.pkg
-e223795ca340e285a760a6446ce57a74500b30e57469a4109961d36184d3c05a  go1.23.1.darwin-arm64.tar.gz
-6af626176923a6ae6c5de6dc1c864f38365793c0e4ecd0d6eab847bdc23953e5  go1.23.1.dragonfly-amd64.tar.gz
-cc957c1a019702e6cdc2e257202d42799011ebc1968b6c3bcd6b1965952607d5  go1.23.1.freebsd-386.tar.gz
-a7d57781c50bb80886a8f04066791956d45aa3eea0f83070c5268b6223afb2ff  go1.23.1.freebsd-amd64.tar.gz
-c7b09f3fef456048e596db9bea746eb66796aeb82885622b0388feee18f36a3e  go1.23.1.freebsd-arm.tar.gz
-b05cd6a77995a0c8439d88df124811c725fb78b942d0b6dd1643529d7ba62f1f  go1.23.1.freebsd-arm64.tar.gz
-56236ae70be1613f2915943b94f53c96be5bffc0719314078facd778a89bc57e  go1.23.1.freebsd-riscv64.tar.gz
-8644c52df4e831202114fd67c9fcaf1f7233ad27bf945ac53fa7217cf1a0349f  go1.23.1.illumos-amd64.tar.gz
-cdee2f4e2efa001f7ee75c90f2efc310b63346cfbba7b549987e9139527c6b17  go1.23.1.linux-386.tar.gz
-49bbb517cfa9eee677e1e7897f7cf9cfdbcf49e05f61984a2789136de359f9bd  go1.23.1.linux-amd64.tar.gz
-faec7f7f8ae53fda0f3d408f52182d942cc89ef5b7d3d9f23ff117437d4b2d2f  go1.23.1.linux-arm64.tar.gz
-6c7832c7dcd8fb6d4eb308f672a725393403c74ee7be1aeccd8a443015df99de  go1.23.1.linux-armv6l.tar.gz
-649ce3856ddc808c00b14a46232eab0bf95e7911cdf497010b17d76656f5ca4e  go1.23.1.linux-loong64.tar.gz
-201911048f234e5a0c51ec94b1a11d4e47062fee4398b1d2faa6c820dc026724  go1.23.1.linux-mips.tar.gz
-2bce3743df463915e45d2612f9476ffb03d0b3750b1cb3879347de08715b5fc6  go1.23.1.linux-mips64.tar.gz
-54e301f266e33431b0703136e0bbd4cf02461b1ecedd37b7cbd90cb862a98e5f  go1.23.1.linux-mips64le.tar.gz
-8efd495e93d17408c0803595cdc3bf13cb28e0f957aeabd9cc18245fb8e64019  go1.23.1.linux-mipsle.tar.gz
-52bd68689095831ad9af7160844c23b28bb8d0acd268de7e300ff5f0662b7a07  go1.23.1.linux-ppc64.tar.gz
-042888cae54b5fbfd9dd1e3b6bc4a5134879777fe6497fc4c62ec394b5ecf2da  go1.23.1.linux-ppc64le.tar.gz
-1a4a609f0391bea202d9095453cbfaf7368fa88a04c206bf9dd715a738664dc3  go1.23.1.linux-riscv64.tar.gz
-47dc49ad45c45e192efa0df7dc7bc5403f5f2d15b5d0dc74ef3018154b616f4d  go1.23.1.linux-s390x.tar.gz
-fbfbd5efa6a5d581ea7f5e65015f927db0e52135cab057e43d39d5482da54b61  go1.23.1.netbsd-386.tar.gz
-e96e1cc5cf36113ee6099d1a7306b22cd9c3f975a36bdff954c59f104f22b853  go1.23.1.netbsd-amd64.tar.gz
-c394dfc06bfc276a591209a37e09cd39089ec9a9cc3db30b94814ce2e39eb1d4  go1.23.1.netbsd-arm.tar.gz
-b3b35d64f32821a68b3e2994032dbefb81978f2ec3f218c7a770623b82d36b8e  go1.23.1.netbsd-arm64.tar.gz
-3c775c4c16c182e33c2c4ac090d9a247a93b3fb18a3df01d87d490f29599faff  go1.23.1.openbsd-386.tar.gz
-5edbe53b47c57b32707fd7154536fbe9eaa79053fea01650c93b54cdba13fc0f  go1.23.1.openbsd-amd64.tar.gz
-c30903dd8fa98b8aca8e9db0962ce9f55502aed93e0ef41e5ae148aaa0088de1  go1.23.1.openbsd-arm.tar.gz
-12da183489e58f9c6b357bc1b626f85ed7d4220cab31a49d6a49e6ac6a718b67  go1.23.1.openbsd-arm64.tar.gz
-9cc9aad37696a4a10c31dcec9e35a308de0b369dad354d54cf07406ac6fa7c6f  go1.23.1.openbsd-ppc64.tar.gz
-e1d740dda062ce5a276a0c3ed7d8b6353238bc8ff405f63e2e3480bfd26a5ec5  go1.23.1.openbsd-riscv64.tar.gz
-da2a37f9987f01f096859230aa13ecc4ad2e7884465bce91004bc78c64435d65  go1.23.1.plan9-386.tar.gz
-fd8fff8b0697d55c4a4d02a8dc998192b80a9dc2a057647373d6ff607cad29de  go1.23.1.plan9-amd64.tar.gz
-52efbc5804c1c86ba7868aa8ebbc31cc8c2a27b62a60fd57944970d48fc67525  go1.23.1.plan9-arm.tar.gz
-f54205f21e2143f2ada1bf1c00ddf64590f5139d5c3fb77cc06175f0d8cc7567  go1.23.1.solaris-amd64.tar.gz
-369a17f0cfd29e5c848e58ffe0d772da20abe334d1c7ca01dbcd55bb3db0b440  go1.23.1.windows-386.msi
-ab866f47d7be56e6b1c67f1d529bf4c23331a339fb0785f435a0552d352cb257  go1.23.1.windows-386.zip
-e99dac215ee437b9bb8f8b14bbfe0e8756882c1ed291f30818e8363bc9c047a5  go1.23.1.windows-amd64.msi
-32dedf277c86610e380e1765593edb66876f00223df71690bd6be68ee17675c0  go1.23.1.windows-amd64.zip
-23169c79dc6b54e0dffb25be6b67425ad9759392a58309bc057430a9bf4c8f6a  go1.23.1.windows-arm.msi
-1a57615a09f13534f88e9f2d7efd5743535d1a5719b19e520eef965a634f8efb  go1.23.1.windows-arm.zip
-313e1a543931ad8735b4df8969e00f5f4c2ef07be21f54015ede961a70263d35  go1.23.1.windows-arm64.msi
-64ad0954d2c33f556fb1018d62de091254aa6e3a94f1c8a8b16af0d3701d194e  go1.23.1.windows-arm64.zip
+124926a62e45f78daabbaedb9c011d97633186a33c238ffc1e25320c02046248  go1.21.6.src.tar.gz
+31d6ecca09010ab351e51343a5af81d678902061fee871f912bdd5ef4d778850  go1.21.6.darwin-amd64.tar.gz
+0ff541fb37c38e5e5c5bcecc8f4f43c5ffd5e3a6c33a5d3e4003ded66fcfb331  go1.21.6.darwin-arm64.tar.gz
+a1d1a149b34bf0f53965a237682c6da1140acabb131bf0e597240e4a140b0e5e  go1.21.6.freebsd-386.tar.gz
+de59e1217e4398b1522eed8dddabab2fa1b97aecbdca3af08e34832b4f0e3f81  go1.21.6.freebsd-amd64.tar.gz
+05d09041b5a1193c14e4b2db3f7fcc649b236c567f5eb93305c537851b72dd95  go1.21.6.linux-386.tar.gz
+3f934f40ac360b9c01f616a9aa1796d227d8b0328bf64cb045c7b8c4ee9caea4  go1.21.6.linux-amd64.tar.gz
+e2e8aa88e1b5170a0d495d7d9c766af2b2b6c6925a8f8956d834ad6b4cacbd9a  go1.21.6.linux-arm64.tar.gz
+6a8eda6cc6a799ff25e74ce0c13fdc1a76c0983a0bb07c789a2a3454bf6ec9b2  go1.21.6.linux-armv6l.tar.gz
+e872b1e9a3f2f08fd4554615a32ca9123a4ba877ab6d19d36abc3424f86bc07f  go1.21.6.linux-ppc64le.tar.gz
+92894d0f732d3379bc414ffdd617eaadad47e1d72610e10d69a1156db03fc052  go1.21.6.linux-s390x.tar.gz
+65b38857135cf45c80e1d267e0ce4f80fe149326c68835217da4f2da9b7943fe  go1.21.6.windows-386.zip
+27ac9dd6e66fb3fd0acfa6792ff053c86e7d2c055b022f4b5d53bfddec9e3301  go1.21.6.windows-amd64.zip
+b93aff8f3c882c764c66a39b7a1483b0460e051e9992bf3435479129e5051bcd  go1.21.6.windows-arm64.zip
 
-# version:golangci 1.59.0
+# version:golangci 1.55.2
 # https://github.com/golangci/golangci-lint/releases/
-# https://github.com/golangci/golangci-lint/releases/download/v1.59.0/
-418acf7e255ddc0783e97129c9b03d9311b77826a5311d425a01c708a86417e7  golangci-lint-1.59.0-darwin-amd64.tar.gz
-5f6a1d95a6dd69f6e328eb56dd311a38e04cfab79a1305fbf4957f4e203f47b6  golangci-lint-1.59.0-darwin-arm64.tar.gz
-8899bf589185d49f747f3e5db9f0bde8a47245a100c64a3dd4d65e8e92cfc4f2  golangci-lint-1.59.0-freebsd-386.tar.gz
-658212f138d9df2ac89427e22115af34bf387c0871d70f2a25101718946a014f  golangci-lint-1.59.0-freebsd-amd64.tar.gz
-4c6395ea40f314d3b6fa17d8997baab93464d5d1deeaab513155e625473bd03a  golangci-lint-1.59.0-freebsd-armv6.tar.gz
-ff37da4fbaacdb6bbae70fdbdbb1ba932a859956f788c82822fa06bef5b7c6b3  golangci-lint-1.59.0-freebsd-armv7.tar.gz
-439739469ed2bda182b1ec276d40c40e02f195537f78e3672996741ad223d6b6  golangci-lint-1.59.0-illumos-amd64.tar.gz
-940801d46790e40d0a097d8fee34e2606f0ef148cd039654029b0b8750a15ed6  golangci-lint-1.59.0-linux-386.tar.gz
-3b14a439f33c4fff83dbe0349950d984042b9a1feb6c62f82787b598fc3ab5f4  golangci-lint-1.59.0-linux-amd64.tar.gz
-c57e6c0b0fa03089a2611dceddd5bc5d206716cccdff8b149da8baac598719a1  golangci-lint-1.59.0-linux-arm64.tar.gz
-93149e2d3b25ac754df9a23172403d8aa6d021a7e0d9c090a12f51897f68c9a0  golangci-lint-1.59.0-linux-armv6.tar.gz
-d10ac38239d9efee3ee87b55c96cdf3fa09e1a525babe3ffdaaf65ccc48cf3dc  golangci-lint-1.59.0-linux-armv7.tar.gz
-047338114b4f0d5f08f0fb9a397b03cc171916ed0960be7dfb355c2320cd5e9c  golangci-lint-1.59.0-linux-loong64.tar.gz
-5632df0f7f8fc03a80a266130faef0b5902d280cf60621f1b2bdc1aef6d97ee9  golangci-lint-1.59.0-linux-mips64.tar.gz
-71dd638c82fa4439171e7126d2c7a32b5d103bfdef282cea40c83632cb3d1f4b  golangci-lint-1.59.0-linux-mips64le.tar.gz
-6cf9ea0d34e91669948483f9ae7f07da319a879344373a1981099fbd890cde00  golangci-lint-1.59.0-linux-ppc64le.tar.gz
-af0205fa6fbab197cee613c359947711231739095d21b5c837086233b36ad971  golangci-lint-1.59.0-linux-riscv64.tar.gz
-a9d2fb93f3c688ebccef94f5dc96c0b07c4d20bf6556cddebd8442159b0c80f6  golangci-lint-1.59.0-linux-s390x.tar.gz
-68ab4c57a847b8ace9679887f2f8b2b6760e57ee29dcde8c3f40dd8bb2654fa2  golangci-lint-1.59.0-netbsd-386.tar.gz
-d277b8b435c19406d00de4d509eadf5a024a5782878332e9a1b7c02bb76e87a7  golangci-lint-1.59.0-netbsd-amd64.tar.gz
-83211656be8dcfa1545af4f92894409f412d1f37566798cb9460a526593ad62c  golangci-lint-1.59.0-netbsd-arm64.tar.gz
-6c6866d28bf79fa9817a0f7d2b050890ed109cae80bdb4dfa39536a7226da237  golangci-lint-1.59.0-netbsd-armv6.tar.gz
-11587566363bd03ca586b7df9776ccaed569fcd1f3489930ac02f9375b307503  golangci-lint-1.59.0-netbsd-armv7.tar.gz
-466181a8967bafa495e41494f93a0bec829c2cf715de874583b0460b3b8ae2b8  golangci-lint-1.59.0-windows-386.zip
-3317d8a87a99a49a0a1321d295c010790e6dbf43ee96b318f4b8bb23eae7a565  golangci-lint-1.59.0-windows-amd64.zip
-b3af955c7fceac8220a36fc799e1b3f19d3b247d32f422caac5f9845df8f7316  golangci-lint-1.59.0-windows-arm64.zip
-6f083c7d0c764e5a0e5bde46ee3e91ae357d80c194190fe1d9754392e9064c7e  golangci-lint-1.59.0-windows-armv6.zip
-3709b4dd425deadab27748778d08e03c0f804d7748f7dd5b6bb488d98aa031c7  golangci-lint-1.59.0-windows-armv7.zip
+# https://github.com/golangci/golangci-lint/releases/download/v1.55.2/
+632e96e6d5294fbbe7b2c410a49c8fa01c60712a0af85a567de85bcc1623ea21  golangci-lint-1.55.2-darwin-amd64.tar.gz
+234463f059249f82045824afdcdd5db5682d0593052f58f6a3039a0a1c3899f6  golangci-lint-1.55.2-darwin-arm64.tar.gz
+2bdd105e2d4e003a9058c33a22bb191a1e0f30fa0790acca0d8fbffac1d6247c  golangci-lint-1.55.2-freebsd-386.tar.gz
+e75056e8b082386676ce23eba455cf893931a792c0d87e1e3743c0aec33c7fb5  golangci-lint-1.55.2-freebsd-amd64.tar.gz
+5789b933facaf6136bd23f1d50add67b79bbcf8dfdfc9069a37f729395940a66  golangci-lint-1.55.2-freebsd-armv6.tar.gz
+7f21ab1008d05f32c954f99470fc86a83a059e530fe2add1d0b7d8ed4d8992a7  golangci-lint-1.55.2-freebsd-armv7.tar.gz
+33ab06139b9219a28251f10821da94423db30285cc2af97494cbb2a281927de9  golangci-lint-1.55.2-illumos-amd64.tar.gz
+57ce6f8ce3ad6ee45d7cc3d9a047545a851c2547637834a3fcb086c7b40b1e6b  golangci-lint-1.55.2-linux-386.tar.gz
+ca21c961a33be3bc15e4292dc40c98c8dcc5463a7b6768a3afc123761630c09c  golangci-lint-1.55.2-linux-amd64.tar.gz
+8eb0cee9b1dbf0eaa49871798c7f8a5b35f2960c52d776a5f31eb7d886b92746  golangci-lint-1.55.2-linux-arm64.tar.gz
+3195f3e0f37d353fd5bd415cabcd4e263f5c29d3d0ffb176c26ff3d2c75eb3bb  golangci-lint-1.55.2-linux-armv6.tar.gz
+c823ee36eb1a719e171de1f2f5ca3068033dce8d9817232fd10ed71fd6650406  golangci-lint-1.55.2-linux-armv7.tar.gz
+758a5d2a356dc494bd13ed4c0d4bf5a54a4dc91267ea5ecdd87b86c7ca0624e7  golangci-lint-1.55.2-linux-loong64.tar.gz
+2c7b9abdce7cae802a67d583cd7c6dca520bff6d0e17c8535a918e2f2b437aa0  golangci-lint-1.55.2-linux-mips64.tar.gz
+024e0a15b85352cc27271285526e16a4ab66d3e67afbbe446c9808c06cb8dbed  golangci-lint-1.55.2-linux-mips64le.tar.gz
+6b00f89ba5506c1de1efdd9fa17c54093013a294fefd8b9b31534db626a672ee  golangci-lint-1.55.2-linux-ppc64le.tar.gz
+0faa0d047d9bf7b703ed3ea65b6117043c93504f9ca1de25ae929d3901c73d4a  golangci-lint-1.55.2-linux-riscv64.tar.gz
+30dec9b22e7d5bb4e9d5ccea96da20f71cd7db3c8cf30b8ddc7cb9174c4d742a  golangci-lint-1.55.2-linux-s390x.tar.gz
+5a0ede48f79ad707902fdb29be8cd2abd8302dc122b65ebae3fdfc86751c7698  golangci-lint-1.55.2-netbsd-386.tar.gz
+95af20a2e617126dd5b08122ece7819101070e1582a961067ce8c41172f901ad  golangci-lint-1.55.2-netbsd-amd64.tar.gz
+94fb7dacb7527847cc95d7120904e19a2a0a81a0d50d61766c9e0251da72ab9d  golangci-lint-1.55.2-netbsd-armv6.tar.gz
+ca906bce5fee9619400e4a321c56476fe4a4efb6ac4fc989d340eb5563348873  golangci-lint-1.55.2-netbsd-armv7.tar.gz
+45b442f69fc8915c4500201c0247b7f3f69544dbc9165403a61f9095f2c57355  golangci-lint-1.55.2-windows-386.zip
+f57d434d231d43417dfa631587522f8c1991220b43c8ffadb9c7bd279508bf81  golangci-lint-1.55.2-windows-amd64.zip
+fd7dc8f4c6829ee6fafb252a4d81d2155cd35da7833665cbb25d53ce7cecd990  golangci-lint-1.55.2-windows-arm64.zip
+1892c3c24f9e7ef44b02f6750c703864b6dc350129f3ec39510300007b2376f1  golangci-lint-1.55.2-windows-armv6.zip
+a5e68ae73d38748b5269fad36ac7575e3c162a5dc63ef58abdea03cc5da4522a  golangci-lint-1.55.2-windows-armv7.zip
 
 # This is the builder on PPA that will build Go itself (inception-y), don't modify!
 #
 # This version is fine to be old and full of security holes, we just use it
-# to build the latest Go. Don't change it.
+# to build the latest Go. Don't change it. If it ever becomes insufficient,
+# we need to switch over to a recursive builder to jump across supported
+# versions.
 #
-# version:ppa-builder-1 1.19.6
+# version:ppa-builder 1.19.6
 # https://go.dev/dl/
 d7f0013f82e6d7f862cc6cb5c8cdb48eef5f2e239b35baa97e2f1a7466043767  go1.19.6.src.tar.gz
-
-# version:ppa-builder-2 1.21.9
-# https://go.dev/dl/
-58f0c5ced45a0012bce2ff7a9df03e128abcc8818ebabe5027bb92bafe20e421  go1.21.9.src.tar.gz
-
-# version:protoc 27.1
-# https://github.com/protocolbuffers/protobuf/releases/
-# https://github.com/protocolbuffers/protobuf/releases/download/v27.1/
-8809c2ec85368c6b6e9af161b6771a153aa92670a24adbe46dd34fa02a04df2f  protoc-27.1-linux-aarch_64.zip
-5d21979a6d27475e810b76b88863d1e784fa01ffb15e511a3ec5bd1924d89426  protoc-27.1-linux-ppcle_64.zip
-84d8852750ed186dc4a057a1a86bcac409be5362d6af04770f42367fee6b7bc1  protoc-27.1-linux-s390_64.zip
-2f028796ff5741691650e0eea290e61ff2f1c0d87f8d31fe45ef47fd967cef0c  protoc-27.1-linux-x86_32.zip
-8970e3d8bbd67d53768fe8c2e3971bdd71e51cfe2001ca06dacad17258a7dae3  protoc-27.1-linux-x86_64.zip
-03b7af1bf469e7285dc51976ee5fa99412704dbd1c017105114852a37b165c12  protoc-27.1-osx-aarch_64.zip
-f14d3973cf13283d07c520ed6f4c12405ad41b9efd18089a1c74897037d742b5  protoc-27.1-osx-universal_binary.zip
-8520d944f3a3890fa296a3b3b0d4bb18337337e2526bbbf1b507eeea3c2a1ec4  protoc-27.1-osx-x86_64.zip
-6263718ff96547b8392a079f6fdf02a4156f2e8d13cd51649a0d03fb7afa2de8  protoc-27.1-win32.zip
-da531c51ccd1290d8d34821f0ce4e219c7fbaa6f9825f5a3fb092a9d03fe6206  protoc-27.1-win64.zip
-
-# version:protoc-gen-go 1.34.2
-# https://github.com/protocolbuffers/protobuf-go/releases/
-# https://github.com/protocolbuffers/protobuf-go/releases/download/v1.34.2/
-9b48d8f90add02e8e94e14962fed74e7ce2b2d6bda4dd42f1f4fbccf0f766f1a  protoc-gen-go.v1.34.2.darwin.amd64.tar.gz
-17aca7f948dbb624049030cf841e35895cf34183ba006e721247fdeb95ff2780  protoc-gen-go.v1.34.2.darwin.arm64.tar.gz
-a191849433fd489f1d44f37788d762658f3f5fb225f3a85d4ce6ba32666703ed  protoc-gen-go.v1.34.2.linux.386.tar.gz
-b87bc134dee55576a842141bf0ed27761c635d746780fce5dee038c6dd16554f  protoc-gen-go.v1.34.2.linux.amd64.tar.gz
-63d400167e75ab9f6690688f6fdc6a9455aa20bc1faa71e32149dbd322f7f198  protoc-gen-go.v1.34.2.linux.arm64.tar.gz
-56e7675816db6e62be4f833a51544d5716b8420c462515579e05ca8444ab06ed  protoc-gen-go.v1.34.2.windows.386.zip
-abafd39612177dd4e9a65207cadd5374a9352d8611e8e040f8462fcfa3010daf  protoc-gen-go.v1.34.2.windows.amd64.zip

build/ci.go

@@ -39,11 +39,9 @@ package main
 
 import (
 	"bytes"
-	"crypto/sha256"
 	"encoding/base64"
 	"flag"
 	"fmt"
-	"io"
 	"log"
 	"os"
 	"os/exec"
@@ -119,13 +117,23 @@ var (
 		debEthereum,
 	}
 
-	// Distros for which packages are created
-	debDistros = []string{
-		"xenial", // 16.04, EOL: 04/2026
-		"bionic", // 18.04, EOL: 04/2028
-		"focal",  // 20.04, EOL: 04/2030
-		"jammy",  // 22.04, EOL: 04/2032
-		"noble",  // 24.04, EOL: 04/2034
+	// Distros for which packages are created.
+	// Note: vivid is unsupported because there is no golang-1.6 package for it.
+	// Note: the following Ubuntu releases have been officially deprecated on Launchpad:
+	//   wily, yakkety, zesty, artful, cosmic, disco, eoan, groovy, hirsuite, impish,
+	//   kinetic, lunar
+	debDistroGoBoots = map[string]string{
+		"trusty": "golang-1.11", // 14.04, EOL: 04/2024
+		"xenial": "golang-go",   // 16.04, EOL: 04/2026
+		"bionic": "golang-go",   // 18.04, EOL: 04/2028
+		"focal":  "golang-go",   // 20.04, EOL: 04/2030
+		"jammy":  "golang-go",   // 22.04, EOL: 04/2032
+		"mantic": "golang-go",   // 23.10, EOL: 07/2024
+	}
+
+	debGoBootPaths = map[string]string{
+		"golang-1.11": "/usr/lib/go-1.11",
+		"golang-go":   "/usr/lib/go",
 	}
 
 	// This is where the tests should be unpacked.
@@ -169,8 +177,6 @@ func main() {
 		doPurge(os.Args[2:])
 	case "sanitycheck":
 		doSanityCheck()
-	case "generate":
-		doGenerate()
 	default:
 		log.Fatal("unknown command ", os.Args[1])
 	}
@@ -237,10 +243,6 @@ func doInstall(cmdline []string) {
 // buildFlags returns the go tool flags for building.
 func buildFlags(env build.Environment, staticLinking bool, buildTags []string) (flags []string) {
 	var ld []string
-	// See https://github.com/golang/go/issues/33772#issuecomment-528176001
-	// We need to set --buildid to the linker here, and also pass --build-id to the
-	// cgo-linker further down.
-	ld = append(ld, "--buildid=none")
 	if env.Commit != "" {
 		ld = append(ld, "-X", "github.com/ethereum/go-ethereum/internal/version.gitCommit="+env.Commit)
 		ld = append(ld, "-X", "github.com/ethereum/go-ethereum/internal/version.gitDate="+env.Date)
@@ -253,11 +255,7 @@ func buildFlags(env build.Environment, staticLinking bool, buildTags []string) (
 	if runtime.GOOS == "linux" {
 		// Enforce the stacksize to 8M, which is the case on most platforms apart from
 		// alpine Linux.
-		// See https://sourceware.org/binutils/docs-2.23.1/ld/Options.html#Options
-		// regarding the options --build-id=none and --strip-all. It is needed for
-		// reproducible builds; removing references to temporary files in C-land, and
-		// making build-id reproducably absent.
-		extld := []string{"-Wl,-z,stack-size=0x800000,--build-id=none,--strip-all"}
+		extld := []string{"-Wl,-z,stack-size=0x800000"}
 		if staticLinking {
 			extld = append(extld, "-static")
 			// Under static linking, use of certain glibc features must be
@@ -304,7 +302,7 @@ func doTest(cmdline []string) {
 	gotest := tc.Go("test")
 
 	// CI needs a bit more time for the statetests (default 10m).
-	gotest.Args = append(gotest.Args, "-timeout=30m")
+	gotest.Args = append(gotest.Args, "-timeout=20m")
 
 	// Enable CKZG backend in CI.
 	gotest.Args = append(gotest.Args, "-tags=ckzg")
@@ -355,130 +353,6 @@ func downloadSpecTestFixtures(csdb *build.ChecksumDB, cachedir string) string {
 	return filepath.Join(cachedir, base)
 }
 
-// hashAllSourceFiles iterates all files under the top-level project directory
-// computing the hash of each file (excluding files within the tests
-// subrepo)
-func hashAllSourceFiles() (map[string]common.Hash, error) {
-	res := make(map[string]common.Hash)
-	err := filepath.WalkDir(".", func(path string, d os.DirEntry, err error) error {
-		if strings.HasPrefix(path, filepath.FromSlash("tests/testdata")) {
-			return filepath.SkipDir
-		}
-		if !d.Type().IsRegular() {
-			return nil
-		}
-		// open the file and hash it
-		f, err := os.OpenFile(path, os.O_RDONLY, 0666)
-		if err != nil {
-			return err
-		}
-		hasher := sha256.New()
-		if _, err := io.Copy(hasher, f); err != nil {
-			return err
-		}
-		res[path] = common.Hash(hasher.Sum(nil))
-		return nil
-	})
-	if err != nil {
-		return nil, err
-	}
-	return res, nil
-}
-
-// hashSourceFiles iterates the provided set of filepaths (relative to the top-level geth project directory)
-// computing the hash of each file.
-func hashSourceFiles(files []string) (map[string]common.Hash, error) {
-	res := make(map[string]common.Hash)
-	for _, filePath := range files {
-		f, err := os.OpenFile(filePath, os.O_RDONLY, 0666)
-		if err != nil {
-			return nil, err
-		}
-		hasher := sha256.New()
-		if _, err := io.Copy(hasher, f); err != nil {
-			return nil, err
-		}
-		res[filePath] = common.Hash(hasher.Sum(nil))
-	}
-	return res, nil
-}
-
-// compareHashedFilesets compares two maps (key is relative file path to top-level geth directory, value is its hash)
-// and returns the list of file paths whose hashes differed.
-func compareHashedFilesets(preHashes map[string]common.Hash, postHashes map[string]common.Hash) []string {
-	updates := []string{}
-	for path, postHash := range postHashes {
-		preHash, ok := preHashes[path]
-		if !ok || preHash != postHash {
-			updates = append(updates, path)
-		}
-	}
-	return updates
-}
-
-func doGoModTidy() {
-	targetFiles := []string{"go.mod", "go.sum"}
-	preHashes, err := hashSourceFiles(targetFiles)
-	if err != nil {
-		log.Fatal("failed to hash go.mod/go.sum", "err", err)
-	}
-	tc := new(build.GoToolchain)
-	c := tc.Go("mod", "tidy")
-	build.MustRun(c)
-	postHashes, err := hashSourceFiles(targetFiles)
-	updates := compareHashedFilesets(preHashes, postHashes)
-	for _, updatedFile := range updates {
-		fmt.Fprintf(os.Stderr, "changed file %s\n", updatedFile)
-	}
-	if len(updates) != 0 {
-		log.Fatal("go.sum and/or go.mod were updated by running 'go mod tidy'")
-	}
-}
-
-// doGenerate ensures that re-generating generated files does not cause
-// any mutations in the source file tree:  i.e. all generated files were
-// updated and committed.  Any stale generated files are updated.
-func doGenerate() {
-	var (
-		tc       = new(build.GoToolchain)
-		cachedir = flag.String("cachedir", "./build/cache", "directory for caching binaries.")
-		verify   = flag.Bool("verify", false, "check whether any files are changed by go generate")
-	)
-
-	protocPath := downloadProtoc(*cachedir)
-	protocGenGoPath := downloadProtocGenGo(*cachedir)
-
-	var preHashes map[string]common.Hash
-	if *verify {
-		var err error
-		preHashes, err = hashAllSourceFiles()
-		if err != nil {
-			log.Fatal("failed to compute map of source hashes", "err", err)
-		}
-	}
-
-	c := tc.Go("generate", "./...")
-	pathList := []string{filepath.Join(protocPath, "bin"), protocGenGoPath, os.Getenv("PATH")}
-	c.Env = append(c.Env, "PATH="+strings.Join(pathList, string(os.PathListSeparator)))
-	build.MustRun(c)
-
-	if !*verify {
-		return
-	}
-	// Check if files were changed.
-	postHashes, err := hashAllSourceFiles()
-	if err != nil {
-		log.Fatal("error computing source tree file hashes", "err", err)
-	}
-	updates := compareHashedFilesets(preHashes, postHashes)
-	for _, updatedFile := range updates {
-		fmt.Fprintf(os.Stderr, "changed file %s\n", updatedFile)
-	}
-	if len(updates) != 0 {
-		log.Fatal("One or more generated files were updated by running 'go generate ./...'")
-	}
-}
-
 // doLint runs golangci-lint on requested packages.
 func doLint(cmdline []string) {
 	var (
@@ -493,8 +367,6 @@ func doLint(cmdline []string) {
 	linter := downloadLinter(*cachedir)
 	lflags := []string{"run", "--config", ".golangci.yml"}
 	build.MustRunCommandWithOutput(linter, append(lflags, packages...)...)
-
-	doGoModTidy()
 	fmt.Println("You have achieved perfection.")
 }
 
@@ -526,96 +398,6 @@ func downloadLinter(cachedir string) string {
 	return filepath.Join(cachedir, base, "golangci-lint")
 }
 
-// protocArchiveBaseName returns the name of the protoc archive file for
-// the current system, stripped of version and file suffix.
-func protocArchiveBaseName() (string, error) {
-	switch runtime.GOOS + "-" + runtime.GOARCH {
-	case "windows-amd64":
-		return "win64", nil
-	case "windows-386":
-		return "win32", nil
-	case "linux-arm64":
-		return "linux-aarch_64", nil
-	case "linux-386":
-		return "linux-x86_32", nil
-	case "linux-amd64":
-		return "linux-x86_64", nil
-	case "darwin-arm64":
-		return "osx-aarch_64", nil
-	case "darwin-amd64":
-		return "osx-x86_64", nil
-	default:
-		return "", fmt.Errorf("no prebuilt release of protoc available for this system (os: %s, arch: %s)", runtime.GOOS, runtime.GOARCH)
-	}
-}
-
-// downloadProtocGenGo downloads protoc-gen-go, which is used by protoc
-// in the generate command.  It returns the full path of the directory
-// containing the 'protoc-gen-go' executable.
-func downloadProtocGenGo(cachedir string) string {
-	csdb := build.MustLoadChecksums("build/checksums.txt")
-	version, err := build.Version(csdb, "protoc-gen-go")
-	if err != nil {
-		log.Fatal(err)
-	}
-	baseName := fmt.Sprintf("protoc-gen-go.v%s.%s.%s", version, runtime.GOOS, runtime.GOARCH)
-	archiveName := baseName
-	if runtime.GOOS == "windows" {
-		archiveName += ".zip"
-	} else {
-		archiveName += ".tar.gz"
-	}
-
-	url := fmt.Sprintf("https://github.com/protocolbuffers/protobuf-go/releases/download/v%s/%s", version, archiveName)
-
-	archivePath := path.Join(cachedir, archiveName)
-	if err := csdb.DownloadFile(url, archivePath); err != nil {
-		log.Fatal(err)
-	}
-	extractDest := filepath.Join(cachedir, baseName)
-	if err := build.ExtractArchive(archivePath, extractDest); err != nil {
-		log.Fatal(err)
-	}
-	extractDest, err = filepath.Abs(extractDest)
-	if err != nil {
-		log.Fatal("error resolving absolute path for protoc", "err", err)
-	}
-	return extractDest
-}
-
-// downloadProtoc downloads the prebuilt protoc binary used to lint generated
-// files as a CI step.  It returns the full path to the directory containing
-// the protoc executable.
-func downloadProtoc(cachedir string) string {
-	csdb := build.MustLoadChecksums("build/checksums.txt")
-	version, err := build.Version(csdb, "protoc")
-	if err != nil {
-		log.Fatal(err)
-	}
-	baseName, err := protocArchiveBaseName()
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	fileName := fmt.Sprintf("protoc-%s-%s", version, baseName)
-	archiveFileName := fileName + ".zip"
-	url := fmt.Sprintf("https://github.com/protocolbuffers/protobuf/releases/download/v%s/%s", version, archiveFileName)
-	archivePath := filepath.Join(cachedir, archiveFileName)
-
-	if err := csdb.DownloadFile(url, archivePath); err != nil {
-		log.Fatal(err)
-	}
-	extractDest := filepath.Join(cachedir, fileName)
-	if err := build.ExtractArchive(archivePath, extractDest); err != nil {
-		log.Fatal(err)
-	}
-	extractDest, err = filepath.Abs(extractDest)
-	if err != nil {
-		log.Fatal("error resolving absolute path for protoc", "err", err)
-	}
-	return extractDest
-}
-
 // Release Packaging
 func doArchive(cmdline []string) {
 	var (
@@ -912,8 +694,8 @@ func doDebianSource(cmdline []string) {
 	}
 	// Download and verify the Go source packages.
 	var (
-		gobootbundles = downloadGoBootstrapSources(*cachedir)
-		gobundle      = downloadGoSources(*cachedir)
+		gobootbundle = downloadGoBootstrapSources(*cachedir)
+		gobundle     = downloadGoSources(*cachedir)
 	)
 	// Download all the dependencies needed to build the sources and run the ci script
 	srcdepfetch := tc.Go("mod", "download")
@@ -926,19 +708,17 @@ func doDebianSource(cmdline []string) {
 
 	// Create Debian packages and upload them.
 	for _, pkg := range debPackages {
-		for _, distro := range debDistros {
+		for distro, goboot := range debDistroGoBoots {
 			// Prepare the debian package with the go-ethereum sources.
-			meta := newDebMetadata(distro, *signer, env, now, pkg.Name, pkg.Version, pkg.Executables)
+			meta := newDebMetadata(distro, goboot, *signer, env, now, pkg.Name, pkg.Version, pkg.Executables)
 			pkgdir := stageDebianSource(*workdir, meta)
 
 			// Add bootstrapper Go source code
-			for i, gobootbundle := range gobootbundles {
-				if err := build.ExtractArchive(gobootbundle, pkgdir); err != nil {
-					log.Fatalf("Failed to extract bootstrapper Go sources: %v", err)
-				}
-				if err := os.Rename(filepath.Join(pkgdir, "go"), filepath.Join(pkgdir, fmt.Sprintf(".goboot-%d", i+1))); err != nil {
-					log.Fatalf("Failed to rename bootstrapper Go source folder: %v", err)
-				}
+			if err := build.ExtractArchive(gobootbundle, pkgdir); err != nil {
+				log.Fatalf("Failed to extract bootstrapper Go sources: %v", err)
+			}
+			if err := os.Rename(filepath.Join(pkgdir, "go"), filepath.Join(pkgdir, ".goboot")); err != nil {
+				log.Fatalf("Failed to rename bootstrapper Go source folder: %v", err)
 			}
 			// Add builder Go source code
 			if err := build.ExtractArchive(gobundle, pkgdir); err != nil {
@@ -974,26 +754,21 @@ func doDebianSource(cmdline []string) {
 	}
 }
 
-// downloadGoBootstrapSources downloads the Go source tarball(s) that will be used
+// downloadGoBootstrapSources downloads the Go source tarball that will be used
 // to bootstrap the builder Go.
-func downloadGoBootstrapSources(cachedir string) []string {
+func downloadGoBootstrapSources(cachedir string) string {
 	csdb := build.MustLoadChecksums("build/checksums.txt")
-
-	var bundles []string
-	for _, booter := range []string{"ppa-builder-1", "ppa-builder-2"} {
-		gobootVersion, err := build.Version(csdb, booter)
-		if err != nil {
-			log.Fatal(err)
-		}
-		file := fmt.Sprintf("go%s.src.tar.gz", gobootVersion)
-		url := "https://dl.google.com/go/" + file
-		dst := filepath.Join(cachedir, file)
-		if err := csdb.DownloadFile(url, dst); err != nil {
-			log.Fatal(err)
-		}
-		bundles = append(bundles, dst)
+	gobootVersion, err := build.Version(csdb, "ppa-builder")
+	if err != nil {
+		log.Fatal(err)
 	}
-	return bundles
+	file := fmt.Sprintf("go%s.src.tar.gz", gobootVersion)
+	url := "https://dl.google.com/go/" + file
+	dst := filepath.Join(cachedir, file)
+	if err := csdb.DownloadFile(url, dst); err != nil {
+		log.Fatal(err)
+	}
+	return dst
 }
 
 // downloadGoSources downloads the Go source tarball.
@@ -1071,7 +846,10 @@ type debPackage struct {
 }
 
 type debMetadata struct {
-	Env         build.Environment
+	Env           build.Environment
+	GoBootPackage string
+	GoBootPath    string
+
 	PackageName string
 
 	// go-ethereum version being built. Note that this
@@ -1099,19 +877,21 @@ func (d debExecutable) Package() string {
 	return d.BinaryName
 }
 
-func newDebMetadata(distro, author string, env build.Environment, t time.Time, name string, version string, exes []debExecutable) debMetadata {
+func newDebMetadata(distro, goboot, author string, env build.Environment, t time.Time, name string, version string, exes []debExecutable) debMetadata {
 	if author == "" {
 		// No signing key, use default author.
 		author = "Ethereum Builds <fjl@ethereum.org>"
 	}
 	return debMetadata{
-		PackageName: name,
-		Env:         env,
-		Author:      author,
-		Distro:      distro,
-		Version:     version,
-		Time:        t.Format(time.RFC1123Z),
-		Executables: exes,
+		GoBootPackage: goboot,
+		GoBootPath:    debGoBootPaths[goboot],
+		PackageName:   name,
+		Env:           env,
+		Author:        author,
+		Distro:        distro,
+		Version:       version,
+		Time:          t.Format(time.RFC1123Z),
+		Executables:   exes,
 	}
 }
 

build/deb/ethereum/deb.control

@@ -2,7 +2,7 @@ Source: {{.Name}}
 Section: science
 Priority: extra
 Maintainer: {{.Author}}
-Build-Depends: debhelper (>= 8.0.0), golang-go
+Build-Depends: debhelper (>= 8.0.0), {{.GoBootPackage}}
 Standards-Version: 3.9.5
 Homepage: https://ethereum.org
 Vcs-Git: https://github.com/ethereum/go-ethereum.git

build/deb/ethereum/deb.rules

@@ -7,7 +7,7 @@
 # Launchpad rejects Go's access to $HOME, use custom folders
 export GOCACHE=/tmp/go-build
 export GOPATH=/tmp/gopath
-export GOROOT_BOOTSTRAP=/usr/lib/go
+export GOROOT_BOOTSTRAP={{.GoBootPath}}
 
 override_dh_auto_clean:
 	# Don't try to be smart Launchpad, we know our build rules better than you
@@ -19,9 +19,8 @@ override_dh_auto_build:
 	#
 	# We're also shipping the bootstrapper as of Go 1.20 as it had minimum version
 	# requirements opposed to older versions of Go.
-	(mv .goboot-1 ../ && cd ../.goboot-1/src && ./make.bash)
-	(mv .goboot-2 ../ && cd ../.goboot-2/src && GOROOT_BOOTSTRAP=`pwd`/../../.goboot-1 ./make.bash)
-	(mv .go ../ && cd ../.go/src && GOROOT_BOOTSTRAP=`pwd`/../../.goboot-2 ./make.bash)
+	(mv .goboot ../ && cd ../.goboot/src && ./make.bash)
+	(mv .go ../ && cd ../.go/src && GOROOT_BOOTSTRAP=`pwd`/../../.goboot ./make.bash)
 
 	# We can't download external go modules within Launchpad, so we're shipping the
 	# entire dependency source cache with go-ethereum.

build/tools/tools.go

@@ -22,6 +22,6 @@ package tools
 import (
 	// Tool imports for go:generate.
 	_ "github.com/fjl/gencodec"
+	_ "github.com/golang/protobuf/protoc-gen-go"
 	_ "golang.org/x/tools/cmd/stringer"
-	_ "google.golang.org/protobuf/cmd/protoc-gen-go"
 )

build/update-license.go

@@ -46,12 +46,13 @@ import (
 	"path/filepath"
 	"regexp"
 	"runtime"
-	"slices"
 	"strconv"
 	"strings"
 	"sync"
 	"text/template"
 	"time"
+
+	"golang.org/x/exp/slices"
 )
 
 var (
@@ -291,8 +292,8 @@ func writeAuthors(files []string) {
 		}
 	}
 	// Write sorted list of authors back to the file.
-	slices.SortFunc(list, func(a, b string) int {
-		return strings.Compare(strings.ToLower(a), strings.ToLower(b))
+	slices.SortFunc(list, func(a, b string) bool {
+		return strings.ToLower(a) < strings.ToLower(b)
 	})
 	content := new(bytes.Buffer)
 	content.WriteString(authorsFileHeader)

cmd/blsync/main.go

@@ -1,103 +0,0 @@
-// Copyright 2022 The go-ethereum Authors
-// This file is part of the go-ethereum library.
-//
-// The go-ethereum library is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// The go-ethereum library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public License
-// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
-
-package main
-
-import (
-	"context"
-	"fmt"
-	"os"
-
-	"github.com/ethereum/go-ethereum/beacon/blsync"
-	"github.com/ethereum/go-ethereum/cmd/utils"
-	"github.com/ethereum/go-ethereum/internal/debug"
-	"github.com/ethereum/go-ethereum/internal/flags"
-	"github.com/ethereum/go-ethereum/log"
-	"github.com/ethereum/go-ethereum/node"
-	"github.com/ethereum/go-ethereum/rpc"
-	"github.com/urfave/cli/v2"
-)
-
-func main() {
-	app := flags.NewApp("beacon light syncer tool")
-	app.Flags = flags.Merge([]cli.Flag{
-		utils.BeaconApiFlag,
-		utils.BeaconApiHeaderFlag,
-		utils.BeaconThresholdFlag,
-		utils.BeaconNoFilterFlag,
-		utils.BeaconConfigFlag,
-		utils.BeaconGenesisRootFlag,
-		utils.BeaconGenesisTimeFlag,
-		utils.BeaconCheckpointFlag,
-		//TODO datadir for optional permanent database
-		utils.MainnetFlag,
-		utils.SepoliaFlag,
-		utils.BlsyncApiFlag,
-		utils.BlsyncJWTSecretFlag,
-	},
-		debug.Flags,
-	)
-	app.Before = func(ctx *cli.Context) error {
-		flags.MigrateGlobalFlags(ctx)
-		return debug.Setup(ctx)
-	}
-	app.After = func(ctx *cli.Context) error {
-		debug.Exit()
-		return nil
-	}
-	app.Action = sync
-
-	if err := app.Run(os.Args); err != nil {
-		fmt.Fprintln(os.Stderr, err)
-		os.Exit(1)
-	}
-}
-
-func sync(ctx *cli.Context) error {
-	// set up blsync
-	client := blsync.NewClient(ctx)
-	client.SetEngineRPC(makeRPCClient(ctx))
-	client.Start()
-
-	// run until stopped
-	<-ctx.Done()
-	client.Stop()
-	return nil
-}
-
-func makeRPCClient(ctx *cli.Context) *rpc.Client {
-	if !ctx.IsSet(utils.BlsyncApiFlag.Name) {
-		log.Warn("No engine API target specified, performing a dry run")
-		return nil
-	}
-	if !ctx.IsSet(utils.BlsyncJWTSecretFlag.Name) {
-		utils.Fatalf("JWT secret parameter missing") //TODO use default if datadir is specified
-	}
-
-	engineApiUrl, jwtFileName := ctx.String(utils.BlsyncApiFlag.Name), ctx.String(utils.BlsyncJWTSecretFlag.Name)
-	var jwtSecret [32]byte
-	if jwt, err := node.ObtainJWTSecret(jwtFileName); err == nil {
-		copy(jwtSecret[:], jwt)
-	} else {
-		utils.Fatalf("Error loading or generating JWT secret: %v", err)
-	}
-	auth := node.NewJWTAuth(jwtSecret)
-	cl, err := rpc.DialOptions(context.Background(), engineApiUrl, rpc.WithHTTPAuth(auth))
-	if err != nil {
-		utils.Fatalf("Could not create RPC client: %v", err)
-	}
-	return cl
-}

cmd/clef/README.md

@@ -29,7 +29,7 @@ GLOBAL OPTIONS:
    --loglevel value        log level to emit to the screen (default: 4)
    --keystore value        Directory for the keystore (default: "$HOME/.ethereum/keystore")
    --configdir value       Directory for Clef configuration (default: "$HOME/.clef")
-   --chainid value         Chain id to use for signing (1=mainnet, 17000=Holesky) (default: 1)
+   --chainid value         Chain id to use for signing (1=mainnet, 5=Goerli) (default: 1)
    --lightkdf              Reduce key-derivation RAM & CPU usage at some expense of KDF strength
    --nousb                 Disables monitoring for and managing USB hardware wallets
    --pcscdpath value       Path to the smartcard daemon (pcscd) socket file (default: "/run/pcscd/pcscd.comm")
@@ -225,8 +225,8 @@ Response
      - `value` [number:optional]: amount of Wei to send with the transaction
      - `data` [data:optional]:  input data
      - `nonce` [number]: account nonce
-  2. method signature [string:optional]
-       - The method signature, if present, is to aid decoding the calldata. Should consist of `methodname(paramtype,...)`, e.g. `transfer(uint256,address)`. The signer may use this data to parse the supplied calldata, and show the user. The data, however, is considered totally untrusted, and reliability is not expected.
+  1. method signature [string:optional]
+     - The method signature, if present, is to aid decoding the calldata. Should consist of `methodname(paramtype,...)`, e.g. `transfer(uint256,address)`. The signer may use this data to parse the supplied calldata, and show the user. The data, however, is considered totally untrusted, and reliability is not expected.
 
 
 #### Result

cmd/clef/consolecmd_test.go

@@ -27,8 +27,9 @@ import (
 // TestImportRaw tests clef --importraw
 func TestImportRaw(t *testing.T) {
 	t.Parallel()
-	keyPath := filepath.Join(t.TempDir(), fmt.Sprintf("%v-tempkey.test", t.Name()))
+	keyPath := filepath.Join(os.TempDir(), fmt.Sprintf("%v-tempkey.test", t.Name()))
 	os.WriteFile(keyPath, []byte("0102030405060708090a0102030405060708090a0102030405060708090a0102"), 0777)
+	t.Cleanup(func() { os.Remove(keyPath) })
 
 	t.Run("happy-path", func(t *testing.T) {
 		t.Parallel()
@@ -67,8 +68,9 @@ func TestImportRaw(t *testing.T) {
 // TestListAccounts tests clef --list-accounts
 func TestListAccounts(t *testing.T) {
 	t.Parallel()
-	keyPath := filepath.Join(t.TempDir(), fmt.Sprintf("%v-tempkey.test", t.Name()))
+	keyPath := filepath.Join(os.TempDir(), fmt.Sprintf("%v-tempkey.test", t.Name()))
 	os.WriteFile(keyPath, []byte("0102030405060708090a0102030405060708090a0102030405060708090a0102"), 0777)
+	t.Cleanup(func() { os.Remove(keyPath) })
 
 	t.Run("no-accounts", func(t *testing.T) {
 		t.Parallel()
@@ -95,8 +97,9 @@ func TestListAccounts(t *testing.T) {
 // TestListWallets tests clef --list-wallets
 func TestListWallets(t *testing.T) {
 	t.Parallel()
-	keyPath := filepath.Join(t.TempDir(), fmt.Sprintf("%v-tempkey.test", t.Name()))
+	keyPath := filepath.Join(os.TempDir(), fmt.Sprintf("%v-tempkey.test", t.Name()))
 	os.WriteFile(keyPath, []byte("0102030405060708090a0102030405060708090a0102030405060708090a0102"), 0777)
+	t.Cleanup(func() { os.Remove(keyPath) })
 
 	t.Run("no-accounts", func(t *testing.T) {
 		t.Parallel()

cmd/clef/main.go

@@ -100,7 +100,7 @@ var (
 	chainIdFlag = &cli.Int64Flag{
 		Name:  "chainid",
 		Value: params.MainnetChainConfig.ChainID.Int64(),
-		Usage: "Chain id to use for signing (1=mainnet, 17000=Holesky)",
+		Usage: "Chain id to use for signing (1=mainnet, 5=Goerli)",
 	}
 	rpcPortFlag = &cli.IntFlag{
 		Name:     "http.port",
@@ -552,7 +552,7 @@ func listWallets(c *cli.Context) error {
 // accountImport imports a raw hexadecimal private key via CLI.
 func accountImport(c *cli.Context) error {
 	if c.Args().Len() != 1 {
-		return errors.New("<keyfile> must be given as first argument")
+		return errors.New("<keyfile> must be given as first argument.")
 	}
 	internalApi, ui, err := initInternalApi(c)
 	if err != nil {

cmd/clef/rules.md

@@ -9,14 +9,14 @@ It enables usecases like the following:
 
 The two main features that are required for this to work well are;
 
-1. Rule Implementation: how to create, manage, and interpret rules in a flexible but secure manner
-2. Credential management and credentials; how to provide auto-unlock without exposing keys unnecessarily.
+1. Rule Implementation: how to create, manage and interpret rules in a flexible but secure manner
+2. Credential managements and credentials; how to provide auto-unlock without exposing keys unnecessarily.
 
 The section below deals with both of them
 
 ## Rule Implementation
 
-A ruleset file is implemented as a `js` file. Under the hood, the ruleset engine is a `SignerUI`, implementing the same methods as the `json-rpc` methods
+A ruleset file is implemented as a `js` file. Under the hood, the ruleset-engine is a `SignerUI`, implementing the same methods as the `json-rpc` methods
 defined in the UI protocol. Example:
 
 ```js
@@ -27,7 +27,7 @@ function asBig(str) {
 	return new BigNumber(str)
 }
 
-// Approve transactions to a certain contract if the value is below a certain limit
+// Approve transactions to a certain contract if value is below a certain limit
 function ApproveTx(req) {
 	var limit = big.Newint("0xb1a2bc2ec50000")
 	var value = asBig(req.transaction.value);
@@ -70,7 +70,7 @@ The Otto vm has a few [caveats](https://github.com/robertkrimen/otto):
 Additionally, a few more have been added
 
 * The rule execution cannot load external javascript files.
-* The only preloaded library is [`bignumber.js`](https://github.com/MikeMcl/bignumber.js) version `2.0.3`. This one is fairly old, and is not aligned with the documentation at the GitHub repository.
+* The only preloaded library is [`bignumber.js`](https://github.com/MikeMcl/bignumber.js) version `2.0.3`. This one is fairly old, and is not aligned with the documentation at the github repository.
 * Each invocation is made in a fresh virtual machine. This means that you cannot store data in global variables between invocations. This is a deliberate choice -- if you want to store data, use the disk-backed `storage`, since rules should not rely on ephemeral data.
 * Javascript API parameters are _always_ an object. This is also a design choice, to ensure that parameters are accessed by _key_ and not by order. This is to prevent mistakes due to missing parameters or parameter changes.
 * The JS engine has access to `storage` and `console`.
@@ -88,8 +88,8 @@ Some security precautions can be made, such as:
 
 ##### Security of implementation
 
-The drawback of this very flexible solution is that the `signer` needs to contain a javascript engine. This is pretty simple to implement since it's already
-implemented for `geth`. There are no known security vulnerabilities in it, nor have we had any security problems with it so far.
+The drawbacks of this very flexible solution is that the `signer` needs to contain a javascript engine. This is pretty simple to implement, since it's already
+implemented for `geth`. There are no known security vulnerabilities in, nor have we had any security-problems with it so far.
 
 The javascript engine would be an added attack surface; but if the validation of `rulesets` is made good (with hash-based attestation), the actual javascript cannot be considered
 an attack surface -- if an attacker can control the ruleset, a much simpler attack would be to implement an "always-approve" rule instead of exploiting the js vm. The only benefit
@@ -105,7 +105,7 @@ It's unclear whether any other DSL could be more secure; since there's always th
 
 ## Credential management
 
-The ability to auto-approve transactions means that the signer needs to have the necessary credentials to decrypt keyfiles. These passwords are hereafter called `ksp` (keystore pass).
+The ability to auto-approve transaction means that the signer needs to have necessary credentials to decrypt keyfiles. These passwords are hereafter called `ksp` (keystore pass).
 
 ### Example implementation
 
@@ -127,8 +127,8 @@ The `vault.dat` would be an encrypted container storing the following informatio
 
 ### Security considerations
 
-This would leave it up to the user to ensure that the `path/to/masterseed` is handled securely. It's difficult to get around this, although one could
-imagine leveraging OS-level keychains where supported. The setup is however, in general, similar to how ssh-keys are stored in `.ssh/`.
+This would leave it up to the user to ensure that the `path/to/masterseed` is handled in a secure way. It's difficult to get around this, although one could
+imagine leveraging OS-level keychains where supported. The setup is however in general similar to how ssh-keys are  stored in `.ssh/`.
 
 
 # Implementation status
@@ -149,7 +149,7 @@ function big(str) {
 // Time window: 1 week
 var window = 1000* 3600*24*7;
 
-// Limit: 1 ether
+// Limit : 1 ether
 var limit = new BigNumber("1e18");
 
 function isLimitOk(transaction) {
@@ -163,7 +163,7 @@ function isLimitOk(transaction) {
 	if (stored != "") {
 		txs = JSON.parse(stored)
 	}
-	// First, remove all that has passed out of the time window
+	// First, remove all that have passed out of the time-window
 	var newtxs = txs.filter(function(tx){return tx.tstamp > windowstart});
 	console.log(txs, newtxs.length);
 
@@ -174,7 +174,7 @@ function isLimitOk(transaction) {
 	console.log("ApproveTx > Sum so far", sum);
 	console.log("ApproveTx > Requested", value.toNumber());
 
-	// Would we exceed the weekly limit ?
+	// Would we exceed weekly limit ?
 	return sum.plus(value).lt(limit)
 
 }

cmd/devp2p/README.md

@@ -44,7 +44,7 @@ set to standard output. The following filters are supported:
 - `-limit <N>` limits the output set to N entries, taking the top N nodes by score
 - `-ip <CIDR>` filters nodes by IP subnet
 - `-min-age <duration>` filters nodes by 'first seen' time
-- `-eth-network <mainnet/sepolia/holesky>` filters nodes by "eth" ENR entry
+- `-eth-network <mainnet/goerli/sepolia/holesky>` filters nodes by "eth" ENR entry
 - `-les-server` filters nodes by LES server support
 - `-snap` filters nodes by snap protocol support
 

cmd/devp2p/discv4cmd.go

@@ -20,7 +20,6 @@ import (
 	"errors"
 	"fmt"
 	"net"
-	"net/http"
 	"strconv"
 	"strings"
 	"time"
@@ -29,11 +28,9 @@ import (
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/ethereum/go-ethereum/internal/flags"
-	"github.com/ethereum/go-ethereum/log"
 	"github.com/ethereum/go-ethereum/p2p/discover"
 	"github.com/ethereum/go-ethereum/p2p/enode"
 	"github.com/ethereum/go-ethereum/params"
-	"github.com/ethereum/go-ethereum/rpc"
 	"github.com/urfave/cli/v2"
 )
 
@@ -48,7 +45,6 @@ var (
 			discv4ResolveJSONCommand,
 			discv4CrawlCommand,
 			discv4TestCommand,
-			discv4ListenCommand,
 		},
 	}
 	discv4PingCommand = &cli.Command{
@@ -79,14 +75,6 @@ var (
 		Flags:     discoveryNodeFlags,
 		ArgsUsage: "<nodes.json file>",
 	}
-	discv4ListenCommand = &cli.Command{
-		Name:   "listen",
-		Usage:  "Runs a discovery node",
-		Action: discv4Listen,
-		Flags: flags.Merge(discoveryNodeFlags, []cli.Flag{
-			httpAddrFlag,
-		}),
-	}
 	discv4CrawlCommand = &cli.Command{
 		Name:   "crawl",
 		Usage:  "Updates a nodes.json file with random nodes found in the DHT",
@@ -143,10 +131,6 @@ var (
 		Usage:   "Enode of the remote node under test",
 		EnvVars: []string{"REMOTE_ENODE"},
 	}
-	httpAddrFlag = &cli.StringFlag{
-		Name:  "rpc",
-		Usage: "HTTP server listening address",
-	}
 )
 
 var discoveryNodeFlags = []cli.Flag{
@@ -170,27 +154,6 @@ func discv4Ping(ctx *cli.Context) error {
 	return nil
 }
 
-func discv4Listen(ctx *cli.Context) error {
-	disc, _ := startV4(ctx)
-	defer disc.Close()
-
-	fmt.Println(disc.Self())
-
-	httpAddr := ctx.String(httpAddrFlag.Name)
-	if httpAddr == "" {
-		// Non-HTTP mode.
-		select {}
-	}
-
-	api := &discv4API{disc}
-	log.Info("Starting RPC API server", "addr", httpAddr)
-	srv := rpc.NewServer()
-	srv.RegisterName("discv4", api)
-	http.DefaultServeMux.Handle("/", srv)
-	httpsrv := http.Server{Addr: httpAddr, Handler: http.DefaultServeMux}
-	return httpsrv.ListenAndServe()
-}
-
 func discv4RequestRecord(ctx *cli.Context) error {
 	n := getNodeArg(ctx)
 	disc, _ := startV4(ctx)
@@ -399,23 +362,3 @@ func parseBootnodes(ctx *cli.Context) ([]*enode.Node, error) {
 	}
 	return nodes, nil
 }
-
-type discv4API struct {
-	host *discover.UDPv4
-}
-
-func (api *discv4API) LookupRandom(n int) (ns []*enode.Node) {
-	it := api.host.RandomNodes()
-	for len(ns) < n && it.Next() {
-		ns = append(ns, it.Node())
-	}
-	return ns
-}
-
-func (api *discv4API) Buckets() [][]discover.BucketNode {
-	return api.host.TableBuckets()
-}
-
-func (api *discv4API) Self() *enode.Node {
-	return api.host.Self()
-}

cmd/devp2p/dns_cloudflare.go

@@ -88,8 +88,7 @@ func (c *cloudflareClient) checkZone(name string) error {
 	if !strings.HasSuffix(name, "."+zone.Name) {
 		return fmt.Errorf("CloudFlare zone name %q does not match name %q to be deployed", zone.Name, name)
 	}
-	// Necessary permissions for Cloudlare management - Zone:Read, DNS:Read, Zone:Edit, DNS:Edit
-	needPerms := map[string]bool{"#zone:edit": false, "#zone:read": false, "#dns_records:read": false, "#dns_records:edit": false}
+	needPerms := map[string]bool{"#zone:edit": false, "#zone:read": false}
 	for _, perm := range zone.Permissions {
 		if _, ok := needPerms[perm]; ok {
 			needPerms[perm] = true

cmd/devp2p/dns_route53.go

@@ -20,7 +20,6 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"slices"
 	"strconv"
 	"strings"
 	"time"
@@ -33,6 +32,7 @@ import (
 	"github.com/ethereum/go-ethereum/log"
 	"github.com/ethereum/go-ethereum/p2p/dnsdisc"
 	"github.com/urfave/cli/v2"
+	"golang.org/x/exp/slices"
 )
 
 const (

cmd/devp2p/enrcmd.go

@@ -183,8 +183,8 @@ var attrFormatters = map[string]func(rlp.RawValue) (string, bool){
 }
 
 func formatAttrRaw(v rlp.RawValue) (string, bool) {
-	content, _, err := rlp.SplitString(v)
-	return hex.EncodeToString(content), err == nil
+	s := hex.EncodeToString(v)
+	return s, true
 }
 
 func formatAttrString(v rlp.RawValue) (string, bool) {

cmd/devp2p/internal/ethtest/chain.go

@@ -26,8 +26,7 @@ import (
 	"io"
 	"math/big"
 	"os"
-	"path/filepath"
-	"slices"
+	"path"
 	"sort"
 	"strings"
 
@@ -41,6 +40,7 @@ import (
 	"github.com/ethereum/go-ethereum/eth/protocols/eth"
 	"github.com/ethereum/go-ethereum/params"
 	"github.com/ethereum/go-ethereum/rlp"
+	"golang.org/x/exp/slices"
 )
 
 // Chain is a lightweight blockchain-like store which can read a hivechain
@@ -56,21 +56,21 @@ type Chain struct {
 // NewChain takes the given chain.rlp file, and decodes and returns
 // the blocks from the file.
 func NewChain(dir string) (*Chain, error) {
-	gen, err := loadGenesis(filepath.Join(dir, "genesis.json"))
+	gen, err := loadGenesis(path.Join(dir, "genesis.json"))
 	if err != nil {
 		return nil, err
 	}
 	gblock := gen.ToBlock()
 
-	blocks, err := blocksFromFile(filepath.Join(dir, "chain.rlp"), gblock)
+	blocks, err := blocksFromFile(path.Join(dir, "chain.rlp"), gblock)
 	if err != nil {
 		return nil, err
 	}
-	state, err := readState(filepath.Join(dir, "headstate.json"))
+	state, err := readState(path.Join(dir, "headstate.json"))
 	if err != nil {
 		return nil, err
 	}
-	accounts, err := readAccounts(filepath.Join(dir, "accounts.json"))
+	accounts, err := readAccounts(path.Join(dir, "accounts.json"))
 	if err != nil {
 		return nil, err
 	}

cmd/devp2p/internal/ethtest/conn.go

@@ -53,8 +53,7 @@ func (s *Suite) dial() (*Conn, error) {
 // dialAs attempts to dial a given node and perform a handshake using the given
 // private key.
 func (s *Suite) dialAs(key *ecdsa.PrivateKey) (*Conn, error) {
-	tcpEndpoint, _ := s.Dest.TCPEndpoint()
-	fd, err := net.Dial("tcp", tcpEndpoint.String())
+	fd, err := net.Dial("tcp", fmt.Sprintf("%v:%d", s.Dest.IP(), s.Dest.TCP()))
 	if err != nil {
 		return nil, err
 	}

cmd/devp2p/internal/ethtest/engine.go

@@ -22,7 +22,7 @@ import (
 	"io"
 	"net/http"
 	"os"
-	"path/filepath"
+	"path"
 	"time"
 
 	"github.com/ethereum/go-ethereum/common"
@@ -38,7 +38,7 @@ type EngineClient struct {
 
 // NewEngineClient creates a new engine client.
 func NewEngineClient(dir, url, jwt string) (*EngineClient, error) {
-	headfcu, err := os.ReadFile(filepath.Join(dir, "headfcu.json"))
+	headfcu, err := os.ReadFile(path.Join(dir, "headfcu.json"))
 	if err != nil {
 		return nil, fmt.Errorf("failed to read headfcu: %w", err)
 	}

cmd/devp2p/internal/ethtest/snap.go

@@ -32,6 +32,7 @@ import (
 	"github.com/ethereum/go-ethereum/internal/utesting"
 	"github.com/ethereum/go-ethereum/trie"
 	"github.com/ethereum/go-ethereum/trie/trienode"
+	"golang.org/x/crypto/sha3"
 )
 
 func (c *Conn) snapRequest(code uint64, msg any) (any, error) {
@@ -647,7 +648,7 @@ The server should reject the request.`,
 					0, 1, 2, 3, 4, 5, 6, 7, 8, 0, 1, 2, 3, 4, 5, 6, 7, 8, 0, 1, 2, 3, 4, 5, 6, 7, 8}},
 			},
 			nBytes:    5000,
-			expHashes: []common.Hash{types.EmptyCodeHash},
+			expHashes: []common.Hash{common.HexToHash("0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470")},
 		},
 
 		{
@@ -904,7 +905,7 @@ func (s *Suite) snapGetByteCodes(t *utesting.T, tc *byteCodesTest) error {
 	// that the serving node is missing
 	var (
 		bytecodes = res.Codes
-		hasher    = crypto.NewKeccakState()
+		hasher    = sha3.NewLegacyKeccak256().(crypto.KeccakState)
 		hash      = make([]byte, 32)
 		codes     = make([][]byte, len(req.Hashes))
 	)
@@ -963,7 +964,7 @@ func (s *Suite) snapGetTrieNodes(t *utesting.T, tc *trieNodesTest) error {
 
 	// Cross reference the requested trienodes with the response to find gaps
 	// that the serving node is missing
-	hasher := crypto.NewKeccakState()
+	hasher := sha3.NewLegacyKeccak256().(crypto.KeccakState)
 	hash := make([]byte, 32)
 	trienodes := res.Nodes
 	if got, want := len(trienodes), len(tc.expHashes); got != want {

cmd/devp2p/internal/ethtest/suite.go

@@ -754,8 +754,8 @@ func makeSidecar(data ...byte) *types.BlobTxSidecar {
 	)
 	for i := range blobs {
 		blobs[i][0] = data[i]
-		c, _ := kzg4844.BlobToCommitment(&blobs[i])
-		p, _ := kzg4844.ComputeBlobProof(&blobs[i], c)
+		c, _ := kzg4844.BlobToCommitment(blobs[i])
+		p, _ := kzg4844.ComputeBlobProof(blobs[i], c)
 		commitments = append(commitments, c)
 		proofs = append(proofs, p)
 	}
@@ -849,16 +849,7 @@ func (s *Suite) TestBlobViolations(t *utesting.T) {
 		if code, _, err := conn.Read(); err != nil {
 			t.Fatalf("expected disconnect on blob violation, got err: %v", err)
 		} else if code != discMsg {
-			if code == protoOffset(ethProto)+eth.NewPooledTransactionHashesMsg {
-				// sometimes we'll get a blob transaction hashes announcement before the disconnect
-				// because blob transactions are scheduled to be fetched right away.
-				if code, _, err = conn.Read(); err != nil {
-					t.Fatalf("expected disconnect on blob violation, got err on second read: %v", err)
-				}
-			}
-			if code != discMsg {
-				t.Fatalf("expected disconnect on blob violation, got msg code: %d", code)
-			}
+			t.Fatalf("expected disconnect on blob violation, got msg code: %d", code)
 		}
 		conn.Close()
 	}

cmd/devp2p/internal/ethtest/suite_test.go

@@ -20,7 +20,7 @@ import (
 	crand "crypto/rand"
 	"fmt"
 	"os"
-	"path/filepath"
+	"path"
 	"testing"
 	"time"
 
@@ -34,12 +34,12 @@ import (
 	"github.com/ethereum/go-ethereum/p2p"
 )
 
-func makeJWTSecret(t *testing.T) (string, [32]byte, error) {
+func makeJWTSecret() (string, [32]byte, error) {
 	var secret [32]byte
 	if _, err := crand.Read(secret[:]); err != nil {
 		return "", secret, fmt.Errorf("failed to create jwt secret: %v", err)
 	}
-	jwtPath := filepath.Join(t.TempDir(), "jwt_secret")
+	jwtPath := path.Join(os.TempDir(), "jwt_secret")
 	if err := os.WriteFile(jwtPath, []byte(hexutil.Encode(secret[:])), 0600); err != nil {
 		return "", secret, fmt.Errorf("failed to prepare jwt secret file: %v", err)
 	}
@@ -47,7 +47,7 @@ func makeJWTSecret(t *testing.T) (string, [32]byte, error) {
 }
 
 func TestEthSuite(t *testing.T) {
-	jwtPath, secret, err := makeJWTSecret(t)
+	jwtPath, secret, err := makeJWTSecret()
 	if err != nil {
 		t.Fatalf("could not make jwt secret: %v", err)
 	}
@@ -75,7 +75,7 @@ func TestEthSuite(t *testing.T) {
 }
 
 func TestSnapSuite(t *testing.T) {
-	jwtPath, secret, err := makeJWTSecret(t)
+	jwtPath, secret, err := makeJWTSecret()
 	if err != nil {
 		t.Fatalf("could not make jwt secret: %v", err)
 	}

cmd/devp2p/internal/ethtest/transaction.go

@@ -102,7 +102,7 @@ func (s *Suite) sendTxs(t *utesting.T, txs []*types.Transaction) error {
 		}
 	}
 
-	return errors.New("timed out waiting for txs")
+	return fmt.Errorf("timed out waiting for txs")
 }
 
 func (s *Suite) sendInvalidTxs(t *utesting.T, txs []*types.Transaction) error {