rebase conflicts from main

.golangci.yaml

@@ -71,8 +71,6 @@ linters-settings:
   gomoddirectives:
     replace-allow-list:
       - github.com/attestantio/go-eth2-client
-      - github.com/attestantio/go-builder-client
-      - github.com/ethereum/go-ethereum
 
   maintidx:
     under: 5

common/types.go

@@ -12,6 +12,7 @@ import (
 	"github.com/attestantio/go-eth2-client/spec/capella"
 	"github.com/attestantio/go-eth2-client/spec/phase0"
 	ssz "github.com/ferranbt/fastssz"
+	boostSsz "github.com/flashbots/go-boost-utils/ssz"
 	boostTypes "github.com/flashbots/go-boost-utils/types"
 	"github.com/holiman/uint256"
 )
@@ -92,22 +93,22 @@ func NewEthNetworkDetails(networkName string) (ret *EthNetworkDetails, err error
 		return nil, fmt.Errorf("%w: %s", ErrUnknownNetwork, networkName)
 	}
 
-	domainBuilder, err = ComputeDomain(ssz.DomainTypeAppBuilder, genesisForkVersion, phase0.Root{}.String())
+	domainBuilder, err = ComputeDomain(boostSsz.DomainTypeAppBuilder, genesisForkVersion, phase0.Root{}.String())
 	if err != nil {
 		return nil, err
 	}
 
-	domainBeaconProposerBellatrix, err = ComputeDomain(ssz.DomainTypeBeaconProposer, bellatrixForkVersion, genesisValidatorsRoot)
+	domainBeaconProposerBellatrix, err = ComputeDomain(boostSsz.DomainTypeBeaconProposer, bellatrixForkVersion, genesisValidatorsRoot)
 	if err != nil {
 		return nil, err
 	}
 
-	domainBeaconProposerCapella, err = ComputeDomain(ssz.DomainTypeBeaconProposer, capellaForkVersion, genesisValidatorsRoot)
+	domainBeaconProposerCapella, err = ComputeDomain(boostSsz.DomainTypeBeaconProposer, capellaForkVersion, genesisValidatorsRoot)
 	if err != nil {
 		return nil, err
 	}
 
-	domainBeaconProposerDeneb, err = ComputeDomain(ssz.DomainTypeBeaconProposer, denebForkVersion, genesisValidatorsRoot)
+	domainBeaconProposerDeneb, err = ComputeDomain(boostSsz.DomainTypeBeaconProposer, denebForkVersion, genesisValidatorsRoot)
 	if err != nil {
 		return nil, err
 	}
@@ -341,11 +342,11 @@ Header only layout:
 [344-944) = EPH       (600 bytes)
 */
 type SubmitBlockRequestV2Optimistic struct {
-	Message                *apiv1.BidTrace
-	ExecutionPayloadHeader *consensuscapella.ExecutionPayloadHeader
-	Signature              phase0.BLSSignature              `ssz-size:"96"`
-	Transactions           []consensusbellatrix.Transaction `ssz-max:"1048576,1073741824" ssz-size:"?,?"`
-	Withdrawals            []*consensuscapella.Withdrawal   `ssz-max:"16"`
+	Message                *builderApiV1.BidTrace
+	ExecutionPayloadHeader *capella.ExecutionPayloadHeader
+	Signature              phase0.BLSSignature     `ssz-size:"96"`
+	Transactions           []bellatrix.Transaction `ssz-max:"1048576,1073741824" ssz-size:"?,?"`
+	Withdrawals            []*capella.Withdrawal   `ssz-max:"16"`
 }
 
 // MarshalSSZ ssz marshals the SubmitBlockRequestV2Optimistic object
