Bump github.com/attestantio/go-builder-client from 0.3.0 to 0.4.2 (#559)

* Bump github.com/attestantio/go-builder-client from 0.3.0 to 0.4.2 Bumps [github.com/attestantio/go-builder-client](https://github.com/attestantio/go-builder-client) from 0.3.0 to 0.4.2. - [Commits](attestantio/go-builder-client@v0.3.0...v0.4.2) --- updated-dependencies: - dependency-name: github.com/attestantio/go-builder-client dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * fix lint --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: shana <[email protected]>
flashbots · Jan 19, 2024 · 930f084 · 930f084
1 parent 3710710
commit 930f084
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 33 deletions.
diff --git a/common/types.go b/common/types.go
@@ -517,23 +517,20 @@ func (b *BuilderSubmitBlockRequest) HasExecutionPayload() bool {
 
 func (b *BuilderSubmitBlockRequest) ExecutionPayloadResponse() (*GetPayloadResponse, error) {
 	if b.Bellatrix != nil {
-		return &GetPayloadResponse{
+		return &GetPayloadResponse{ //nolint:exhaustruct
 			Bellatrix: &boostTypes.GetPayloadResponse{
 				Version: boostTypes.VersionString(consensusspec.DataVersionBellatrix.String()),
 				Data:    b.Bellatrix.ExecutionPayload,
 			},
-			Capella: nil,
 		}, nil
 	}
 
 	if b.Capella != nil {
-		return &GetPayloadResponse{
-			Capella: &api.VersionedExecutionPayload{
-				Version:   consensusspec.DataVersionCapella,
-				Capella:   b.Capella.ExecutionPayload,
-				Bellatrix: nil,
+		return &GetPayloadResponse{ //nolint:exhaustruct
+			Capella: &api.VersionedExecutionPayload{ //nolint:exhaustruct
+				Version: consensusspec.DataVersionCapella,
+				Capella: b.Capella.ExecutionPayload,
 			},
-			Bellatrix: nil,
 		}, nil
 	}
 

diff --git a/common/types_spec.go b/common/types_spec.go
@@ -59,13 +59,11 @@ func BuildGetHeaderResponse(payload *BuilderSubmitBlockRequest, sk *bls.SecretKe
 		if err != nil {
 			return nil, err
 		}
-		return &GetHeaderResponse{
-			Capella: &spec.VersionedSignedBuilderBid{
-				Version:   consensusspec.DataVersionCapella,
-				Capella:   signedBuilderBid,
-				Bellatrix: nil,
+		return &GetHeaderResponse{ //nolint:exhaustruct
+			Capella: &spec.VersionedSignedBuilderBid{ //nolint:exhaustruct
+				Version: consensusspec.DataVersionCapella,
+				Capella: signedBuilderBid,
 			},
-			Bellatrix: nil,
 		}, nil
 	}
 	return nil, ErrEmptyPayload
@@ -83,13 +81,11 @@ func BuildGetPayloadResponse(payload *BuilderSubmitBlockRequest) (*GetPayloadRes
 	}
 
 	if payload.Capella != nil {
-		return &GetPayloadResponse{
-			Capella: &api.VersionedExecutionPayload{
-				Version:   consensusspec.DataVersionCapella,
-				Capella:   payload.Capella.ExecutionPayload,
-				Bellatrix: nil,
+		return &GetPayloadResponse{ //nolint:exhaustruct
+			Capella: &api.VersionedExecutionPayload{ //nolint:exhaustruct
+				Version: consensusspec.DataVersionCapella,
+				Capella: payload.Capella.ExecutionPayload,
 			},
-			Bellatrix: nil,
 		}, nil
 	}
 

diff --git a/database/typesconv.go b/database/typesconv.go
@@ -93,14 +93,12 @@ func ExecutionPayloadEntryToExecutionPayload(executionPayloadEntry *ExecutionPay
 		if err != nil {
 			return nil, err
 		}
-		capella := api.VersionedExecutionPayload{
-			Version:   consensusspec.DataVersionCapella,
-			Capella:   executionPayload,
-			Bellatrix: nil,
+		capella := api.VersionedExecutionPayload{ //nolint:exhaustruct
+			Version: consensusspec.DataVersionCapella,
+			Capella: executionPayload,
 		}
-		return &common.VersionedExecutionPayload{
-			Capella:   &capella,
-			Bellatrix: nil,
+		return &common.VersionedExecutionPayload{ //nolint:exhaustruct
+			Capella: &capella,
 		}, nil
 	} else if payloadVersion == common.ForkVersionStringBellatrix {
 		executionPayload := new(types.ExecutionPayload)

diff --git a/go.mod b/go.mod
@@ -5,7 +5,7 @@ go 1.20
 require (
 	github.com/NYTimes/gziphandler v1.1.1
 	github.com/alicebob/miniredis/v2 v2.31.0
-	github.com/attestantio/go-builder-client v0.3.0
+	github.com/attestantio/go-builder-client v0.4.2
 	github.com/attestantio/go-eth2-client v0.19.9
 	github.com/bradfitz/gomemcache v0.0.0-20230124162541-5f7a7d875746
 	github.com/btcsuite/btcd/btcutil v1.1.2
@@ -45,7 +45,7 @@ require (
 	github.com/fatih/color v1.16.0 // indirect
 	github.com/getsentry/sentry-go v0.18.0 // indirect
 	github.com/go-gorp/gorp/v3 v3.1.0 // indirect
-	github.com/goccy/go-yaml v1.11.0 // indirect
+	github.com/goccy/go-yaml v1.11.2 // indirect
 	github.com/gofrs/flock v0.8.1 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/protobuf v1.5.3 // indirect

diff --git a/go.sum b/go.sum
@@ -23,8 +23,8 @@ github.com/alicebob/miniredis/v2 v2.31.0/go.mod h1:UB/T2Uztp7MlFSDakaX1sTXUv5CAS
 github.com/allegro/bigcache v1.2.1-0.20190218064605-e24eb225f156 h1:eMwmnE/GDgah4HI848JfFxHt+iPb26b4zyfspmqY0/8=
 github.com/allegro/bigcache v1.2.1-0.20190218064605-e24eb225f156/go.mod h1:Cb/ax3seSYIx7SuZdm2G2xzfwmv3TPSk2ucNfQESPXM=
 github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
-github.com/attestantio/go-builder-client v0.3.0 h1:NY7pUNT070T3tx/N8hCaO5KpExvaVQhH//9zsgRh43M=
-github.com/attestantio/go-builder-client v0.3.0/go.mod h1:DwesMTOqnCp4u+n3uZ+fWL8wwnSBZVD9VMIVPDR+AZE=
+github.com/attestantio/go-builder-client v0.4.2 h1:EycfAFqQV+ooc2z6hmTsbuH4TCLknr0aO0nHLHLMpJM=
+github.com/attestantio/go-builder-client v0.4.2/go.mod h1:e02i/WO4fjs3/u9oIZEjiC8CK1Qyxy4cpiMMGKx4VqQ=
 github.com/attestantio/go-eth2-client v0.19.9 h1:g5LLX3X7cLC0KS0oai/MtxBOZz3U3QPIX5qryYMxgVE=
 github.com/attestantio/go-eth2-client v0.19.9/go.mod h1:TTz7YF6w4z6ahvxKiHuGPn6DbQn7gH6HPuWm/DEQeGE=
 github.com/aymerick/raymond v2.0.3-0.20180322193309-b565731e1464+incompatible/go.mod h1:osfaiScAUVup+UC9Nfq76eWqDhXlp+4UYaA8uhTBO6g=
@@ -162,8 +162,8 @@ github.com/gobuffalo/packr/v2 v2.8.3 h1:xE1yzvnO56cUC0sTpKR3DIbxZgB54AftTFMhB2XE
 github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee/go.mod h1:L0fX3K22YWvt/FAX9NnzrNzcI4wNYi9Yku4O0LKYflo=
 github.com/gobwas/pool v0.2.0/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw=
 github.com/gobwas/ws v1.0.2/go.mod h1:szmBTxLgaFppYjEmNtny/v3w89xOydFnnZMcgRRu/EM=
-github.com/goccy/go-yaml v1.11.0 h1:n7Z+zx8S9f9KgzG6KtQKf+kwqXZlLNR2F6018Dgau54=
-github.com/goccy/go-yaml v1.11.0/go.mod h1:H+mJrWtjPTJAHvRbV09MCK9xYwODM+wRTVFFTWckfng=
+github.com/goccy/go-yaml v1.11.2 h1:joq77SxuyIs9zzxEjgyLBugMQ9NEgTWxXfz2wVqwAaQ=
+github.com/goccy/go-yaml v1.11.2/go.mod h1:wKnAMd44+9JAAnGQpWVEgBzGt3YuTaQ4uXoHvE4m7WU=
 github.com/gofrs/flock v0.8.1 h1:+gYjHKf32LDeiEEFhQaotPbLuUXjY5ZqxKgXy7n59aw=
 github.com/gofrs/flock v0.8.1/go.mod h1:F1TvTiK9OcQqauNUHlbJvyl9Qa1QvF/gOUDKA14jxHU=
 github.com/gogo/googleapis v0.0.0-20180223154316-0cd9801be74a/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFGgqEef3s=