Skip to content
This repository was archived by the owner on Sep 28, 2026. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 13 additions & 34 deletions api/builder.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"bytes"
"context"
"encoding/json"
"errors"
"fmt"
"io/ioutil"
"mergemock/types"
Expand All @@ -14,11 +15,8 @@ import (
"github.com/sirupsen/logrus"
)

func BuilderGetHeader(ctx context.Context, log logrus.Ext1FieldLogger, sk bls.SecretKey, builderAddr string, blockHash common.Hash) (*types.ExecutionPayloadHeader, error) {
e := log.WithField("blockHash", blockHash)
e.Debug("getting header")

path := fmt.Sprintf("/eth/v1/builder/header/%d/%s/0x%x", 1, blockHash.Hex(), sk.PublicKey().Marshal())
func BuilderGetHeader(ctx context.Context, log logrus.Ext1FieldLogger, builderAddr string, slot uint64, blockHash common.Hash, pubkey []byte) (*types.ExecutionPayloadHeader, error) {
path := fmt.Sprintf("/eth/v1/builder/header/%d/%s/0x%x", slot, blockHash.Hex(), pubkey)
url := builderAddr + path
resp, err := http.Get(url)
if err != nil {
Expand All @@ -39,37 +37,19 @@ func BuilderGetHeader(ctx context.Context, log logrus.Ext1FieldLogger, sk bls.Se
return nil, err
}

e.Debug("Received payload")
return bid.Data.Message.Header, nil
}

func BuilderGetPayload(ctx context.Context, log logrus.Ext1FieldLogger, sk bls.SecretKey, builderAddr string, header *types.ExecutionPayloadHeader) (*types.ExecutionPayloadV1, error) {
e := log.WithField("block_hash", header.BlockHash)
e.Debug("sending payload for execution")

msg := &types.BlindedBeaconBlock{
Slot: 1,
ProposerIndex: 1,
Body: &types.BlindedBeaconBlockBody{
Eth1Data: &types.Eth1Data{},
SyncAggregate: &types.SyncAggregate{},
ExecutionPayloadHeader: header,
},
// Verify signature
ok, err := types.VerifySignature(bid.Data.Message, bid.Data.Message.Pubkey[:], bid.Data.Signature[:])
if !ok || err != nil {
log.WithError(err).Warn("Failed to verify header signature")
return nil, errors.New("failed to verify header signature")
}

// Sign payload
root, err := msg.HashTreeRoot()
if err != nil {
return nil, err
}
sig := sk.Sign(root[:]).Marshal()
var signature types.Signature
signature.FromSlice(sig)
// TODO: we should eventually add a list of "trusted" builders to cross-reference the builder pubkey against
return bid.Data.Message.Header, nil
}

payloadBytes, err := json.Marshal(types.SignedBlindedBeaconBlock{
Message: msg,
Signature: signature,
})
func BuilderGetPayload(ctx context.Context, log logrus.Ext1FieldLogger, sk bls.SecretKey, builderAddr string, signedBlindedBeaconBlock *types.SignedBlindedBeaconBlock) (*types.ExecutionPayloadV1, error) {
payloadBytes, err := json.Marshal(signedBlindedBeaconBlock)
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -100,7 +80,6 @@ func BuilderGetPayload(ctx context.Context, log logrus.Ext1FieldLogger, sk bls.S
return nil, err
}

e.Debug("Received proposed payload")
elPayload, err := types.RESTPayloadToELPayload(getPayloadResponse.Data)
if err != nil {
return nil, err
Expand Down
28 changes: 24 additions & 4 deletions consensus.go
Original file line number Diff line number Diff line change
Expand Up @@ -392,14 +392,34 @@ func (c *ConsensusCmd) sendForkchoiceUpdated(latest, safe, final common.Hash, at
return result.PayloadID, nil
}

func (c *ConsensusCmd) getMockProposal(ctx context.Context, log logrus.Ext1FieldLogger, payloadId types.PayloadID) (*types.ExecutionPayloadV1, error) {
func (c *ConsensusCmd) getMockProposal(ctx context.Context, log logrus.Ext1FieldLogger, payloadId types.PayloadID, slot uint64) (*types.ExecutionPayloadV1, error) {
// If the CL is connected to builder client, request the payload from there.
if c.BuilderAddr != "" {
header, err := api.BuilderGetHeader(c.ctx, log, c.sk, c.BuilderAddr, c.mockChain.CurrentHeader().Hash())
header, err := api.BuilderGetHeader(c.ctx, log, c.BuilderAddr, slot, c.mockChain.CurrentHeader().Hash(), c.sk.PublicKey().Marshal())
if err != nil {
return nil, err
}
payload, err := api.BuilderGetPayload(ctx, log, c.sk, c.BuilderAddr, header)

signedBlindedBeaconBlock := &types.SignedBlindedBeaconBlock{
Message: &types.BlindedBeaconBlock{
Slot: slot,
ProposerIndex: 1,
Body: &types.BlindedBeaconBlockBody{
Eth1Data: &types.Eth1Data{},
SyncAggregate: &types.SyncAggregate{},
ExecutionPayloadHeader: header,
},
},
Signature: types.Signature{},
}
root, err := signedBlindedBeaconBlock.Message.HashTreeRoot()
if err != nil {
return nil, err
}
sig := c.sk.Sign(root[:]).Marshal()
signedBlindedBeaconBlock.Signature.FromSlice(sig)

payload, err := api.BuilderGetPayload(ctx, log, c.sk, c.BuilderAddr, signedBlindedBeaconBlock)
if err != nil {
return nil, err
}
Expand All @@ -418,7 +438,7 @@ func (c *ConsensusCmd) mockProposal(log logrus.Ext1FieldLogger, payloadId types.
ctx, cancel := context.WithTimeout(c.ctx, time.Second*20)
defer cancel()

payload, err := c.getMockProposal(ctx, log, payloadId)
payload, err := c.getMockProposal(ctx, log, payloadId, slot)
if err != nil {
log.WithError(err).Error("Unable to retrieve proposal payload")
maybeExit(c.SlotBound)
Expand Down
63 changes: 24 additions & 39 deletions relay.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (
"mergemock/rpc"
"mergemock/types"
"net/http"
"strconv"
"time"

"github.com/ethereum/go-ethereum/common"
Expand All @@ -24,6 +25,8 @@ const (
)

var (
errInvalidSlot = errors.New("invalid slot")
errInvalidHash = errors.New("invalid hash")
errInvalidPubkey = errors.New("invalid pubkey")
errInvalidSignature = errors.New("invalid signature")

Expand Down Expand Up @@ -140,26 +143,6 @@ func NewRelayBackend(log *logrus.Logger, engineListenAddr, engineListenAddrWs st
return &RelayBackend{log, engine, pk, sk, types.PublicKey{}}, nil
}

type hashTreeRoot interface {
HashTreeRoot() ([32]byte, error)
}

func verifySignature(obj hashTreeRoot, pk, s []byte) (bool, error) {
msg, err := obj.HashTreeRoot()
if err != nil {
return false, err
}
sig, err := bls.SignatureFromBytes(s)
if err != nil {
return false, err
}
pubkey, err := bls.PublicKeyFromBytes(pk)
if err != nil {
return false, err
}
return sig.Verify(pubkey, msg[:]), nil
}

func (r *RelayBackend) getRouter() http.Handler {
router := mux.NewRouter()

Expand All @@ -175,7 +158,9 @@ func (r *RelayBackend) getRouter() http.Handler {
}

func (r *RelayBackend) handleStatus(w http.ResponseWriter, req *http.Request) {
w.Header().Set("Content-Type", "application/json")
w.WriteHeader(http.StatusOK)
fmt.Fprintf(w, `{}`)
}

func (r *RelayBackend) handleRegisterValidator(w http.ResponseWriter, req *http.Request) {
Expand All @@ -195,15 +180,17 @@ func (r *RelayBackend) handleRegisterValidator(w http.ResponseWriter, req *http.
return
}

ok, err := verifySignature(payload.Message, payload.Message.Pubkey[:], payload.Signature[:])
ok, err := types.VerifySignature(payload.Message, payload.Message.Pubkey[:], payload.Signature[:])
if !ok || err != nil {
r.log.WithError(err).Error("error verifying signature")
http.Error(w, errInvalidSignature.Error(), http.StatusBadRequest)
return
}

// TODO: update mapping?
w.Header().Set("Content-Type", "application/json")
w.WriteHeader(http.StatusOK)
fmt.Fprintf(w, `{}`)
}

func (r *RelayBackend) handleGetHeader(w http.ResponseWriter, req *http.Request) {
Expand All @@ -218,6 +205,21 @@ func (r *RelayBackend) handleGetHeader(w http.ResponseWriter, req *http.Request)
})
plog.Info("getHeader")

if _, err := strconv.ParseInt(slot, 10, 64); err != nil {
http.Error(w, errInvalidSlot.Error(), http.StatusBadRequest)
return
}

if len(pubkey) != 98 {
http.Error(w, errInvalidPubkey.Error(), http.StatusBadRequest)
return
}

if len(parentHashHex) != 66 {
http.Error(w, errInvalidHash.Error(), http.StatusBadRequest)
return
}

payload, ok := r.engine.backend.recentPayloads.Get(common.HexToHash(parentHashHex))
if !ok {
plog.Warn("Cannot get unknown payload")
Expand Down Expand Up @@ -281,15 +283,14 @@ func (r *RelayBackend) handleGetPayload(w http.ResponseWriter, req *http.Request
return
}

ok, err := verifySignature(payload.Message, r.latestPubkey[:], payload.Signature[:])
ok, err := types.VerifySignature(payload.Message, r.latestPubkey[:], payload.Signature[:])
if !ok || err != nil {
plog.WithError(err).Error("error verifying signature")
http.Error(w, errInvalidSignature.Error(), http.StatusBadRequest)
return
}

parentHashHex := payload.Message.Body.ExecutionPayloadHeader.ParentHash.String()
fmt.Println("===== getPayload get for parentHash", parentHashHex, "blockHash", payload.Message.Body.ExecutionPayloadHeader.BlockHash)
_execPayloadEL, ok := r.engine.backend.recentPayloads.Get(common.HexToHash(parentHashHex))
if !ok {
plog.Warn("Cannot get unknown payload")
Expand Down Expand Up @@ -317,19 +318,3 @@ func (r *RelayBackend) handleGetPayload(w http.ResponseWriter, req *http.Request
}
w.WriteHeader(http.StatusOK)
}

// func (r *RelayBackend) GetHeaderV1(ctx context.Context, slot hexutil.Uint64, pubkey hexutil.Bytes, parentHash common.Hash) (*types.SignedBuilderBidV1, error) {
// plog := r.log.WithField("parentHash", parentHash)
// }

// func (r *RelayBackend) GetPayloadV1(ctx context.Context, block types.BlindedBeaconBlockV1, signature hexutil.Bytes) (*types.ExecutionPayloadV1, error) {
// hash := block.Body.ExecutionPayloadHeader.BlockHash
// plog := r.log.WithField("blockhash", hash)
// payload, ok := r.recentPayloads.Get(hash)
// if !ok {
// plog.Warn("Cannot get unknown payload")
// return nil, &rpc.Error{Err: fmt.Errorf("unknown payload %d", hash), Id: int(api.UnavailablePayload)}
// }
// plog.Info("Consensus client retrieved prepared payload header")
// return payload.(*types.ExecutionPayloadV1), nil
// }
4 changes: 2 additions & 2 deletions relay_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -157,14 +157,14 @@ func TestGetHeader(t *testing.T) {

path := fmt.Sprintf("/eth/v1/builder/header/%d/%s/0x%x", 0, parentHash.Hex(), pk)
rr := relay.testRequest(t, "GET", path, nil)
require.Equal(t, http.StatusOK, rr.Code)
require.Equal(t, http.StatusOK, rr.Code, rr.Body.String())

bid := new(types.GetHeaderResponse)
err = json.Unmarshal(rr.Body.Bytes(), bid)
require.NoError(t, err)

require.Equal(t, parentHash[:], bid.Data.Message.Header.ParentHash[:], "didn't build on expected parent")
ok, err := verifySignature(bid.Data.Message, relay.pk[:], bid.Data.Signature[:])
ok, err := types.VerifySignature(bid.Data.Message, relay.pk[:], bid.Data.Signature[:])
require.NoError(t, err, "error verifying signature")
require.True(t, ok, "bid signature not valid")

Expand Down
Loading