@@ -366,7 +367,7 @@ func (s *SubmitBlockRequestV2Optimistic) UnmarshalSSZ(buf []byte) error {
 
 	// Field (0) 'Message'
 	if s.Message == nil {
-		s.Message = new(apiv1.BidTrace)
+		s.Message = new(builderApiV1.BidTrace)
 	}
 	if err = s.Message.UnmarshalSSZ(buf[0:236]); err != nil {
 		return err
@@ -398,7 +399,7 @@ func (s *SubmitBlockRequestV2Optimistic) UnmarshalSSZ(buf []byte) error {
 	{
 		buf = tail[o1:o3]
 		if s.ExecutionPayloadHeader == nil {
-			s.ExecutionPayloadHeader = new(consensuscapella.ExecutionPayloadHeader)
+			s.ExecutionPayloadHeader = new(capella.ExecutionPayloadHeader)
 		}
 		if err = s.ExecutionPayloadHeader.UnmarshalSSZ(buf); err != nil {
 			return err
@@ -412,13 +413,13 @@ func (s *SubmitBlockRequestV2Optimistic) UnmarshalSSZ(buf []byte) error {
 		if err != nil {
 			return err
 		}
-		s.Transactions = make([]consensusbellatrix.Transaction, num)
+		s.Transactions = make([]bellatrix.Transaction, num)
 		err = ssz.UnmarshalDynamic(buf, num, func(indx int, buf []byte) (err error) {
 			if len(buf) > 1073741824 {
 				return ssz.ErrBytesLength
 			}
 			if cap(s.Transactions[indx]) == 0 {
-				s.Transactions[indx] = consensusbellatrix.Transaction(make([]byte, 0, len(buf)))
+				s.Transactions[indx] = bellatrix.Transaction(make([]byte, 0, len(buf)))
 			}
 			s.Transactions[indx] = append(s.Transactions[indx], buf...)
 			return nil
@@ -435,10 +436,10 @@ func (s *SubmitBlockRequestV2Optimistic) UnmarshalSSZ(buf []byte) error {
 		if err != nil {
 			return err
 		}
-		s.Withdrawals = make([]*consensuscapella.Withdrawal, num)
+		s.Withdrawals = make([]*capella.Withdrawal, num)
 		for ii := 0; ii < num; ii++ {
 			if s.Withdrawals[ii] == nil {
-				s.Withdrawals[ii] = new(consensuscapella.Withdrawal)
+				s.Withdrawals[ii] = new(capella.Withdrawal)
 			}
 			if err = s.Withdrawals[ii].UnmarshalSSZ(buf[ii*44 : (ii+1)*44]); err != nil {
 				return err
@@ -461,7 +462,7 @@ func (s *SubmitBlockRequestV2Optimistic) UnmarshalSSZHeaderOnly(buf []byte) erro
 
 	// Field (0) 'Message'
 	if s.Message == nil {
-		s.Message = new(apiv1.BidTrace)
+		s.Message = new(builderApiV1.BidTrace)
 	}
 	if err = s.Message.UnmarshalSSZ(buf[0:236]); err != nil {
 		return err
@@ -488,7 +489,7 @@ func (s *SubmitBlockRequestV2Optimistic) UnmarshalSSZHeaderOnly(buf []byte) erro
 	{
 		buf = tail[o1:o3]
 		if s.ExecutionPayloadHeader == nil {
-			s.ExecutionPayloadHeader = new(consensuscapella.ExecutionPayloadHeader)
+			s.ExecutionPayloadHeader = new(capella.ExecutionPayloadHeader)
 		}
 		if err = s.ExecutionPayloadHeader.UnmarshalSSZ(buf); err != nil {
 			return err
@@ -504,7 +505,7 @@ func (s *SubmitBlockRequestV2Optimistic) MarshalSSZTo(buf []byte) (dst []byte, e
 
 	// Field (0) 'Message'
 	if s.Message == nil {
-		s.Message = new(apiv1.BidTrace)
+		s.Message = new(builderApiV1.BidTrace)
 	}
 	if dst, err = s.Message.MarshalSSZTo(dst); err != nil {
 		return
@@ -513,7 +514,7 @@ func (s *SubmitBlockRequestV2Optimistic) MarshalSSZTo(buf []byte) (dst []byte, e
 	// Offset (1) 'ExecutionPayloadHeader'
 	dst = ssz.WriteOffset(dst, offset)
 	if s.ExecutionPayloadHeader == nil {
-		s.ExecutionPayloadHeader = new(consensuscapella.ExecutionPayloadHeader)
+		s.ExecutionPayloadHeader = new(capella.ExecutionPayloadHeader)
 	}
 	offset += s.ExecutionPayloadHeader.SizeSSZ()
 
@@ -574,7 +575,7 @@ func (s *SubmitBlockRequestV2Optimistic) SizeSSZ() (size int) {
 
 	// Field (1) 'ExecutionPayloadHeader'
 	if s.ExecutionPayloadHeader == nil {
-		s.ExecutionPayloadHeader = new(consensuscapella.ExecutionPayloadHeader)
+		s.ExecutionPayloadHeader = new(capella.ExecutionPayloadHeader)
 	}
 	size += s.ExecutionPayloadHeader.SizeSSZ()
 

common/types_spec.go

@@ -9,8 +9,8 @@ import (
 	builderApiDeneb "github.com/attestantio/go-builder-client/api/deneb"
 	builderSpec "github.com/attestantio/go-builder-client/spec"
 	eth2Api "github.com/attestantio/go-eth2-client/api"
-	eth2ApiV1Capella "github.com/attestantio/go-eth2-client/api/v1/capella"
-	eth2ApiV1Deneb "github.com/attestantio/go-eth2-client/api/v1/deneb"
+	eth2builderApiV1Capella "github.com/attestantio/go-eth2-client/api/v1/capella"
+	eth2builderApiV1Deneb "github.com/attestantio/go-eth2-client/api/v1/deneb"
 	"github.com/attestantio/go-eth2-client/spec"
 	"github.com/attestantio/go-eth2-client/spec/capella"
 	"github.com/attestantio/go-eth2-client/spec/deneb"
@@ -197,7 +197,7 @@ func SignedBlindedBeaconBlockToBeaconBlock(signedBlindedBeaconBlock *VersionedSi
 	return &signedBeaconBlock, nil
 }
 
-func CapellaUnblindSignedBlock(blindedBlock *eth2ApiV1Capella.SignedBlindedBeaconBlock, executionPayload *capella.ExecutionPayload) *capella.SignedBeaconBlock {
+func CapellaUnblindSignedBlock(blindedBlock *eth2builderApiV1Capella.SignedBlindedBeaconBlock, executionPayload *capella.ExecutionPayload) *capella.SignedBeaconBlock {
 	return &capella.SignedBeaconBlock{
 		Signature: blindedBlock.Signature,
 		Message: &capella.BeaconBlock{
@@ -222,7 +222,7 @@ func CapellaUnblindSignedBlock(blindedBlock *eth2ApiV1Capella.SignedBlindedBeaco
 	}
 }
 
-func DenebUnblindSignedBlock(blindedBlock *eth2ApiV1Deneb.SignedBlindedBeaconBlock, blockPayload *builderApiDeneb.ExecutionPayloadAndBlobsBundle, blockRoot phase0.Root) *eth2ApiV1Deneb.SignedBlockContents {
+func DenebUnblindSignedBlock(blindedBlock *eth2builderApiV1Deneb.SignedBlindedBeaconBlock, blockPayload *builderApiDeneb.ExecutionPayloadAndBlobsBundle, blockRoot phase0.Root) *eth2builderApiV1Deneb.SignedBlockContents {
 	denebBlobSidecars := make([]*deneb.SignedBlobSidecar, len(blockPayload.BlobsBundle.Blobs))
 
 	for i := range denebBlobSidecars {
@@ -240,7 +240,7 @@ func DenebUnblindSignedBlock(blindedBlock *eth2ApiV1Deneb.SignedBlindedBeaconBlo
 			Signature: denebBlobSidecars[i].Signature,
 		}
 	}
-	return &eth2ApiV1Deneb.SignedBlockContents{
+	return &eth2builderApiV1Deneb.SignedBlockContents{
 		SignedBlock: &deneb.SignedBeaconBlock{
 			Message: &deneb.BeaconBlock{
 				Slot:          blindedBlock.Message.Slot,
@@ -365,7 +365,7 @@ func (r *VersionedSignedBlockRequest) MarshalJSON() ([]byte, error) {
 func (r *VersionedSignedBlockRequest) UnmarshalJSON(input []byte) error {
 	var err error
 
-	denebContents := new(eth2ApiV1Deneb.SignedBlockContents)
+	denebContents := new(eth2builderApiV1Deneb.SignedBlockContents)
 	if err = json.Unmarshal(input, denebContents); err == nil {
 		r.Version = spec.DataVersionDeneb
 		r.Deneb = denebContents
@@ -401,14 +401,14 @@ func (r *VersionedSignedBlindedBlockRequest) MarshalJSON() ([]byte, error) {
 func (r *VersionedSignedBlindedBlockRequest) UnmarshalJSON(input []byte) error {
 	var err error
 
-	denebContents := new(eth2ApiV1Deneb.SignedBlindedBlockContents)
+	denebContents := new(eth2builderApiV1Deneb.SignedBlindedBlockContents)
 	if err = json.Unmarshal(input, denebContents); err == nil {
 		r.Version = spec.DataVersionDeneb
 		r.Deneb = denebContents
 		return nil
 	}
 
-	capellaBlock := new(eth2ApiV1Capella.SignedBlindedBeaconBlock)
+	capellaBlock := new(eth2builderApiV1Capella.SignedBlindedBeaconBlock)
 	if err = json.Unmarshal(input, capellaBlock); err == nil {
 		r.Version = spec.DataVersionCapella
 		r.Capella = capellaBlock

common/types_test.go

@@ -1,56 +1,55 @@
 package common
 
 import (
-	"encoding/hex"
 	"testing"
 
-	v1 "github.com/attestantio/go-builder-client/api/v1"
-	consensusspec "github.com/attestantio/go-eth2-client/spec"
+	builderApiV1 "github.com/attestantio/go-builder-client/api/v1"
+	"github.com/attestantio/go-eth2-client/spec"
 	"github.com/attestantio/go-eth2-client/spec/bellatrix"
 	"github.com/attestantio/go-eth2-client/spec/capella"
 	"github.com/attestantio/go-eth2-client/spec/phase0"
-	boostTypes "github.com/flashbots/go-boost-utils/types"
+	"github.com/flashbots/go-boost-utils/utils"
 	"github.com/holiman/uint256"
 	"github.com/stretchr/testify/require"
 )
 
 func makeTestSubmitBlockRequestV2Optimistic(t *testing.T) *SubmitBlockRequestV2Optimistic {
 	t.Helper()
-	testParentHash, err := hex.DecodeString("ec51bd499a3fa0270f1446fbf05ff0b61157cfe4ec719bb4c3e834e339ee9c5c")
+	testParentHash, err := utils.HexToHash("0xec51bd499a3fa0270f1446fbf05ff0b61157cfe4ec719bb4c3e834e339ee9c5c")
 	require.Nil(t, err)
-	testBlockHash, err := hex.DecodeString("3f5b5aaa800a3d25c3f75e72dc45da89fdd58168f1358a9f94aac8b029361a0a")
+	testBlockHash, err := utils.HexToHash("0x3f5b5aaa800a3d25c3f75e72dc45da89fdd58168f1358a9f94aac8b029361a0a")
 	require.Nil(t, err)
-	testRandao, err := hex.DecodeString("8cf6b7fbfbaf80da001fe769fd02e9b8dbfa0a646d9cf51b5d7137dd4f8103cc")
+	testRandao, err := utils.HexToHash("0x8cf6b7fbfbaf80da001fe769fd02e9b8dbfa0a646d9cf51b5d7137dd4f8103cc")
 	require.Nil(t, err)
-	testRoot, err := hex.DecodeString("7554727cee6d976a1dfdad80b392b37c87f0651ff5b01f6a0b3402bcfce92077")
+	testRoot, err := utils.HexToHash("0x7554727cee6d976a1dfdad80b392b37c87f0651ff5b01f6a0b3402bcfce92077")
 	require.Nil(t, err)
-	testBuilderPubkey, err := hex.DecodeString("ae7bde4839fa905b7d8125fd84cfdcd0c32cd74e1be3fa24263d71b520fc78113326ce0a90b95d73f19e6d8150a2f73b")
+	testBuilderPubkey, err := utils.HexToPubkey("0xae7bde4839fa905b7d8125fd84cfdcd0c32cd74e1be3fa24263d71b520fc78113326ce0a90b95d73f19e6d8150a2f73b")
 	require.Nil(t, err)
-	testProposerPubkey, err := hex.DecodeString("bb8e223239fa905b7d8125fd84cfdcd0c32cd74e1be3fa24263d71b520fc78113326ce0a90b95d73f19e6d8150a2f73b")
+	testProposerPubkey, err := utils.HexToPubkey("0xbb8e223239fa905b7d8125fd84cfdcd0c32cd74e1be3fa24263d71b520fc78113326ce0a90b95d73f19e6d8150a2f73b")
 	require.Nil(t, err)
-	testAddress, err := hex.DecodeString("95222290DD7278Aa3Ddd389Cc1E1d165CC4BAfe5")
+	testAddress, err := utils.HexToAddress("0x95222290DD7278Aa3Ddd389Cc1E1d165CC4BAfe5")
 	require.Nil(t, err)
-	testSignature, err := hex.DecodeString("b06311be19c92307c06070578af9ad147c9c6ea902439eac19f785f3dca478c354b79a0af9b09839c3d06c1ccf2185b0162f4d4fbf981220f77586b52ed9ae8a8acfc953baaa30dee15e1b112913c6cbe02c780d7b5363a4af16563fe55c2e88")
+	testSignature, err := utils.HexToSignature("0xb06311be19c92307c06070578af9ad147c9c6ea902439eac19f785f3dca478c354b79a0af9b09839c3d06c1ccf2185b0162f4d4fbf981220f77586b52ed9ae8a8acfc953baaa30dee15e1b112913c6cbe02c780d7b5363a4af16563fe55c2e88")
 	require.Nil(t, err)
 	testValue := new(uint256.Int)
 	err = testValue.SetFromDecimal("100")
 	require.Nil(t, err)
 
 	return &SubmitBlockRequestV2Optimistic{
-		Message: &v1.BidTrace{
+		Message: &builderApiV1.BidTrace{
 			Slot:                 31,
-			ParentHash:           phase0.Hash32(testParentHash),
-			BlockHash:            phase0.Hash32(testBlockHash),
-			BuilderPubkey:        phase0.BLSPubKey(testBuilderPubkey),
-			ProposerPubkey:       phase0.BLSPubKey(testProposerPubkey),
-			ProposerFeeRecipient: bellatrix.ExecutionAddress(testAddress),
+			ParentHash:           testParentHash,
+			BlockHash:            testBlockHash,
+			BuilderPubkey:        testBuilderPubkey,
+			ProposerPubkey:       testProposerPubkey,
+			ProposerFeeRecipient: testAddress,
 			GasLimit:             30_000_000,
 			GasUsed:              15_000_000,
 			Value:                testValue,
 		},
 		ExecutionPayloadHeader: &capella.ExecutionPayloadHeader{
-			ParentHash:       phase0.Hash32(testParentHash),
-			FeeRecipient:     bellatrix.ExecutionAddress(testAddress),
+			ParentHash:       testParentHash,
+			FeeRecipient:     testAddress,
 			StateRoot:        [32]byte(testBlockHash),
 			ReceiptsRoot:     [32]byte(testBlockHash),
 			LogsBloom:        [256]byte{0xaa, 0xbb, 0xcc},
@@ -61,11 +60,11 @@ func makeTestSubmitBlockRequestV2Optimistic(t *testing.T) *SubmitBlockRequestV2O
 			Timestamp:        168318215,
 			ExtraData:        make([]byte, 32),
 			BaseFeePerGas:    [32]byte{0xaa, 0xbb},
-			BlockHash:        phase0.Hash32(testBlockHash),
+			BlockHash:        testBlockHash,
 			TransactionsRoot: phase0.Root(testRoot),
 			WithdrawalsRoot:  phase0.Root(testRoot),
 		},
-		Signature: phase0.BLSSignature(testSignature),
+		Signature: testSignature,
 		Transactions: []bellatrix.Transaction{
 			[]byte{0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09},
 			[]byte{0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19},
@@ -78,35 +77,13 @@ func makeTestSubmitBlockRequestV2Optimistic(t *testing.T) *SubmitBlockRequestV2O
 			{
 				Index:          capella.WithdrawalIndex(120),
 				ValidatorIndex: phase0.ValidatorIndex(121),
-				Address:        bellatrix.ExecutionAddress(testAddress),
+				Address:        testAddress,
 				Amount:         phase0.Gwei(102412521125125),
 			},
 		},
 	}
 }
 
-func TestBoostBidToBidTrace(t *testing.T) {
-	bidTrace := boostTypes.BidTrace{
-		Slot:                 uint64(25),
-		ParentHash:           boostTypes.Hash{0x02, 0x03},
-		BuilderPubkey:        boostTypes.PublicKey{0x04, 0x05},
-		ProposerPubkey:       boostTypes.PublicKey{0x06, 0x07},
-		ProposerFeeRecipient: boostTypes.Address{0x08, 0x09},
-		GasLimit:             uint64(50),
-		GasUsed:              uint64(100),
-		Value:                boostTypes.U256Str{0x0a},
-	}
-	convertedBidTrace := BoostBidToBidTrace(&bidTrace)
-	require.Equal(t, bidTrace.Slot, convertedBidTrace.Slot)
-	require.Equal(t, phase0.Hash32(bidTrace.ParentHash), convertedBidTrace.ParentHash)
-	require.Equal(t, phase0.BLSPubKey(bidTrace.BuilderPubkey), convertedBidTrace.BuilderPubkey)
-	require.Equal(t, phase0.BLSPubKey(bidTrace.ProposerPubkey), convertedBidTrace.ProposerPubkey)
-	require.Equal(t, bellatrix.ExecutionAddress(bidTrace.ProposerFeeRecipient), convertedBidTrace.ProposerFeeRecipient)
-	require.Equal(t, bidTrace.GasLimit, convertedBidTrace.GasLimit)
-	require.Equal(t, bidTrace.GasUsed, convertedBidTrace.GasUsed)
-	require.Equal(t, bidTrace.Value.BigInt().String(), convertedBidTrace.Value.ToBig().String())
-}
-
 func TestDataVersion(t *testing.T) {
 	require.Equal(t, ForkVersionStringBellatrix, spec.DataVersionBellatrix.String())
 	require.Equal(t, ForkVersionStringCapella, spec.DataVersionCapella.String())

database/database_test.go

@@ -9,7 +9,7 @@ import (
 
 	builderApiV1 "github.com/attestantio/go-builder-client/api/v1"
 	eth2Api "github.com/attestantio/go-eth2-client/api"
-	eth2ApiV1Deneb "github.com/attestantio/go-eth2-client/api/v1/deneb"
+	eth2builderApiV1Deneb "github.com/attestantio/go-eth2-client/api/v1/deneb"
 	"github.com/attestantio/go-eth2-client/spec"
 	"github.com/attestantio/go-eth2-client/spec/bellatrix"
 	"github.com/attestantio/go-eth2-client/spec/capella"
@@ -374,7 +374,7 @@ func TestUpdateBuilderDemotion(t *testing.T) {
 			beaconBlock: common.VersionedSignedBlockRequest{
 				VersionedBlockRequest: eth2Api.VersionedBlockRequest{
 					Version: spec.DataVersionDeneb,
-					Deneb:   &eth2ApiV1Deneb.SignedBlockContents{},
+					Deneb:   &eth2builderApiV1Deneb.SignedBlockContents{},
 				},
 			},
 		},

go.mod

@@ -5,13 +5,13 @@ go 1.20
 require (
 	github.com/NYTimes/gziphandler v1.1.1
 	github.com/alicebob/miniredis/v2 v2.30.5
-	github.com/attestantio/go-builder-client v0.3.2-0.20230701110827-d0ecfee1ab62
-	github.com/attestantio/go-eth2-client v0.18.1
+	github.com/attestantio/go-builder-client v0.3.2-0.20230809093013-1fa02af241e1
+	github.com/attestantio/go-eth2-client v0.18.3
 	github.com/bradfitz/gomemcache v0.0.0-20230124162541-5f7a7d875746
 	github.com/btcsuite/btcd/btcutil v1.1.2
 	github.com/buger/jsonparser v1.1.1
-	github.com/ethereum/go-ethereum v1.13.1
-	github.com/flashbots/go-boost-utils v1.7.1-0.20230625230411-8c44018f4777
+	github.com/ethereum/go-ethereum v1.13.2
+	github.com/flashbots/go-boost-utils v1.7.2-0.20230922193448-757aa4804cd5
 	github.com/flashbots/go-utils v0.5.0
 	github.com/go-redis/redis/v9 v9.0.0-rc.1
 	github.com/gorilla/mux v1.8.0
@@ -40,7 +40,7 @@ require (
 	github.com/cockroachdb/pebble v0.0.0-20230906160148-46873a6a7a06 // indirect
 	github.com/cockroachdb/redact v1.1.3 // indirect
 	github.com/consensys/bavard v0.1.13 // indirect
-	github.com/consensys/gnark-crypto v0.11.0 // indirect
+	github.com/consensys/gnark-crypto v0.11.2 // indirect
 	github.com/crate-crypto/go-kzg-4844 v0.3.0 // indirect
 	github.com/ethereum/c-kzg-4844 v0.3.1 // indirect
 	github.com/fatih/color v1.15.0 // indirect
@@ -120,8 +120,4 @@ retract (
 	v1.0.0-alpha1
 )
 
-replace github.com/attestantio/go-builder-client => github.com/avalonche/go-builder-client v0.0.0-20230802220600-85be1e39d33b
-
 replace github.com/attestantio/go-eth2-client => github.com/avalonche/go-eth2-client v0.0.0-20230810012152-c934f6ee3bee
-
-replace github.com/ethereum/go-ethereum => github.com/MariusVanDerWijden/go-ethereum v1.8.22-0.20230807121326-6861f29a109a