@@ -10,14 +10,14 @@ import (
1010 "testing"
1111 "time"
1212
13- "github.com/attestantio/go-builder-client/api"
14- apibellatrix "github.com/attestantio/go-builder-client/api/bellatrix"
15- apicapella "github.com/attestantio/go-builder-client/api/capella"
16- apiv1 "github.com/attestantio/go-builder-client/api/v1"
17- "github.com/attestantio/go-builder-client/spec"
18- consensusspec "github.com/attestantio/go-eth2-client/spec"
19- "github.com/attestantio/go-eth2-client/spec/bellatrix"
13+ builderApi "github.com/attestantio/go-builder-client/api"
14+ builderApiCapella "github.com/attestantio/go-builder-client/api/capella"
15+ builderApiDeneb "github.com/attestantio/go-builder-client/api/deneb"
16+ builderApiV1 "github.com/attestantio/go-builder-client/api/v1"
17+ builderSpec "github.com/attestantio/go-builder-client/spec"
18+ "github.com/attestantio/go-eth2-client/spec"
2019 "github.com/attestantio/go-eth2-client/spec/capella"
20+ "github.com/attestantio/go-eth2-client/spec/deneb"
2121 "github.com/attestantio/go-eth2-client/spec/phase0"
2222 "github.com/ethereum/go-ethereum/common/hexutil"
2323 "github.com/flashbots/go-boost-utils/bls"
@@ -59,8 +59,8 @@ type mockRelay struct {
5959 handlerOverrideGetPayload func (w http.ResponseWriter , req * http.Request )
6060
6161 // Default responses placeholders, used if overrider does not exist
62- GetHeaderResponse * spec .VersionedSignedBuilderBid
63- GetPayloadResponse * api. VersionedExecutionPayload
62+ GetHeaderResponse * builderSpec .VersionedSignedBuilderBid
63+ GetPayloadResponse * builderApi. VersionedSubmitBlindedBlockResponse
6464
6565 // Server section
6666 Server * httptest.Server
@@ -141,7 +141,7 @@ func (m *mockRelay) handleStatus(w http.ResponseWriter, _ *http.Request) {
141141 fmt .Fprintf (w , `{}` )
142142}
143143
144- // By default, handleRegisterValidator returns a default apiv1 .SignedValidatorRegistration
144+ // By default, handleRegisterValidator returns a default builderApiV1 .SignedValidatorRegistration
145145func (m * mockRelay ) handleRegisterValidator (w http.ResponseWriter , req * http.Request ) {
146146 m .mu .Lock ()
147147 defer m .mu .Unlock ()
@@ -154,7 +154,7 @@ func (m *mockRelay) handleRegisterValidator(w http.ResponseWriter, req *http.Req
154154
155155// defaultHandleRegisterValidator returns the default handler for handleRegisterValidator
156156func (m * mockRelay ) defaultHandleRegisterValidator (w http.ResponseWriter , req * http.Request ) {
157- payload := []apiv1 .SignedValidatorRegistration {}
157+ payload := []builderApiV1 .SignedValidatorRegistration {}
158158 if err := DecodeJSON (req .Body , & payload ); err != nil {
159159 http .Error (w , err .Error (), http .StatusBadRequest )
160160 return
@@ -166,14 +166,15 @@ func (m *mockRelay) defaultHandleRegisterValidator(w http.ResponseWriter, req *h
166166
167167// MakeGetHeaderResponse is used to create the default or can be used to create a custom response to the getHeader
168168// method
169- func (m * mockRelay ) MakeGetHeaderResponse (value uint64 , blockHash , parentHash , publicKey string , version consensusspec .DataVersion ) * spec .VersionedSignedBuilderBid {
169+ func (m * mockRelay ) MakeGetHeaderResponse (value uint64 , blockHash , parentHash , publicKey string , version spec .DataVersion ) * builderSpec .VersionedSignedBuilderBid {
170170 switch version {
171- case consensusspec . DataVersionBellatrix :
171+ case spec . DataVersionCapella :
172172 // Fill the payload with custom values.
173- message := & apibellatrix.BuilderBid {
174- Header : & bellatrix.ExecutionPayloadHeader {
175- BlockHash : _HexToHash (blockHash ),
176- ParentHash : _HexToHash (parentHash ),
173+ message := & builderApiCapella.BuilderBid {
174+ Header : & capella.ExecutionPayloadHeader {
175+ BlockHash : _HexToHash (blockHash ),
176+ ParentHash : _HexToHash (parentHash ),
177+ WithdrawalsRoot : phase0.Root {},
177178 },
178179 Value : uint256 .NewInt (value ),
179180 Pubkey : _HexToPubkey (publicKey ),
@@ -183,37 +184,38 @@ func (m *mockRelay) MakeGetHeaderResponse(value uint64, blockHash, parentHash, p
183184 signature , err := ssz .SignMessage (message , ssz .DomainBuilder , m .secretKey )
184185 require .NoError (m .t , err )
185186
186- return & spec .VersionedSignedBuilderBid {
187- Version : consensusspec .DataVersionCapella ,
188- Bellatrix : & apibellatrix .SignedBuilderBid {
187+ return & builderSpec .VersionedSignedBuilderBid {
188+ Version : spec .DataVersionCapella ,
189+ Capella : & builderApiCapella .SignedBuilderBid {
189190 Message : message ,
190191 Signature : signature ,
191192 },
192193 }
193- case consensusspec .DataVersionCapella :
194- // Fill the payload with custom values.
195- message := & apicapella.BuilderBid {
196- Header : & capella.ExecutionPayloadHeader {
194+ case spec .DataVersionDeneb :
195+ message := & builderApiDeneb.BuilderBid {
196+ Header : & deneb.ExecutionPayloadHeader {
197197 BlockHash : _HexToHash (blockHash ),
198198 ParentHash : _HexToHash (parentHash ),
199199 WithdrawalsRoot : phase0.Root {},
200+ BaseFeePerGas : uint256 .NewInt (0 ),
200201 },
201- Value : uint256 .NewInt (value ),
202- Pubkey : _HexToPubkey (publicKey ),
202+ BlobKZGCommitments : make ([]deneb.KZGCommitment , 0 ),
203+ Value : uint256 .NewInt (value ),
204+ Pubkey : _HexToPubkey (publicKey ),
203205 }
204206
205207 // Sign the message.
206208 signature , err := ssz .SignMessage (message , ssz .DomainBuilder , m .secretKey )
207209 require .NoError (m .t , err )
208210
209- return & spec .VersionedSignedBuilderBid {
210- Version : consensusspec . DataVersionCapella ,
211- Capella : & apicapella .SignedBuilderBid {
211+ return & builderSpec .VersionedSignedBuilderBid {
212+ Version : spec . DataVersionDeneb ,
213+ Deneb : & builderApiDeneb .SignedBuilderBid {
212214 Message : message ,
213215 Signature : signature ,
214216 },
215217 }
216- case consensusspec .DataVersionUnknown , consensusspec .DataVersionPhase0 , consensusspec .DataVersionAltair , consensusspec . DataVersionDeneb :
218+ case spec .DataVersionUnknown , spec .DataVersionPhase0 , spec .DataVersionAltair , spec . DataVersionBellatrix :
217219 return nil
218220 }
219221 return nil
@@ -243,7 +245,7 @@ func (m *mockRelay) defaultHandleGetHeader(w http.ResponseWriter) {
243245 "0xe28385e7bd68df656cd0042b74b69c3104b5356ed1f20eb69f1f925df47a3ab7" ,
244246 "0xe28385e7bd68df656cd0042b74b69c3104b5356ed1f20eb69f1f925df47a3ab7" ,
245247 "0x8a1d7b8dd64e0aafe7ea7b6c95065c9364cf99d38470c12ee807d55f7de1529ad29ce2c422e0b65e3d5a05c02caca249" ,
246- consensusspec .DataVersionCapella ,
248+ spec .DataVersionCapella ,
247249 )
248250 if m .GetHeaderResponse != nil {
249251 response = m .GetHeaderResponse
@@ -257,9 +259,9 @@ func (m *mockRelay) defaultHandleGetHeader(w http.ResponseWriter) {
257259
258260// MakeGetPayloadResponse is used to create the default or can be used to create a custom response to the getPayload
259261// method
260- func (m * mockRelay ) MakeGetPayloadResponse (parentHash , blockHash , feeRecipient string , blockNumber uint64 ) * api. VersionedExecutionPayload {
261- return & api. VersionedExecutionPayload {
262- Version : consensusspec . DataVersionCapella ,
262+ func (m * mockRelay ) MakeGetPayloadResponse (parentHash , blockHash , feeRecipient string , blockNumber uint64 , version spec. DataVersion ) * builderApi. VersionedSubmitBlindedBlockResponse {
263+ return & builderApi. VersionedSubmitBlindedBlockResponse {
264+ Version : version ,
263265 Capella : & capella.ExecutionPayload {
264266 ParentHash : _HexToHash (parentHash ),
265267 BlockHash : _HexToHash (blockHash ),
@@ -294,6 +296,7 @@ func (m *mockRelay) defaultHandleGetPayload(w http.ResponseWriter) {
294296 "0x534809bd2b6832edff8d8ce4cb0e50068804fd1ef432c8362ad708a74fdc0e46" ,
295297 "0xdb65fEd33dc262Fe09D9a2Ba8F80b329BA25f941" ,
296298 12345 ,
299+ spec .DataVersionCapella ,
297300 )
298301
299302 if m .GetPayloadResponse != nil {
0 commit comments