fix linting

api/electra/generate.go

@@ -15,5 +15,6 @@ package electra
 
 // Need to `go install github.com/ferranbt/fastssz/sszgen@latest` for this to work.
 //go:generate rm -f builderbid_ssz.go executionpayloadandblobsbundle_ssz.go signedbuilderbid_ssz.go submitblockrequest_ssz.go
+//nolint:revive
 //go:generate sszgen --suffix ssz --include ../../../go-eth2-client/spec/phase0,../../../go-eth2-client/spec/bellatrix,../../../go-eth2-client/spec/capella,../../../go-eth2-client/spec/deneb,../../../go-eth2-client/spec/electra,../v1,../deneb --path . --objs BuilderBid,ExecutionPayloadAndBlobsBundle,SignedBuilderBid,SubmitBlockRequest
 //go:generate goimports -w builderbid_ssz.go executionpayloadandblobsbundle_ssz.go signedbuilderbid_ssz.go submitblockrequest_ssz.go

api/electra/submitblockrequest.go

@@ -17,15 +17,15 @@ import (
 	"fmt"
 
 	"github.com/attestantio/go-builder-client/api/deneb"
-	v1 "github.com/attestantio/go-builder-client/api/v1"
+	apiv1 "github.com/attestantio/go-builder-client/api/v1"
 	"github.com/attestantio/go-eth2-client/spec/electra"
 	"github.com/attestantio/go-eth2-client/spec/phase0"
 	"github.com/goccy/go-yaml"
 )
 
 // SubmitBlockRequest is the request from the builder to submit a block.
 type SubmitBlockRequest struct {
-	Message          *v1.BidTrace
+	Message          *apiv1.BidTrace
 	ExecutionPayload *electra.ExecutionPayload
 	BlobsBundle      *deneb.BlobsBundle
 	Signature        phase0.BLSSignature `ssz-size:"96"`

api/electra/submitblockrequest_json.go

@@ -20,15 +20,15 @@ import (
 	"strings"
 
 	"github.com/attestantio/go-builder-client/api/deneb"
-	v1 "github.com/attestantio/go-builder-client/api/v1"
+	apiv1 "github.com/attestantio/go-builder-client/api/v1"
 	"github.com/attestantio/go-eth2-client/spec/electra"
 	"github.com/attestantio/go-eth2-client/spec/phase0"
 	"github.com/pkg/errors"
 )
 
 // submitBlockRequestJSON is the spec representation of the struct.
 type submitBlockRequestJSON struct {
-	Message          *v1.BidTrace              `json:"message"`
+	Message          *apiv1.BidTrace           `json:"message"`
 	ExecutionPayload *electra.ExecutionPayload `json:"execution_payload"`
 	BlobsBundle      *deneb.BlobsBundle        `json:"blobs_bundle"`
 	Signature        string                    `json:"signature"`

api/electra/submitblockrequest_yaml.go

@@ -18,14 +18,14 @@ import (
 	"fmt"
 
 	"github.com/attestantio/go-builder-client/api/deneb"
-	v1 "github.com/attestantio/go-builder-client/api/v1"
+	apiv1 "github.com/attestantio/go-builder-client/api/v1"
 	"github.com/attestantio/go-eth2-client/spec/electra"
 	"github.com/goccy/go-yaml"
 )
 
 // submitBlockRequestYAML is the spec representation of the struct.
 type submitBlockRequestYAML struct {
-	Message          *v1.BidTrace              `yaml:"message"`
+	Message          *apiv1.BidTrace           `yaml:"message"`
 	ExecutionPayload *electra.ExecutionPayload `yaml:"execution_payload"`
 	BlobsBundle      *deneb.BlobsBundle        `yaml:"blobs_bundle"`
 	Signature        string                    `yaml:"signature"`

http/unblindproposal.go

@@ -421,7 +421,9 @@ func (s *Service) unblindElectraProposal(ctx context.Context,
 			return nil, errors.Join(errors.New("failed to generate hash tree root for the received execution payload header"), err)
 		}
 		if !bytes.Equal(ourExecutionPayloadHash[:], receivedExecutionPayloadHash[:]) {
-			return nil, fmt.Errorf("execution payload hash mismatch: %#x != %#x", receivedExecutionPayloadHash[:], ourExecutionPayloadHash[:])
+			return nil, fmt.Errorf("execution payload hash mismatch: %#x != %#x", receivedExecutionPayloadHash[:],
+				ourExecutionPayloadHash[:],
+			)
 		}
 		res.Electra.SignedBlock.Message.Body.ExecutionPayload = bundle.ExecutionPayload